Move placeholder substitution back into persistence services

* reason is for example the ModifyToCreate transformer because some strategies are only applicable to a create command and I want to avoid unnecessary code, therefore I didn't create a new strategy for it. Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Jul 19, 2022 · 860273c · 860273c
1 parent 2144cc2
commit 860273c
Show file tree

Hide file tree

Showing 33 changed files with 72 additions and 66 deletions.
diff --git a/base/service/pom.xml b/base/service/pom.xml
@@ -115,6 +115,14 @@
             <groupId>io.kamon</groupId>
             <artifactId>kamon-opentelemetry_${scala.version}</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.ditto</groupId>
+            <artifactId>ditto-placeholders</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.ditto</groupId>
+            <artifactId>ditto-policies-model</artifactId>
+        </dependency>
 
         <!-- test scope -->
         <dependency>

diff --git a/...tion/AbstractPlaceholderSubstitution.java → ...tion/AbstractPlaceholderSubstitution.java b/...tion/AbstractPlaceholderSubstitution.java → ...tion/AbstractPlaceholderSubstitution.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution;
+package org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...on/AbstractTypedSubstitutionStrategy.java → ...on/AbstractTypedSubstitutionStrategy.java b/...on/AbstractTypedSubstitutionStrategy.java → ...on/AbstractTypedSubstitutionStrategy.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution;
+package org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...asedPlaceholderSubstitutionAlgorithm.java → ...asedPlaceholderSubstitutionAlgorithm.java b/...asedPlaceholderSubstitutionAlgorithm.java → ...asedPlaceholderSubstitutionAlgorithm.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution;
+package org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 
@@ -26,9 +26,9 @@
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
-import org.eclipse.ditto.placeholders.PlaceholderNotResolvableException;
 import org.eclipse.ditto.placeholders.ExpressionResolver;
 import org.eclipse.ditto.placeholders.PipelineElement;
+import org.eclipse.ditto.placeholders.PlaceholderNotResolvableException;
 
 /**
  * An algorithm for placeholder substitution based on {@link DittoHeaders}.
@@ -96,8 +96,7 @@ private Function<String, PipelineElement> createReplacerFunction(final DittoHead
             final String placeholder = placeholderWithSpaces.trim();
             final Function<DittoHeaders, String> placeholderResolver = replacementDefinitions.get(placeholder);
             if (placeholderResolver == null) {
-                throw PlaceholderNotResolvableException.newUnknownPlaceholderBuilder(placeholder,
-                        knownPlaceHolders)
+                throw PlaceholderNotResolvableException.newUnknownPlaceholderBuilder(placeholder, knownPlaceHolders)
                         .dittoHeaders(dittoHeaders)
                         .build();
             }

diff --git a/...ution/SubjectIdReplacementDefinition.java → ...ution/SubjectIdReplacementDefinition.java b/...ution/SubjectIdReplacementDefinition.java → ...ution/SubjectIdReplacementDefinition.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution;
+package org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...dersubstitution/SubstitutionStrategy.java → ...dersubstitution/SubstitutionStrategy.java b/...dersubstitution/SubstitutionStrategy.java → ...dersubstitution/SubstitutionStrategy.java
@@ -10,10 +10,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution;
+package org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution;
 
 import org.eclipse.ditto.base.model.signals.Signal;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
 
 /**
  * Defines the (placeholder) substitution strategy for a certain command (which is of type {@link Signal}.

diff --git a/...itution/SubstitutionStrategyRegistry.java → ...itution/SubstitutionStrategyRegistry.java b/...itution/SubstitutionStrategyRegistry.java → ...itution/SubstitutionStrategyRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution;
+package org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...PlaceholderSubstitutionAlgorithmTest.java → ...PlaceholderSubstitutionAlgorithmTest.java b/...PlaceholderSubstitutionAlgorithmTest.java → ...PlaceholderSubstitutionAlgorithmTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution;
+package org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -22,16 +22,16 @@
 import java.util.Map;
 import java.util.function.Function;
 
+import org.assertj.core.api.Assertions;
 import org.assertj.core.api.ThrowableAssert;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
 import org.eclipse.ditto.placeholders.PlaceholderNotResolvableException;
 import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Tests {@link org.eclipse.ditto.policies.enforcement.placeholders.HeaderBasedPlaceholderSubstitutionAlgorithm}.
+ * Tests {@link HeaderBasedPlaceholderSubstitutionAlgorithm}.
  */
 public class HeaderBasedPlaceholderSubstitutionAlgorithmTest {
 
@@ -161,8 +161,8 @@ private void assertGatewayPlaceholderNotResolvableExceptionIsThrown(final String
                 .isThrownBy(throwingCallable)
                 .satisfies(e -> {
                     assertThat(e.getMessage()).isEqualTo(expectedMessage);
-                    assertThat(e.getDescription()).contains(expectedDescription);
-                    assertThat(e.getDittoHeaders()).isEqualTo(DITTO_HEADERS);
+                    Assertions.assertThat(e.getDescription()).contains(expectedDescription);
+                    Assertions.assertThat(e.getDittoHeaders()).isEqualTo(DITTO_HEADERS);
                 });
     }
 

diff --git a/...n/SubjectIdReplacementDefinitionTest.java → ...n/SubjectIdReplacementDefinitionTest.java b/...n/SubjectIdReplacementDefinitionTest.java → ...n/SubjectIdReplacementDefinitionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution;
+package org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -19,7 +19,7 @@
 import org.eclipse.ditto.base.model.auth.AuthorizationSubject;
 import org.eclipse.ditto.base.model.auth.DittoAuthorizationContextType;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.SubjectIdReplacementDefinition;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.SubjectIdReplacementDefinition;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/edge/service/src/main/resources/ditto-edge-service.conf b/edge/service/src/main/resources/ditto-edge-service.conf
@@ -13,9 +13,7 @@ ditto {
               default-namespace = ${?DITTO_DEFAULT_NAMESPACE}
             }
           },
