From f720446bdf841c472e325f829e3df9caae9f1afe Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Thu, 1 Dec 2022 18:37:03 +0200 Subject: [PATCH] Remove the obsolete "AggregationDetails" code and rename the related variables (which have already changed types). --- .../controllers/DashboardController.java | 10 +-- .../manager/domain/AggregationDetails.java | 63 ------------------- .../domain/CollectionMonitorSummary.java | 14 ++--- .../manager/service/DashboardServiceImpl.java | 10 +-- .../dnetlib/repo/manager/utils/Converter.java | 22 +------ 5 files changed, 20 insertions(+), 99 deletions(-) delete mode 100644 src/main/java/eu/dnetlib/repo/manager/domain/AggregationDetails.java diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java index 4dca562..368ba14 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java @@ -57,20 +57,20 @@ public class DashboardController { @PathVariable("repoId") String repoId, @RequestParam(name = "size", required = false, defaultValue = "20") int size) throws JSONException { - List aggregationDetails = repositoryService.getRepositoryAggregations(repoId, 0, size); + List aggregationInfo = repositoryService.getRepositoryAggregations(repoId, 0, size); CollectionMonitorSummary collectionMonitorSummary = new CollectionMonitorSummary(); - collectionMonitorSummary.setAggregationDetails(aggregationDetails); + collectionMonitorSummary.setAggregationInfo(aggregationInfo); size = 0; do { - aggregationDetails = repositoryService.getRepositoryAggregations(repoId, size, size + 50); - for (AggregationInfo aggregationDetail : aggregationDetails) { + aggregationInfo = repositoryService.getRepositoryAggregations(repoId, size, size + 50); + for (AggregationInfo aggregationDetail : aggregationInfo) { if (aggregationDetail.isIndexedVersion()) { collectionMonitorSummary.setLastIndexedVersion(aggregationDetail); break; } } size += 30; - } while (aggregationDetails.size() != 0 && collectionMonitorSummary.getLastIndexedVersion() == null); + } while (aggregationInfo.size() != 0 && collectionMonitorSummary.getLastIndexedVersion() == null); return collectionMonitorSummary; } diff --git a/src/main/java/eu/dnetlib/repo/manager/domain/AggregationDetails.java b/src/main/java/eu/dnetlib/repo/manager/domain/AggregationDetails.java deleted file mode 100644 index b5b7df2..0000000 --- a/src/main/java/eu/dnetlib/repo/manager/domain/AggregationDetails.java +++ /dev/null @@ -1,63 +0,0 @@ -package eu.dnetlib.repo.manager.domain; - -import java.util.Calendar; -import java.util.Date; - -public class AggregationDetails{ - - - private String aggregationStage; - private Date date; - private int numberOfRecords; - private String collectionMode; - private Boolean indexedVersion; - - public AggregationDetails() { - } - - public String getAggregationStage() { - return aggregationStage; - } - - public String getCollectionMode() { - return collectionMode; - } - - public void setCollectionMode(String collectionMode) { - this.collectionMode = collectionMode; - } - - public void setAggregationStage(String aggregationStage) { - this.aggregationStage = aggregationStage; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - public int getNumberOfRecords() { - return numberOfRecords; - } - - public void setNumberOfRecords(int numberOfRecords) { - this.numberOfRecords = numberOfRecords; - } - - public String getYear() { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(getDate()); - return String.valueOf(calendar.get(Calendar.YEAR)); - } - - public Boolean getIndexedVersion() { - return indexedVersion; - } - - public void setIndexedVersion(Boolean indexedVersion) { - this.indexedVersion = indexedVersion; - } -} diff --git a/src/main/java/eu/dnetlib/repo/manager/domain/CollectionMonitorSummary.java b/src/main/java/eu/dnetlib/repo/manager/domain/CollectionMonitorSummary.java index ecccf88..db279ea 100644 --- a/src/main/java/eu/dnetlib/repo/manager/domain/CollectionMonitorSummary.java +++ b/src/main/java/eu/dnetlib/repo/manager/domain/CollectionMonitorSummary.java @@ -5,23 +5,23 @@ import eu.dnetlib.enabling.datasources.common.AggregationInfo; import java.util.List; public class CollectionMonitorSummary { - private List aggregationDetails; + private List aggregationInfo; private AggregationInfo lastIndexedVersion; public CollectionMonitorSummary(){} - public CollectionMonitorSummary(List aggregationDetails, AggregationInfo lastIndexedVersion) { - this.aggregationDetails = aggregationDetails; + public CollectionMonitorSummary(List aggregationInfo, AggregationInfo lastIndexedVersion) { + this.aggregationInfo = aggregationInfo; this.lastIndexedVersion = lastIndexedVersion; } - public List getAggregationDetails() { - return aggregationDetails; + public List getAggregationInfo() { + return aggregationInfo; } - public void setAggregationDetails(List aggregationDetails) { - this.aggregationDetails = aggregationDetails; + public void setAggregationInfo(List aggregationInfo) { + this.aggregationInfo = aggregationInfo; } public AggregationInfo getLastIndexedVersion() { 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 fe329c2..8ff9595 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java @@ -44,11 +44,11 @@ public class DashboardServiceImpl implements DashboardService { //TODO getRepositoryAggregations returns only the 20 more recent items. Is it positive that we will find an indexed version there? long start = System.currentTimeMillis(); - List aggregationDetailsList = repositoryService.getRepositoryAggregations(repository.getId(), 0, 20); - for (AggregationInfo aggregationDetails : aggregationDetailsList) { - if (aggregationDetails.isIndexedVersion()) { - repositorySummaryInfo.setRecordsCollected(aggregationDetails.getNumberOfRecords()); - repositorySummaryInfo.setLastIndexedVersion(DateUtils.toDate(aggregationDetails.getDate())); + List aggregationInfoList = repositoryService.getRepositoryAggregations(repository.getId(), 0, 20); + for (AggregationInfo aggregationInfo : aggregationInfoList) { + if (aggregationInfo.isIndexedVersion()) { + repositorySummaryInfo.setRecordsCollected(aggregationInfo.getNumberOfRecords()); + repositorySummaryInfo.setLastIndexedVersion(DateUtils.toDate(aggregationInfo.getDate())); break; } } 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 81e7ff8..98066ec 100644 --- a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java +++ b/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java @@ -101,14 +101,13 @@ public class Converter { } public List toAggregationHistory(String aggregationHistoryResponse) throws JSONException { - List aggregationDetailsList = new ArrayList<>(); + List aggregationInfoList = new ArrayList<>(); JSONArray aggregationInfo = new JSONObject(aggregationHistoryResponse).getJSONArray("aggregationInfo"); for (int i = 0; i < aggregationInfo.length(); i++) -// aggregationDetailsList.add(toAggregationDetails(aggregationInfo.getJSONObject(i))); - aggregationDetailsList.add(objectMapper.convertValue(aggregationInfo.getJSONObject(i), AggregationInfo.class)); + aggregationInfoList.add(objectMapper.convertValue(aggregationInfo.getJSONObject(i), AggregationInfo.class)); - return aggregationDetailsList; + return aggregationInfoList; } public List toTimezones(List timezones) { @@ -138,20 +137,5 @@ public class Converter { return Double.valueOf(number); } - private AggregationDetails toAggregationDetails(JSONObject aggregationObject) throws JSONException { - - AggregationDetails aggregationDetails = new AggregationDetails(); - - if (aggregationObject.has("collectionMode")) - aggregationDetails.setCollectionMode(aggregationObject.get("collectionMode").toString()); - if (aggregationObject.has("indexedVersion")) - aggregationDetails.setIndexedVersion(Boolean.parseBoolean(aggregationObject.get("indexedVersion").toString())); - - aggregationDetails.setAggregationStage(aggregationObject.get("aggregationStage").toString()); - aggregationDetails.setDate(DateUtils.toDate(aggregationObject.get("date").toString())); - aggregationDetails.setNumberOfRecords(Integer.parseInt(aggregationObject.get("numberOfRecords").toString())); - - return aggregationDetails; - } }