migrate to version 9.1.16 of Fluxtion

v12technology · Jan 28, 2024 · 1cdc1e8 · 1cdc1e8
1 parent 8ab9a19
commit 1cdc1e8
Show file tree

Hide file tree

Showing 25 changed files with 307 additions and 202 deletions.
diff --git a/getting-started/tutorial1-lottery/pom.xml b/getting-started/tutorial1-lottery/pom.xml
@@ -13,7 +13,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fluxtion.version>9.1.10</fluxtion.version>
+        <fluxtion.version>9.1.16</fluxtion.version>
     </properties>
 
     <dependencies>

diff --git a/getting-started/tutorial2-lottery-aot/pom.xml b/getting-started/tutorial2-lottery-aot/pom.xml
@@ -13,19 +13,40 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fluxtion.version>9.1.10</fluxtion.version>
+        <fluxtion.version>9.1.16</fluxtion.version>
     </properties>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <mainClass>com.fluxtion.example.cookbook.lottery.BuildAot</mainClass>
-                    <classpathScope>compile</classpathScope>
-                </configuration>
+                <groupId>com.fluxtion</groupId>
+                <artifactId>fluxtion-maven-plugin</artifactId>
+                <version>3.0.12</version>
+                <executions>
+                    <execution>
+                        <id>spring to fluxtion builder</id>
+                        <goals>
+                            <goal>springToFluxtion</goal>
+                        </goals>
+                        <configuration>
+                            <springFile>src/main/resources/spring-lottery.xml</springFile>
+                            <className>LotteryProcessor</className>
+                            <packageName>com.fluxtion.example.cookbook.lottery.aot</packageName>
+                        </configuration>
+                    </execution>
+<!--                    <execution>-->
+<!--                        <id>yaml to fluxtion builder</id>-->
+<!--                        <goals>-->
+<!--                            <goal>yamlToFluxtion</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <fluxtionConfigFiles>-->
+<!--                                <fluxtionConfigFile>src/main/resources/fluxtion-lottery.yml</fluxtionConfigFile>-->
+<!--                                <fluxtionConfigFile>src/main/resources/fluxtion-lottery2.yml</fluxtionConfigFile>-->
+<!--                            </fluxtionConfigFiles>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+                </executions>
             </plugin>
         </plugins>
     </build>

diff --git a/...d/tutorial2-lottery-aot/src/main/java/com/fluxtion/example/cookbook/lottery/BuildAot.java b/...d/tutorial2-lottery-aot/src/main/java/com/fluxtion/example/cookbook/lottery/BuildAot.java
diff --git a/...lottery-aot/src/main/java/com/fluxtion/example/cookbook/lottery/aot/LotteryProcessor.java b/...lottery-aot/src/main/java/com/fluxtion/example/cookbook/lottery/aot/LotteryProcessor.java
@@ -49,9 +49,9 @@
  *
  *
  * <pre>
- * generation time                 : 2023-09-26T07:08:43.510562
- * eventProcessorGenerator version : 9.1.9
- * api version                     : 9.1.9
+ * generation time                 : Not available
+ * eventProcessorGenerator version : 9.1.15
+ * api version                     : 9.1.15
  * </pre>
  *
  * Event classes supported:

diff --git a/getting-started/tutorial2-lottery-aot/src/main/resources/fluxtion-lottery.yml b/getting-started/tutorial2-lottery-aot/src/main/resources/fluxtion-lottery.yml
@@ -0,0 +1,15 @@
+#enableAudit: true
+#auditMethodTraceLogLevel: INFO
+compilerConfig:
+  className: LotteryProcessorVVV
+  packageName: com.fluxtion.example.cookbook.lottery.aot
+#  outputDirectory: src/main/java
+#  resourcesOutputDirectory : src/strategy/resources
+#  generateDescription: true
+  writeSourceToFile: true
+  formatSource: true
+  compileSource: false
+nodes:
+  - &ticketStore !!com.fluxtion.example.cookbook.lottery.nodes.TicketStoreNode []
+  - !!com.fluxtion.example.cookbook.lottery.nodes.LotteryMachineNode [*ticketStore]
+
diff --git a/getting-started/tutorial3-lottery-auditor/pom.xml b/getting-started/tutorial3-lottery-auditor/pom.xml
@@ -13,19 +13,28 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fluxtion.version>9.1.9</fluxtion.version>
+        <fluxtion.version>9.1.16</fluxtion.version>
     </properties>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <mainClass>com.fluxtion.example.cookbook.lottery.BuildAot</mainClass>
