From ddf715212305fc6fc5fe3bb496d774dad967c0a5 Mon Sep 17 00:00:00 2001 From: "ioannis.diplas" Date: Thu, 25 Jul 2019 12:58:01 +0000 Subject: [PATCH] Cleaning up the code --- pom.xml | 86 +------------------ .../manager/service/DashboardServiceImpl.java | 1 - .../manager/service/MonitorServiceImpl.java | 4 +- .../manager/service/PiWikServiceImpl.java | 1 - .../service/RepositoryServiceImpl.java | 53 +++++------- .../manager/service/ValidatorServiceImpl.java | 19 ++-- .../shared/DatasourceVocabularies.java | 10 +-- .../eu/dnetlib/repo/manager/shared/Term.java | 8 +- .../dnetlib/repo/manager/shared/Timezone.java | 4 +- .../manager/shared/broker/BrowseEntry.java | 4 +- .../dnetlib/repo/manager/utils/Converter.java | 41 +-------- 11 files changed, 50 insertions(+), 181 deletions(-) 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 reSubmitJobForValidation(String email, String jobId) throws JSONException, ValidatorServiceException { LOGGER.debug("Resubmit validation job with id : " + jobId); - StoredJob job = monitorApi.getJobSummary(jobId,"all"); + StoredJob job = monitorApi.getJobSummary(jobId, "all"); Set contentRules = new HashSet(); Set usageRules = new HashSet(); @@ -120,12 +120,13 @@ public class ValidatorServiceImpl implements ValidatorService { break; } } - - for (int ruleId : job.getRules()) { - if (ruleSet.getContentRulesIds().contains(ruleId)) - contentRules.add(ruleId); - else if (ruleSet.getUsageRulesIds().contains(ruleId)) - usageRules.add(ruleId); + if (ruleSet != null){ + for (int ruleId : job.getRules()) { + if (ruleSet.getContentRulesIds().contains(ruleId)) + contentRules.add(ruleId); + else if (ruleSet.getUsageRulesIds().contains(ruleId)) + usageRules.add(ruleId); + } } if (!contentRules.isEmpty()) job.setSelectedContentRules(contentRules); diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/DatasourceVocabularies.java b/src/main/java/eu/dnetlib/repo/manager/shared/DatasourceVocabularies.java index 93e17ee..f382e05 100644 --- a/src/main/java/eu/dnetlib/repo/manager/shared/DatasourceVocabularies.java +++ b/src/main/java/eu/dnetlib/repo/manager/shared/DatasourceVocabularies.java @@ -10,11 +10,11 @@ import java.util.Map; */ public class DatasourceVocabularies implements IsSerializable { - Map countries; - List timezones; - Map datasourceClasses; - List typologies; - Map compatibilityLevels; + private Map countries; + private List timezones; + private Map datasourceClasses; + private List typologies; + private Map compatibilityLevels; public DatasourceVocabularies() { } diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Term.java b/src/main/java/eu/dnetlib/repo/manager/shared/Term.java index 9f3c58a..01f70e6 100644 --- a/src/main/java/eu/dnetlib/repo/manager/shared/Term.java +++ b/src/main/java/eu/dnetlib/repo/manager/shared/Term.java @@ -7,10 +7,10 @@ import com.google.gwt.user.client.rpc.IsSerializable; */ public class Term implements IsSerializable { - public String englishName; - public String nativeName; - public String encoding; - public String code; + private String englishName; + private String nativeName; + private String encoding; + private String code; public Term(String englishName, String nativeName, String encoding, String code) { this.englishName = englishName; diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Timezone.java b/src/main/java/eu/dnetlib/repo/manager/shared/Timezone.java index 80d22ec..5e922dd 100644 --- a/src/main/java/eu/dnetlib/repo/manager/shared/Timezone.java +++ b/src/main/java/eu/dnetlib/repo/manager/shared/Timezone.java @@ -3,8 +3,8 @@ package eu.dnetlib.repo.manager.shared; import com.google.gwt.user.client.rpc.IsSerializable; public class Timezone implements IsSerializable { - public String name; - public double offset; + private String name; + private double offset; public Timezone(){ } diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/BrowseEntry.java b/src/main/java/eu/dnetlib/repo/manager/shared/broker/BrowseEntry.java index c419501..0d72a2e 100644 --- a/src/main/java/eu/dnetlib/repo/manager/shared/broker/BrowseEntry.java +++ b/src/main/java/eu/dnetlib/repo/manager/shared/broker/BrowseEntry.java @@ -7,8 +7,8 @@ import com.google.gwt.user.client.rpc.IsSerializable; */ public class BrowseEntry implements Comparable, IsSerializable{ - public String value; - public Long size; + private String value; + private Long size; public BrowseEntry() { } diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java b/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java index f41ddc7..a807ee2 100644 --- a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java +++ b/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java @@ -116,7 +116,7 @@ public class Converter { try { return formatter.parse(date); } catch (ParseException e) { - e.printStackTrace(); + LOGGER.error(e); } return null; } @@ -287,26 +287,6 @@ public class Converter { repositoryMap.put("identities",identities); repositoryMap.put("subjects",""); - //TODO check fields - /* jsonObject.put("certificates",repository.getCertificates()); - jsonObject.put("citationguidelineurl",repository.getCitationGuidelineUrl()); - jsonObject.put("databaseaccessrestriction",repository.getDatabaseAccessRestriction()); - jsonObject.put("databaseaccesstype",repository.getDatabaseAccessType()); - jsonObject.put("datauploadrestriction",repository.getDataUploadRestriction()); - jsonObject.put("datauploadtype",repository.getDataUploadType()); - jsonObject.put("missionstatementurl",repository.getMissionStatementUrl()); - jsonObject.put("od_contenttypes",repository.getOdContentTypes()); - jsonObject.put("officialname",repository.getOfficialname()); - jsonObject.put("pidsystems",repository.getPidSystems()); - jsonObject.put("provenanceaction",repository.getProvenanceActionClass()); - jsonObject.put("qualitymanagementkind",repository.getQualityManagementKind()); - jsonObject.put("releaseenddate",convertDateToString(repository.getReleaseEndDate())); - jsonObject.put("releasestartdate",convertDateToString(repository.getReleaseStartDate())); - jsonObject.put("serviceprovider",repository.getServiceProvider()); - jsonObject.put("versioning",repository.getVersioning()); - //datasource.get("platform"); - //datasource.get("subjects");*/ - return mapper.writeValueAsString(repositoryMap); } @@ -363,7 +343,7 @@ public class Converter { br.close(); } catch (IOException e) { LOGGER.debug("Error opening file!"); - e.printStackTrace(); + LOGGER.error(e); } return list; } @@ -396,21 +376,6 @@ public class Converter { return aggregationDetails; } - public static AggregationDetails getLastCollectionFromJson(JSONObject datasourceInfo) throws JSONException { - - if( datasourceInfo.get("lastCollection").equals(null)) - return null; - - return jsonToAggregationDetails(datasourceInfo.getJSONObject("lastCollection")); - } - - public static AggregationDetails getLastTransformationFromJson(JSONObject datasourceInfo) throws JSONException { - - if( datasourceInfo.get("lastTransformation").equals(null)) - return null; - - return jsonToAggregationDetails(datasourceInfo.getJSONObject("lastTransformation")); - } public static List toTimezones(List timezones) { @@ -422,7 +387,7 @@ public class Converter { return tmz; } - public static String getOpenaireId(String repositoryId) { + private static String getOpenaireId(String repositoryId) { if (repositoryId != null && repositoryId.contains("::")) return repositoryId.split("::")[0] + "::" + DigestUtils.md5Hex(repositoryId.split("::")[1]); return null;