Eliminate ditto-internal-utils-aggregator module

* moved classes to edge-service and things-service depending on where they are used Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Aug 26, 2022 · 85dfec4 · 85dfec4
1 parent 1c234d7
commit 85dfec4
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 110 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -571,11 +571,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.eclipse.ditto</groupId>
-                <artifactId>ditto-internal-utils-aggregator</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.ditto</groupId>
                 <artifactId>ditto-internal-utils-akka</artifactId>

diff --git a/connectivity/service/pom.xml b/connectivity/service/pom.xml
@@ -85,10 +85,6 @@
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-internal-utils-search</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-utils-aggregator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-internal-utils-pubsub-things</artifactId>

diff --git a/edge/service/pom.xml b/edge/service/pom.xml
@@ -69,10 +69,6 @@
             <artifactId>ditto-thingsearch-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-utils-aggregator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-internal-utils-akka</artifactId>

diff --git a/...e/src/main/java/org/eclipse/ditto/edge/service/dispatching/EdgeCommandForwarderActor.java b/...e/src/main/java/org/eclipse/ditto/edge/service/dispatching/EdgeCommandForwarderActor.java
@@ -12,7 +12,6 @@
  */
 package org.eclipse.ditto.edge.service.dispatching;
 
-import java.time.Duration;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Supplier;
 
@@ -28,7 +27,6 @@
 import org.eclipse.ditto.base.service.signaltransformer.SignalTransformers;
 import org.eclipse.ditto.connectivity.api.commands.sudo.ConnectivitySudoCommand;
 import org.eclipse.ditto.connectivity.model.signals.commands.ConnectivityCommand;
-import org.eclipse.ditto.internal.utils.aggregator.ThingsAggregatorProxyActor;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoDiagnosticLoggingAdapter;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
 import org.eclipse.ditto.internal.utils.cacheloaders.config.DefaultAskWithRetryConfig;

diff --git a/...ggregator/ThingsAggregatorProxyActor.java → ...spatching/ThingsAggregatorProxyActor.java b/...ggregator/ThingsAggregatorProxyActor.java → ...spatching/ThingsAggregatorProxyActor.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.internal.utils.aggregator;
+package org.eclipse.ditto.edge.service.dispatching;
 
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 

diff --git a/...gator/ThingsAggregatorProxyActorTest.java → ...ching/ThingsAggregatorProxyActorTest.java b/...gator/ThingsAggregatorProxyActorTest.java → ...ching/ThingsAggregatorProxyActorTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.internal.utils.aggregator;
+package org.eclipse.ditto.edge.service.dispatching;
 
 import java.util.UUID;
 

diff --git a/gateway/service/pom.xml b/gateway/service/pom.xml
@@ -53,10 +53,6 @@
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-base-model</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-utils-aggregator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-internal-utils-akka</artifactId>

diff --git a/internal/utils/aggregator/pom.xml b/internal/utils/aggregator/pom.xml
diff --git a/internal/utils/pom.xml b/internal/utils/pom.xml
@@ -26,7 +26,6 @@
     <name>Eclipse Ditto :: Internal :: Utils</name>
 
     <modules>
-        <module>aggregator</module>
         <module>akka</module>
         <module>cache</module>
         <module>cache-loaders</module>

diff --git a/things/service/pom.xml b/things/service/pom.xml
@@ -50,10 +50,6 @@
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-internal-utils-namespaces</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-utils-aggregator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-internal-utils-pubsub-things</artifactId>

diff --git a/...egator/DefaultThingsAggregatorConfig.java → ...gation/DefaultThingsAggregatorConfig.java b/...egator/DefaultThingsAggregatorConfig.java → ...gation/DefaultThingsAggregatorConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.internal.utils.aggregator;
+package org.eclipse.ditto.things.service.aggregation;
 
 import java.time.Duration;
 import java.util.Objects;

diff --git a/...ils/aggregator/ThingsAggregatorActor.java → ...ce/aggregation/ThingsAggregatorActor.java b/...ils/aggregator/ThingsAggregatorActor.java → ...ce/aggregation/ThingsAggregatorActor.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.internal.utils.aggregator;
+package org.eclipse.ditto.things.service.aggregation;
 
 import java.util.Collection;
 import java.util.Objects;

diff --git a/...ls/aggregator/ThingsAggregatorConfig.java → ...e/aggregation/ThingsAggregatorConfig.java b/...ls/aggregator/ThingsAggregatorConfig.java → ...e/aggregation/ThingsAggregatorConfig.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.internal.utils.aggregator;
+package org.eclipse.ditto.things.service.aggregation;
 
 import java.time.Duration;
 

diff --git a/things/service/src/main/java/org/eclipse/ditto/things/service/starter/ThingsRootActor.java b/things/service/src/main/java/org/eclipse/ditto/things/service/starter/ThingsRootActor.java
@@ -17,9 +17,9 @@
 import org.eclipse.ditto.base.api.devops.signals.commands.RetrieveStatisticsDetails;
 import org.eclipse.ditto.base.service.RootChildActorStarter;
 import org.eclipse.ditto.base.service.actors.DittoRootActor;
-import org.eclipse.ditto.internal.utils.aggregator.DefaultThingsAggregatorConfig;
-import org.eclipse.ditto.internal.utils.aggregator.ThingsAggregatorActor;
-import org.eclipse.ditto.internal.utils.aggregator.ThingsAggregatorConfig;
+import org.eclipse.ditto.things.service.aggregation.DefaultThingsAggregatorConfig;
+import org.eclipse.ditto.things.service.aggregation.ThingsAggregatorActor;
+import org.eclipse.ditto.things.service.aggregation.ThingsAggregatorConfig;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
 import org.eclipse.ditto.internal.utils.cluster.DistPubSubAccess;
 import org.eclipse.ditto.internal.utils.cluster.RetrieveStatisticsDetailsResponseSupplier;

diff --git a/...or/DefaultThingsAggregatorConfigTest.java → ...on/DefaultThingsAggregatorConfigTest.java b/...or/DefaultThingsAggregatorConfigTest.java → ...on/DefaultThingsAggregatorConfigTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.internal.utils.aggregator;
+package org.eclipse.ditto.things.service.aggregation;
 
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;

diff --git a/...est/resources/things-aggregator-test.conf → ...est/resources/things-aggregator-test.conf b/...est/resources/things-aggregator-test.conf → ...est/resources/things-aggregator-test.conf