Move Synapse expression content check to util and use in log mediator

modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java

@@ -32,6 +32,7 @@
 import org.apache.synapse.config.xml.SynapsePath;
 import org.apache.synapse.config.xml.SynapsePathFactory;
 import org.apache.synapse.util.xpath.SynapseExpression;
+import org.apache.synapse.util.xpath.SynapseExpressionUtils;
 import org.apache.synapse.util.xpath.SynapseJsonPath;
 import org.apache.synapse.util.xpath.SynapseXPath;
 import org.jaxen.JaxenException;
@@ -216,8 +217,8 @@ public static boolean isInlineSynapseExpressionsContentAware(String inlineText)
         Matcher matcher = SYNAPSE_EXPRESSION_PLACEHOLDER_PATTERN.matcher(inlineText);
         while (matcher.find()) {
             // Extract the expression inside ${...}
-            String placeholder = matcher.group(1);
-            if (placeholder.contains("xpath(") || placeholder.contains("payload.") || placeholder.contains("$.")) {
+            String expression = matcher.group(1);
+            if (SynapseExpressionUtils.isSynapseExpressionContentAware(expression)) {
                 return true;
             }
         }

modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseExpression.java

@@ -74,34 +74,7 @@ public SynapseExpression(String synapseExpression) throws JaxenException {
             }
             throw new JaxenException(errorMessage.toString());
         }
-
-        // TODO : Need to improve the content aware detection logic
-        if (synapseExpression.equals("payload") || synapseExpression.equals("$")
-                || synapseExpression.contains("payload.") || synapseExpression.contains("$.")) {
-            isContentAware = true;
-        } else if (synapseExpression.contains("xpath(")) {
-            // TODO change the regex to support xpath + variable syntax
-            Pattern pattern = Pattern.compile("xpath\\(['\"](.*?)['\"]\\s*(,\\s*['\"](.*?)['\"])?\\)?");
-            Matcher matcher = pattern.matcher(synapseExpression);
-            // Find all matches
-            while (matcher.find()) {
-                if (matcher.group(2) != null) {
-                    // evaluating xpath on a variable so not content aware
-                    isContentAware = false;
-                    break;
-                }
-                String xpath = matcher.group(1);
-                try {
-                    SynapseXPath synapseXPath = new SynapseXPath(xpath);
-                    if (synapseXPath.isContentAware()) {
-                        isContentAware = true;
-                        break;
-                    }
-                } catch (JaxenException e) {
-                    // Ignore the exception and continue
-                }
-            }
-        }
+        isContentAware = SynapseExpressionUtils.isSynapseExpressionContentAware(synapseExpression);
     }
 
     @Override

modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseExpressionUtils.java

@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 LLC. licenses this file to you under the Apache License,
+ *  Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied. See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.synapse.util.xpath;
+
+import org.jaxen.JaxenException;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Utility class for Synapse Expressions
+ */
+public class SynapseExpressionUtils {
+
+    /**
+     * Checks whether the synapse expression is content aware
+     *
+     * @param synapseExpression synapse expression string
+     * @return true if the synapse expression is content aware, false otherwise
+     */
+    public static boolean isSynapseExpressionContentAware(String synapseExpression) {
+
+        // TODO : Need to improve the content aware detection logic
+        if (synapseExpression.equals("payload") || synapseExpression.equals("$")
+                || synapseExpression.contains("payload.") || synapseExpression.contains("$.")) {
+            return true;
+        } else if (synapseExpression.contains("xpath(")) {
+            // TODO change the regex to support xpath + variable syntax
+            Pattern pattern = Pattern.compile("xpath\\(['\"](.*?)['\"]\\s*(,\\s*['\"](.*?)['\"])?\\)?");
+            Matcher matcher = pattern.matcher(synapseExpression);
+            // Find all matches
+            while (matcher.find()) {
+                if (matcher.group(2) != null) {
+                    // evaluating xpath on a variable so not content aware
+                    return false;
+                }
+                String xpath = matcher.group(1);
+                try {
+                    SynapseXPath synapseXPath = new SynapseXPath(xpath);
+                    return synapseXPath.isContentAware();
+                } catch (JaxenException e) {
+                    // Ignore the exception and continue
+                }
+            }
+        }
+        return false;
+    }
+}