Merge branch 'develop' into release

v12technology · Jan 28, 2024 · 684d8ca · 684d8ca
2 parents 1ffa152 + 8b7ee28
commit 684d8ca
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 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.14-SNAPSHOT</version>
+        <version>9.1.15-SNAPSHOT</version>
         <relativePath>../parent-root/pom.xml</relativePath>
     </parent>
 

diff --git a/compiler/src/main/java/com/fluxtion/compiler/Fluxtion.java b/compiler/src/main/java/com/fluxtion/compiler/Fluxtion.java
@@ -214,10 +214,10 @@ static EventProcessor compileAot(RootNodeConfig rootNode, String packagePrefix)
     static EventProcessor compileFromReader(Reader reader) {
         Yaml yaml = new Yaml();
         DataDrivenGenerationConfig rootInjectedConfig = yaml.loadAs(reader, DataDrivenGenerationConfig.class);
-        if (rootInjectedConfig.getCompilerConfig().isCompileSource()) {
-            return EventProcessorFactory.compile(rootInjectedConfig.getEventProcessorConfig(), rootInjectedConfig.getCompilerConfig());
-        } else {
+        if (rootInjectedConfig.getCompilerConfig().isInterpreted()) {
             return interpret(rootInjectedConfig.getRootNodeConfig());
+        } else {
+            return EventProcessorFactory.compile(rootInjectedConfig.getEventProcessorConfig(), rootInjectedConfig.getCompilerConfig());
         }
     }
 

diff --git a/compiler/src/main/java/com/fluxtion/compiler/FluxtionCompilerConfig.java b/compiler/src/main/java/com/fluxtion/compiler/FluxtionCompilerConfig.java
@@ -18,6 +18,8 @@
 package com.fluxtion.compiler;
 
 import com.fluxtion.compiler.generation.OutputRegistry;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.StringWriter;
 import java.io.Writer;
@@ -58,6 +60,12 @@ public class FluxtionCompilerConfig {
      * Attempt to compile the generated source files
      */
     private boolean compileSource;
+    /**
+     * Generate an interpreted version
+     */
+    @Getter
+    @Setter
+    private boolean interpreted = false;
     /**
      * Attempt to format the generated source files
      */
@@ -226,6 +234,7 @@ public String toString() {
                 + ", buildOutputdirectory=" + buildOutputDirectory
                 + ", writeSourceToFile=" + writeSourceToFile
                 + ", compileSource=" + compileSource
+                + ", interpreted=" + interpreted
                 + ", formatSource=" + formatSource
                 + ", templateSep=" + templateSep
                 + ", generateDescription=" + generateDescription

diff --git a/compiler/src/main/java/com/fluxtion/compiler/generation/EventProcessorFactory.java b/compiler/src/main/java/com/fluxtion/compiler/generation/EventProcessorFactory.java
@@ -206,9 +206,8 @@ public static EventProcessor compile(
             FluxtionCompilerConfig fluxtionCompilerConfig)
             throws Exception {
         EventProcessorCompilation compiler = new EventProcessorCompilation();
-        Class<EventProcessor> sepClass = compiler.compile(fluxtionCompilerConfig, eventProcessorConfig);
-        EventProcessor sep = sepClass.getDeclaredConstructor().newInstance();
-        return sep;
+        Class<EventProcessor<?>> sepClass = compiler.compile(fluxtionCompilerConfig, eventProcessorConfig);
+        return fluxtionCompilerConfig.isCompileSource() ? sepClass.getDeclaredConstructor().newInstance() : null;
     }
 
     private static class InProcessEventProcessorConfig extends EventProcessorConfig {

diff --git a/...test/java/com/fluxtion/compiler/builder/factory/RootNodeWithFactoryAndYamlConfigTest.java b/...test/java/com/fluxtion/compiler/builder/factory/RootNodeWithFactoryAndYamlConfigTest.java
@@ -65,8 +65,8 @@ public void interpretNoConfigFromStringTest() {
     private static final String interpretString = "compilerConfig:\n" +
             "  className: MyProcessor\n" +
             "  packageName: com.mypackage\n" +
-            "  compileSource: false\n" +
             "  formatSource: false\n" +
+            "  interpreted: true\n" +
             "  generateDescription: false\n" +
             "  writeSourceToFile: false\n" +
             "configMap:\n" +
@@ -78,7 +78,7 @@ public void interpretNoConfigFromStringTest() {
     private static final String interpretNoConfigString = "compilerConfig:\n" +
             "  className: MyProcessor\n" +
             "  packageName: com.mypackage\n" +
-            "  compileSource: false\n" +
+            "  interpreted: true\n" +
             "  formatSource: false\n" +
             "  generateDescription: false\n" +
             "  writeSourceToFile: false\n" +

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.14-SNAPSHOT</version>
+    <version>9.1.15-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.14-SNAPSHOT</version>
+    <version>9.1.15-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.14-SNAPSHOT</version>
+        <version>9.1.15-SNAPSHOT</version>
         <relativePath>../parent-root/pom.xml</relativePath>
     </parent>