cleanup

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / geo / DistributionServiceUtilities.java

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 fd70b262aae9d3b66f2e6c77b25ad7d5cd0b72f8..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
@@ -378,8 +378,8 @@ public class DistributionServiceUtilities {
      * @param distribution
      * @param area
      */
-    private static void addAreaToLayerMap(Map<String, Map<Integer,
-            Set<Distribution>>> layerMap,
+    private static void addAreaToLayerMap(Map<String,
+            Map<Integer,Set<Distribution>>> layerMap,
             List<PresenceAbsenceTerm> statusList,
             Distribution distribution,
             NamedArea area,
@@ -541,12 +541,13 @@ public class DistributionServiceUtilities {
 
     private static void addDistributionToStyleMap(Distribution distribution, Map<Integer, Set<Distribution>> styleMap,
             List<PresenceAbsenceTerm> statusList) {
+
         PresenceAbsenceTerm status = distribution.getStatus();
         if (status != null) {
             int style = statusList.indexOf(status);
             Set<Distribution> distributionSet = styleMap.get(style);
             if (distributionSet == null) {
-                distributionSet = new HashSet<Distribution>();
+                distributionSet = new HashSet<>();
                 styleMap.put(style, distributionSet);
             }
             distributionSet.add(distribution);
@@ -706,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<>();
@@ -715,7 +716,7 @@ public class DistributionServiceUtilities {
             }
         }
 
-        // assign distributions to the area and filter undefinedStatus
+        // assign distributions to the area and filter undefined status
         for(Distribution distribution : distributions){
             NamedArea area = distribution.getArea();
             if(area == null) {
@@ -726,7 +727,7 @@ public class DistributionServiceUtilities {
                     (distribution.getStatus() == null
                       || !statusPositiveSet.contains(distribution.getStatus().getUuid()));
             if (!filterOutStatus){
-                filteredDistributions.putItem(area, distribution);
+                filteredDistributionsPerArea.putItem(area, distribution);
             }
         }
 
@@ -740,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,
@@ -880,20 +881,20 @@ public class DistributionServiceUtilities {
 
     /**
      * Removes all distributions that have an area being a parent of
-     * anothers distributions area. E.g. removes distribution for "Europe"
+     * another distribution area. E.g. removes distribution for "Europe"
      * if a distribution for "France" exists in the list, where Europe
      * is a direct parent for France.
      */
     private static void handleSubAreaPreferenceRule(SetMap<NamedArea, Distribution> filteredDistributions,
             TermTree<NamedArea> areaTree) {
 
-        SetMap<NamedArea, NamedArea> parentMap = areaTree.getParentMap();
+        SetMap<NamedArea, NamedArea> childToParentsMap = areaTree.getParentMap();
         Set<NamedArea> removeCandidatesArea = new HashSet<>();
         for(NamedArea area : filteredDistributions.keySet()){
             if(removeCandidatesArea.contains(area)){
                 continue;
             }
-            parentMap.get(area).forEach(parent->{
+            childToParentsMap.get(area).forEach(parent->{
                 if(parent != null && filteredDistributions.containsKey(parent)){
                     removeCandidatesArea.add(parent);
                 }