#898: moved ditto-internal-models-placeholders to a public module "di…

…tto-placeholders" * make use of PlaceholderResolver in RQL ThingPredicateVisitor et. al * move TopicPathPlaceholder from connectivity internals to "ditto-protocol" * instantiate TopicPathPlaceholder with extracted TopicPath at places relying on RQL filtering Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Sep 14, 2021 · 08295cb · 08295cb
1 parent 8365d57
commit 08295cb
Show file tree

Hide file tree

Showing 161 changed files with 1,222 additions and 546 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -481,7 +481,7 @@
             </dependency>
             <dependency>
                 <groupId>org.eclipse.ditto</groupId>
-                <artifactId>ditto-internal-models-placeholders</artifactId>
+                <artifactId>ditto-placeholders</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

diff --git a/...ncierge/service/enforcement/placeholders/HeaderBasedPlaceholderSubstitutionAlgorithm.java b/...ncierge/service/enforcement/placeholders/HeaderBasedPlaceholderSubstitutionAlgorithm.java
@@ -26,9 +26,9 @@
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
-import org.eclipse.ditto.internal.models.placeholders.ExpressionResolver;
-import org.eclipse.ditto.internal.models.placeholders.PipelineElement;
 import org.eclipse.ditto.base.model.signals.commands.exceptions.GatewayPlaceholderNotResolvableException;
