Merge branch 'develop' into release

v12technology · Jan 28, 2024 · bd2051d · bd2051d
2 parents 684d8ca + 8d5cfd8
commit bd2051d
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 7 deletions.
diff --git a/compiler/pom.xml b/compiler/pom.xml
@@ -19,7 +19,7 @@ Copyright (C) 2018 V12 Technology Ltd.
     <parent>
         <groupId>com.fluxtion</groupId>
         <artifactId>root-parent-pom</artifactId>
-        <version>9.1.15-SNAPSHOT</version>
+        <version>9.1.16-SNAPSHOT</version>
         <relativePath>../parent-root/pom.xml</relativePath>
     </parent>
 

diff --git a/compiler/src/main/java/com/fluxtion/compiler/EventProcessorConfig.java b/compiler/src/main/java/com/fluxtion/compiler/EventProcessorConfig.java
@@ -230,7 +230,9 @@ public Clock clock() {
      * the level at which method tracing will take place.
      */
     public void addEventAudit(LogLevel tracingLogLevel) {
-        addAuditor(new EventLogManager().tracingOn(tracingLogLevel), EventLogManager.NODE_NAME);
+        if (tracingLogLevel != null) {
+            addAuditor(new EventLogManager().tracingOn(tracingLogLevel), EventLogManager.NODE_NAME);
+        }
     }
 
     /**

diff --git a/compiler/src/main/java/com/fluxtion/compiler/extern/spring/FluxtionSpring.java b/compiler/src/main/java/com/fluxtion/compiler/extern/spring/FluxtionSpring.java
@@ -4,6 +4,7 @@
 import com.fluxtion.compiler.Fluxtion;
 import com.fluxtion.compiler.FluxtionCompilerConfig;
 import com.fluxtion.runtime.EventProcessor;
+import com.fluxtion.runtime.audit.Auditor;
 import com.fluxtion.runtime.partition.LambdaReflection;
 import com.fluxtion.runtime.partition.LambdaReflection.SerializableConsumer;
 import lombok.SneakyThrows;
@@ -15,6 +16,8 @@
 
 import java.io.File;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -147,10 +150,27 @@ private EventProcessor<?> _interpret() {
 
     private void addNodes(EventProcessorConfig config) {
         LOGGER.debug("loading spring context:{}", context);
+        List<Auditor> auditorMap = new ArrayList<>();
         for (String beanDefinitionName : context.getBeanDefinitionNames()) {
             Object bean = context.getBean(beanDefinitionName);
-            LOGGER.debug("adding bean:{} to fluxtion", beanDefinitionName);
-            config.addNode(bean, beanDefinitionName);
+            if (bean instanceof FluxtionSpringConfig) {
+                FluxtionSpringConfig springConfig = (FluxtionSpringConfig) bean;
+                auditorMap.addAll(springConfig.getAuditors());
+                config.addEventAudit(springConfig.getLogLevel());
+            }
+        }
+
+        for (String beanDefinitionName : context.getBeanDefinitionNames()) {
+            Object bean = context.getBean(beanDefinitionName);
+            if (!(bean instanceof FluxtionSpringConfig)) {
+                if (bean instanceof Auditor && auditorMap.contains(bean)) {
+                    LOGGER.debug("adding auditor:{} to fluxtion", beanDefinitionName);
+                    config.addAuditor((Auditor) bean, beanDefinitionName);
+                } else {
+                    LOGGER.debug("adding bean:{} to fluxtion", beanDefinitionName);
+                    config.addNode(bean, beanDefinitionName);
+                }
+            }
         }
         configCustomizer.accept(config);
     }

diff --git a/compiler/src/main/java/com/fluxtion/compiler/extern/spring/FluxtionSpringConfig.java b/compiler/src/main/java/com/fluxtion/compiler/extern/spring/FluxtionSpringConfig.java
@@ -0,0 +1,16 @@
+package com.fluxtion.compiler.extern.spring;
+
+import com.fluxtion.runtime.audit.Auditor;
+import com.fluxtion.runtime.audit.EventLogControlEvent;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class FluxtionSpringConfig {
+    private List<Auditor> auditors = new ArrayList<>();
+    private EventLogControlEvent.LogLevel logLevel;
+}
diff --git a/parent-root/pom.xml b/parent-root/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.fluxtion</groupId>
     <artifactId>root-parent-pom</artifactId>
-    <version>9.1.15-SNAPSHOT</version>
+    <version>9.1.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>fluxtion :: poms :: parent root</name>
 

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@ along with this program.  If not, see
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.fluxtion</groupId>
     <artifactId>fluxtion.master</artifactId>
-    <version>9.1.15-SNAPSHOT</version>
+    <version>9.1.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>fluxtion</name>
 

diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -20,7 +20,7 @@ Copyright (C) 2018 V12 Technology Ltd.
     <parent>
         <groupId>com.fluxtion</groupId>
         <artifactId>root-parent-pom</artifactId>
-        <version>9.1.15-SNAPSHOT</version>
+        <version>9.1.16-SNAPSHOT</version>
         <relativePath>../parent-root/pom.xml</relativePath>
     </parent>