-          "org.eclipse.ditto.edge.service.dispatching.signaltransformer.OriginatorSetterSignalTransformer",
-          "org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies.PoliciesPlaceholderSubstitution",
-          "org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.things.ThingsPlaceholderSubstitution"
+          "org.eclipse.ditto.edge.service.dispatching.signaltransformer.OriginatorSetterSignalTransformer"
         ]
       }
     }

diff --git a/...ies/CreatePolicySubstitutionStrategy.java → ...ion/CreatePolicySubstitutionStrategy.java b/...ies/CreatePolicySubstitutionStrategy.java → ...ion/CreatePolicySubstitutionStrategy.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
 import org.eclipse.ditto.policies.model.Policy;
 import org.eclipse.ditto.policies.model.signals.commands.modify.CreatePolicy;
 

diff --git a/...ifyPolicyEntriesSubstitutionStrategy.java → ...ifyPolicyEntriesSubstitutionStrategy.java b/...ifyPolicyEntriesSubstitutionStrategy.java → ...ifyPolicyEntriesSubstitutionStrategy.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
 import org.eclipse.ditto.policies.model.PolicyEntry;
 import org.eclipse.ditto.policies.model.signals.commands.modify.ModifyPolicyEntries;
 

diff --git a/...odifyPolicyEntrySubstitutionStrategy.java → ...odifyPolicyEntrySubstitutionStrategy.java b/...odifyPolicyEntrySubstitutionStrategy.java → ...odifyPolicyEntrySubstitutionStrategy.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
 import org.eclipse.ditto.policies.model.PolicyEntry;
 import org.eclipse.ditto.policies.model.signals.commands.modify.ModifyPolicyEntry;
 

diff --git a/...ies/ModifyPolicySubstitutionStrategy.java → ...ion/ModifyPolicySubstitutionStrategy.java b/...ies/ModifyPolicySubstitutionStrategy.java → ...ion/ModifyPolicySubstitutionStrategy.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
 import org.eclipse.ditto.policies.model.Policy;
 import org.eclipse.ditto.policies.model.signals.commands.modify.ModifyPolicy;
 

diff --git a/...es/ModifySubjectSubstitutionStrategy.java → ...on/ModifySubjectSubstitutionStrategy.java b/...es/ModifySubjectSubstitutionStrategy.java → ...on/ModifySubjectSubstitutionStrategy.java
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
 import org.eclipse.ditto.policies.model.Subject;
 import org.eclipse.ditto.policies.model.signals.commands.modify.ModifySubject;
 

diff --git a/...s/ModifySubjectsSubstitutionStrategy.java → ...n/ModifySubjectsSubstitutionStrategy.java b/...s/ModifySubjectsSubstitutionStrategy.java → ...n/ModifySubjectsSubstitutionStrategy.java
@@ -10,13 +10,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static java.util.Objects.requireNonNull;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.AbstractTypedSubstitutionStrategy;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.HeaderBasedPlaceholderSubstitutionAlgorithm;
 import org.eclipse.ditto.policies.model.Subjects;
 import org.eclipse.ditto.policies.model.signals.commands.modify.ModifySubjects;
 

