diff --git a/pom.xml b/pom.xml
index a1daa72..87d08bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,12 +177,6 @@
2.7.0
-
-
postgresql
@@ -194,13 +188,13 @@
org.apache.tomcat
tomcat-catalina
- LATEST
+ 9.0.22
commons-fileupload
commons-fileupload
- LATEST
+ 1.4
@@ -304,82 +298,6 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
uoa-repository-manager-service
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
index d2fef5f..a347367 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
@@ -86,7 +86,6 @@ public class DashboardServiceImpl implements DashboardService {
} catch (Exception e) {
logger.error("Something baad happened!", e);
- e.printStackTrace();
}
return repositorySummaryInfoList;
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
index 5bd69e8..bb9a73e 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
@@ -91,7 +91,7 @@ public class MonitorServiceImpl implements MonitorService {
try {
return getValidationService().getStoredJobsTotalNumberNew(user, jobType, validationStatus);
} catch (ValidatorServiceException e) {
- e.printStackTrace();
+ LOGGER.error(e);
}
return 0;
}
@@ -103,7 +103,7 @@ public class MonitorServiceImpl implements MonitorService {
try {
return getValidationService().getStoredJob(Integer.parseInt(jobId), groupBy);
} catch (ValidatorServiceException e) {
- e.printStackTrace();
+ LOGGER.error(e);
}
return null;
}
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
index cd33c1c..7917a1c 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
@@ -96,7 +96,6 @@ public class PiWikServiceImpl implements PiWikService {
@Override
public List getPiwikSitesForRepos(OrderByField orderByField, OrderByType orderByType, int from, int quantity, String searchField) {
- LOGGER.debug("Getting piwik sites for repos! ");
try{
String finalizedQuery = GET_PIWIK_SITES + " where ("+
" repositoryid ilike ? " +
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
index ccebaeb..3734154 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
@@ -80,44 +80,14 @@ public class RepositoryServiceImpl implements RepositoryService {
ValidatorService validatorService;
- private Map vocabularyMap = new ConcurrentHashMap();
+ private Map vocabularyMap = new ConcurrentHashMap<>();
private Map countriesMap = new HashMap<>();
private Map inverseCountriesMap = new HashMap<>();
- private static Map> dataSourceClass = new HashMap>(){{
- put("opendoar",new ArrayList(){{ add("pubsrepository::institutional");
- add("pubsrepository::thematic");
- add("pubsrepository::unknown");
- add("pubsrepository::mock");
- }});
- put("re3data",new ArrayList(){{ add("datarepository::unknown");
- }});
- put("journal",new ArrayList(){{ add("pubsrepository::journal");
- }});
- put("aggregator",new ArrayList(){{ add("aggregator::pubsrepository::institutional");
- add("aggregator::pubsrepository::journals");
- add("aggregator::datarepository");
- add("aggregator::pubsrepository::unknown");
- }});
- }};
+ private static Map> dataSourceClass = new HashMap<>();
- private static Map invertedDataSourceClass = new HashMap(){{
- put("pubsrepository::institutional","opendoar");
- put("pubsrepository::thematic","opendoar");
- put("pubsrepository::unknown","opendoar");
- put("pubsrepository::mock","opendoar");
-
- put("datarepository::unknown","re3data");
-
- put("pubsrepository::journal","journal");
-
- put("aggregator::pubsrepository::institutional","aggregator");
- put("aggregator::pubsrepository::journals","aggregator");
- put("aggregator::datarepository","aggregator");
- put("aggregator::pubsrepository::unknown","aggregator");
-
- }};
+ private static Map invertedDataSourceClass = new HashMap<>();
@@ -126,6 +96,23 @@ public class RepositoryServiceImpl implements RepositoryService {
LOGGER.debug("Initialization method of repository api!");
LOGGER.debug("Updated version!");
+ dataSourceClass.put("opendoar",Arrays.asList("pubsrepository::institutional","pubsrepository::thematic","pubsrepository::unknown","pubsrepository::mock"));
+ dataSourceClass.put("re3data", Collections.singletonList("datarepository::unknown"));
+ dataSourceClass.put("journal", Collections.singletonList("pubsrepository::journal"));
+ dataSourceClass.put("aggregator",Arrays.asList("aggregator::pubsrepository::institutional","aggregator::pubsrepository::journals","aggregator::datarepository", "aggregator::pubsrepository::unknown"));
+
+ invertedDataSourceClass.put("pubsrepository::institutional","opendoar");
+ invertedDataSourceClass.put("pubsrepository::thematic","opendoar");
+ invertedDataSourceClass.put("pubsrepository::unknown","opendoar");
+ invertedDataSourceClass.put("pubsrepository::mock","opendoar");
+ invertedDataSourceClass.put("datarepository::unknown","re3data");
+ invertedDataSourceClass.put("pubsrepository::journal","journal");
+ invertedDataSourceClass.put("aggregator::pubsrepository::institutional","aggregator");
+ invertedDataSourceClass.put("aggregator::pubsrepository::journals","aggregator");
+ invertedDataSourceClass.put("aggregator::datarepository","aggregator");
+ invertedDataSourceClass.put("aggregator::pubsrepository::unknown","aggregator");
+
+
httpHeaders = new HttpHeaders();
httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java
index b8d28fc..ec8d44b 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java
@@ -81,7 +81,7 @@ public class ValidatorServiceImpl implements ValidatorService {
}
}
} catch (ValidatorServiceException e) {
- e.printStackTrace();
+ LOGGER.error(e);
}
}
@@ -98,7 +98,7 @@ public class ValidatorServiceImpl implements ValidatorService {
emailUtils.reportException(e);
throw e;
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error(e);
}
return jobForValidation;
}
@@ -108,7 +108,7 @@ public class ValidatorServiceImpl implements ValidatorService {
public ResponseEntity