fix failing ImmutableFunctionExpression Unit-Test

Signed-off-by: Florian Fendt <Florian.Fendt@bosch-si.com>
eclipse-ditto · Feb 26, 2019 · 9937ee8 · 9937ee8
1 parent f341b20
commit 9937ee8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/...lders/src/main/java/org/eclipse/ditto/model/placeholders/ImmutableFunctionExpression.java b/...lders/src/main/java/org/eclipse/ditto/model/placeholders/ImmutableFunctionExpression.java
@@ -51,14 +51,13 @@ public List<String> getSupportedNames() {
     }
 
     @Override
-    public boolean supports(final String expression) {
+    public boolean supports(final String expressionName) {
 
         // it is sufficient that the passed in name starts with the function name and an opening parentheses,
         // e.g.: default('foo'). the function validates itself whether the remaining part is valid.
         return SUPPORTED.stream()
                 .map(PipelineFunction::getName)
-                .map(psfName -> psfName.replaceFirst(getPrefix() + ":", ""))
-                .anyMatch(psfName -> expression.startsWith(psfName + "("));
+                .anyMatch(psfName -> expressionName.startsWith(psfName + "("));
     }
 
     @Override

diff --git a/model/placeholders/src/main/java/org/eclipse/ditto/model/placeholders/ImmutablePipeline.java b/model/placeholders/src/main/java/org/eclipse/ditto/model/placeholders/ImmutablePipeline.java
@@ -33,8 +33,7 @@ final class ImmutablePipeline implements Pipeline {
     }
 
     @Override
-    public Optional<String> execute(final Optional<String> pipelineInput,
-            final ExpressionResolver expressionResolver) {
+    public Optional<String> execute(final Optional<String> pipelineInput, final ExpressionResolver expressionResolver) {
 
         Optional<String> stageValue = pipelineInput;
         for (final String expression : stageExpressions) {

diff --git a/...ceholders/src/main/java/org/eclipse/ditto/model/placeholders/PipelineFunctionDefault.java b/...ceholders/src/main/java/org/eclipse/ditto/model/placeholders/PipelineFunctionDefault.java
@@ -47,6 +47,8 @@ public DefaultFunctionSignature getSignature() {
     public Optional<String> apply(final Optional<String> value, final String paramsIncludingParentheses,
             final ExpressionResolver expressionResolver) {
 
+        validateOrThrow(paramsIncludingParentheses);
+
         if (value.isPresent()) {
             // if previous stage was non-empty: proceed with that
             return value;
@@ -58,6 +60,13 @@ public Optional<String> apply(final Optional<String> value, final String paramsI
         }
     }
 
+    private void validateOrThrow(final String paramsIncludingParentheses) {
+        if (!paramsIncludingParentheses.matches(OVERALL_PATTERN_STR)) {
+            throw PlaceholderFunctionSignatureInvalidException.newBuilder(paramsIncludingParentheses, this)
+                    .build();
+        }
+    }
+
     private ResolvedFunctionParameter<String> parseAndResolve(final String paramsIncludingParentheses,
             final ExpressionResolver expressionResolver) {