From ae92b36b8702f01b73846ad08b259b88ea334f6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Wed, 31 Jan 2024 21:45:42 +0100 Subject: [PATCH] cleanup --- .../cdm/api/service/TestServiceImpl.java | 1 + .../service/geo/DistributionServiceImpl.java | 1 + .../geo/DistributionServiceUtilities.java | 20 +++++++++---------- .../geo/DistributionServiceImplTest.java | 16 +++++++++------ 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TestServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TestServiceImpl.java index b3f0c6e484..1398857de8 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TestServiceImpl.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TestServiceImpl.java @@ -94,6 +94,7 @@ public class TestServiceImpl implements ITestService { RuntimeException ex, List feedbacks, long feedbackWaitTimeout) { + int noOfSteps = 10; int stepToThrowException = noOfSteps / 2; int stepToWaitForFeedback = noOfSteps / 2; diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImpl.java index 5f20ab7290..e6d3a9554f 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImpl.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImpl.java @@ -200,6 +200,7 @@ public class DistributionServiceImpl implements IDistributionService { distributionOrder, termDao, useSecondMethod); }else { //version with model entities as used in direct webservice (not taxon page DTO) + //TODO this is probably not in use anymore tree = DistributionServiceUtilities.buildOrderedTree(omitLevels, filteredDistributions, parentAreaMap, fallbackAreaMarkerTypes, alternativeRootAreaMarkerTypes, neverUseFallbackAreaAsParent, diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceUtilities.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceUtilities.java index 19f0a322a9..5bb0a8a87f 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceUtilities.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceUtilities.java @@ -707,7 +707,7 @@ public class DistributionServiceUtilities { boolean preferAggregated, boolean statusOrderPreference, boolean subAreaPreference, boolean keepFallBackOnlyIfNoSubareaDataExists) { - SetMap filteredDistributions = new SetMap<>(distributions.size()); + SetMap filteredDistributionsPerArea = new SetMap<>(distributions.size()); Set statusPositiveSet = null; if (statusTree != null) { statusPositiveSet = new HashSet<>(); @@ -727,7 +727,7 @@ public class DistributionServiceUtilities { (distribution.getStatus() == null || !statusPositiveSet.contains(distribution.getStatus().getUuid())); if (!filterOutStatus){ - filteredDistributions.putItem(area, distribution); + filteredDistributionsPerArea.putItem(area, distribution); } } @@ -741,33 +741,33 @@ public class DistributionServiceUtilities { //TODO since using area tree this is only relevant if keepFallBackOnlyIfNoSubareaDataExists = true // as the area tree should also exclude real hidden areas // if(!CdmUtils.isNullSafeEmpty(fallbackAreaMarkerTypes)) { - removeHiddenAndKeepFallbackAreas(areaTree, fallbackAreaMarkerTypes, filteredDistributions, keepFallBackOnlyIfNoSubareaDataExists); + removeHiddenAndKeepFallbackAreas(areaTree, fallbackAreaMarkerTypes, filteredDistributionsPerArea, keepFallBackOnlyIfNoSubareaDataExists); // } // ------------------------------------------------------------------- // 2) remove not computed distributions for areas for which computed // distributions exists if(preferAggregated) { - handlePreferAggregated(filteredDistributions); + handlePreferAggregated(filteredDistributionsPerArea); } // ------------------------------------------------------------------- // 3) status order preference rule if (statusOrderPreference) { - SetMap tmpMap = new SetMap<>(filteredDistributions.size()); - for(NamedArea key : filteredDistributions.keySet()){ - tmpMap.put(key, filterByHighestDistributionStatusForArea(filteredDistributions.get(key))); + SetMap tmpMap = new SetMap<>(filteredDistributionsPerArea.size()); + for(NamedArea key : filteredDistributionsPerArea.keySet()){ + tmpMap.put(key, filterByHighestDistributionStatusForArea(filteredDistributionsPerArea.get(key))); } - filteredDistributions = tmpMap; + filteredDistributionsPerArea = tmpMap; } // ------------------------------------------------------------------- // 4) Sub area preference rule if(subAreaPreference){ - handleSubAreaPreferenceRule(filteredDistributions, areaTree); + handleSubAreaPreferenceRule(filteredDistributionsPerArea, areaTree); } - return valuesOfAllInnerSets(filteredDistributions.values()); + return valuesOfAllInnerSets(filteredDistributionsPerArea.values()); } static TermTree getAreaTree(Collection distributions, diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImplTest.java index 23887e4478..39751ed056 100644 --- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImplTest.java +++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImplTest.java @@ -33,8 +33,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.unitils.dbunit.annotation.DataSet; +import org.unitils.dbunit.annotation.DataSets; import org.unitils.spring.annotation.SpringBeanByType; import eu.etaxonomy.cdm.api.service.ITaxonService; @@ -61,6 +63,7 @@ import eu.etaxonomy.cdm.model.term.TermTree; import eu.etaxonomy.cdm.model.term.TermType; import eu.etaxonomy.cdm.model.term.TermVocabulary; import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest; +import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy; /** * @author a.mueller @@ -352,13 +355,14 @@ public class DistributionServiceImplTest extends CdmTransactionalIntegrationTest subTestWithEditMapService(result); } -// @Test + @Test + @Ignore @DataSet( value="EditGeoServiceTest.getDistributionServiceRequestParameterString.xml") -// @DataSets({ -// @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml"), -// @DataSet("/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml"), -// @DataSet( value="EditGeoServiceTest.getDistributionServiceRequestParameterString.xml") -// }) + @DataSets({ + @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml"), + @DataSet("/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml"), + @DataSet( value="EditGeoServiceTest.getDistributionServiceRequestParameterString.xml") + }) public void getDistributionServiceRequestParameterString(){ boolean subAreaPreference = false; -- 2.34.1