From 23e5c9fcecdc627f8d7c984404cf9e2e09bd219a Mon Sep 17 00:00:00 2001
From: Johannes Schneider <johannes.schneider@bosch.io>
Date: Mon, 24 Aug 2020 12:50:19 +0200
Subject: [PATCH] #760 made small method more readable

Signed-off-by: Johannes Schneider <johannes.schneider@bosch.io>
---
 .../messaging/MessageMappingProcessor.java    | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/MessageMappingProcessor.java b/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/MessageMappingProcessor.java
index a878cf7839..50310cc649 100644
--- a/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/MessageMappingProcessor.java
+++ b/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/MessageMappingProcessor.java
@@ -295,27 +295,22 @@ private static boolean shouldMapMessageByContentType(final ExternalMessage messa
     }
 
     private static boolean shouldMapMessageByConditions(final ExternalMessage message, final MessageMapper mapper) {
-        return validateMapperConditions(mapper, Resolvers.forExternalMessage(message));
+        return resolveConditions(mapper, Resolvers.forExternalMessage(message));
     }
 
-    private static boolean shouldMapMessageByConditions(final OutboundSignal.Mappable outboundSignal,
+    private static boolean shouldMapMessageByConditions(final OutboundSignal.Mappable mappable,
             final MessageMapper mapper) {
-        return validateMapperConditions(mapper, Resolvers.forOutboundSignal(outboundSignal));
+        return resolveConditions(mapper, Resolvers.forOutboundSignal(mappable));
     }
 
-    private static boolean validateMapperConditions(final MessageMapper mapper,
-            final ExpressionResolver expressionResolver) {
-        if (!mapper.getConditions().isEmpty()) {
-            boolean conditionBool = true;
-            ExpressionResolver resolver = expressionResolver;
-            for (String condition : mapper.getConditions()) {
-                conditionBool &= Boolean.parseBoolean(
-                        PlaceholderFilter.applyOrElseDelete("{{ fn:default('true') | " + condition + " }}", resolver)
-                                .orElse("false"));
-            }
-            return conditionBool;
+    private static boolean resolveConditions(final MessageMapper mapper, final ExpressionResolver resolver) {
+        boolean conditionBool = true;
+        for (String condition : mapper.getConditions()) {
+            final String template = "{{ fn:default('true') | " + condition + " }}";
+            final String resolvedCondition = PlaceholderFilter.applyOrElseDelete(template, resolver).orElse("false");
+            conditionBool &= Boolean.parseBoolean(resolvedCondition);
         }
-        return true;
+        return conditionBool;
     }
 
     private static Function<String, Boolean> filterByContentTypeBlocklist(final MessageMapper mapper) {