Revision 49763
Added by Panagiotis Kanakakis over 6 years ago
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/RestService.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.controllers; |
|
2 |
|
|
3 |
import org.springframework.stereotype.Component; |
|
4 |
import org.springframework.web.client.RestTemplate; |
|
5 |
|
|
6 |
@Component |
|
7 |
public class RestService { |
|
8 |
|
|
9 |
private static RestTemplate restTemplate = new org.springframework.web.client.RestTemplate(); |
|
10 |
|
|
11 |
|
|
12 |
public static String executeGET(String uri){ |
|
13 |
return restTemplate.getForObject(uri,String.class); |
|
14 |
} |
|
15 |
|
|
16 |
public static String executePOST(String uri,String json){ |
|
17 |
return restTemplate.postForObject(uri,json,String.class); |
|
18 |
} |
|
19 |
} |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/Range.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/Vocabulary.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/UserAccessException.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/DatasourceRegistrationState.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
import eu.dnetlib.domain.data.Repository; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/utils/Converter.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
import eu.dnetlib.domain.data.Repository; |
4 | 4 |
import eu.dnetlib.domain.data.RepositoryInterface; |
5 |
import eu.dnetlib.repo.manager.shared.*; |
|
6 |
import org.apache.log4j.Logger; |
|
5 | 7 |
import org.json.JSONArray; |
6 | 8 |
import org.json.JSONException; |
7 | 9 |
import org.json.JSONObject; |
... | ... | |
16 | 18 |
|
17 | 19 |
public class Converter { |
18 | 20 |
|
19 |
public static Repository jsonToRepositoryObject(JSONObject jsonObject) throws JSONException {
|
|
21 |
private static final Logger LOGGER = Logger.getLogger(Converter.class);
|
|
20 | 22 |
|
23 |
public static Repository jsonToRepositoryObject(JSONObject repositoryObject) throws JSONException { |
|
24 |
|
|
21 | 25 |
Repository repository = new Repository(); |
22 | 26 |
|
23 |
if( jsonObject.get("datasource").equals(null))
|
|
27 |
if( repositoryObject.get("datasource").equals(null))
|
|
24 | 28 |
return null; |
25 | 29 |
|
26 |
JSONObject datasource = (JSONObject) jsonObject.get("datasource");
|
|
30 |
JSONObject datasource = (JSONObject) repositoryObject.get("datasource");
|
|
27 | 31 |
|
28 | 32 |
repository.setActivationId(datasource.get("activationId").toString()); |
29 | 33 |
repository.setAggregator(datasource.get("aggregator").toString()); |
... | ... | |
35 | 39 |
repository.setDatabaseAccessType(datasource.get("databaseaccesstype").toString()); |
36 | 40 |
repository.setDataUploadRestriction(datasource.get("datauploadrestriction").toString()); |
37 | 41 |
repository.setDataUploadType(datasource.get("datauploadtype").toString()); |
38 |
repository.setDateOfCollection(convertDate( datasource.get("dateofcollection").toString())); |
|
39 |
repository.setDateOfValidation(convertDate( datasource.get("dateofvalidation").toString())); |
|
42 |
repository.setDateOfCollection(convertStringToDate( datasource.get("dateofcollection").toString()));
|
|
43 |
repository.setDateOfValidation(convertStringToDate( datasource.get("dateofvalidation").toString()));
|
|
40 | 44 |
repository.setDescription(datasource.get("description").toString()); |
41 | 45 |
repository.setEissn(datasource.get("eissn").toString()); |
42 | 46 |
repository.setEnglishName( datasource.get("englishname").toString()); |
... | ... | |
57 | 61 |
repository.setProvenanceActionClass( datasource.get("provenanceaction").toString()); |
58 | 62 |
repository.setQualityManagementKind(datasource.get("qualitymanagementkind").toString()); |
59 | 63 |
repository.setRegisteredBy(datasource.get("registeredby").toString()); |
60 |
repository.setReleaseEndDate(convertDate(datasource.get("releaseenddate").toString())); |
|
61 |
repository.setReleaseStartDate(convertDate(datasource.get("releasestartdate").toString())); |
|
64 |
repository.setReleaseEndDate(convertStringToDate(datasource.get("releaseenddate").toString()));
|
|
65 |
repository.setReleaseStartDate(convertStringToDate(datasource.get("releasestartdate").toString()));
|
|
62 | 66 |
repository.setServiceProvider(Boolean.valueOf(datasource.get("serviceprovider").toString())); |
63 | 67 |
//datasource.get("subjects"); |
64 | 68 |
Double timezone = toDouble(datasource.get("timezone").toString()); |
... | ... | |
69 | 73 |
return repository; |
70 | 74 |
} |
71 | 75 |
|
72 |
public static Date convertDate(String date){ |
|
76 |
public static Date convertStringToDate(String date){
|
|
73 | 77 |
|
74 | 78 |
if(Objects.equals(date, "null")) |
75 | 79 |
return null; |
... | ... | |
83 | 87 |
return null; |
84 | 88 |
} |
85 | 89 |
|
86 |
public static String convertDateToString(String date){
|
|
90 |
public static String convertDateToString(Date date){
|
|
87 | 91 |
|
88 | 92 |
if(Objects.equals(date, "null")) |
89 | 93 |
return null; |
90 | 94 |
|
91 |
SimpleDateFormat formatter = new SimpleDateFormat("E MMM dd HH:mm:ss Z yyyy"); |
|
92 |
|
|
93 |
Date d = null; |
|
94 |
try { |
|
95 |
d = (Date)formatter.parse(date); |
|
96 |
Calendar cal = Calendar.getInstance(); |
|
97 |
cal.setTime(d); |
|
98 |
return cal.get(Calendar.DATE) + "-" + (cal.get(Calendar.MONTH) + 1) + "-" + cal.get(Calendar.YEAR); |
|
99 |
|
|
100 |
} catch (ParseException e) { |
|
101 |
e.printStackTrace(); |
|
102 |
} |
|
103 |
return null; |
|
95 |
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); |
|
96 |
return formatter.format(date); |
|
104 | 97 |
} |
105 | 98 |
|
106 | 99 |
public static Double toDouble(String number){ |
... | ... | |
118 | 111 |
return resultSet; |
119 | 112 |
} |
120 | 113 |
|
121 |
public static RepositoryInterface jsonToRepositoryInterfaceObject(JSONObject jsonObject) throws JSONException {
|
|
114 |
public static RepositoryInterface jsonToRepositoryInterfaceObject(JSONObject repositoryInterfaceObject) throws JSONException {
|
|
122 | 115 |
|
123 | 116 |
RepositoryInterface repositoryInterface = new RepositoryInterface(); |
124 | 117 |
|
125 |
repositoryInterface.setBaseUrl(jsonObject.get("baseurl").toString());
|
|
126 |
repositoryInterface.setContentDescription(jsonObject.get("contentdescription").toString());
|
|
127 |
repositoryInterface.setId(jsonObject.get("id").toString());
|
|
128 |
repositoryInterface.setMetadataIdentifierPath(jsonObject.get("metadataIdentifierPath").toString());
|
|
129 |
repositoryInterface.setAccessProtocol(jsonObject.get("protocol").toString());
|
|
130 |
repositoryInterface.setTypology(jsonObject.get("typology").toString());
|
|
131 |
repositoryInterface.setDesiredCompatibilityLevel(jsonObject.get("compatibility").toString());
|
|
132 |
repositoryInterface.setActive(Boolean.parseBoolean(jsonObject.get("active").toString()));
|
|
133 |
repositoryInterface.setRemovable(Boolean.parseBoolean(jsonObject.get("removable").toString()));
|
|
118 |
repositoryInterface.setBaseUrl(repositoryInterfaceObject.get("baseurl").toString());
|
|
119 |
repositoryInterface.setContentDescription(repositoryInterfaceObject.get("contentdescription").toString());
|
|
120 |
repositoryInterface.setId(repositoryInterfaceObject.get("id").toString());
|
|
121 |
repositoryInterface.setMetadataIdentifierPath(repositoryInterfaceObject.get("metadataIdentifierPath").toString());
|
|
122 |
repositoryInterface.setAccessProtocol(repositoryInterfaceObject.get("protocol").toString());
|
|
123 |
repositoryInterface.setTypology(repositoryInterfaceObject.get("typology").toString());
|
|
124 |
repositoryInterface.setDesiredCompatibilityLevel(repositoryInterfaceObject.get("compatibility").toString());
|
|
125 |
repositoryInterface.setActive(Boolean.parseBoolean(repositoryInterfaceObject.get("active").toString()));
|
|
126 |
repositoryInterface.setRemovable(Boolean.parseBoolean(repositoryInterfaceObject.get("removable").toString()));
|
|
134 | 127 |
|
135 | 128 |
return repositoryInterface; |
136 | 129 |
} |
... | ... | |
148 | 141 |
jsonObject.put("databaseaccesstype",repository.getDatabaseAccessType()); |
149 | 142 |
jsonObject.put("datauploadrestriction",repository.getDataUploadRestriction()); |
150 | 143 |
jsonObject.put("datauploadtype",repository.getDataUploadType()); |
151 |
jsonObject.put("dateofcollection",convertDateToString(String.valueOf(repository.getDateOfCollection())));
|
|
152 |
jsonObject.put("dateofvalidation",convertDateToString(String.valueOf(repository.getDateOfValidation())));
|
|
144 |
jsonObject.put("dateofcollection",convertDateToString(repository.getDateOfCollection()));
|
|
145 |
jsonObject.put("dateofvalidation",convertDateToString(repository.getDateOfValidation()));
|
|
153 | 146 |
jsonObject.put("description",repository.getDescription()); |
154 | 147 |
jsonObject.put("eissn",repository.getEissn()); |
155 | 148 |
jsonObject.put("englishname",repository.getEnglishName()); |
... | ... | |
168 | 161 |
jsonObject.put("provenanceaction",repository.getProvenanceActionClass()); |
169 | 162 |
jsonObject.put("qualitymanagementkind",repository.getQualityManagementKind()); |
170 | 163 |
jsonObject.put("registeredby",repository.getRegisteredBy()); |
171 |
jsonObject.put("releaseenddate",convertDateToString(String.valueOf(repository.getReleaseEndDate())));
|
|
172 |
jsonObject.put("releasestartdate",convertDateToString(String.valueOf(repository.getReleaseStartDate())));
|
|
164 |
jsonObject.put("releaseenddate",convertDateToString(repository.getReleaseEndDate()));
|
|
165 |
jsonObject.put("releasestartdate",convertDateToString(repository.getReleaseStartDate()));
|
|
173 | 166 |
jsonObject.put("serviceprovider",repository.getServiceProvider()); |
174 | 167 |
jsonObject.put("timezone",repository.getTimezone()); |
175 | 168 |
jsonObject.put("typology",repository.getTypology()); |
... | ... | |
213 | 206 |
} |
214 | 207 |
return list; |
215 | 208 |
} |
209 |
|
|
210 |
public static List<AggregationDetails> getAggregationHistoryFromJson(JSONObject repositoryObject) throws JSONException { |
|
211 |
|
|
212 |
if( repositoryObject.get("aggregationHistory").toString().equals("[]")) |
|
213 |
return null; |
|
214 |
|
|
215 |
JSONArray rs = new JSONArray(repositoryObject.get("aggregationHistory").toString()); |
|
216 |
List<AggregationDetails> aggregationDetailsList = new ArrayList<>(); |
|
217 |
for(int i=0;i<rs.length();i++) |
|
218 |
aggregationDetailsList.add(jsonToAggregationDetails(rs.getJSONObject(i))); |
|
219 |
return aggregationDetailsList; |
|
220 |
} |
|
221 |
|
|
222 |
private static AggregationDetails jsonToAggregationDetails(JSONObject aggregationObject) throws JSONException { |
|
223 |
|
|
224 |
AggregationDetails aggregationDetails = new AggregationDetails(); |
|
225 |
aggregationDetails.setAggregationStage(aggregationObject.get("aggregationStage").toString()); |
|
226 |
aggregationDetails.setCollectionMode(aggregationObject.get("collectionMode").toString()); |
|
227 |
aggregationDetails.setDate(convertStringToDate(aggregationObject.get("date").toString())); |
|
228 |
aggregationDetails.setNumberOfRecords(Integer.parseInt(aggregationObject.get("numberOfRecords").toString())); |
|
229 |
return aggregationDetails; |
|
230 |
} |
|
231 |
|
|
232 |
public static AggregationDetails getLastCollectionFromJson(JSONObject repositoryObject) throws JSONException { |
|
233 |
|
|
234 |
if( repositoryObject.get("lastCollection").equals(null)) |
|
235 |
return null; |
|
236 |
|
|
237 |
return jsonToAggregationDetails(repositoryObject.getJSONObject("lastCollection")); |
|
238 |
} |
|
239 |
|
|
240 |
public static AggregationDetails getLastTransformationFromJson(JSONObject repositoryObject) throws JSONException { |
|
241 |
|
|
242 |
if( repositoryObject.get("lastTransformation").equals(null)) |
|
243 |
return null; |
|
244 |
|
|
245 |
return jsonToAggregationDetails(repositoryObject.getJSONObject("lastTransformation")); |
|
246 |
} |
|
247 |
|
|
248 |
public static List<Timezone> toTimezones(List<String> timezones) { |
|
249 |
|
|
250 |
List<Timezone> tmz = new ArrayList<>(); |
|
251 |
for(String t : timezones){ |
|
252 |
String[] s = t.split("\t"); |
|
253 |
tmz.add(new Timezone(s[1],Double.parseDouble(s[0]))); |
|
254 |
} |
|
255 |
return tmz; |
|
256 |
} |
|
216 | 257 |
} |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/BrokerApiImpl.java | ||
---|---|---|
4 | 4 |
import com.fasterxml.jackson.databind.ObjectMapper; |
5 | 5 |
import com.google.gson.Gson; |
6 | 6 |
import eu.dnetlib.domain.data.Repository; |
7 |
import eu.dnetlib.repo.manager.service.shared.BrokerException;
|
|
8 |
import eu.dnetlib.repo.manager.service.shared.Tuple;
|
|
9 |
import eu.dnetlib.repo.manager.service.shared.broker.AdvQueryObject;
|
|
10 |
import eu.dnetlib.repo.manager.service.shared.broker.BrowseEntry;
|
|
11 |
import eu.dnetlib.repo.manager.service.shared.broker.DatasourcesBroker;
|
|
12 |
import eu.dnetlib.repo.manager.service.shared.broker.EventsPage;
|
|
7 |
import eu.dnetlib.repo.manager.shared.BrokerException; |
|
8 |
import eu.dnetlib.repo.manager.shared.Tuple; |
|
9 |
import eu.dnetlib.repo.manager.shared.broker.AdvQueryObject; |
|
10 |
import eu.dnetlib.repo.manager.shared.broker.BrowseEntry; |
|
11 |
import eu.dnetlib.repo.manager.shared.broker.DatasourcesBroker; |
|
12 |
import eu.dnetlib.repo.manager.shared.broker.EventsPage; |
|
13 | 13 |
import org.json.JSONException; |
14 | 14 |
import org.json.JSONObject; |
15 | 15 |
import org.springframework.beans.factory.annotation.Autowired; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/MonitorApi.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
import eu.dnetlib.api.functionality.ValidatorServiceException; |
4 | 4 |
import eu.dnetlib.domain.functionality.validator.StoredJob; |
5 |
import eu.dnetlib.repo.manager.service.shared.JobsOfUser;
|
|
5 |
import eu.dnetlib.repo.manager.shared.JobsOfUser; |
|
6 | 6 |
import org.json.JSONException; |
7 |
import org.json.JSONObject; |
|
8 | 7 |
import org.springframework.http.MediaType; |
9 | 8 |
import org.springframework.web.bind.annotation.*; |
10 | 9 |
|
11 |
import java.util.List; |
|
12 |
import java.util.Map; |
|
13 |
|
|
14 | 10 |
@RestController |
15 | 11 |
@RequestMapping(value = "/monitor") |
16 | 12 |
public interface MonitorApi { |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApiImpl.java | ||
---|---|---|
6 | 6 |
import gr.uoa.di.driver.util.ServiceLocator; |
7 | 7 |
import eu.dnetlib.domain.functionality.validator.JobForValidation; |
8 | 8 |
import eu.dnetlib.domain.functionality.validator.RuleSet; |
9 |
import eu.dnetlib.repo.manager.service.shared.Constants;
|
|
9 |
import eu.dnetlib.repo.manager.shared.Constants; |
|
10 | 10 |
|
11 | 11 |
import java.util.*; |
12 | 12 |
import java.util.concurrent.ConcurrentHashMap; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/MonitorApiImpl.java | ||
---|---|---|
3 | 3 |
import eu.dnetlib.api.functionality.ValidatorService; |
4 | 4 |
import eu.dnetlib.api.functionality.ValidatorServiceException; |
5 | 5 |
import eu.dnetlib.domain.functionality.validator.StoredJob; |
6 |
import eu.dnetlib.repo.manager.service.shared.JobsOfUser;
|
|
7 |
import eu.dnetlib.repo.manager.service.shared.Constants;
|
|
6 |
import eu.dnetlib.repo.manager.shared.JobsOfUser; |
|
7 |
import eu.dnetlib.repo.manager.shared.Constants; |
|
8 | 8 |
import gr.uoa.di.driver.util.ServiceLocator; |
9 | 9 |
import org.apache.log4j.Logger; |
10 | 10 |
import org.json.JSONException; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApi.java | ||
---|---|---|
2 | 2 |
|
3 | 3 |
import eu.dnetlib.domain.data.Repository; |
4 | 4 |
import eu.dnetlib.domain.data.RepositoryInterface; |
5 |
import eu.dnetlib.repo.manager.service.shared.Country;
|
|
5 |
import eu.dnetlib.repo.manager.shared.*;
|
|
6 | 6 |
import org.json.JSONException; |
7 | 7 |
import org.springframework.http.MediaType; |
8 | 8 |
import org.springframework.web.bind.annotation.RequestMapping; |
... | ... | |
10 | 10 |
import org.springframework.web.bind.annotation.ResponseBody; |
11 | 11 |
import org.springframework.web.bind.annotation.RestController; |
12 | 12 |
import java.util.List; |
13 |
import java.util.Map; |
|
14 | 13 |
import java.util.Set; |
15 | 14 |
|
16 | 15 |
@RestController |
17 | 16 |
@RequestMapping(value = "/repository") |
18 | 17 |
public interface RepositoryApi { |
19 | 18 |
|
19 |
|
|
20 |
@RequestMapping(value = "/testAggregations", method = RequestMethod.GET, |
|
21 |
produces = MediaType.APPLICATION_JSON_VALUE) |
|
22 |
@ResponseBody |
|
23 |
Aggregations testAggregations() throws JSONException; |
|
24 |
|
|
20 | 25 |
@RequestMapping(value = "/getCountries", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) |
21 | 26 |
@ResponseBody |
22 | 27 |
Country[] getCountries() ; |
... | ... | |
28 | 33 |
|
29 | 34 |
@RequestMapping(value = "/getRepositoriesOfUser/{userEmail}/{page}/{size}") |
30 | 35 |
@ResponseBody |
31 |
List<Repository> getRepositoriesOfUser( String userEmail,
|
|
32 |
String page, |
|
33 |
String size) throws JSONException; |
|
36 |
List<Repository> getRepositoriesOfUser(String userEmail, |
|
37 |
String page,
|
|
38 |
String size) throws JSONException;
|
|
34 | 39 |
|
35 | 40 |
@RequestMapping(value = "/getRepositoryById/{id}", method = RequestMethod.GET, |
36 | 41 |
produces = MediaType.APPLICATION_JSON_VALUE) |
37 | 42 |
@ResponseBody |
38 | 43 |
Repository getRepositoryById(String id) throws JSONException; |
39 | 44 |
|
45 |
|
|
46 |
@RequestMapping(value = "/getRepositoryAggregations/{id}", method = RequestMethod.GET, |
|
47 |
produces = MediaType.APPLICATION_JSON_VALUE) |
|
48 |
@ResponseBody |
|
49 |
Aggregations getRepositoryAggregations(String id) throws JSONException; |
|
50 |
|
|
51 |
|
|
40 | 52 |
@RequestMapping(value = "/getRepositoriesByName/{name}/{page}/{size}/", method = RequestMethod.GET, |
41 | 53 |
produces = MediaType.APPLICATION_JSON_VALUE) |
42 | 54 |
@ResponseBody |
43 | 55 |
List<Repository> getRepositoriesByName(String name, |
44 |
String page, |
|
45 |
String size) throws JSONException; |
|
56 |
String page,
|
|
57 |
String size) throws JSONException;
|
|
46 | 58 |
|
47 | 59 |
@RequestMapping(value = "/getRepositoryInterface/{id}", method = RequestMethod.GET, |
48 | 60 |
produces = MediaType.APPLICATION_JSON_VALUE) |
... | ... | |
72 | 84 |
@RequestMapping(value = "/getTimezones", method = RequestMethod.GET, |
73 | 85 |
produces = MediaType.APPLICATION_JSON_VALUE) |
74 | 86 |
@ResponseBody |
75 |
List<String> getTimezones();
|
|
87 |
List<Timezone> getTimezones();
|
|
76 | 88 |
|
77 | 89 |
@RequestMapping(value = "/updateManagedStatus", method = RequestMethod.POST, |
78 | 90 |
produces = MediaType.APPLICATION_JSON_VALUE) |
79 | 91 |
@ResponseBody |
80 |
String updateManagedStatus(String id,String managed); |
|
92 |
String updateManagedStatus(String id, String managed);
|
|
81 | 93 |
|
82 | 94 |
@RequestMapping(value = "/updateEnglishName", method = RequestMethod.POST, |
83 | 95 |
produces = MediaType.APPLICATION_JSON_VALUE) |
84 | 96 |
@ResponseBody |
85 |
String updateEnglishName(String id,String englishName); |
|
97 |
String updateEnglishName(String id, String englishName);
|
|
86 | 98 |
|
87 | 99 |
@RequestMapping(value = "/updateLatitude", method = RequestMethod.POST, |
88 | 100 |
produces = MediaType.APPLICATION_JSON_VALUE) |
89 | 101 |
@ResponseBody |
90 |
String updateLatitude(String id,String latitude); |
|
102 |
String updateLatitude(String id, String latitude);
|
|
91 | 103 |
|
92 | 104 |
@RequestMapping(value = "/updateLongitude", method = RequestMethod.POST, |
93 | 105 |
produces = MediaType.APPLICATION_JSON_VALUE) |
94 | 106 |
@ResponseBody |
95 |
String updateLongitude(String id,String longitude); |
|
107 |
String updateLongitude(String id, String longitude);
|
|
96 | 108 |
|
97 | 109 |
@RequestMapping(value = "/updateOfficialName", method = RequestMethod.POST, |
98 | 110 |
produces = MediaType.APPLICATION_JSON_VALUE) |
99 | 111 |
@ResponseBody |
100 |
String updateOfficialName(String id,String officialName); |
|
112 |
String updateOfficialName(String id, String officialName);
|
|
101 | 113 |
|
102 |
@RequestMapping(value = "/getUrlsOfUserRepos/{user_email}",method = RequestMethod.GET,
|
|
114 |
@RequestMapping(value = "/getUrlsOfUserRepos/{email}/{page}/{size}/",method = RequestMethod.GET,
|
|
103 | 115 |
produces = MediaType.APPLICATION_JSON_VALUE) |
104 | 116 |
@ResponseBody |
105 |
String getUrlsOfUserRepos(String user_email); |
|
117 |
List<String> getUrlsOfUserRepos(String user_email, |
|
118 |
String page, |
|
119 |
String size) throws JSONException; |
|
106 | 120 |
|
107 | 121 |
@RequestMapping(value = "/getDatasourceVocabularies/{mode}",method = RequestMethod.GET, |
108 | 122 |
produces = MediaType.APPLICATION_JSON_VALUE) |
... | ... | |
113 | 127 |
|
114 | 128 |
|
115 | 129 |
|
130 |
|
|
131 |
|
|
116 | 132 |
} |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/Pid.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/DatasourcesBroker.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
import eu.dnetlib.repo.manager.service.shared.Tuple; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/Subscription.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
/** |
4 | 4 |
* Created by stefanos on 10-Mar-17. |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/AdvQueryObject.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker;
|
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/InterfaceInformation.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/Constants.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/JobsOfUser.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
import eu.dnetlib.domain.functionality.validator.StoredJob; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/DatasourcesCollection.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
import eu.dnetlib.domain.data.Repository; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApiImpl.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.repo.manager.service.controllers; |
2 | 2 |
|
3 | 3 |
import eu.dnetlib.domain.enabling.Vocabulary; |
4 |
import eu.dnetlib.repo.manager.service.shared.Country; |
|
5 | 4 |
import eu.dnetlib.repo.manager.service.utils.Converter; |
6 | 5 |
import eu.dnetlib.domain.data.Repository; |
7 | 6 |
import eu.dnetlib.domain.data.RepositoryInterface; |
8 | 7 |
import gr.uoa.di.driver.enabling.vocabulary.VocabularyLoader; |
8 |
import org.apache.log4j.Logger; |
|
9 | 9 |
import org.json.JSONArray; |
10 | 10 |
import org.json.JSONException; |
11 | 11 |
import org.json.JSONObject; |
... | ... | |
19 | 19 |
import org.springframework.web.client.RestTemplate; |
20 | 20 |
import org.springframework.web.util.UriComponents; |
21 | 21 |
import org.springframework.web.util.UriComponentsBuilder; |
22 |
|
|
23 | 22 |
import javax.annotation.PostConstruct; |
24 | 23 |
import java.util.*; |
25 | 24 |
import java.util.concurrent.ConcurrentHashMap; |
25 |
import eu.dnetlib.repo.manager.shared.*; |
|
26 | 26 |
|
27 |
|
|
28 | 27 |
@Component |
29 | 28 |
public class RepositoryApiImpl implements RepositoryApi { |
30 | 29 |
|
... | ... | |
35 | 34 |
|
36 | 35 |
private final String[] vocabularyNames = {"dnet:countries", "dnet:datasource_typologies", "dnet:compatibilityLevel"}; |
37 | 36 |
|
37 |
private static final Logger LOGGER = Logger.getLogger(RepositoryApiImpl.class); |
|
38 |
|
|
38 | 39 |
@Autowired |
39 | 40 |
private VocabularyLoader vocabularyLoader; |
40 | 41 |
|
... | ... | |
53 | 54 |
} |
54 | 55 |
|
55 | 56 |
@Override |
57 |
public Aggregations testAggregations() throws JSONException { |
|
58 |
|
|
59 |
int page = 1; |
|
60 |
int size = 1000; |
|
61 |
|
|
62 |
UriComponents uriComponents = UriComponentsBuilder |
|
63 |
.fromHttpUrl(baseAddress + "/ds/list/") |
|
64 |
.path("/{page}/{size}/") |
|
65 |
.build().expand(page,size).encode(); |
|
66 |
|
|
67 |
String rs = restTemplate.getForObject(uriComponents.toUri(), String.class); |
|
68 |
while(!rs.equals("[]")){ |
|
69 |
|
|
70 |
Aggregations aggregations = getFirstNonEmptyAggregation(rs); |
|
71 |
if(aggregations != null) |
|
72 |
return aggregations; |
|
73 |
|
|
74 |
LOGGER.debug("Checked " + page*size + " records!"); |
|
75 |
|
|
76 |
page+=1; |
|
77 |
uriComponents = UriComponentsBuilder |
|
78 |
.fromHttpUrl(baseAddress + "/ds/list/") |
|
79 |
.path("/{page}/{size}/") |
|
80 |
.build().expand(page,size).encode(); |
|
81 |
rs = restTemplate.getForObject(uriComponents.toUri(), String.class); |
|
82 |
} |
|
83 |
|
|
84 |
return null; |
|
85 |
} |
|
86 |
|
|
87 |
private Aggregations getFirstNonEmptyAggregation(String rs) throws JSONException { |
|
88 |
|
|
89 |
JSONArray ids = new JSONArray(rs); |
|
90 |
for(int i=0;i<ids.length();i++){ |
|
91 |
String id = ids.getString(i); |
|
92 |
Aggregations aggregations = getRepositoryAggregations(id); |
|
93 |
if(aggregations.getAggregationHistory() != null) |
|
94 |
return aggregations; |
|
95 |
} |
|
96 |
return null; |
|
97 |
} |
|
98 |
|
|
99 |
@Override |
|
56 | 100 |
public Country[] getCountries() { |
57 | 101 |
UriComponents uriComponents = UriComponentsBuilder |
58 | 102 |
.fromHttpUrl(baseAddress + "/ds/countries") |
... | ... | |
140 | 184 |
} |
141 | 185 |
|
142 | 186 |
@Override |
187 |
public Aggregations getRepositoryAggregations(@PathVariable("id") String id) throws JSONException { |
|
188 |
|
|
189 |
UriComponents uriComponents = UriComponentsBuilder |
|
190 |
.fromHttpUrl(baseAddress + "/ds/get/") |
|
191 |
.path("/{id}/") |
|
192 |
.build().expand(id).encode(); |
|
193 |
|
|
194 |
String rs = restTemplate.getForObject(uriComponents.toUri(), String.class); |
|
195 |
JSONObject repository = new JSONObject(rs); |
|
196 |
|
|
197 |
Aggregations aggregations = new Aggregations(); |
|
198 |
|
|
199 |
aggregations.setAggregationHistory(Converter.getAggregationHistoryFromJson(repository)); |
|
200 |
aggregations.setLastCollection(Converter.getLastCollectionFromJson(repository)); |
|
201 |
aggregations.setLastTransformation(Converter.getLastTransformationFromJson(repository)); |
|
202 |
return aggregations; |
|
203 |
} |
|
204 |
|
|
205 |
@Override |
|
143 | 206 |
public List<Repository> getRepositoriesByName(@PathVariable("name") String name, |
144 | 207 |
@PathVariable("page") String page, |
145 | 208 |
@PathVariable("size") String size) throws JSONException { |
... | ... | |
194 | 257 |
} |
195 | 258 |
|
196 | 259 |
@Override |
197 |
public List<String> getTimezones() { |
|
198 |
return Converter.readFile("timezones.txt"); |
|
260 |
public List<Timezone> getTimezones() { |
|
261 |
List<String> timezones = Converter.readFile("timezones.txt"); |
|
262 |
return Converter.toTimezones(timezones); |
|
199 | 263 |
} |
200 | 264 |
|
201 | 265 |
@Override |
... | ... | |
262 | 326 |
} |
263 | 327 |
|
264 | 328 |
@Override |
265 |
public String getUrlsOfUserRepos(@PathVariable("user_email") String user_email) { |
|
266 |
|
|
267 |
//TODO create service a join datasource d for user u method |
|
268 |
|
|
269 |
return null; |
|
329 |
public List<String> getUrlsOfUserRepos(@PathVariable("user_email") String user_email, |
|
330 |
@PathVariable("page") String page, |
|
331 |
@PathVariable("size") String size) throws JSONException { |
|
332 |
UriComponents uriComponents = UriComponentsBuilder |
|
333 |
.fromHttpUrl(baseAddress + "/api/baseurl/") |
|
334 |
.path("/{page}/{size}") |
|
335 |
.queryParam("userEmail",user_email) |
|
336 |
.build().expand(page,size).encode(); |
|
337 |
return Arrays.asList(restTemplate.getForObject(uriComponents.toUri(), String[].class)); |
|
270 | 338 |
} |
271 | 339 |
|
272 | 340 |
@Override |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/service/controllers/BrokerApi.java | ||
---|---|---|
1 | 1 |
package eu.dnetlib.repo.manager.service.controllers; |
2 | 2 |
|
3 |
import eu.dnetlib.repo.manager.service.shared.BrokerException;
|
|
4 |
import eu.dnetlib.repo.manager.service.shared.broker.BrowseEntry;
|
|
5 |
import eu.dnetlib.repo.manager.service.shared.broker.DatasourcesBroker;
|
|
6 |
import eu.dnetlib.repo.manager.service.shared.broker.EventsPage;
|
|
3 |
import eu.dnetlib.repo.manager.shared.BrokerException; |
|
4 |
import eu.dnetlib.repo.manager.shared.broker.BrowseEntry; |
|
5 |
import eu.dnetlib.repo.manager.shared.broker.DatasourcesBroker; |
|
6 |
import eu.dnetlib.repo.manager.shared.broker.EventsPage; |
|
7 | 7 |
import org.json.JSONException; |
8 | 8 |
import org.springframework.http.MediaType; |
9 | 9 |
import org.springframework.web.bind.annotation.RequestBody; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/Triple.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/PiwikInfo.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/WizardState.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/Country.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
public class Country { |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/BrokerException.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
|
4 | 4 |
/** |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/Provenance.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/ExternalReference.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/EventsPage.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/ConditionOperator.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/Instance.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/Project.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/OpenaireSubscription.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
import eu.dnetlib.repo.manager.service.shared.NotificationMode; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/MapConditions.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationFrequency.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/Publication.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/Journal.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/MapValueType.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/OpenAireEventPayload.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/BrowseEntry.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/Dataset.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/ConditionParams.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/broker/SimpleSubscriptionDesc.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared.broker;
|
|
1 |
package eu.dnetlib.repo.manager.shared.broker; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/Aggregations.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 |
|
|
3 |
import java.util.ArrayList; |
|
4 |
import java.util.List; |
|
5 |
|
|
6 |
public class Aggregations { |
|
7 |
|
|
8 |
private List<AggregationDetails> aggregationHistory = new ArrayList<>(); |
|
9 |
private AggregationDetails lastCollection; |
|
10 |
private AggregationDetails lastTransformation; |
|
11 |
|
|
12 |
public Aggregations() { |
|
13 |
} |
|
14 |
|
|
15 |
public List<AggregationDetails> getAggregationHistory() { |
|
16 |
return aggregationHistory; |
|
17 |
} |
|
18 |
|
|
19 |
public void setAggregationHistory(List<AggregationDetails> aggregationHistory) { |
|
20 |
this.aggregationHistory = aggregationHistory; |
|
21 |
} |
|
22 |
|
|
23 |
public AggregationDetails getLastCollection() { |
|
24 |
return lastCollection; |
|
25 |
} |
|
26 |
|
|
27 |
public void setLastCollection(AggregationDetails lastCollection) { |
|
28 |
this.lastCollection = lastCollection; |
|
29 |
} |
|
30 |
|
|
31 |
public AggregationDetails getLastTransformation() { |
|
32 |
return lastTransformation; |
|
33 |
} |
|
34 |
|
|
35 |
public void setLastTransformation(AggregationDetails lastTransformation) { |
|
36 |
this.lastTransformation = lastTransformation; |
|
37 |
} |
|
38 |
} |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/RepositoryServiceException.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/Tuple.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/ValidationServiceException.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/AggregationDetails.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 |
|
|
3 |
import java.util.Date; |
|
4 |
|
|
5 |
public class AggregationDetails { |
|
6 |
|
|
7 |
|
|
8 |
private String aggregationStage; |
|
9 |
private Date date; |
|
10 |
private int numberOfRecords; |
|
11 |
private String collectionMode; |
|
12 |
|
|
13 |
public AggregationDetails() { |
|
14 |
} |
|
15 |
|
|
16 |
public String getAggregationStage() { |
|
17 |
return aggregationStage; |
|
18 |
} |
|
19 |
|
|
20 |
public String getCollectionMode() { |
|
21 |
return collectionMode; |
|
22 |
} |
|
23 |
|
|
24 |
public void setCollectionMode(String collectionMode) { |
|
25 |
this.collectionMode = collectionMode; |
|
26 |
} |
|
27 |
|
|
28 |
public void setAggregationStage(String aggregationStage) { |
|
29 |
this.aggregationStage = aggregationStage; |
|
30 |
} |
|
31 |
|
|
32 |
public Date getDate() { |
|
33 |
return date; |
|
34 |
} |
|
35 |
|
|
36 |
public void setDate(Date date) { |
|
37 |
this.date = date; |
|
38 |
} |
|
39 |
|
|
40 |
public int getNumberOfRecords() { |
|
41 |
return numberOfRecords; |
|
42 |
} |
|
43 |
|
|
44 |
public void setNumberOfRecords(int numberOfRecords) { |
|
45 |
this.numberOfRecords = numberOfRecords; |
|
46 |
} |
|
47 |
} |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/ValidationState.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
import eu.dnetlib.domain.functionality.validator.JobForValidation; |
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/DatasourceVocabularies.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/main/java/eu/dnetlib/repo/manager/shared/Timezone.java | ||
---|---|---|
1 |
package eu.dnetlib.repo.manager.service.shared;
|
|
1 |
package eu.dnetlib.repo.manager.shared; |
|
2 | 2 |
|
3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
4 | 4 |
|
modules/uoa-repository-manager-service/src/pom.xml | ||
---|---|---|
1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
2 |
<project xmlns="http://maven.apache.org/POM/4.0.0" |
|
3 |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
|
4 |
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
|
5 |
|
|
6 |
<parent> |
|
7 |
<groupId>eu.dnetlib</groupId> |
|
8 |
<artifactId>dnet45-parent</artifactId> |
|
9 |
<version>1.0.0-SNAPSHOT</version> |
|
10 |
</parent> |
|
11 |
<modelVersion>4.0.0</modelVersion> |
|
12 |
<groupId>eu.dnetlib</groupId> |
|
13 |
<artifactId>uoa-repository-manager-service</artifactId> |
|
14 |
<version>1.0.0-SNAPSHOT</version> |
|
15 |
<packaging>jar</packaging> |
|
16 |
|
|
17 |
|
|
18 |
<build> |
|
19 |
<plugins> |
|
20 |
<plugin> |
|
21 |
<groupId>org.apache.maven.plugins</groupId> |
|
22 |
<artifactId>maven-compiler-plugin</artifactId> |
|
23 |
<version>3.1</version> |
|
24 |
<configuration> |
|
25 |
<source>1.8</source> |
|
26 |
<target>1.8</target> |
|
27 |
<encoding>UTF-8</encoding> |
|
28 |
</configuration> |
|
29 |
</plugin> |
|
30 |
|
|
31 |
<plugin> |
|
32 |
<artifactId>maven-war-plugin</artifactId> |
|
33 |
<version>2.6</version> |
|
34 |
<configuration> |
|
35 |
<failOnMissingWebXml>false</failOnMissingWebXml> |
|
36 |
</configuration> |
|
37 |
</plugin> |
|
38 |
<plugin> |
|
39 |
<groupId>cz.habarta.typescript-generator</groupId> |
|
40 |
<artifactId>typescript-generator-maven-plugin</artifactId> |
|
41 |
<version>1.27.339</version> |
|
42 |
<executions> |
|
43 |
<execution> |
|
44 |
<id>generate1</id> |
|
45 |
<goals> |
|
46 |
<goal>generate</goal> |
|
47 |
</goals> |
|
48 |
<configuration> |
|
49 |
<jsonLibrary>jackson2</jsonLibrary> |
|
50 |
<outputFileType>implementationFile</outputFileType> |
|
51 |
<mapClasses>asClasses</mapClasses> |
|
52 |
<classPatterns> |
|
53 |
<pattern>eu.dnetlib.domain.data.*</pattern> |
|
54 |
</classPatterns> |
|
55 |
<outputFile>target/typeScriptClasses.ts</outputFile> |
|
56 |
<outputKind>module</outputKind> |
|
57 |
</configuration> |
|
58 |
</execution> |
|
59 |
</executions> |
|
60 |
</plugin> |
|
61 |
</plugins> |
|
62 |
</build> |
|
63 |
|
|
64 |
<dependencies> |
|
65 |
|
|
66 |
<dependency> |
|
67 |
<groupId>org.springframework</groupId> |
|
68 |
<artifactId>spring-webmvc</artifactId> |
|
69 |
<version>${spring.version}</version> |
|
70 |
</dependency> |
|
71 |
|
|
72 |
<dependency> |
|
73 |
<groupId>org.hibernate</groupId> |
|
74 |
<artifactId>hibernate-validator-annotation-processor</artifactId> |
|
75 |
<version>4.1.0.Final</version> |
|
76 |
</dependency> |
|
77 |
|
|
78 |
<dependency> |
|
79 |
<groupId>log4j</groupId> |
|
80 |
<artifactId>log4j</artifactId> |
|
81 |
<version>(1.2, 1.5]</version> |
|
82 |
<scope>compile</scope> |
|
83 |
</dependency> |
|
84 |
|
|
85 |
<dependency> |
|
86 |
<groupId>eu.dnetlib</groupId> |
|
87 |
<artifactId>dnet-runtime</artifactId> |
|
88 |
<version>[1.0.0-SNAPSHOT, 2.0.0)</version> |
|
89 |
<exclusions> |
|
90 |
<exclusion> <!-- declare the exclusion here --> |
|
91 |
<groupId>org.apache.geronimo.specs</groupId> |
|
92 |
<artifactId>geronimo-javamail_1.4_spec</artifactId> |
|
93 |
</exclusion> |
|
94 |
</exclusions> |
|
95 |
</dependency> |
|
96 |
|
|
97 |
<dependency> |
|
98 |
<groupId>eu.dnetlib</groupId> |
|
99 |
<artifactId>uoa-utils</artifactId> |
|
100 |
<version>[2.0.0-SNAPSHOT, 3.0.0)</version> |
|
101 |
</dependency> |
|
102 |
|
|
103 |
<dependency> |
|
104 |
<groupId>eu.dnetlib</groupId> |
|
105 |
<artifactId>uoa-domain</artifactId> |
|
106 |
<version>[2.0.0-SNAPSHOT, 3.0.0)</version> |
|
107 |
<exclusions> |
|
108 |
<exclusion> <!-- declare the exclusion here --> |
|
109 |
<groupId>cglib</groupId> |
|
110 |
<artifactId>cglib</artifactId> |
|
111 |
</exclusion> |
|
112 |
</exclusions> |
|
113 |
</dependency> |
|
114 |
|
|
115 |
|
|
116 |
<dependency> |
|
117 |
<groupId>cglib</groupId> |
|
118 |
<artifactId>cglib-nodep</artifactId> |
|
119 |
<version>2.2</version> |
|
120 |
</dependency> |
|
121 |
|
|
122 |
<dependency> |
|
123 |
<groupId>eu.dnetlib</groupId> |
|
124 |
<artifactId>uoa-commons</artifactId> |
|
125 |
<version>[2.0.0-SNAPSHOT, 3.0.0)</version> |
|
126 |
</dependency> |
|
127 |
<dependency> |
|
128 |
<groupId>eu.dnetlib</groupId> |
|
129 |
<artifactId>uoa-clients</artifactId> |
|
130 |
<version>[2.0.0-SNAPSHOT, 3.0.0)</version> |
|
131 |
</dependency> |
|
132 |
<dependency> |
|
133 |
<groupId>eu.dnetlib</groupId> |
|
134 |
<artifactId>uoa-hcm</artifactId> |
|
135 |
<version>[2.0.0-SNAPSHOT, 3.0.0)</version> |
|
136 |
</dependency> |
|
137 |
|
|
138 |
<dependency> |
|
139 |
<groupId>commons-io</groupId> |
|
140 |
<artifactId>commons-io</artifactId> |
|
141 |
<version>2.4</version> |
|
142 |
</dependency> |
|
143 |
|
|
144 |
<dependency> |
|
145 |
<groupId>se.kb</groupId> |
|
146 |
<artifactId>oai4j</artifactId> |
|
147 |
<version>[0.6b1,)</version> |
|
148 |
</dependency> |
|
149 |
<dependency> |
|
150 |
<groupId>xalan</groupId> |
|
151 |
<artifactId>xalan</artifactId> |
|
152 |
<version>2.7.2</version> |
|
153 |
</dependency> |
|
154 |
|
|
155 |
<dependency> |
|
156 |
<groupId>org.slf4j</groupId> |
|
157 |
<artifactId>slf4j-log4j12</artifactId> |
|
158 |
<version>1.5.6</version> |
|
159 |
</dependency> |
|
160 |
|
|
161 |
<dependency> |
|
162 |
<groupId>xerces</groupId> |
|
163 |
<artifactId>xercesImpl</artifactId> |
|
164 |
<version>2.11.0</version> |
|
165 |
</dependency> |
|
166 |
|
|
167 |
<dependency> |
|
168 |
<groupId>com.fasterxml.jackson.core</groupId> |
|
169 |
<artifactId>jackson-core</artifactId> |
|
170 |
<version>2.5.1</version> |
|
171 |
<scope>compile</scope> |
|
172 |
</dependency> |
|
173 |
<dependency> |
|
174 |
<groupId>com.fasterxml.jackson.core</groupId> |
|
175 |
<artifactId>jackson-databind</artifactId> |
|
176 |
<version>2.5.1</version> |
|
177 |
<scope>compile</scope> |
|
178 |
</dependency> |
|
179 |
|
|
180 |
<dependency> |
|
181 |
<groupId>org.springframework</groupId> |
|
182 |
<artifactId>spring-context</artifactId> |
|
183 |
<version>${spring.version}</version> |
|
184 |
</dependency> |
|
185 |
<dependency> |
|
186 |
<groupId>com.sun.jersey</groupId> |
|
187 |
<artifactId>jersey-client</artifactId> |
|
188 |
<version>1.19.3</version> |
|
189 |
</dependency> |
|
190 |
|
|
191 |
<dependency> |
|
192 |
<groupId>org.aksw.gson</groupId> |
|
193 |
<artifactId>gson-utils-core</artifactId> |
|
194 |
<version>1.0.0</version> |
|
195 |
</dependency> |
|
196 |
<dependency> |
|
197 |
<groupId>org.json</groupId> |
|
198 |
<artifactId>json</artifactId> |
|
199 |
<version>20080701</version> |
|
200 |
</dependency> |
|
201 |
</dependencies> |
|
202 |
|
|
203 |
|
|
204 |
|
|
205 |
</project> |
Also available in: Unified diff
1. Make getTimezones return List<Timezone> instead of List<String>
2. Add new classes on shared folder for aggregations.
3. Implemented methods: getUsersBaseUrls , getRepositoryAggregations
4. Implement methods on Converter class.
5. Change location of source folder.