Adapt E+M aggregation activators to new AggregationMode.byXXX signatures

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/EuroMedActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/EuroMedActivator.java
index dc1b23dd1bc17fa5c98486cad39e8476bc7c1ee7..e073e7802f853e49a5b8dbd2a72ced8355cdeada 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/EuroMedActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/EuroMedActivator.java
@@ -475,7 +475,7 @@ public class EuroMedActivator {
 
                 DistributionAggregationConfiguration aggregationConfig = DistributionAggregationConfiguration
                         .NewInstance(
-                        AggregationMode.byAreasAndRanks(),
+                        AggregationMode.byWithinTaxonAndToParent(),
                         areaPager.getRecords().stream().map(area->area.getUuid()).collect(Collectors.toList()),
                         filter,
                         DefaultProgressMonitor.NewInstance());

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/euromed/EuroMedDistributionAggregationActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/euromed/EuroMedDistributionAggregationActivator.java
index 941564eb11e8883e33bdd9385ae0259667e2ab1c..a584ec223518ac885e57999fa4752187e7ce91b5 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/euromed/EuroMedDistributionAggregationActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/euromed/EuroMedDistributionAggregationActivator.java
@@ -66,7 +66,7 @@ public class EuroMedDistributionAggregationActivator {
                 null, Rank.uuidGenus);
         DistributionAggregationConfiguration aggregationConfig =
                 DistributionAggregationConfiguration.NewInstance(
-                AggregationMode.byRanks(),
+                AggregationMode.byToParent(),
                 null,
                 filter,
                 DefaultProgressMonitor.NewInstance());