Fixed Save Provider Command

Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz>
DataInMotion · Apr 12, 2024 · 5bcf42a · 5bcf42a
1 parent ff8bf90
commit 5bcf42a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/core/api/src/main/java/org/eclipse/sensinact/core/model/Model.java b/core/api/src/main/java/org/eclipse/sensinact/core/model/Model.java
@@ -21,6 +21,8 @@
  */
 public interface Model extends Modelled, CommandScoped {
 
+    String getPackageUri();
+
     ServiceBuilder<Service> createService(String service);
 
     Map<String, ? extends Service> getServices();

diff --git a/core/impl/src/main/java/org/eclipse/sensinact/core/impl/SaveProviderCommand.java b/core/impl/src/main/java/org/eclipse/sensinact/core/impl/SaveProviderCommand.java
@@ -14,6 +14,7 @@
 
 import java.time.Instant;
 
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.sensinact.core.emf.command.AbstractSensinactEMFCommand;
 import org.eclipse.sensinact.core.emf.model.SensinactEMFModelManager;
 import org.eclipse.sensinact.core.emf.twin.SensinactEMFDigitalTwin;
@@ -35,11 +36,12 @@ public SaveProviderCommand(Provider provider) {
     protected Promise<Void> call(SensinactEMFDigitalTwin twin, SensinactEMFModelManager modelMgr,
             PromiseFactory promiseFactory) {
 
-        Model model = modelMgr.getModel(provider.eClass());
+        EClass eClass = provider.eClass();
+        Model model = modelMgr.getModel(eClass);
         if (model == null) {
-            model = modelMgr.createModel(provider.eClass()).withCreationTime(Instant.now()).build();
+            model = modelMgr.createModel(eClass).withCreationTime(Instant.now()).build();
         }
-        SensinactEMFProvider sp = twin.getProvider(model.getName(), provider.getId());
+        SensinactEMFProvider sp = twin.getProvider(model.getPackageUri(), model.getName(), provider.getId());
         if (sp == null) {
             sp = twin.createProvider(provider);
         }

diff --git a/core/impl/src/main/java/org/eclipse/sensinact/core/model/impl/ModelImpl.java b/core/impl/src/main/java/org/eclipse/sensinact/core/model/impl/ModelImpl.java
@@ -46,6 +46,12 @@ public String getName() {
         return name;
     }
 
+    @Override
+    public String getPackageUri() {
+        checkValid();
+        return eClass.getEPackage().getNsURI();
+    }
+
     @Override
     public boolean isExclusivelyOwned() {
         checkValid();