Merge pull request #16 from wldt/release_0.3.0

Release 0.3.0

Author: piconem

README.md

@@ -2,7 +2,7 @@
  * This file was generated by the Gradle 'init' task.
  */
 group = "io.github.wldt"
-version = "0.2.1"
+version = "0.3.0"
 description = "The core library to build White Label Digital Twins"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
@@ -14,14 +14,14 @@ plugins {
 
 repositories {
     mavenCentral()
-
+    mavenLocal()
 }
 
 dependencies {
     api("org.apache.commons:commons-lang3:3.9")
-    api("ch.qos.logback:logback-classic:1.4.6")
+    api("ch.qos.logback:logback-classic:1.4.12")
     api("javax.inject:javax.inject:1")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.1")
 }
 
 java {

build.gradle.kts

@@ -1,5 +1,7 @@
 package it.wldt.adapter.physical;
 
+import it.wldt.exception.WldtWorkerException;
+
 /**
  * Authors:
  *          Marco Picone, Ph.D. (picone.m@gmail.com)
@@ -13,7 +15,11 @@ public abstract class ConfigurablePhysicalAdapter<C> extends PhysicalAdapter {
 
     private C configuration;
 
-    public ConfigurablePhysicalAdapter(String id, C configuration){
+    private ConfigurablePhysicalAdapter() {
+        super("");
+    }
+
+    public ConfigurablePhysicalAdapter(String id, C configuration) {
         super(id);
         this.configuration = configuration;
     }

images/wldt_structure.jpg

@@ -4,7 +4,7 @@
 import it.wldt.core.event.WldtEventBus;
 import it.wldt.core.event.WldtEventFilter;
 import it.wldt.core.event.WldtEventListener;
-import it.wldt.core.worker.WldtWorker;
+import it.wldt.core.engine.DigitalTwinWorker;
 import it.wldt.exception.EventBusException;
 import it.wldt.exception.PhysicalAdapterException;
 import it.wldt.exception.WldtRuntimeException;
@@ -33,7 +33,7 @@
  * same time on the Digital Twin with the aim to handle different interaction with the physical layer according to the
  * nature of the twin and the associated physical device.
  */
-public abstract class PhysicalAdapter extends WldtWorker implements WldtEventListener {
+public abstract class PhysicalAdapter extends DigitalTwinWorker implements WldtEventListener {
 
     private static final Logger logger = LoggerFactory.getLogger(ConfigurablePhysicalAdapter.class);
 
@@ -45,7 +45,12 @@ public abstract class PhysicalAdapter extends WldtWorker implements WldtEventLis
 
     private PhysicalAssetDescription adapterPhysicalAssetDescription;
 
-    public PhysicalAdapter(String id){
+    private PhysicalAdapter(){
+
+    }
+
+    public PhysicalAdapter(String id) {
+        super();
         this.id = id;
     }
 
@@ -101,19 +106,19 @@ public void setPhysicalAdapterListener(PhysicalAdapterListener physicalAdapterLi
     public abstract void onAdapterStop();
 
     protected void publishPhysicalAssetPropertyWldtEvent(PhysicalAssetPropertyWldtEvent<?> targetPhysicalPropertyEventMessage) throws EventBusException {
-        WldtEventBus.getInstance().publishEvent(getId(), targetPhysicalPropertyEventMessage);
+        WldtEventBus.getInstance().publishEvent(this.digitalTwinId, getId(), targetPhysicalPropertyEventMessage);
     }
 
     protected void publishPhysicalAssetEventWldtEvent(PhysicalAssetEventWldtEvent<?> targetPhysicalAssetEventWldtEvent) throws EventBusException {
-        WldtEventBus.getInstance().publishEvent(getId(), targetPhysicalAssetEventWldtEvent);
+        WldtEventBus.getInstance().publishEvent(this.digitalTwinId, getId(), targetPhysicalAssetEventWldtEvent);
     }
 
     protected void publishPhysicalAssetRelationshipCreatedWldtEvent(PhysicalAssetRelationshipInstanceCreatedWldtEvent<?> targetPhysicalAssetRelationshipWldtEvent) throws EventBusException {
-        WldtEventBus.getInstance().publishEvent(getId(), targetPhysicalAssetRelationshipWldtEvent);
+        WldtEventBus.getInstance().publishEvent(this.digitalTwinId, getId(), targetPhysicalAssetRelationshipWldtEvent);
     }
 
     protected void publishPhysicalAssetRelationshipDeletedWldtEvent(PhysicalAssetRelationshipInstanceDeletedWldtEvent<?> targetPhysicalAssetRelationshipWldtEvent) throws EventBusException {
-        WldtEventBus.getInstance().publishEvent(getId(), targetPhysicalAssetRelationshipWldtEvent);
+        WldtEventBus.getInstance().publishEvent(this.digitalTwinId, getId(), targetPhysicalAssetRelationshipWldtEvent);
     }
 
     public PhysicalAssetDescription getPhysicalAssetDescription() {
@@ -212,7 +217,7 @@ protected void updatePhysicalAssetDescription(PhysicalAssetDescription physicalA
                 this.physicalActionEventsFilter = new WldtEventFilter();
             else {
                 //Clean existing subscriptions and the local event filter
-                WldtEventBus.getInstance().unSubscribe(this.id, this.physicalActionEventsFilter, this);
+                WldtEventBus.getInstance().unSubscribe(this.digitalTwinId, this.id, this.physicalActionEventsFilter, this);
                 this.physicalActionEventsFilter.clear();
             }
 
@@ -221,7 +226,7 @@ protected void updatePhysicalAssetDescription(PhysicalAssetDescription physicalA
                 this.physicalActionEventsFilter.add(PhysicalAssetActionWldtEvent
                         .buildEventType(PhysicalAssetActionWldtEvent.EVENT_BASIC_TYPE, physicalAssetAction.getKey()));
 
-            WldtEventBus.getInstance().subscribe(this.id, this.physicalActionEventsFilter, this);
+            WldtEventBus.getInstance().subscribe(this.digitalTwinId, this.id, this.physicalActionEventsFilter, this);
 
         }
         else

images/wldt_structure_old.jpeg images/wldt_structure_v0.1.jpegimages/wldt_structure_old.jpeg renamed to images/wldt_structure_v0.1.jpeg

@@ -0,0 +1,38 @@
+package it.wldt.augmentation;
+
+/**
+ * @author Marco Picone, Ph.D. - picone.m@gmail.com
+ */
+public abstract class AugmentationFunction<T> implements Runnable {
+
+    private String id;
+
+    private AugmentationFunctionListener<T> listener;
+
+    private AugmentationFunction(){
+
+    }
+
+    public AugmentationFunction(String id, AugmentationFunctionListener<T> listener) {
+        this.id = id;
+        this.listener = listener;
+    }
+
+    @Override
+    public void run() {
+        try{
+
+            T result = execute();
+            if(this.listener != null)
+                this.listener.onFunctionResult(result);
+
+        }catch (Exception e){
+            if(this.listener != null)
+                this.listener.onFunctionError(e.getLocalizedMessage());
+            //TODO Else + Log
+
+        }
+    }
+
+    public abstract T execute();
+}

images/wldt_structure.jpeg images/wldt_structure_v0.2.jpegimages/wldt_structure.jpeg renamed to images/wldt_structure_v0.2.jpeg

@@ -0,0 +1,49 @@
+package it.wldt.augmentation;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @author Marco Picone, Ph.D. - picone.m@gmail.com
+ */
+public class AugmentationFunctionExecutor {
+
+    private static final int AUGMENTATION_FUNCTION_THREAD_SIZE = 5;
+
+    private ExecutorService functionExecutorService = null;
+
+    private static AugmentationFunctionExecutor instance;
+
+    private List<AugmentationFunction<?>> augmentationFunctionList = null;
+
+    private AugmentationFunctionExecutor(){
+        this.functionExecutorService = Executors.newFixedThreadPool(AUGMENTATION_FUNCTION_THREAD_SIZE);
+        this.augmentationFunctionList = new ArrayList<>();
+    }
+
+    public static AugmentationFunctionExecutor getInstance(){
+        if(instance == null)
+            instance = new AugmentationFunctionExecutor();
+
+        return instance;
+    }
+
+    public void addFunction(AugmentationFunction<?> augmentationFunction){
+        this.augmentationFunctionList.add(augmentationFunction);
+    }
+
+    public void deleteFunction(String functionId){
+        //TODO Implement
+    }
+
+    public void execute(){
+        this.augmentationFunctionList.forEach(function -> {
+            this.functionExecutorService.execute(function);
+        });
+
+        this.functionExecutorService.shutdown();
+    }
+
+}