From d3de1e863aded8a73505414349dd5002d0c4c703 Mon Sep 17 00:00:00 2001 From: Thomas Jaeckle Date: Mon, 24 Jan 2022 16:47:07 +0100 Subject: [PATCH] fix that placeholder `time:now` did not resolve to the current time when used in a connection's headerMapping Signed-off-by: Thomas Jaeckle --- .../api/placeholders/ConnectivityPlaceholders.java | 2 +- .../ditto/connectivity/service/messaging/Resolvers.java | 2 +- .../service/messaging/httppush/HttpPushValidator.java | 2 +- .../service/messaging/mqtt/AbstractMqttValidator.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/connectivity/api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectivityPlaceholders.java b/connectivity/api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectivityPlaceholders.java index f59616aaad..f99fc5a398 100644 --- a/connectivity/api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectivityPlaceholders.java +++ b/connectivity/api/src/main/java/org/eclipse/ditto/connectivity/api/placeholders/ConnectivityPlaceholders.java @@ -74,7 +74,7 @@ public static ResourcePlaceholder newResourcePlaceholder() { /** * @return the singleton instance of {@link TimePlaceholder} */ - public static TimePlaceholder newMiscPlaceholder() { + public static TimePlaceholder newTimePlaceholder() { return TimePlaceholder.getInstance(); } diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/Resolvers.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/Resolvers.java index dec57376dc..8b1eba847d 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/Resolvers.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/Resolvers.java @@ -65,7 +65,7 @@ private Resolvers() { }), ResolverCreator.of(ConnectivityPlaceholders.newTopicPathPlaceholder(), (e, s, t, a, c) -> t), ResolverCreator.of(ConnectivityPlaceholders.newResourcePlaceholder(), (e, s, t, a, c) -> s), - ResolverCreator.of(ConnectivityPlaceholders.newMiscPlaceholder(), (e, s, t, a, c) -> null), + ResolverCreator.of(ConnectivityPlaceholders.newTimePlaceholder(), (e, s, t, a, c) -> new Object()), ResolverCreator.of(ConnectivityPlaceholders.newRequestPlaceholder(), (e, s, t, a, c) -> a), ResolverCreator.of(ConnectivityPlaceholders.newConnectionIdPlaceholder(), (e, s, t, a, c) -> c) ); diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java index 1a308e1596..8d782245a4 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/httppush/HttpPushValidator.java @@ -107,7 +107,7 @@ protected void validateTarget(final Target target, final DittoHeaders dittoHeade ConnectivityPlaceholders.newThingPlaceholder(), ConnectivityPlaceholders.newTopicPathPlaceholder(), ConnectivityPlaceholders.newResourcePlaceholder(), - ConnectivityPlaceholders.newMiscPlaceholder(), + ConnectivityPlaceholders.newTimePlaceholder(), newHeadersPlaceholder(), ConnectivityPlaceholders.newFeaturePlaceholder()); validateTargetAddress(target.getAddress(), dittoHeaders, targetDescription); diff --git a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/AbstractMqttValidator.java b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/AbstractMqttValidator.java index 80b142c050..32e5988083 100644 --- a/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/AbstractMqttValidator.java +++ b/connectivity/service/src/main/java/org/eclipse/ditto/connectivity/service/messaging/mqtt/AbstractMqttValidator.java @@ -14,11 +14,11 @@ 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.newMiscPlaceholder; 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; @@ -115,7 +115,7 @@ protected void validateTarget(final Target target, final DittoHeaders dittoHeade validateTargetQoS(qos.get(), dittoHeaders, targetDescription); validateTemplate(target.getAddress(), dittoHeaders, newThingPlaceholder(), newTopicPathPlaceholder(), - newResourcePlaceholder(), newMiscPlaceholder(), newHeadersPlaceholder(), newFeaturePlaceholder()); + newResourcePlaceholder(), newTimePlaceholder(), newHeadersPlaceholder(), newFeaturePlaceholder()); } /**