Query System Integrated and Unit Test Added

Author: piconem

src/main/java/it/wldt/storage/DefaultWldtStorage.java

@@ -167,7 +167,7 @@ public void saveDigitalTwinState(DigitalTwinState digitalTwinState, List<Digital
      * @return the latest computed Digital Twin State
      */
     @Override
-    public Optional<DigitalTwinStateRecord> getLastDigitalTwinStateVariation() {
+    public Optional<DigitalTwinStateRecord> getLastDigitalTwinState() {
 
         if (digitalTwinStateMap.isEmpty()) {
             return Optional.empty();
@@ -319,6 +319,16 @@ public void saveLifeCycleState(LifeCycleStateVariation lifeCycleStateVariation)
 
     }
 
+    /**
+     * Get the last LifeCycleState of the Digital Twin
+     *
+     * @return the last LifeCycleState of the Digital Twin
+     */
+    @Override
+    public LifeCycleVariationRecord getLastLifeCycleState() throws StorageException {
+        return lifeCycleStateMap.isEmpty() ? null : lifeCycleStateMap.get(Collections.max(lifeCycleStateMap.keySet()));
+    }
+
     /**
      * Get the number of LifeCycleState of the Digital Twin
      * @return the number of LifeCycleState of the Digital Twin
@@ -814,7 +824,7 @@ public List<PhysicalAssetPropertyVariationRecord> getPhysicalAssetPropertyVariat
      * @param physicalRelationshipInstanceVariation the Physical Relationship Instance Variation to be saved
      */
     @Override
-    public void savePhysicalAssetRelationshipInstanceCreatedEvent(PhysicalRelationshipInstanceVariation physicalRelationshipInstanceVariation) throws StorageException {
+    public void savePhysicalAssetRelationshipInstanceCreatedNotification(PhysicalRelationshipInstanceVariation physicalRelationshipInstanceVariation) throws StorageException {
         if(physicalRelationshipInstanceVariation == null)
             throw new StorageException("Physical Relationship Instance Variation cannot be null.");
 
@@ -838,7 +848,7 @@ public void savePhysicalAssetRelationshipInstanceCreatedEvent(PhysicalRelationsh
      * @return the number of Physical Asset Relationship Instance Created Event
      */
     @Override
-    public int getPhysicalAssetRelationshipInstanceCreatedEventCount() {
+    public int getPhysicalAssetRelationshipInstanceCreatedNotificationCount() {
         return this.physicalRelationshipInstanceCreatedMap.size();
     }
 
@@ -850,7 +860,7 @@ public int getPhysicalAssetRelationshipInstanceCreatedEventCount() {
      * @return the list of Physical Asset Relationship Instance Created Event in the specified time range
      */
     @Override
-    public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceCreatedEventInTimeRange(long startTimestampMs, long endTimestampMs) throws IllegalArgumentException {
+    public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceCreatedNotificationInTimeRange(long startTimestampMs, long endTimestampMs) throws IllegalArgumentException {
         List<PhysicalRelationshipInstanceVariationRecord> result = new ArrayList<>();
         for (Map.Entry<Long, PhysicalRelationshipInstanceVariationRecord> entry : physicalRelationshipInstanceCreatedMap.entrySet()) {
             long timestamp = entry.getKey();
@@ -871,7 +881,7 @@ public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelatio
      * @throws IllegalArgumentException  if startIndex is greater than endIndex
      */
     @Override
-    public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceCreatedEventInRange(int startIndex, int endIndex) throws IllegalArgumentException {
+    public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceCreatedNotificationInRange(int startIndex, int endIndex) throws IllegalArgumentException {
         if (startIndex < 0 || endIndex < 0 || startIndex > endIndex) {
             throw new IllegalArgumentException("Invalid index range.");
         }
@@ -893,7 +903,7 @@ public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelatio
      * @param physicalRelationshipInstanceVariation the Physical Relationship Instance Variation to be saved
      */
     @Override
-    public void savePhysicalAssetRelationshipInstanceDeletedEvent(PhysicalRelationshipInstanceVariation physicalRelationshipInstanceVariation) throws StorageException {
+    public void savePhysicalAssetRelationshipInstanceDeletedNotification(PhysicalRelationshipInstanceVariation physicalRelationshipInstanceVariation) throws StorageException {
         if(physicalRelationshipInstanceVariation == null)
             throw new StorageException("Physical Relationship Instance Variation cannot be null.");
 
@@ -917,7 +927,7 @@ public void savePhysicalAssetRelationshipInstanceDeletedEvent(PhysicalRelationsh
      * @return the number of Physical Asset Relationship Instance Updated Event
      */
     @Override
-    public int getPhysicalAssetRelationshipInstanceDeletedEventCount() {
+    public int getPhysicalAssetRelationshipInstanceDeletedNotificationCount() {
         return this.physicalRelationshipInstanceDeletedMap.size();
     }
 
@@ -929,7 +939,7 @@ public int getPhysicalAssetRelationshipInstanceDeletedEventCount() {
      * @return the list of Physical Asset Relationship Instance Updated Event in the specified time range
      */
     @Override
-    public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceDeletedEventInTimeRange(long startTimestampMs, long endTimestampMs) throws IllegalArgumentException {
+    public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceDeletedNotificationInTimeRange(long startTimestampMs, long endTimestampMs) throws IllegalArgumentException {
         List<PhysicalRelationshipInstanceVariationRecord> result = new ArrayList<>();
         for (Map.Entry<Long, PhysicalRelationshipInstanceVariationRecord> entry : physicalRelationshipInstanceDeletedMap.entrySet()) {
             long timestamp = entry.getKey();
@@ -950,7 +960,7 @@ public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelatio
      * @throws IllegalArgumentException  if startIndex is greater than endIndex
      */
     @Override
-    public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceDeletedEventInRange(int startIndex, int endIndex) throws IndexOutOfBoundsException, IllegalArgumentException {
+    public List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceDeletedNotificationInRange(int startIndex, int endIndex) throws IndexOutOfBoundsException, IllegalArgumentException {
         if (startIndex < 0 || endIndex < 0 || startIndex > endIndex) {
             throw new IllegalArgumentException("Invalid index range.");
         }

src/main/java/it/wldt/storage/StorageManager.java

@@ -275,15 +275,15 @@ public void onPhysicalAssetEvent(WldtEvent<?> event) {
                         if(WldtEventBus.getInstance().matchWildCardType(event.getType(), WldtEventTypes.ALL_PHYSICAL_RELATIONSHIP_INSTANCE_CREATION_EVENT_TYPE) && event instanceof PhysicalAssetRelationshipInstanceCreatedWldtEvent<?>){
                             PhysicalAssetRelationshipInstanceCreatedWldtEvent<?> physicalEvent = (PhysicalAssetRelationshipInstanceCreatedWldtEvent<?>) event;
                             PhysicalAssetRelationshipInstance<?> relationshipInstance = physicalEvent.getBody();
-                            storage.savePhysicalAssetRelationshipInstanceCreatedEvent(new PhysicalRelationshipInstanceVariation(physicalEvent.getCreationTimestamp(),
+                            storage.savePhysicalAssetRelationshipInstanceCreatedNotification(new PhysicalRelationshipInstanceVariation(physicalEvent.getCreationTimestamp(),
                                     relationshipInstance));
                         }
 
                         // Save the PhysicalAsset Relationship Instance Deleted
                         if(WldtEventBus.getInstance().matchWildCardType(event.getType(), WldtEventTypes.ALL_PHYSICAL_RELATIONSHIP_INSTANCE_DELETED_EVENT_TYPE) && event instanceof PhysicalAssetRelationshipInstanceDeletedWldtEvent<?>){
                             PhysicalAssetRelationshipInstanceDeletedWldtEvent<?> physicalEvent = (PhysicalAssetRelationshipInstanceDeletedWldtEvent<?>) event;
                             PhysicalAssetRelationshipInstance<?> relationshipInstance = physicalEvent.getBody();
-                            storage.savePhysicalAssetRelationshipInstanceDeletedEvent(new PhysicalRelationshipInstanceVariation(physicalEvent.getCreationTimestamp(),
+                            storage.savePhysicalAssetRelationshipInstanceDeletedNotification(new PhysicalRelationshipInstanceVariation(physicalEvent.getCreationTimestamp(),
                                     relationshipInstance));
                         }
                     }

src/main/java/it/wldt/storage/WldtStorage.java

@@ -24,17 +24,15 @@
  * Project: White Label Digital Twin Java Framework - (whitelabel-digitaltwin)
  * Defines an Interface allowing the Digital Twin developer to implement its internal storage system for the Digital Twin instance.
  * The interface defines methods for the management of:
- *      i) Digital Twin State storage and retrieval;
- *      ii) Digital Twin State Change List storage and retrieval;
- *      iii) Received Physical Events;
- *      iv) Generated Digital Events;
- *      v) Life Cycle State storage and retrieval;
- *      vi) Physical Asset Description storage and retrieval;
- *      vii) Physical Asset Property Variation storage and retrieval;
- *      viii) Physical Asset Relationship Instance storage and retrieval;
- *      ix) Digital Action Request storage and retrieval;
- *      x) Physical Asset Action Request storage and retrieval;
- *      xi) Physical Asset Event Notification storage and retrieval;
+ *      - Digital Twin State storage and retrieval with the associated change list;
+ *      - Generated State Digital Events;
+ *      - Life Cycle State storage and retrieval;
+ *      - Physical Asset Description storage and retrieval;
+ *      - Physical Asset Property Variation storage and retrieval;
+ *      - Physical Asset Relationship Instance storage and retrieval;
+ *      - Digital Action Request storage and retrieval;
+ *      - Physical Asset Action Request storage and retrieval;
+ *      - Physical Asset Event Notification storage and retrieval;
  */
 public abstract class WldtStorage {
 
@@ -177,7 +175,7 @@ public void setStorageId(String storageId) {
      * Returns the latest computed Digital Twin State of the target Digital Twin instance
      * @return the latest computed Digital Twin State
      */
-    public abstract Optional<DigitalTwinStateRecord> getLastDigitalTwinStateVariation() throws StorageException;
+    public abstract Optional<DigitalTwinStateRecord> getLastDigitalTwinState() throws StorageException;
 
     /**
      * Returns the number of computed and stored Digital Twin States
@@ -242,6 +240,12 @@ public void setStorageId(String storageId) {
      */
     public abstract void saveLifeCycleState(LifeCycleStateVariation lifeCycleStateVariation) throws StorageException;
 
+    /**
+     * Get the last LifeCycleState of the Digital Twin
+     * @return the last LifeCycleState of the Digital Twin
+     */
+    public abstract LifeCycleVariationRecord getLastLifeCycleState() throws StorageException;
+
     /**
      * Get the number of LifeCycleState of the Digital Twin
      * @return the number of LifeCycleState of the Digital Twin
@@ -448,21 +452,21 @@ public void setStorageId(String storageId) {
      * Save the Physical Asset Relationship Instance Created Event
      * @param physicalRelationshipInstanceVariation the Physical Relationship Instance Variation to be saved
      */
-    public abstract void savePhysicalAssetRelationshipInstanceCreatedEvent(PhysicalRelationshipInstanceVariation physicalRelationshipInstanceVariation) throws StorageException;
+    public abstract void savePhysicalAssetRelationshipInstanceCreatedNotification(PhysicalRelationshipInstanceVariation physicalRelationshipInstanceVariation) throws StorageException;
 
     /**
      * Get the number of Physical Asset Relationship Instance Created Event
      * @return the number of Physical Asset Relationship Instance Created Event
      */
-    public abstract int getPhysicalAssetRelationshipInstanceCreatedEventCount() throws StorageException;
+    public abstract int getPhysicalAssetRelationshipInstanceCreatedNotificationCount() throws StorageException;
 
     /**
      * Get the Physical Asset Relationship Instance Created Event in the specified time range
      * @param startTimestampMs the start timestamp of the time range
      * @param endTimestampMs the end timestamp of the time range
      * @return the list of Physical Asset Relationship Instance Created Event in the specified time range
      */
-    public abstract List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceCreatedEventInTimeRange(long startTimestampMs, long endTimestampMs) throws StorageException, IllegalArgumentException;
+    public abstract List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceCreatedNotificationInTimeRange(long startTimestampMs, long endTimestampMs) throws StorageException, IllegalArgumentException;
 
     /**
      * Get the Physical Asset Relationship Instance Created Event in the specified range of indices
@@ -472,27 +476,27 @@ public void setStorageId(String storageId) {
      * @throws IndexOutOfBoundsException if the startIndex or endIndex is out of bounds
      * @throws IllegalArgumentException if startIndex is greater than endIndex
      */
-    public abstract List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceCreatedEventInRange(int startIndex, int endIndex) throws StorageException, IllegalArgumentException;
+    public abstract List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceCreatedNotificationInRange(int startIndex, int endIndex) throws StorageException, IllegalArgumentException;
 
     /**
      * Save the Physical Asset Relationship Instance Updated Event
      * @param physicalRelationshipInstanceVariation the Physical Relationship Instance Variation to be saved
      */
-    public abstract void savePhysicalAssetRelationshipInstanceDeletedEvent(PhysicalRelationshipInstanceVariation physicalRelationshipInstanceVariation) throws StorageException;
+    public abstract void savePhysicalAssetRelationshipInstanceDeletedNotification(PhysicalRelationshipInstanceVariation physicalRelationshipInstanceVariation) throws StorageException;
 
     /**
      * Get the number of Physical Asset Relationship Instance Updated Event
      * @return the number of Physical Asset Relationship Instance Updated Event
      */
-    public abstract int getPhysicalAssetRelationshipInstanceDeletedEventCount() throws StorageException;
+    public abstract int getPhysicalAssetRelationshipInstanceDeletedNotificationCount() throws StorageException;
 
     /**
      * Get the Physical Asset Relationship Instance Updated Event in the specified time range
      * @param startTimestampMs the start timestamp of the time range
      * @param endTimestampMs the end timestamp of the time range
      * @return the list of Physical Asset Relationship Instance Updated Event in the specified time range
      */
-    public abstract List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceDeletedEventInTimeRange(long startTimestampMs, long endTimestampMs) throws StorageException, IllegalArgumentException;
+    public abstract List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceDeletedNotificationInTimeRange(long startTimestampMs, long endTimestampMs) throws StorageException, IllegalArgumentException;
 
     /**
      * Get the Physical Asset Relationship Instance Updated Event in the specified range of indices
@@ -502,7 +506,7 @@ public void setStorageId(String storageId) {
      * @throws IndexOutOfBoundsException if the startIndex or endIndex is out of bounds
      * @throws IllegalArgumentException if startIndex is greater than endIndex
      */
-    public abstract List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceDeletedEventInRange(int startIndex, int endIndex) throws StorageException, IndexOutOfBoundsException, IllegalArgumentException;
+    public abstract List<PhysicalRelationshipInstanceVariationRecord> getPhysicalAssetRelationshipInstanceDeletedNotificationInRange(int startIndex, int endIndex) throws StorageException, IndexOutOfBoundsException, IllegalArgumentException;
 
     /**
      * Initialize the WLDT Storage