fixed placeholder validation: placeholders must be unresolvable

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
eclipse-ditto · Jan 28, 2019 · 2d18107 · 2d18107
1 parent 118f933
commit 2d18107
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/...g/eclipse/ditto/services/connectivity/messaging/validation/AbstractProtocolValidator.java b/...g/eclipse/ditto/services/connectivity/messaging/validation/AbstractProtocolValidator.java
@@ -94,6 +94,12 @@ protected void validateSourceConfigs(final Connection connection, final DittoHea
                 validateSource(source, dittoHeaders, sourceDescription(source, connection)));
     }
 
+    /**
+     * TODO TJ doc
+     * @param source
+     * @param dittoHeaders
+     * @param sourceDescription
+     */
     protected abstract void validateSource(final Source source, final DittoHeaders dittoHeaders,
             final Supplier<String> sourceDescription);
 
@@ -108,11 +114,22 @@ protected void validateTargetConfigs(final Connection connection,
         connection.getTargets().forEach(target -> validateTarget(target, dittoHeaders, targetDescription(target, connection)));
     }
 
+    /**
+     * TODO TJ doc
+     * @param headerMapping
+     * @param dittoHeaders
+     */
     protected void validateHeaderMapping(final HeaderMapping headerMapping, final DittoHeaders dittoHeaders) {
         headerMapping.getMapping().forEach((key, value)
                 -> validateTemplate(value, dittoHeaders, newHeadersPlaceholder(), newThingPlaceholder()));
     }
 
+    /**
+     * TODO TJ doc
+     * @param target
+     * @param dittoHeaders
+     * @param sourceDescription
+     */
     protected abstract void validateTarget(final Target target, final DittoHeaders dittoHeaders,
             final Supplier<String> sourceDescription);
 
@@ -140,11 +157,23 @@ private static Supplier<String> targetDescription(final Target target, final Con
                 target.getAddress(), connection.getId());
     }
 
+    /**
+     * TODO TJ doc
+     * @param template
+     * @param placeholder
+     * @param headers
+     */
     protected void validateTemplate(final String template, final Placeholder<?> placeholder,
             final DittoHeaders headers) {
         validateTemplate(template, headers, placeholder);
     }
 
+    /**
+     * TODO TJ doc
+     * @param template
+     * @param headers
+     * @param placeholders
+     */
     protected void validateTemplate(final String template, final DittoHeaders headers,
             final Placeholder<?>... placeholders) {
         try {

diff --git a/...c/test/java/org/eclipse/ditto/services/connectivity/messaging/amqp/AmqpValidatorTest.java b/...c/test/java/org/eclipse/ditto/services/connectivity/messaging/amqp/AmqpValidatorTest.java
@@ -58,6 +58,7 @@ public void testValidHeaderMapping() {
                 .headerMapping(TestConstants.HEADER_MAPPING)
                 .build();
 
+        // TODO TJ - when validating the mapping should not be applied, should it?
         UNDER_TEST.validateSource(source, DittoHeaders.empty(), () -> "testSource");
     }
 

diff --git a/...in/java/org/eclipse/ditto/services/models/connectivity/placeholder/PlaceholderFilter.java b/...in/java/org/eclipse/ditto/services/models/connectivity/placeholder/PlaceholderFilter.java
@@ -186,12 +186,17 @@ private static <T> String doApply(final String template,
                 UNRESOLVED_INPUT_HANDLER, allowUnresolved);
     }
 
+    /**
+     * TODO TJ doc
+     *
+     * @param template
+     * @param placeholders
+     * @return
+     */
     public static String validate(final String template, final Placeholder<?>... placeholders) {
         String replaced = template;
-        for (int i = 0; i < placeholders.length; i++) {
-            boolean isNotLastPlaceholder = i < placeholders.length - 1;
-            final Placeholder<?> thePlaceholder = placeholders[i];
-            replaced = doApply(template, thePlaceholder, isNotLastPlaceholder,
+        for (final Placeholder<?> thePlaceholder : placeholders) {
+            replaced = doApply(template, thePlaceholder, true, // when validating, placeholders may be unresolved
                     placeholder -> Optional.of(thePlaceholder.getPrefix()));
         }
         return replaced;