Updated with the review suggestions

Author: Anil Konakalla

pom.xml

@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>mule-custom-logger</artifactId>
-  <version>3.1.12-SNAPSHOT</version>
+  <version>3.1.0-SNAPSHOT</version>
   <packaging>mule-extension</packaging>
   <name>Mule Custom Logger</name>
   <description>Mule Custom Logger module that provides standard structured logging</description>

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

@@ -1,19 +1,43 @@
 package com.avioconsulting.mule.logger.api.processor;
 
 import org.mule.runtime.extension.api.annotation.Alias;
+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.ParameterGroup;
 import org.mule.runtime.extension.api.annotation.param.display.Summary;
 
-@Alias("flow-logs-config")
+@Alias("flow-log-config")
 public class FlowLogConfig {
 
   @Parameter
   @Summary("Name of the flow to associate given expression as attributes")
   private String flowName;
 
-  @ParameterGroup(name = "Flow Attributes")
-  private ExpressionText 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;
+  }
 
   public String getFlowName() {
     return flowName;
@@ -24,11 +48,4 @@ public FlowLogConfig setFlowName(String flowName) {
     return this;
   }
 
-  public ExpressionText getExpressionText() {
-    return expressionText;
-  }
-
-  public void setExpressionText(ExpressionText expressionText) {
-    this.expressionText = expressionText;
-  }
 }

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

@@ -345,13 +345,6 @@ 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) {
@@ -387,5 +380,17 @@ public void initialise() throws InitialisationException {
       throw new InitialisationException(createStaticMessage(
           "Encryption Algorithm must be provided if encryption password is being supplied"), this);
     }
+    flowLogConfigs.forEach(flowLogConfig -> {
+      if (flowLogConfig.getMessageExpressionText() == null
+          && flowLogConfig.getAttributesExpressionText() == null) {
+        try {
+          throw new InitialisationException(createStaticMessage(
+              "One of attributesExpressionText or messageExpressionText must be defined in flow-logs-config"),
+              this);
+        } catch (InitialisationException e) {
+          throw new RuntimeException(e);
+        }
+      }
+    });
   }
 }

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

@@ -11,6 +11,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public abstract class CustomLoggerAbstractNotificationListener {
@@ -58,14 +59,14 @@ protected Map<String, String> getFlowLogAttributes(EnrichedServerNotification no
      * 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
      **/
-    List<Map.Entry<String, FlowLogConfig>> matchedEntries = config.getFlowLogConfigMap().entrySet().stream()
+    Optional<Map.Entry<String, FlowLogConfig>> matchedEntry = config.getFlowLogConfigMap().entrySet().stream()
         .filter(entry -> matchWildcard(entry.getKey(), notification.getResourceIdentifier()))
-        .collect(Collectors.toList());
-    if (!matchedEntries.isEmpty()) {
-      flowLogConfig = matchedEntries.get(0).getValue();
+        .findFirst();
+    if (matchedEntry.isPresent()) {
+      flowLogConfig = matchedEntry.get().getValue();
       TypedValue<Map<String, String>> evaluate = (TypedValue<Map<String, String>>) config
           .getExpressionManager()
-          .evaluate("#[" + flowLogConfig.getExpressionText().getAttributesExpressionText() + "]",
+          .evaluate("#[" + flowLogConfig.getAttributesExpressionText() + "]",
               notification.getEvent().asBindingContext());
       value = evaluate.getValue();
       if (value == null)
@@ -79,7 +80,7 @@ public boolean matchWildcard(String wildcardKey, String searchString) {
     String cleanWildcardKey = wildcardKey.trim();
 
     // Exact match if no wildcards
-    if (searchString.equals(wildcardKey)) {
+    if (searchString.equalsIgnoreCase(wildcardKey.toLowerCase())) {
       return true;
     }
 

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

@@ -10,6 +10,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /*
@@ -42,14 +43,15 @@ public void onNotification(PipelineMessageNotification notification) {
     if (config != null) {
       try {
         String msgToAppend = "";
-        List<Map.Entry<String, FlowLogConfig>> matchedEntries = config.getFlowLogConfigMap().entrySet().stream()
+        Optional<Map.Entry<String, FlowLogConfig>> matchedEntry = config.getFlowLogConfigMap().entrySet()
+            .stream()
             .filter(entry -> matchWildcard(entry.getKey(), notification.getResourceIdentifier()))
-            .collect(Collectors.toList());
-        if (!matchedEntries.isEmpty()) {
-          FlowLogConfig flowLogConfig = matchedEntries.get(0).getValue();
+            .findFirst();
+        if (matchedEntry.isPresent()) {
+          FlowLogConfig flowLogConfig = matchedEntry.get().getValue();
           TypedValue<String> evaluate = (TypedValue<String>) config
               .getExpressionManager()
-              .evaluate("#[" + flowLogConfig.getExpressionText().getMessageExpressionText() + "]",
+              .evaluate("#[" + flowLogConfig.getMessageExpressionText() + "]",
                   notification.getEvent().asBindingContext());
           msgToAppend = evaluate.getValue();
         }

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

@@ -9,14 +9,14 @@ http://www.mulesoft.org/schema/mule/avio-logger http://www.mulesoft.org/schema/m
     <avio-logger:config name="AVIO_Logger_Config_Json" doc:name="AVIO Logger Config" doc:id="84bd2712-015b-46b8-93e9-94536774b8ad"
                         applicationVersion="1" applicationName="munit" environment="test" compressor="GZIP" encryptionAlgorithm="PBEWithHmacSHA512AndAES_128" encryptionPassword="example" enableFlowLogs="true" formatAsJson="true" flowLogLevel="INFO">
         <avio-logger:flow-log-configs >
-            <avio-logger:flow-logs-config flowName="custom-logger-configFlow" attributesExpressionText="attributes" />
+            <avio-logger:flow-log-config flowName="custom-logger-configFlow" attributesExpressionText="attributes" />
         </avio-logger:flow-log-configs>
     </avio-logger:config>
 
     <avio-logger:config name="AVIO_Logger_Config" doc:name="AVIO Logger Config" doc:id="84bd2712-015b-46b8-93e9-94536774b8ad"
                       applicationVersion="1" applicationName="munit" environment="test" compressor="GZIP" encryptionAlgorithm="PBEWithHmacSHA512AndAES_128" encryptionPassword="example" enableFlowLogs="true" flowLogLevel="INFO">
         <avio-logger:flow-log-configs >
-            <avio-logger:flow-logs-config flowName="custom-logger-configFlow" attributesExpressionText="attributes" />
+            <avio-logger:flow-log-config flowName="custom-logger-configFlow" attributesExpressionText="attributes" />
         </avio-logger:flow-log-configs>
     </avio-logger:config>