use all available placeholders for HttpPushValidator and AbstractMqtt…

…Validator like in the other validators; Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
eclipse-ditto · Jan 25, 2022 · f182110 · f182110
1 parent b9b609b
commit f182110
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/...ain/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java b/...ain/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java
@@ -12,8 +12,6 @@
  */
 package org.eclipse.ditto.connectivity.service.messaging.httppush;
 
-import static org.eclipse.ditto.placeholders.PlaceholderFactory.newHeadersPlaceholder;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -22,7 +20,6 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.ConnectionConfigurationInvalidException;
 import org.eclipse.ditto.connectivity.model.ConnectionType;
@@ -31,6 +28,7 @@
 import org.eclipse.ditto.connectivity.model.Target;
 import org.eclipse.ditto.connectivity.service.config.ConnectivityConfig;
 import org.eclipse.ditto.connectivity.service.config.HttpPushConfig;
+import org.eclipse.ditto.connectivity.service.messaging.Resolvers;
 import org.eclipse.ditto.connectivity.service.messaging.validation.AbstractProtocolValidator;
 
 import akka.actor.ActorSystem;
@@ -102,14 +100,7 @@ protected void validateSource(final Source source, final DittoHeaders dittoHeade
     protected void validateTarget(final Target target, final DittoHeaders dittoHeaders,
             final Supplier<String> targetDescription) {
         validateHeaderMapping(target.getHeaderMapping(), dittoHeaders);
-        validateTemplate(target.getAddress(), dittoHeaders,
-                ConnectivityPlaceholders.newEntityPlaceholder(),
-                ConnectivityPlaceholders.newThingPlaceholder(),
-                ConnectivityPlaceholders.newTopicPathPlaceholder(),
-                ConnectivityPlaceholders.newResourcePlaceholder(),
-                ConnectivityPlaceholders.newTimePlaceholder(),
-                newHeadersPlaceholder(),
-                ConnectivityPlaceholders.newFeaturePlaceholder());
+        validateTemplate(target.getAddress(), dittoHeaders, Resolvers.getPlaceholders());
         validateTargetAddress(target.getAddress(), dittoHeaders, targetDescription);
     }
 

diff --git a/...ain/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/AbstractMqttValidator.java b/...ain/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/AbstractMqttValidator.java
@@ -13,14 +13,9 @@
 package org.eclipse.ditto.connectivity.service.messaging.mqtt;
 
 import static org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders.newEntityPlaceholder;
-import static org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders.newFeaturePlaceholder;
 import static org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders.newPolicyPlaceholder;
-import static org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders.newResourcePlaceholder;
 import static org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders.newSourceAddressPlaceholder;
 import static org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders.newThingPlaceholder;
-import static org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders.newTimePlaceholder;
-import static org.eclipse.ditto.connectivity.api.placeholders.ConnectivityPlaceholders.newTopicPathPlaceholder;
-import static org.eclipse.ditto.placeholders.PlaceholderFactory.newHeadersPlaceholder;
 
 import java.text.MessageFormat;
 import java.util.AbstractMap;
@@ -51,6 +46,7 @@
 import org.eclipse.ditto.connectivity.model.Source;
 import org.eclipse.ditto.connectivity.model.Target;
 import org.eclipse.ditto.connectivity.service.config.MqttConfig;
+import org.eclipse.ditto.connectivity.service.messaging.Resolvers;
 import org.eclipse.ditto.connectivity.service.messaging.validation.AbstractProtocolValidator;
 import org.eclipse.ditto.placeholders.ExpressionResolver;
 import org.eclipse.ditto.placeholders.Placeholder;
@@ -114,8 +110,7 @@ protected void validateTarget(final Target target, final DittoHeaders dittoHeade
         }
 
         validateTargetQoS(qos.get(), dittoHeaders, targetDescription);
-        validateTemplate(target.getAddress(), dittoHeaders, newThingPlaceholder(), newTopicPathPlaceholder(),
-                newResourcePlaceholder(), newTimePlaceholder(), newHeadersPlaceholder(), newFeaturePlaceholder());
+        validateTemplate(target.getAddress(), dittoHeaders, Resolvers.getPlaceholders());
     }
 
     /**

diff --git a/.../eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java b/.../eclipse/ditto/connectivity/service/messaging/persistence/ConnectionPersistenceActor.java
@@ -226,6 +226,7 @@ public final class ConnectionPersistenceActor
     private ConnectivityConfig getConnectivityConfigWithOverwrites(final Config connectivityConfigOverwrites) {
         final Config defaultConfig = getContext().getSystem().settings().config();
         final Config withOverwrites = connectivityConfigOverwrites.withFallback(defaultConfig);
+
         return ConnectivityConfig.of(withOverwrites);
     }
 
@@ -414,6 +415,7 @@ protected ConnectivityEvent<?> modifyEventBeforePersist(final ConnectivityEvent<
                     .build();
             return superEvent.setDittoHeaders(headersWithJournalTags);
         }
+
         return superEvent;
     }
 
@@ -776,6 +778,7 @@ private void testConnection(final StagedCommand command) {
                                 command.withResponse(
                                         toDittoRuntimeException(error, entityId, command.getDittoHeaders())),
                                 ActorRef.noSender());
+
                         return null;
                     });
         }
@@ -885,6 +888,7 @@ private void respondWithEmptyLogs(final WithDittoHeaders command, final ActorRef
     private CompletionStage<Object> startAndAskClientActors(final SignalWithEntityId<?> cmd, final int clientCount) {
         startClientActorsIfRequired(clientCount, cmd.getDittoHeaders());
         final Object msg = consistentHashableEnvelope(cmd, cmd.getEntityId().toString());
+
         return processClientAskResult(Patterns.ask(clientActorRouter, msg, clientActorAskTimeout));
     }
 
@@ -905,6 +909,7 @@ private CompletionStage<Object> broadcastToClientActorsIfStarted(final Command<?
         if (clientActorRouter != null && entity != null) {
             // wrap in Broadcast message because these management messages must be delivered to each client actor
             final Broadcast broadcast = new Broadcast(cmd);
+
             return processClientAskResult(Patterns.ask(clientActorRouter, broadcast, clientActorAskTimeout));
         } else {
             return CompletableFuture.completedFuture(null);
@@ -960,6 +965,7 @@ private Void handleException(final String action,
                 "Operation {0} failed due to {1}", action, dre.getMessage());
         log.warning("Operation <{}> on connection <{}> failed due to {}: {}.", action, entityId,
                 dre.getClass().getSimpleName(), dre.getMessage());
+
         return null;
     }