-                    <classpathScope>compile</classpathScope>
-                </configuration>
+                <groupId>com.fluxtion</groupId>
+                <artifactId>fluxtion-maven-plugin</artifactId>
+                <version>3.0.12</version>
+                <executions>
+                    <execution>
+                        <id>spring to fluxtion builder</id>
+                        <goals>
+                            <goal>springToFluxtion</goal>
+                        </goals>
+                        <configuration>
+                            <springFile>src/main/resources/spring-lottery.xml</springFile>
+                            <className>LotteryProcessor</className>
+                            <packageName>com.fluxtion.example.cookbook.lottery.aot</packageName>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

diff --git a/...torial3-lottery-auditor/src/main/java/com/fluxtion/example/cookbook/lottery/BuildAot.java b/...torial3-lottery-auditor/src/main/java/com/fluxtion/example/cookbook/lottery/BuildAot.java
diff --git a/...ery-auditor/src/main/java/com/fluxtion/example/cookbook/lottery/aot/LotteryProcessor.java b/...ery-auditor/src/main/java/com/fluxtion/example/cookbook/lottery/aot/LotteryProcessor.java
@@ -51,9 +51,9 @@
  *
  *
  * <pre>
- * generation time                 : 2023-09-28T08:00:27.899951
- * eventProcessorGenerator version : 9.1.9
- * api version                     : 9.1.9
+ * generation time                 : Not available
+ * eventProcessorGenerator version : 9.1.16-SNAPSHOT
+ * api version                     : 9.1.16-SNAPSHOT
  * </pre>
  *
  * Event classes supported:

diff --git a/getting-started/tutorial3-lottery-auditor/src/main/resources/spring-lottery.xml b/getting-started/tutorial3-lottery-auditor/src/main/resources/spring-lottery.xml
@@ -11,4 +11,13 @@
         <constructor-arg ref="ticketStore"/>
     </bean>
 
+    <!--AUDITORS-->
+    <bean id="systemAuditor" class="com.fluxtion.example.cookbook.lottery.auditor.SystemStatisticsAuditor"/>
+    <bean class="com.fluxtion.compiler.extern.spring.FluxtionSpringConfig">
+        <property name="auditors">
+            <list>
+                <ref bean="systemAuditor"/>
+            </list>
+        </property>
+    </bean>
 </beans>
diff --git a/getting-started/tutorial4-lottery-auditlog/pom.xml b/getting-started/tutorial4-lottery-auditlog/pom.xml
@@ -13,9 +13,31 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fluxtion.version>9.1.10</fluxtion.version>
+        <fluxtion.version>9.1.16</fluxtion.version>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.fluxtion</groupId>
+                <artifactId>fluxtion-maven-plugin</artifactId>
+                <version>3.0.12</version>
+                <executions>
+                    <execution>
+                        <id>spring to fluxtion builder</id>
+                        <goals>
+                            <goal>springToFluxtion</goal>
+                        </goals>
+                        <configuration>
+                            <springFile>src/main/resources/spring-lottery.xml</springFile>
+                            <className>LotteryProcessor</className>
+                            <packageName>com.fluxtion.example.cookbook.lottery.aot</packageName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <dependency>

diff --git a/...ial4-lottery-auditlog/src/main/java/com/fluxtion/example/cookbook/lottery/LotteryApp.java b/...ial4-lottery-auditlog/src/main/java/com/fluxtion/example/cookbook/lottery/LotteryApp.java
@@ -1,6 +1,7 @@
 package com.fluxtion.example.cookbook.lottery;
 
 import com.fluxtion.compiler.extern.spring.FluxtionSpring;
+import com.fluxtion.example.cookbook.lottery.aot.LotteryProcessor;
 import com.fluxtion.example.cookbook.lottery.api.LotteryMachine;
 import com.fluxtion.example.cookbook.lottery.api.Ticket;
 import com.fluxtion.example.cookbook.lottery.api.TicketStore;
