Minor changes and Fix in Current and Previous DT State management in transaction

piconem · piconem · commit f469561d9c1c · 2024-01-31T17:23:03.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@
  * This file was generated by the Gradle 'init' task.
  */
 group = "io.github.wldt"
-version = "0.3.0-alpha"
+version = "0.3.0-alpha-31012024"
 description = "The core library to build White Label Digital Twins"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
@@ -14,7 +14,7 @@ plugins {
 
 repositories {
     mavenCentral()
-
+    mavenLocal()
 }
 
 dependencies {
diff --git a/src/main/java/it/wldt/augmentation/AugmentationFunction.java b/src/main/java/it/wldt/augmentation/AugmentationFunction.java
@@ -2,8 +2,6 @@
 
 /**
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project HelloJava
- * @created 26/10/2023 - 15:43
  */
 public abstract class AugmentationFunction<T> implements Runnable {
 
diff --git a/src/main/java/it/wldt/augmentation/AugmentationFunctionExecutor.java b/src/main/java/it/wldt/augmentation/AugmentationFunctionExecutor.java
@@ -7,8 +7,6 @@
 
 /**
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 26/10/2023 - 16:06
  */
 public class AugmentationFunctionExecutor {
 
diff --git a/src/main/java/it/wldt/augmentation/AugmentationFunctionListener.java b/src/main/java/it/wldt/augmentation/AugmentationFunctionListener.java
@@ -2,8 +2,6 @@
 
 /**
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 26/10/2023 - 15:54
  */
 public interface AugmentationFunctionListener<T> {
 
diff --git a/src/main/java/it/wldt/augmentation/AverageHrAugmentationFunction.java b/src/main/java/it/wldt/augmentation/AverageHrAugmentationFunction.java
@@ -2,8 +2,6 @@
 
 /**
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 26/10/2023 - 15:52
  */
 public class AverageHrAugmentationFunction extends AugmentationFunction<Double>{
 
diff --git a/src/main/java/it/wldt/augmentation/TestAugmentation.java b/src/main/java/it/wldt/augmentation/TestAugmentation.java
@@ -2,8 +2,6 @@
 
 /**
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 26/10/2023 - 16:03
  */
 public class TestAugmentation {
 
diff --git a/src/main/java/it/wldt/core/engine/DigitalTwinEngine.java b/src/main/java/it/wldt/core/engine/DigitalTwinEngine.java
@@ -13,8 +13,6 @@
  * The DigitalTwinEngine class manages a collection of DigitalTwin instances.
  *
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 29/12/2023 - 15:50
  */
 public class DigitalTwinEngine {
 
diff --git a/src/main/java/it/wldt/core/event/DefaultWldtEventLogger.java b/src/main/java/it/wldt/core/event/DefaultWldtEventLogger.java
@@ -19,26 +19,26 @@ public class DefaultWldtEventLogger implements IWldtEventLogger {
     @Override
     public void logEventPublished(String publisherId, WldtEvent<?> wldtEvent) {
         if(wldtEvent != null)
-            logger.info("PUBLISHER [{}] -> PUBLISHED EVENT TYPE: {} Message: {}", publisherId, wldtEvent.getType(), wldtEvent);
+            logger.debug("PUBLISHER [{}] -> PUBLISHED EVENT TYPE: {} Message: {}", publisherId, wldtEvent.getType(), wldtEvent);
         else
             logger.error("PUBLISHER [{}] -> NULL MESSAGE !", publisherId);
     }
 
     @Override
     public void logEventForwarded(String publisherId, String subscriberId, WldtEvent<?> wldtEvent) {
         if(wldtEvent != null)
-            logger.info("EVENT-BUS -> FORWARDED from PUBLISHER [{}] to SUBSCRIBER [{}] -> TOPIC: {} Message: {}", publisherId, subscriberId, wldtEvent.getType(), wldtEvent);
+            logger.debug("EVENT-BUS -> FORWARDED from PUBLISHER [{}] to SUBSCRIBER [{}] -> TOPIC: {} Message: {}", publisherId, subscriberId, wldtEvent.getType(), wldtEvent);
         else
             logger.error("EVENT-BUS FORWARDING from PUBLISHER [{}] to SUBSCRIBER [{}] -> NULL MESSAGE ! ", publisherId, subscriberId);
     }
 
     @Override
     public void logClientSubscription(String eventType, String subscriberId) {
-        logger.info("SUBSCRIBER [{}] -> Subscribed Correctly - Event Type: {}", subscriberId, eventType);
+        logger.debug("SUBSCRIBER [{}] -> Subscribed Correctly - Event Type: {}", subscriberId, eventType);
     }
 
     @Override
     public void logClientUnSubscription(String eventType, String subscriberId) {
-        logger.info("SUBSCRIBER [{}] -> UnSubscribed Correctly  - Event Type: {}", subscriberId, eventType);
+        logger.debug("SUBSCRIBER [{}] -> UnSubscribed Correctly  - Event Type: {}", subscriberId, eventType);
     }
 }
diff --git a/src/main/java/it/wldt/core/event/SubscriptionDescriptor.java b/src/main/java/it/wldt/core/event/SubscriptionDescriptor.java
@@ -5,8 +5,6 @@
 
 /**
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 30/12/2023 - 19:37
  */
 public class SubscriptionDescriptor extends HashMap<String, List<WldtSubscriberInfo>> {
 }
diff --git a/src/main/java/it/wldt/core/state/DigitalTwinState.java b/src/main/java/it/wldt/core/state/DigitalTwinState.java
@@ -12,8 +12,6 @@
  * Manages the lifecycle and operations on these components.
  *
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 18/10/2023 - 15:14
  */
 public class DigitalTwinState {
 
@@ -58,6 +56,20 @@ public DigitalTwinState(Map<String, DigitalTwinStateProperty<?>> properties,
         this.evaluationInstant = Instant.now();
     }
 
+    /**
+     * Constructor to build a new DT State from a previous one.
+     * The evaluationInstant will be assigned to now and values are copied
+     *
+     * @param sourceDigitalTwinState The Source DT State to copy
+     */
+    public DigitalTwinState(DigitalTwinState sourceDigitalTwinState) {
+        this();
+        this.properties.putAll(sourceDigitalTwinState.properties);
+        this.actions.putAll(sourceDigitalTwinState.actions);
+        this.events.putAll(sourceDigitalTwinState.events);
+        this.relationships.putAll(sourceDigitalTwinState.relationships);
+    }
+
     //////////////////////////// PROPERTY MANAGEMENT //////////////////////////////////////////////////////////
 
     /**
diff --git a/src/main/java/it/wldt/core/state/DigitalTwinStateChange.java b/src/main/java/it/wldt/core/state/DigitalTwinStateChange.java
@@ -9,8 +9,6 @@
  * Represents a change in the state of a Digital Twin.
  *
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 18/10/2023 - 15:35
  */
 public class DigitalTwinStateChange {
 
diff --git a/src/main/java/it/wldt/core/state/DigitalTwinStateManager.java b/src/main/java/it/wldt/core/state/DigitalTwinStateManager.java
@@ -93,7 +93,7 @@ public void commitStateTransaction() throws WldtDigitalTwinStateException {
         if(digitalTwinStateTransaction == null)
             throw new WldtDigitalTwinStateException("Trying to commit Digital Twin State Transaction without properly starting it ! Call start() and then commit() to apply changes");
 
-        logger.info("Committing Digital Twin State ({}) Changes ...", this.digitalTwinStateTransaction);
+        logger.debug("Committing Digital Twin State: Start State: {} Changes: {}", this.digitalTwinStateTransaction.getStartDigitalTwinState(), this.digitalTwinStateTransaction.getDigitalTwinStateChangeList());
 
         //Apply Digital Twin State Changes
         this.digitalTwinStateTransaction.handleStateChanges();
@@ -556,9 +556,18 @@ public void deleteRelationshipInstance(String relationshipName, String instanceK
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+
+    /**
+     * Returns the last DT State Transaction
+     * @return The last DT State Transaction
+     */
+    public DigitalTwinStateTransaction getDigitalTwinStateTransaction() {
+        return digitalTwinStateTransaction;
+    }
+
     /**
      * Returns the current Digital Twin State
-     * @return
+     * @return The current DT State
      */
     public DigitalTwinState getDigitalTwinState() {
         return digitalTwinState;
diff --git a/src/main/java/it/wldt/core/state/DigitalTwinStateResource.java b/src/main/java/it/wldt/core/state/DigitalTwinStateResource.java
@@ -6,8 +6,6 @@
  * Properties, Events, Actions, Relationships and Relationships Instances
  *
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 18/10/2023 - 15:44
  */
 public class DigitalTwinStateResource {
 }
diff --git a/src/main/java/it/wldt/core/state/DigitalTwinStateTransaction.java b/src/main/java/it/wldt/core/state/DigitalTwinStateTransaction.java
@@ -9,8 +9,6 @@
 
 /**
  * @author Marco Picone, Ph.D. - picone.m@gmail.com
- * @project wldt-core
- * @created 18/10/2023 - 16:02
  */
 public class DigitalTwinStateTransaction {
 
@@ -41,7 +39,7 @@ private DigitalTwinStateTransaction(){}
      */
     public DigitalTwinStateTransaction(DigitalTwinState startDigitalTwinState) {
         this.startDigitalTwinState = startDigitalTwinState;
-        this.endDigitalTwinState = startDigitalTwinState;
+        this.endDigitalTwinState = new DigitalTwinState(startDigitalTwinState);
         this.digitalTwinStateChangeList = new ArrayList<>();
     }
 
diff --git a/src/test/java/it/wldt/core/adapter/DigitalAdapterCallbacksTester.java b/src/test/java/it/wldt/core/adapter/DigitalAdapterCallbacksTester.java
@@ -94,7 +94,6 @@ private DigitalAdapter<String> createDigitalAdapter(String id , List<DigitalAdap
 
             @Override
             protected void onStateUpdate(DigitalTwinState newDigitalTwinState, DigitalTwinState previousDigitalTwinState, ArrayList<DigitalTwinStateChange> digitalTwinStateChangeList) {
-
             }
 
             @Override
diff --git a/src/test/java/it/wldt/core/adapter/digital/TestDigitalAdapter.java b/src/test/java/it/wldt/core/adapter/digital/TestDigitalAdapter.java
@@ -9,6 +9,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class TestDigitalAdapter extends DigitalAdapter<TestDigitalAdapterConfiguration> {
 
     private static final Logger logger = LoggerFactory.getLogger(TestDigitalAdapter.class);
@@ -95,6 +97,13 @@ protected void onStateUpdate(DigitalTwinState newDigitalTwinState, DigitalTwinSt
         logger.info("DummyDigitalTwinAdapter -> onStateUpdate() - Previous State: {}", previousDigitalTwinState);
         logger.info("DummyDigitalTwinAdapter -> onStateUpdate() - State's Changes: {}", digitalTwinStateChangeList);
 
+        assertNotNull(newDigitalTwinState);
+
+        if(previousDigitalTwinState != null){
+            //Check if the two state are different
+            assertNotEquals(newDigitalTwinState.getEvaluationInstant().toEpochMilli(), previousDigitalTwinState.getEvaluationInstant().toEpochMilli());
+        }
+
         if(this.receivedDigitalTwinStateUpdateList != null)
             this.receivedDigitalTwinStateUpdateList.add(digitalTwinState);
     }

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`	`* The DigitalTwinEngine class manages a collection of DigitalTwin instances.`
`14`	`14`	`*`
`15`	`15`	`* @author Marco Picone, Ph.D. - picone.m@gmail.com`
`16`		`- * @project wldt-core`
`17`		`- * @created 29/12/2023 - 15:50`
`18`	`16`	`*/`
`19`	`17`	`public class DigitalTwinEngine {`
`20`	`18`
Original file line number	Diff line number	Diff line change
`@@ -19,26 +19,26 @@ public class DefaultWldtEventLogger implements IWldtEventLogger {`
`19`	`19`	`@Override`
`20`	`20`	`public void logEventPublished(String publisherId, WldtEvent<?> wldtEvent) {`
`21`	`21`	`if(wldtEvent != null)`
`22`		`- logger.info("PUBLISHER [{}] -> PUBLISHED EVENT TYPE: {} Message: {}", publisherId, wldtEvent.getType(), wldtEvent);`
	`22`	`+ logger.debug("PUBLISHER [{}] -> PUBLISHED EVENT TYPE: {} Message: {}", publisherId, wldtEvent.getType(), wldtEvent);`
`23`	`23`	`else`
`24`	`24`	`logger.error("PUBLISHER [{}] -> NULL MESSAGE !", publisherId);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`public void logEventForwarded(String publisherId, String subscriberId, WldtEvent<?> wldtEvent) {`
`29`	`29`	`if(wldtEvent != null)`
`30`		`- logger.info("EVENT-BUS -> FORWARDED from PUBLISHER [{}] to SUBSCRIBER [{}] -> TOPIC: {} Message: {}", publisherId, subscriberId, wldtEvent.getType(), wldtEvent);`
	`30`	`+ logger.debug("EVENT-BUS -> FORWARDED from PUBLISHER [{}] to SUBSCRIBER [{}] -> TOPIC: {} Message: {}", publisherId, subscriberId, wldtEvent.getType(), wldtEvent);`
`31`	`31`	`else`
`32`	`32`	`logger.error("EVENT-BUS FORWARDING from PUBLISHER [{}] to SUBSCRIBER [{}] -> NULL MESSAGE ! ", publisherId, subscriberId);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public void logClientSubscription(String eventType, String subscriberId) {`
`37`		`- logger.info("SUBSCRIBER [{}] -> Subscribed Correctly - Event Type: {}", subscriberId, eventType);`
	`37`	`+ logger.debug("SUBSCRIBER [{}] -> Subscribed Correctly - Event Type: {}", subscriberId, eventType);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`	`41`	`public void logClientUnSubscription(String eventType, String subscriberId) {`
`42`		`- logger.info("SUBSCRIBER [{}] -> UnSubscribed Correctly - Event Type: {}", subscriberId, eventType);`
	`42`	`+ logger.debug("SUBSCRIBER [{}] -> UnSubscribed Correctly - Event Type: {}", subscriberId, eventType);`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`
`6`	`6`	`/**`
`7`	`7`	`* @author Marco Picone, Ph.D. - picone.m@gmail.com`
`8`		`- * @project wldt-core`
`9`		`- * @created 30/12/2023 - 19:37`
`10`	`8`	`*/`
`11`	`9`	`public class SubscriptionDescriptor extends HashMap<String, List<WldtSubscriberInfo>> {`
`12`	`10`	`}`