Updated validation loginc for flow log attributes

Author: Anil Konakalla

src/main/java/com/avioconsulting/mule/logger/api/processor/ExpressionText.java

@@ -0,0 +1,35 @@
+package com.avioconsulting.mule.logger.api.processor;
+
+import org.mule.runtime.extension.api.annotation.param.ExclusiveOptionals;
+import org.mule.runtime.extension.api.annotation.param.Optional;
+import org.mule.runtime.extension.api.annotation.param.Parameter;
+import org.mule.runtime.extension.api.annotation.param.display.Summary;
+
+public class ExpressionText {
+
+  @Parameter
+  @Optional
+  @Summary("A valid dataweave expression that resolves to a Map object with key-value pairs")
+  private String attributesExpressionText;
+
+  @Parameter
+  @Optional
+  @Summary("A valid dataweave expression that results in a String to append to default flow start message")
+  private String messageExpressionText;
+
+  public String getAttributesExpressionText() {
+    return attributesExpressionText;
+  }
+
+  public void setAttributesExpressionText(String attributesExpressionText) {
+    this.attributesExpressionText = attributesExpressionText;
+  }
+
+  public String getMessageExpressionText() {
+    return messageExpressionText;
+  }
+
+  public void setMessageExpressionText(String messageExpressionText) {
+    this.messageExpressionText = messageExpressionText;
+  }
+}

src/main/java/com/avioconsulting/mule/logger/internal/config/CustomLoggerConfiguration.java

@@ -345,6 +345,13 @@ public void start() throws MuleException {
     customLoggerRegistrationService.setConfig(this);
     if (isEnableFlowLogs()) {
       classLogger.info("Flow logs enabled");
+      flowLogConfigs.forEach(flowLogConfig -> {
+        if (flowLogConfig.getExpressionText().getMessageExpressionText() == null
+            && flowLogConfig.getExpressionText().getAttributesExpressionText() == null) {
+          throw new IllegalStateException(
+              "One of attributesExpressionText or messageExpressionText must be defined in flow-logs-config");
+        }
+      });
       flowLogConfigMap = flowLogConfigs.stream().collect(
           Collectors.toMap(FlowLogConfig::getFlowName, Function.identity()));
       synchronized (CustomLoggerConfiguration.class) {

src/main/java/com/avioconsulting/mule/logger/internal/listeners/CustomLoggerAbstractNotificationListener.java

@@ -51,35 +51,25 @@ protected void logMessage(ComponentLocation location, Event event, String logMes
   protected Map<String, String> getFlowLogAttributes(EnrichedServerNotification notification) {
     Map<String, String> value = emptyAttributes;
     FlowLogConfig flowLogConfig = config.getFlowLogConfigMap().get(notification.getResourceIdentifier());
-    if (flowLogConfig != null) {
-      TypedValue<Map<String, String>> evaluate = (TypedValue<Map<String, String>>) config.getExpressionManager()
-          .evaluate("#[" + flowLogConfig.getExpressionText().getAttributesExpressionText() + "]",
-              notification.getEvent().asBindingContext());
-      value = evaluate.getValue();
-      if (value == null)
-        value = emptyAttributes;
-    }
     /**
      * Flow name can contain wildcard (*)
      * We only look for wildcard either starting of the string or ending of the
      * string
      * ex: mq-listener-* will look for all the flows that starts with mq-listener
      * ex: *-mq-flow will look for all the flows that ends with -mq-flow
      **/
-    else {
-      List<Map.Entry<String, FlowLogConfig>> matchedEntries = config.getFlowLogConfigMap().entrySet().stream()
-          .filter(entry -> matchWildcard(entry.getKey(), notification.getResourceIdentifier()))
-          .collect(Collectors.toList());
-      if (!matchedEntries.isEmpty()) {
-        flowLogConfig = matchedEntries.get(0).getValue();
-        TypedValue<Map<String, String>> evaluate = (TypedValue<Map<String, String>>) config
-            .getExpressionManager()
-            .evaluate("#[" + flowLogConfig.getExpressionText().getAttributesExpressionText() + "]",
-                notification.getEvent().asBindingContext());
-        value = evaluate.getValue();
-        if (value == null)
-          value = emptyAttributes;
-      }
+    List<Map.Entry<String, FlowLogConfig>> matchedEntries = config.getFlowLogConfigMap().entrySet().stream()
+        .filter(entry -> matchWildcard(entry.getKey(), notification.getResourceIdentifier()))
+        .collect(Collectors.toList());
+    if (!matchedEntries.isEmpty()) {
+      flowLogConfig = matchedEntries.get(0).getValue();
+      TypedValue<Map<String, String>> evaluate = (TypedValue<Map<String, String>>) config
+          .getExpressionManager()
+          .evaluate("#[" + flowLogConfig.getExpressionText().getAttributesExpressionText() + "]",
+              notification.getEvent().asBindingContext());
+      value = evaluate.getValue();
+      if (value == null)
+        value = emptyAttributes;
     }
     return value;
   }
@@ -88,8 +78,8 @@ public boolean matchWildcard(String wildcardKey, String searchString) {
     // Trim the wildcard key
     String cleanWildcardKey = wildcardKey.trim();
 
-    // If wildcard key is just '*', match everything
-    if (cleanWildcardKey.equals("*")) {
+    // Exact match if no wildcards
+    if (searchString.equals(wildcardKey)) {
       return true;
     }
 
@@ -105,8 +95,8 @@ public boolean matchWildcard(String wildcardKey, String searchString) {
       return searchString.startsWith(prefix);
     }
 
-    // Exact match if no wildcards
-    return searchString.equals(wildcardKey);
+    // If wildcard key is just '*', match everything
+    return cleanWildcardKey.equals("*");
   }
 
 }

src/main/java/com/avioconsulting/mule/logger/internal/listeners/CustomLoggerPipelineNotificationListener.java

@@ -72,7 +72,12 @@ public void onNotification(PipelineMessageNotification notification) {
             config.getFlowCategorySuffix(),
             config.getFlowLogLevel(), flowLogAttributes);
       } catch (Exception e) {
-        classLogger.error("Error processing flow notification", e);
+        if (e.getClass().getName().equals("java.lang.ClassCastException")
+            || e.getClass().getName().equals("ClassCastException")) {
+          classLogger.error("Message expression text in flow-log-config needs to be a String", e);
+        } else {
+          classLogger.error("Error processing flow notification", e);
+        }
       }
     } else {
       classLogger.warn(