diff --git a/...cies/PoliciesPlaceholderSubstitution.java → ...tion/PoliciesPlaceholderSubstitution.java b/...cies/PoliciesPlaceholderSubstitution.java → ...tion/PoliciesPlaceholderSubstitution.java
@@ -10,10 +10,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.AbstractPlaceholderSubstitution;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.AbstractPlaceholderSubstitution;
 
 import com.typesafe.config.Config;
 

diff --git a/...s/PolicySubstitutionStrategyRegistry.java → ...n/PolicySubstitutionStrategyRegistry.java b/...s/PolicySubstitutionStrategyRegistry.java → ...n/PolicySubstitutionStrategyRegistry.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -19,8 +19,8 @@
 import javax.annotation.concurrent.Immutable;
 
 import org.eclipse.ditto.base.model.signals.Signal;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.SubstitutionStrategy;
-import org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.SubstitutionStrategyRegistry;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.SubstitutionStrategy;
+import org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.SubstitutionStrategyRegistry;
 
 /**
  * Registry containing all of policy specific instances of {@link SubstitutionStrategy}.

diff --git a/policies/service/src/main/resources/policies.conf b/policies/service/src/main/resources/policies.conf
@@ -8,7 +8,8 @@ ditto {
       "org.eclipse.ditto.policies.enforcement.pre.CreationRestrictionPreEnforcer"
     ]
     signal-transformers-provider.extension-config.signal-transformers = [
-      "org.eclipse.ditto.policies.service.enforcement.pre.ModifyToCreatePolicyTransformer" // always keep this as first transformer in order to guarantee that all following transformers know that the command is creating a policy instead of modifying it
+      "org.eclipse.ditto.policies.service.enforcement.pre.ModifyToCreatePolicyTransformer", // always keep this as first transformer in order to guarantee that all following transformers know that the command is creating a policy instead of modifying it
+      "org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution.PoliciesPlaceholderSubstitution"
     ]
     snapshot-adapter = {
       extension-class = "org.eclipse.ditto.policies.service.persistence.serializer.PolicyMongoSnapshotAdapter"

diff --git a/...ctPolicySubstitutionStrategyTestBase.java → ...ctPolicySubstitutionStrategyTestBase.java b/...ctPolicySubstitutionStrategyTestBase.java → ...ctPolicySubstitutionStrategyTestBase.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import java.util.Collections;
 import java.util.concurrent.CompletionStage;
@@ -34,7 +34,7 @@
 
 /**
  * Abstract base class for test of concrete implementations of
- * {@link org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.SubstitutionStrategy} via
+ * {@link org.eclipse.ditto.base.service.signaltransformer.placeholdersubstitution.SubstitutionStrategy} via
  * {@link PoliciesPlaceholderSubstitution}.
  */
 abstract class AbstractPolicySubstitutionStrategyTestBase {

diff --git a/...CreatePolicySubstitutionStrategyTest.java → ...CreatePolicySubstitutionStrategyTest.java b/...CreatePolicySubstitutionStrategyTest.java → ...CreatePolicySubstitutionStrategyTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;

diff --git a/...olicyEntriesSubstitutionStrategyTest.java → ...olicyEntriesSubstitutionStrategyTest.java b/...olicyEntriesSubstitutionStrategyTest.java → ...olicyEntriesSubstitutionStrategyTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;

diff --git a/...yPolicyEntrySubstitutionStrategyTest.java → ...yPolicyEntrySubstitutionStrategyTest.java b/...yPolicyEntrySubstitutionStrategyTest.java → ...yPolicyEntrySubstitutionStrategyTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;

diff --git a/...ModifyPolicySubstitutionStrategyTest.java → ...ModifyPolicySubstitutionStrategyTest.java b/...ModifyPolicySubstitutionStrategyTest.java → ...ModifyPolicySubstitutionStrategyTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;

diff --git a/...odifySubjectSubstitutionStrategyTest.java → ...odifySubjectSubstitutionStrategyTest.java b/...odifySubjectSubstitutionStrategyTest.java → ...odifySubjectSubstitutionStrategyTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;

diff --git a/...difySubjectsSubstitutionStrategyTest.java → ...difySubjectsSubstitutionStrategyTest.java b/...difySubjectsSubstitutionStrategyTest.java → ...difySubjectsSubstitutionStrategyTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;

diff --git a/.../PoliciesPlaceholderSubstitutionTest.java → .../PoliciesPlaceholderSubstitutionTest.java b/.../PoliciesPlaceholderSubstitutionTest.java → .../PoliciesPlaceholderSubstitutionTest.java
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package org.eclipse.ditto.edge.service.dispatching.signaltransformer.placeholdersubstitution.policies;
+package org.eclipse.ditto.policies.service.signaltransformation.placeholdersubstitution;
 
 import static org.assertj.core.api.Assertions.assertThat;