@@ -50,9 +51,7 @@ public static void main(String[] args) {
     }
 
     public static void start(Consumer<String> ticketReceiptHandler, Consumer<String> resultsPublisher){
-        lotteryEventProcessor = FluxtionSpring.interpret(
-                new ClassPathXmlApplicationContext("/spring-lottery.xml"),
-                c -> c.addEventAudit(EventLogControlEvent.LogLevel.INFO));
+        lotteryEventProcessor = new LotteryProcessor();
         lotteryEventProcessor.init();
         lotteryEventProcessor.setAuditLogProcessor(new FluxtionSlf4jAuditor());
         lotteryMachine = lotteryEventProcessor.getExportedService();

diff --git a/getting-started/tutorial4-lottery-auditlog/src/main/resources/simplelogger.properties b/getting-started/tutorial4-lottery-auditlog/src/main/resources/simplelogger.properties
@@ -1,4 +1,4 @@
-org.slf4j.simpleLogger.logFile=myAudit.log
+#org.slf4j.simpleLogger.logFile=myAudit.log
 org.slf4j.simpleLogger.defaultLogLevel=INFO
 org.slf4j.simpleLogger.showDateTime=false
 org.slf4j.simpleLogger.dateTimeFormat=dd-MMM-yy HH:mm:ss

diff --git a/getting-started/tutorial4-lottery-auditlog/src/main/resources/spring-lottery.xml b/getting-started/tutorial4-lottery-auditlog/src/main/resources/spring-lottery.xml
@@ -11,4 +11,8 @@
         <constructor-arg ref="ticketStore"/>
     </bean>
 
+    <bean class="com.fluxtion.compiler.extern.spring.FluxtionSpringConfig">
+        <property name="logLevel" value="DEBUG"/>
+    </bean>
+
 </beans>
diff --git a/getting-started/tutorial5-lottery-extended/pom.xml b/getting-started/tutorial5-lottery-extended/pom.xml
@@ -13,9 +13,32 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fluxtion.version>9.1.10</fluxtion.version>
+        <fluxtion.version>9.1.16</fluxtion.version>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.fluxtion</groupId>
+                <artifactId>fluxtion-maven-plugin</artifactId>
+                <version>3.0.12</version>
+                <executions>
+                    <execution>
+                        <id>spring to fluxtion builder</id>
+                        <goals>
+                            <goal>springToFluxtion</goal>
+                        </goals>
+                        <configuration>
+                            <springFile>src/main/resources/spring-lottery.xml</springFile>
+                            <className>LotteryProcessor</className>
+                            <packageName>com.fluxtion.example.cookbook.lottery.aot</packageName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>com.fluxtion</groupId>

diff --git a/...orial5-lottery-extended/src/main/java/com/fluxtion/example/cookbook/lottery/BuildAot.java b/...orial5-lottery-extended/src/main/java/com/fluxtion/example/cookbook/lottery/BuildAot.java
diff --git a/...ial5-lottery-extended/src/main/java/com/fluxtion/example/cookbook/lottery/LotteryApp.java b/...ial5-lottery-extended/src/main/java/com/fluxtion/example/cookbook/lottery/LotteryApp.java
@@ -1,6 +1,7 @@
 package com.fluxtion.example.cookbook.lottery;
 
 import com.fluxtion.compiler.extern.spring.FluxtionSpring;
+import com.fluxtion.example.cookbook.lottery.aot.LotteryProcessor;
 import com.fluxtion.example.cookbook.lottery.api.LotteryMachine;
 import com.fluxtion.example.cookbook.lottery.api.Ticket;
 import com.fluxtion.example.cookbook.lottery.api.TicketStore;
@@ -32,8 +33,7 @@ public static void main(String[] args) {
     }
 
     public static void start(Consumer<String> ticketReceiptHandler, Consumer<String> resultsPublisher){
-        var lotteryEventProcessor = FluxtionSpring.interpret(
-                new ClassPathXmlApplicationContext("/spring-lottery.xml"));
+        var lotteryEventProcessor = new LotteryProcessor();
         lotteryEventProcessor.init();
         lotteryMachine = lotteryEventProcessor.getExportedService();
         ticketStore = lotteryEventProcessor.getExportedService();
@@ -51,5 +51,4 @@ public static void ticketReceipt(String receipt){
     public static void lotteryResult(String receipt){
         log.info(receipt);
     }
-
 }