cleanup

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 b3f0c6e484d8f8f1bbdded5d21840eee26117d63..1398857de8b5dcaec1c07d420a1b19b02d2678ce 100644 (file)
--- 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<String> 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 5f20ab72909d9ba5f9cf59df7a1f8592f5dba7a3..e6d3a9554f9f1cde160042d0bc89655e037b3f17 100644 (file)
--- 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 19f0a322a9350600b1731ccb80b24fc7400e77c2..5bb0a8a87f19d2b4960f63a89af2cada4c5137cc 100644 (file)
--- 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<NamedArea, Distribution> filteredDistributions = new SetMap<>(distributions.size());
+        SetMap<NamedArea, Distribution> filteredDistributionsPerArea = new SetMap<>(distributions.size());
         Set<UUID> 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<NamedArea, Distribution> tmpMap = new SetMap<>(filteredDistributions.size());
-            for(NamedArea key : filteredDistributions.keySet()){
-                tmpMap.put(key, filterByHighestDistributionStatusForArea(filteredDistributions.get(key)));
+            SetMap<NamedArea, Distribution> 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<NamedArea> getAreaTree(Collection<Distribution> 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 23887e447832ae13d79e6ad6b677c2eb77d10e90..39751ed056bc965225d598f764b1f7ebb3e08c84 100644 (file)
--- 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;