+import org.eclipse.ditto.placeholders.ExpressionResolver;
+import org.eclipse.ditto.placeholders.PipelineElement;
 
 /**
  * An algorithm for placeholder substitution based on {@link DittoHeaders}.

diff --git a/.../org/eclipse/ditto/concierge/service/starter/ConciergeServiceGlobalErrorRegistryTest.java b/.../org/eclipse/ditto/concierge/service/starter/ConciergeServiceGlobalErrorRegistryTest.java
@@ -26,9 +26,9 @@
 import org.eclipse.ditto.base.model.signals.commands.exceptions.PathUnknownException;
 import org.eclipse.ditto.connectivity.model.ConnectionConfigurationInvalidException;
 import org.eclipse.ditto.connectivity.model.signals.commands.exceptions.ConnectionConflictException;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFunctionSignatureInvalidException;
 import org.eclipse.ditto.internal.utils.test.GlobalErrorRegistryTestCases;
 import org.eclipse.ditto.messages.model.AuthorizationSubjectBlockedException;
+import org.eclipse.ditto.placeholders.PlaceholderFunctionSignatureInvalidException;
 import org.eclipse.ditto.policies.model.PolicyEntryInvalidException;
 import org.eclipse.ditto.policies.model.PolicyIdInvalidException;
 import org.eclipse.ditto.policies.model.signals.commands.exceptions.PolicyConflictException;

diff --git a/connectivity/api/pom.xml b/connectivity/api/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-models-placeholders</artifactId>
+            <artifactId>ditto-placeholders</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>

diff --git a/...ivity/api/src/main/java/org/eclipse/ditto/connectivity/api/EnforcementFactoryFactory.java b/...ivity/api/src/main/java/org/eclipse/ditto/connectivity/api/EnforcementFactoryFactory.java
@@ -16,11 +16,11 @@
 import java.util.List;
 
 import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders;
 import org.eclipse.ditto.connectivity.model.Enforcement;
 import org.eclipse.ditto.connectivity.model.EnforcementFilterFactory;
-import org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
-import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.placeholders.Placeholder;
 
 /**
  * Factory class that creates instances of {@link EnforcementFilterFactory}s.

diff --git a/...ctivity/api/src/main/java/org/eclipse/ditto/connectivity/api/SignalEnforcementFilter.java b/...ctivity/api/src/main/java/org/eclipse/ditto/connectivity/api/SignalEnforcementFilter.java
@@ -24,13 +24,13 @@
 import org.eclipse.ditto.base.model.entity.id.EntityId;
 import org.eclipse.ditto.base.model.entity.id.WithEntityId;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.connectivity.model.ConnectionSignalIdEnforcementFailedException;
 import org.eclipse.ditto.connectivity.model.Enforcement;
 import org.eclipse.ditto.connectivity.model.EnforcementFilter;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFilter;
-import org.eclipse.ditto.internal.models.placeholders.UnresolvedPlaceholderException;
-import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.PlaceholderFilter;
+import org.eclipse.ditto.placeholders.UnresolvedPlaceholderException;
 
 /**
  * Implementation of an {@link EnforcementFilter} which is applicable to signals.

diff --git a/.../api/src/main/java/org/eclipse/ditto/connectivity/api/SignalEnforcementFilterFactory.java b/.../api/src/main/java/org/eclipse/ditto/connectivity/api/SignalEnforcementFilterFactory.java
@@ -17,13 +17,13 @@
 import javax.annotation.concurrent.Immutable;
 
 import org.eclipse.ditto.base.model.entity.id.EntityId;
+import org.eclipse.ditto.base.model.signals.Signal;
 import org.eclipse.ditto.connectivity.model.Enforcement;
 import org.eclipse.ditto.connectivity.model.EnforcementFilter;
 import org.eclipse.ditto.connectivity.model.EnforcementFilterFactory;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFactory;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFilter;
-import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.PlaceholderFactory;
+import org.eclipse.ditto.placeholders.PlaceholderFilter;
 
 /**
  * Factory that creates instances of EnforcementFilterFactory.

diff --git a/...rc/main/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectionIdPlaceholder.java b/...rc/main/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectionIdPlaceholder.java
@@ -13,10 +13,10 @@
 package org.eclipse.ditto.connectivity.api.placeholders;
 
 import org.eclipse.ditto.connectivity.model.ConnectionId;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.Placeholder;
 
 /**
- * A {@link org.eclipse.ditto.internal.models.placeholders.Placeholder} that requires a {@code String}
+ * A {@link org.eclipse.ditto.placeholders.Placeholder} that requires a {@code String}
  * (a valid Connection ID) to resolve its placeholders.
  *
  * @since 1.4.0

diff --git a/...c/main/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectivityPlaceholders.java b/...c/main/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectivityPlaceholders.java
@@ -13,7 +13,8 @@
 package org.eclipse.ditto.connectivity.api.placeholders;
 
 import org.eclipse.ditto.base.model.auth.AuthorizationContext;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.Placeholder;
+import org.eclipse.ditto.protocol.placeholders.TopicPathPlaceholder;
 
 public final class ConnectivityPlaceholders {
 
@@ -60,7 +61,7 @@ public static Placeholder<AuthorizationContext> newRequestPlaceholder() {
      * @return the singleton instance of {@link TopicPathPlaceholder}
      */
     public static TopicPathPlaceholder newTopicPathPlaceholder() {
-        return ImmutableTopicPathPlaceholder.INSTANCE;
+        return TopicPathPlaceholder.getInstance();
     }
 
     /**

diff --git a/...pi/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/EntityIdPlaceholder.java b/...pi/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/EntityIdPlaceholder.java
@@ -13,10 +13,10 @@
 package org.eclipse.ditto.connectivity.api.placeholders;
 
 import org.eclipse.ditto.base.model.entity.id.EntityId;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.Placeholder;
 
 /**
- * A {@link org.eclipse.ditto.internal.models.placeholders.Placeholder} that requires a {@code String}
+ * A {@link org.eclipse.ditto.placeholders.Placeholder} that requires a {@code String}
  * (a valid Entity ID) to resolve its placeholders.
  */
 public interface EntityIdPlaceholder extends Placeholder<EntityId> {

diff --git a/...api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/FeaturePlaceholder.java b/...api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/FeaturePlaceholder.java
@@ -12,12 +12,12 @@
  */
 package org.eclipse.ditto.connectivity.api.placeholders;
 
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.Placeholder;
 
 /**
- * A {@link org.eclipse.ditto.internal.models.placeholders.Placeholder} that requires a {@code String}
+ * A {@link org.eclipse.ditto.placeholders.Placeholder} that requires a {@code String}
  * (a valid Feature ID) to resolve its placeholders.
- * A {@link org.eclipse.ditto.internal.models.placeholders.Placeholder} that requires a {@code String} (a valid Feature ID) to resolve its placeholders.
+ * A {@link org.eclipse.ditto.placeholders.Placeholder} that requires a {@code String} (a valid Feature ID) to resolve its placeholders.
  *
  * @since 1.5.0
  */

diff --git a/...ain/java/org/eclipse/ditto/connectivity/api/placeholders/ImmutableRequestPlaceholder.java b/...ain/java/org/eclipse/ditto/connectivity/api/placeholders/ImmutableRequestPlaceholder.java
@@ -21,7 +21,7 @@
 
 import org.eclipse.ditto.base.model.auth.AuthorizationContext;
 import org.eclipse.ditto.base.model.auth.AuthorizationSubject;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.Placeholder;
 
 /**
  * Placeholder implementation that replaces {@code request} related things based on an {@link AuthorizationContext}.

diff --git a/.../api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/PolicyPlaceholder.java b/.../api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/PolicyPlaceholder.java
@@ -13,10 +13,10 @@
 package org.eclipse.ditto.connectivity.api.placeholders;
 
 import org.eclipse.ditto.base.model.entity.id.EntityId;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.Placeholder;
 
 /**
- * A {@link org.eclipse.ditto.internal.models.placeholders.Placeholder} that requires a {@code String}
+ * A {@link org.eclipse.ditto.placeholders.Placeholder} that requires a {@code String}
  * (a valid Policy ID) to resolve its placeholders.
  */
 public interface PolicyPlaceholder extends Placeholder<EntityId> {

diff --git a/...c/main/java/org/eclipse/ditto/connectivity/api/placeholders/SourceAddressPlaceholder.java b/...c/main/java/org/eclipse/ditto/connectivity/api/placeholders/SourceAddressPlaceholder.java
@@ -13,10 +13,10 @@
 package org.eclipse.ditto.connectivity.api.placeholders;
 
 
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.Placeholder;
 
 /**
- * A {@link org.eclipse.ditto.internal.models.placeholders.Placeholder} that requires a {@code String}
+ * A {@link org.eclipse.ditto.placeholders.Placeholder} that requires a {@code String}
  * (a {@link org.eclipse.ditto.connectivity.model.Source} {@code address}) to resolve its placeholders.
  */
 public interface SourceAddressPlaceholder extends Placeholder<String> {

diff --git a/...y/api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/ThingPlaceholder.java b/...y/api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/ThingPlaceholder.java
@@ -13,10 +13,10 @@
 package org.eclipse.ditto.connectivity.api.placeholders;
 
 import org.eclipse.ditto.base.model.entity.id.EntityId;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.Placeholder;
 
 /**
- * A {@link org.eclipse.ditto.internal.models.placeholders.Placeholder} that requires a {@code String}
+ * A {@link org.eclipse.ditto.placeholders.Placeholder} that requires a {@code String}
  * (a valid Thing ID) to resolve its placeholders.
  */
 public interface ThingPlaceholder extends Placeholder<EntityId> {

diff --git a/...i/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/TopicPathPlaceholder.java b/...i/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/TopicPathPlaceholder.java
diff --git a/...ity/api/src/test/java/org/eclipse/ditto/connectivity/api/SignalEnforcementFilterTest.java b/...ity/api/src/test/java/org/eclipse/ditto/connectivity/api/SignalEnforcementFilterTest.java
@@ -22,19 +22,19 @@
 import org.eclipse.ditto.base.model.entity.id.AbstractNamespacedEntityId;
 import org.eclipse.ditto.base.model.entity.id.NamespacedEntityId;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.eclipse.ditto.connectivity.model.ConnectionSignalIdEnforcementFailedException;
 import org.eclipse.ditto.connectivity.model.ConnectivityModelFactory;
 import org.eclipse.ditto.connectivity.model.Enforcement;
 import org.eclipse.ditto.connectivity.model.EnforcementFilter;
 import org.eclipse.ditto.connectivity.model.EnforcementFilterFactory;
+import org.eclipse.ditto.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.PlaceholderFactory;
+import org.eclipse.ditto.placeholders.UnresolvedPlaceholderException;
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.things.model.ThingConstants;
 import org.eclipse.ditto.things.model.ThingId;
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFactory;
-import org.eclipse.ditto.internal.models.placeholders.UnresolvedPlaceholderException;
-import org.eclipse.ditto.base.model.signals.Signal;
-import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.junit.Test;
 import org.mutabilitydetector.unittesting.AllowedReason;
 import org.mutabilitydetector.unittesting.MutabilityAssert;

diff --git a/connectivity/api/src/test/java/org/eclipse/ditto/connectivity/api/SimplePlaceholder.java b/connectivity/api/src/test/java/org/eclipse/ditto/connectivity/api/SimplePlaceholder.java
@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.eclipse.ditto.internal.models.placeholders.Placeholder;
+import org.eclipse.ditto.placeholders.Placeholder;
 
 /**
  * Simple placeholder for test purposes.

diff --git a/...est/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectionIdPlaceholderTest.java b/...est/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectionIdPlaceholderTest.java
@@ -17,9 +17,9 @@
  import java.util.Collections;
 
  import org.eclipse.ditto.connectivity.model.ConnectionId;
- import org.eclipse.ditto.internal.models.placeholders.ExpressionResolver;
- import org.eclipse.ditto.internal.models.placeholders.PlaceholderFactory;
- import org.eclipse.ditto.internal.models.placeholders.PlaceholderResolver;
+ import org.eclipse.ditto.placeholders.ExpressionResolver;
+ import org.eclipse.ditto.placeholders.PlaceholderFactory;
+ import org.eclipse.ditto.placeholders.PlaceholderResolver;
  import org.junit.Test;
 
  public final class ConnectionIdPlaceholderTest {

diff --git a/...i/src/test/java/org/eclipse/ditto/connectivity/api/placeholders/TopicPlaceholderTest.java b/...i/src/test/java/org/eclipse/ditto/connectivity/api/placeholders/TopicPlaceholderTest.java
@@ -17,14 +17,15 @@
 
 import java.util.Collections;
 
-import org.eclipse.ditto.internal.models.placeholders.ExpressionResolver;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFactory;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFilter;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderResolver;
-import org.eclipse.ditto.internal.models.placeholders.UnresolvedPlaceholderException;
-import org.eclipse.ditto.things.model.ThingId;
+import org.eclipse.ditto.placeholders.ExpressionResolver;
+import org.eclipse.ditto.placeholders.PlaceholderFactory;
+import org.eclipse.ditto.placeholders.PlaceholderFilter;
+import org.eclipse.ditto.placeholders.PlaceholderResolver;
+import org.eclipse.ditto.placeholders.UnresolvedPlaceholderException;
 import org.eclipse.ditto.protocol.ProtocolFactory;
 import org.eclipse.ditto.protocol.TopicPath;
+import org.eclipse.ditto.protocol.placeholders.TopicPathPlaceholder;
+import org.eclipse.ditto.things.model.ThingId;
 import org.junit.Test;
 
 public final class TopicPlaceholderTest {

diff --git a/connectivity/service/pom.xml b/connectivity/service/pom.xml
@@ -46,18 +46,18 @@
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-base-service</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-models-acks</artifactId>
+            <artifactId>ditto-placeholders</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-models-signalenrichment</artifactId>
+            <artifactId>ditto-internal-models-acks</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-models-placeholders</artifactId>
+            <artifactId>ditto-internal-models-signalenrichment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>

diff --git a/...in/java/org/eclipse/ditto/connectivity/service/mapping/ConnectionStatusMessageMapper.java b/...in/java/org/eclipse/ditto/connectivity/service/mapping/ConnectionStatusMessageMapper.java
@@ -20,29 +20,29 @@
 
 import javax.annotation.Nullable;
 
-import org.eclipse.ditto.connectivity.service.config.mapping.MappingConfig;
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonPointer;
-import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.base.model.common.Placeholders;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.headers.WithDittoHeaders;
+import org.eclipse.ditto.connectivity.api.ExternalMessage;
 import org.eclipse.ditto.connectivity.model.MessageMapperConfigurationInvalidException;
 import org.eclipse.ditto.connectivity.model.MessageMappingFailedException;
-import org.eclipse.ditto.internal.models.placeholders.ExpressionResolver;
-import org.eclipse.ditto.internal.models.placeholders.HeadersPlaceholder;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFactory;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFilter;
+import org.eclipse.ditto.connectivity.service.config.mapping.MappingConfig;
+import org.eclipse.ditto.internal.utils.akka.logging.DittoLogger;
+import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.json.JsonValue;
+import org.eclipse.ditto.placeholders.ExpressionResolver;
+import org.eclipse.ditto.placeholders.HeadersPlaceholder;
+import org.eclipse.ditto.placeholders.PlaceholderFactory;
+import org.eclipse.ditto.placeholders.PlaceholderFilter;
+import org.eclipse.ditto.protocol.Adaptable;
+import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
 import org.eclipse.ditto.things.model.Feature;
 import org.eclipse.ditto.things.model.FeatureDefinition;
 import org.eclipse.ditto.things.model.FeatureProperties;
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.ThingIdInvalidException;
-import org.eclipse.ditto.protocol.Adaptable;
-import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
-import org.eclipse.ditto.connectivity.api.ExternalMessage;
-import org.eclipse.ditto.internal.utils.akka.logging.DittoLogger;
-import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
 import org.eclipse.ditto.things.model.signals.commands.modify.ModifyFeature;
 import org.eclipse.ditto.things.model.signals.commands.modify.ModifyFeatureProperty;
 

diff --git a/...va/org/eclipse/ditto/connectivity/service/mapping/ImplicitThingCreationMessageMapper.java b/...va/org/eclipse/ditto/connectivity/service/mapping/ImplicitThingCreationMessageMapper.java
@@ -32,16 +32,16 @@
 import org.eclipse.ditto.connectivity.api.ExternalMessage;
 import org.eclipse.ditto.connectivity.model.MessageMapperConfigurationInvalidException;
 import org.eclipse.ditto.connectivity.service.config.mapping.MappingConfig;
-import org.eclipse.ditto.internal.models.placeholders.ExpressionResolver;
-import org.eclipse.ditto.internal.models.placeholders.HeadersPlaceholder;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFactory;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFilter;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLogger;
 import org.eclipse.ditto.internal.utils.akka.logging.DittoLoggerFactory;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonValue;
+import org.eclipse.ditto.placeholders.ExpressionResolver;
+import org.eclipse.ditto.placeholders.HeadersPlaceholder;
+import org.eclipse.ditto.placeholders.PlaceholderFactory;
+import org.eclipse.ditto.placeholders.PlaceholderFilter;
 import org.eclipse.ditto.policies.model.Policy;
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.protocol.Adaptable;

diff --git a/...ervice/src/main/java/org/eclipse/ditto/connectivity/service/mapping/RawMessageMapper.java b/...ervice/src/main/java/org/eclipse/ditto/connectivity/service/mapping/RawMessageMapper.java
@@ -32,8 +32,6 @@
 import org.eclipse.ditto.connectivity.model.ConnectivityModelFactory;
 import org.eclipse.ditto.connectivity.model.MappingContext;
 import org.eclipse.ditto.connectivity.service.config.mapping.MappingConfig;
-import org.eclipse.ditto.internal.models.placeholders.ExpressionResolver;
-import org.eclipse.ditto.internal.models.placeholders.PlaceholderFactory;
 import org.eclipse.ditto.json.JsonArray;
 import org.eclipse.ditto.json.JsonCollectors;
 import org.eclipse.ditto.json.JsonFactory;
@@ -48,6 +46,8 @@
 import org.eclipse.ditto.messages.model.MessageHeaders;
 import org.eclipse.ditto.messages.model.MessagesModelFactory;
 import org.eclipse.ditto.messages.model.signals.commands.MessageDeserializer;
+import org.eclipse.ditto.placeholders.ExpressionResolver;
+import org.eclipse.ditto.placeholders.PlaceholderFactory;
 import org.eclipse.ditto.protocol.Adaptable;
 import org.eclipse.ditto.protocol.MessagePath;
 import org.eclipse.ditto.protocol.Payload;