Removes obsolete methods from MetaModelElementFactory
* Prepares removal of Factory
Change-Id: I219d678ea8ca8b7c43278b10c02d4c6447226403
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
diff --git a/components/basys.components/src/main/java/org/eclipse/basyx/models/manufacturing/process/product/ProductQualitySubmodel.java b/components/basys.components/src/main/java/org/eclipse/basyx/models/manufacturing/process/product/ProductQualitySubmodel.java
index c589ea3..0585bb7 100644
--- a/components/basys.components/src/main/java/org/eclipse/basyx/models/manufacturing/process/product/ProductQualitySubmodel.java
+++ b/components/basys.components/src/main/java/org/eclipse/basyx/models/manufacturing/process/product/ProductQualitySubmodel.java
@@ -50,7 +50,7 @@
MetaModelElementFactory fac = new MetaModelElementFactory();
// Add quality data property
- getProperties().put("qualityData", fac.create(new Property(), qualityData));
+ getProperties().put("qualityData", new Property(qualityData));
// Add access operations for quality data
// - Add a quality data entry
diff --git a/components/basys.components/src/test/java/org/eclipse/basyx/regression/support/processengine/submodel/DeviceSubmodelFactory.java b/components/basys.components/src/test/java/org/eclipse/basyx/regression/support/processengine/submodel/DeviceSubmodelFactory.java
index fd29ae6..f5b6885 100644
--- a/components/basys.components/src/test/java/org/eclipse/basyx/regression/support/processengine/submodel/DeviceSubmodelFactory.java
+++ b/components/basys.components/src/test/java/org/eclipse/basyx/regression/support/processengine/submodel/DeviceSubmodelFactory.java
@@ -15,13 +15,13 @@
public SubModel create(String id, ICoilcar coilcar) {
MetaModelElementFactory factory = new MetaModelElementFactory();
// create a single value property
- Property property1 = factory.create(new Property(), 0);
+ Property property1 = new Property(0);
property1.setId("currentPosition");
- Property property2 = factory.create(new Property(), 0);
+ Property property2 = new Property(0);
property2.setId("lifterPosition");
- Property property3 = factory.create(new Property(), false);
+ Property property3 = new Property(false);
property3.setId("physicalSpeed");
// create 2 opertations
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/deployment/device/DeviceSubModelDeployment.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/deployment/device/DeviceSubModelDeployment.java
index 64b8ebf..8718489 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/deployment/device/DeviceSubModelDeployment.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/deployment/device/DeviceSubModelDeployment.java
@@ -9,7 +9,6 @@
import org.eclipse.basyx.aas.backend.connector.basyx.BaSyxConnectorProvider;
import org.eclipse.basyx.aas.backend.provider.VABMultiSubmodelProvider;
import org.eclipse.basyx.aas.backend.provider.VirtualPathModelProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.SubModel;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.examples.support.directory.ExampleAASRegistry;
@@ -37,16 +36,19 @@
// Create AAS sub model and sub model properties
- // - The MetaModelElementFactory factory class creates sub model properties and ensures
- // presence of all meta data
- MetaModelElementFactory fac = new MetaModelElementFactory();
+
// - Create sub model
SubModel submodel = new SubModel();
// - Set sub model ID "SampleSM" to full qualified ID urn:de.FHG:devices.es.iese:SampleSM:1.0:3:x-509#003
submodel.setId("urn:de.FHG:devices.es.iese:SampleSM:1.0:3:x-509#003");
// - Add example properties
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop2.setId("prop2");
+ submodel.getProperties().put(prop2);
// Export sub model via BaSyx server
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/deployment/device/DeviceSubModelDeploymentVAB.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/deployment/device/DeviceSubModelDeploymentVAB.java
index 10061c3..441b221 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/deployment/device/DeviceSubModelDeploymentVAB.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/deployment/device/DeviceSubModelDeploymentVAB.java
@@ -6,7 +6,6 @@
import org.eclipse.basyx.aas.backend.connector.basyx.BaSyxConnector;
import org.eclipse.basyx.aas.backend.provider.VABMultiSubmodelProvider;
import org.eclipse.basyx.aas.backend.provider.VirtualPathModelProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.SubModel;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.vab.backend.server.basyx.BaSyxTCPServer;
@@ -34,16 +33,18 @@
// Create AAS sub model and sub model properties
- // - The MetaModelElementFactory factory class creates sub model properties and ensures
- // presence of all meta data
- MetaModelElementFactory fac = new MetaModelElementFactory();
// - Create sub model
SubModel submodel = new SubModel();
// - Set sub model ID
submodel.setId("dynamicSM");
// - Add example properties
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop2.setId("prop2");
+ submodel.getProperties().put(prop2);
// Export sub model via BaSyx server
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToSubModelEndpoints.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToSubModelEndpoints.java
index b276e9a..44a360d 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToSubModelEndpoints.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToSubModelEndpoints.java
@@ -9,7 +9,6 @@
import org.eclipse.basyx.aas.api.resources.ISubModel;
import org.eclipse.basyx.aas.backend.connected.ConnectedAssetAdministrationShellManager;
import org.eclipse.basyx.aas.backend.connector.http.HTTPConnectorProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.SubModel;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.descriptor.AASDescriptor;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.descriptor.SubmodelDescriptor;
@@ -97,15 +96,17 @@
regProxy.register(aasURN, aasDescriptor);
// Create sub model
- // - This factory creates sub model properties and ensures presence of all meta data
- MetaModelElementFactory fac = new MetaModelElementFactory();
-
- // Create sub model
SubModel submodel = new SubModel();
- // - Add example properties to sub model
submodel.setId(subModelId);
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+
+ // - Add example properties to sub model
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop2.setId("prop2");
+ submodel.getProperties().put(prop2);
// - Transfer sub model to server
// - This creates the "exampleSM" element on the server, which is the server
// end point that will host the AAS sub model.
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/ConnectToAASSubModelSDK.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/ConnectToAASSubModelSDK.java
index ab8e632..d514d9d 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/ConnectToAASSubModelSDK.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/ConnectToAASSubModelSDK.java
@@ -64,18 +64,22 @@
// Add example properties
// - Add simple property
- getProperties().put(fac.create(new Property(), 234, "prop1"));
+ Property prop1 = new Property(234);
+ prop1.setId("prop1");
+ getProperties().put(prop1);
+ Property prop11 = new Property(123);
+ prop11.setId("prop11");
// - Add container property that holds other properties
- List<SubmodelElement> containerProperties = fac.createList(
- fac.create(new Property(), 123, "prop11")
- );
+ List<SubmodelElement> containerProperties = fac.createList(prop11);
// - Add container to property map
getProperties().put(fac.createContainer(new SubmodelElementCollection(), containerProperties, fac.emptyList(), "prop2"));
// Add another property manually to sub model container "properties"
+ Property prop3 = new Property(17);
+ prop3.setId("prop3");
{
- ((Map<String, Object>) this.get(PROPERTIES)).put("prop3", fac.create(new Property(), 17, "prop3"));
+ ((Map<String, Object>) this.get("dataElements")).put("prop3", prop3);
}
}
}
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/ConnectToAASSubModelVAB.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/ConnectToAASSubModelVAB.java
index 28aa225..6900ff8 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/ConnectToAASSubModelVAB.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/ConnectToAASSubModelVAB.java
@@ -60,23 +60,28 @@
setId("sm-001");
// Create factory that helps with property creation
- // - This factory creates sub model properties and ensures presence of all meta data
+ // - This factory creates sub model properties and ensures presence of all meta
+ // data
MetaModelElementFactory fac = new MetaModelElementFactory();
// Add example properties
// - Add simple property
- getProperties().put(fac.create(new Property(), 234, "prop1"));
+ Property prop1 = new Property(234);
+ prop1.setId("prop1");
+ getProperties().put(prop1);
+ Property prop11 = new Property(123);
+ prop11.setId("prop11");
// - Add container property that holds other properties
- List<SubmodelElement> containerProperties = fac.createList(
- fac.create(new Property(), 123, "prop11")
- );
+ List<SubmodelElement> containerProperties = fac.createList(prop11);
// - Add container to property map
getProperties().put(fac.createContainer(new SubmodelElementCollection(), containerProperties, fac.emptyList(), "prop2"));
// Add another property manually to sub model container "properties"
+ Property prop3 = new Property(17);
+ prop3.setId("prop3");
{
- ((Map<String, Object>) this.get(PROPERTIES)).put("prop3", fac.create(new Property(), 17, "prop3"));
+ ((Map<String, Object>) this.get("dataElements")).put("prop3", prop3);
}
}
}
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/CreateAASSubModelSDK.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/CreateAASSubModelSDK.java
index 40aaabd..d2c5571 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/CreateAASSubModelSDK.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/CreateAASSubModelSDK.java
@@ -44,23 +44,28 @@
setId("sm-001");
// Create factory that helps with property creation
- // - This factory creates sub model properties and ensures presence of all meta data
+ // - This factory creates sub model properties and ensures presence of all meta
+ // data
MetaModelElementFactory fac = new MetaModelElementFactory();
// Add example properties
// - Add simple property
- getProperties().put(fac.create(new Property(), 234, "prop1"));
+ Property prop1 = new Property(234);
+ prop1.setId("prop1");
+ getProperties().put(prop1);
+ Property prop11 = new Property(123);
+ prop11.setId("prop11");
// - Add container property that holds other properties
- List<SubmodelElement> containerProperties = fac.createList(
- fac.create(new Property(), 123, "prop11")
- );
+ List<SubmodelElement> containerProperties = fac.createList(prop11);
// - Add container to property map
getProperties().put(fac.createContainer(new SubmodelElementCollection(), containerProperties, fac.emptyList(), "prop2"));
// Add another property manually to sub model container "properties"
+ Property prop3 = new Property(17);
+ prop3.setId("prop3");
{
- ((Map<String, Object>) this.get(PROPERTIES)).put("prop3", fac.create(new Property(), 17, "prop3"));
+ ((Map<String, Object>) this.get("dataElements")).put("prop3", prop3);
}
}
}
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/DynamicSubModelDeployment.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/DynamicSubModelDeployment.java
index 787059d..f75f35b 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/DynamicSubModelDeployment.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/DynamicSubModelDeployment.java
@@ -7,7 +7,6 @@
import org.eclipse.basyx.aas.api.resources.ISubModel;
import org.eclipse.basyx.aas.backend.connected.ConnectedAssetAdministrationShellManager;
import org.eclipse.basyx.aas.backend.connector.http.HTTPConnectorProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.SubModel;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.components.servlet.submodel.DynamicModelProviderServlet;
@@ -62,16 +61,17 @@
*/
@Test
public void snippet() throws Exception {
- // Create factory that helps with property creation
- // - This factory creates sub model properties and ensures presence of all meta data
- MetaModelElementFactory fac = new MetaModelElementFactory();
-
// Instantiate sub model
SubModel submodel = new SubModel();
// - Add example properties to sub model
submodel.setId(STATUS_SM);
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop2.setId("prop2");
+ submodel.getProperties().put(prop2);
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/DynamicSubModelDeploymentHTTP.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/DynamicSubModelDeploymentHTTP.java
index 9f51470..6197cc3 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/DynamicSubModelDeploymentHTTP.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/submodels/DynamicSubModelDeploymentHTTP.java
@@ -6,7 +6,6 @@
import org.eclipse.basyx.aas.api.webserviceclient.WebServiceJSONClient;
import org.eclipse.basyx.aas.backend.connector.http.HTTPConnectorProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.SubModel;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.components.servlet.submodel.DynamicModelProviderServlet;
@@ -78,15 +77,16 @@
// sub model ID tuple, as illustrated in the registry examples.
VABElementProxy connSubModel1 = this.connManager.connectToVABElement("urn:de.FHG:devices.es.iese:statusSM:1.0:3:x-509:003");
- // Create factory that helps with property creation
- // - This factory creates sub model properties and ensures presence of all meta data
- MetaModelElementFactory fac = new MetaModelElementFactory();
-
// Add example properties
SubModel submodel = new SubModel();
submodel.setId("urn:de.FHG:devices.es.iese:statusSM:1.0:3:x-509:003");
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop2.setId("prop2");
+ submodel.getProperties().put(prop2);
// Transfer sub model to server
connSubModel1.createValue("aas/submodels/de.FHG:devices.es.iese:statusSM:1.0:3:x-509:003", submodel);
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASServletConnection.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASServletConnection.java
index 668dc4b..885a910 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASServletConnection.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASServletConnection.java
@@ -63,17 +63,25 @@
// Add example properties
// - Add simple property
- getProperties().put(fac.create(new Property(), 234, "prop1"));
+ Property prop1 = new Property(234);
+ prop1.setId("prop1");
+ getProperties().put(prop1);
+ Property prop11 = new Property(123);
+ prop11.setId("prop11");
// - Add container property that holds other properties
List<SubmodelElement> containerProperties = fac.createList(
- fac.create(new Property(), 123, "prop11")
+ prop11
);
// - Add container to property map
getProperties().put(fac.createContainer(new SubmodelElementCollection(), containerProperties, fac.emptyList(), "prop2"));
// Add another property manually to sub model container "properties"
- {((Map<String, Object>) this.get("dataElements")).put("prop3", fac.create(new Property(), 17, "prop3"));}
+ Property prop3 = new Property(17);
+ prop3.setId("prop3");
+ {
+ ((Map<String, Object>) this.get("dataElements")).put("prop3", prop3);
+ }
}
}
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASServletConnectionFull.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASServletConnectionFull.java
index 88c46ab..a43d95a 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASServletConnectionFull.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASServletConnectionFull.java
@@ -63,17 +63,25 @@
// Add example properties
// - Add simple property
- getProperties().put(fac.create(new Property(), 234, "prop1"));
+ Property prop1 = new Property(234);
+ prop1.setId("prop1");
+ getProperties().put(prop1);
+ Property prop11 = new Property(123);
+ prop11.setId("prop11");
// - Add container property that holds other properties
List<SubmodelElement> containerProperties = fac.createList(
- fac.create(new Property(), 123, "prop11")
+ prop11
);
// - Add container to property map
getProperties().put(fac.createContainer(new SubmodelElementCollection(), containerProperties, fac.emptyList(), "prop2"));
// Add another property manually to sub model container "properties"
- {((Map<String, Object>) this.get("dataElements")).put("prop3", fac.create(new Property(), 17, "prop3"));}
+ Property prop3 = new Property(17);
+ prop3.setId("prop3");
+ {
+ ((Map<String, Object>) this.get("dataElements")).put("prop3", prop3);
+ }
}
}
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASSubModelServletConnectorConnection.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASSubModelServletConnectorConnection.java
index d2eabc1..b92fc1a 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASSubModelServletConnectorConnection.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASSubModelServletConnectorConnection.java
@@ -61,18 +61,24 @@
// Add example properties
// - Add simple property
- getProperties().put(fac.create(new Property(), 234, "prop1"));
+ Property prop1 = new Property(234);
+ prop1.setId("prop1");
+ getProperties().put(prop1);
+ Property prop11 = new Property(123);
+ prop11.setId("prop11");
// - Add container property that holds other properties
List<SubmodelElement> containerProperties = fac.createList(
- fac.create(new Property(), 123, "prop11")
+ prop11
);
// - Add container to property map
getProperties().put(fac.createContainer(new SubmodelElementCollection(), containerProperties, fac.emptyList(), "prop2"));
// Add another property manually to sub model container "properties"
+ Property prop3 = new Property(17);
+ prop3.setId("prop3");
{
- ((Map<String, Object>) this.get(PROPERTIES)).put("prop3", fac.create(new Property(), 17, "prop3"));
+ ((Map<String, Object>) this.get("dataElements")).put("prop3", prop3);
}
}
}
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASSubModelServletVABConnection.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASSubModelServletVABConnection.java
index 7a4bc63..098e463 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASSubModelServletVABConnection.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/connection/servlet/AASSubModelServletVABConnection.java
@@ -55,18 +55,24 @@
// Add example properties
// - Add simple property
- getProperties().put(fac.create(new Property(), 234, "prop1"));
+ Property prop1 = new Property(234);
+ prop1.setId("prop1");
+ getProperties().put(prop1);
+ Property prop11 = new Property(123);
+ prop11.setId("prop11");
// - Add container property that holds other properties
List<SubmodelElement> containerProperties = fac.createList(
- fac.create(new Property(), 123, "prop11")
+ prop11
);
// - Add container to property map
getProperties().put(fac.createContainer(new SubmodelElementCollection(), containerProperties, fac.emptyList(), "prop2"));
// Add another property manually to sub model container "properties"
+ Property prop3 = new Property(17);
+ prop3.setId("prop3");
{
- ((Map<String, Object>) this.get(PROPERTIES)).put("prop3", fac.create(new Property(), 17, "prop3"));
+ ((Map<String, Object>) this.get("dataElements")).put("prop3", prop3);
}
}
}
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASDynamicOperationSnippet.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASDynamicOperationSnippet.java
index 56f5b93..761340b 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASDynamicOperationSnippet.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASDynamicOperationSnippet.java
@@ -7,7 +7,6 @@
import java.util.function.Supplier;
import org.eclipse.basyx.aas.backend.connector.http.HTTPConnectorProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.SubModel;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.components.servlet.submodel.EmptyVABLambdaElementServlet;
@@ -69,13 +68,17 @@
// Create properties on AAS
- // - This factory creates sub model properties and ensures presence of all meta data
- MetaModelElementFactory fac = new MetaModelElementFactory();
+
// - Add example properties
SubModel submodel = new SubModel();
submodel.setId("urn:de.FHG:devices.es.iese:statusSM:1.0:3:x-509#003");
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop2.setId("prop2");
+ submodel.getProperties().put(prop2);
// - Transfer sub model to server
connSubModel1.setModelPropertyValue("/", submodel);
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASManualHTTPOperationsSnippet.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASManualHTTPOperationsSnippet.java
index c07f7f2..e5c43f2 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASManualHTTPOperationsSnippet.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASManualHTTPOperationsSnippet.java
@@ -6,7 +6,6 @@
import org.eclipse.basyx.aas.api.webserviceclient.WebServiceJSONClient;
import org.eclipse.basyx.aas.backend.connector.http.HTTPConnectorProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.SubModel;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.components.servlet.submodel.EmptyVABLambdaElementServlet;
@@ -65,15 +64,16 @@
// - Connect to device (VAB object)
VABElementProxy connSubModel1 = this.connManager.connectToVABElement("urn:de.FHG:devices.es.iese:statusSM:1.0:3:x-509#003");
- // Create factory that helps with property creation
- // - This factory creates sub model properties and ensures presence of all meta data
- MetaModelElementFactory fac = new MetaModelElementFactory();
-
// Add example properties
SubModel submodel = new SubModel();
submodel.setId("urn:de.FHG:devices.es.iese:statusSM:1.0:3:x-509#003");
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop2.setId("prop2");
+ submodel.getProperties().put(prop2);
// Transfer sub model to server
connSubModel1.setModelPropertyValue("/", submodel);
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASPropertiesCRUDAccessSnippet.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASPropertiesCRUDAccessSnippet.java
index 98730a2..15b5bfa 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASPropertiesCRUDAccessSnippet.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASPropertiesCRUDAccessSnippet.java
@@ -3,7 +3,6 @@
import static org.junit.Assert.assertTrue;
import org.eclipse.basyx.aas.backend.connector.http.HTTPConnectorProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.SubModel;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.components.servlet.submodel.EmptyVABLambdaElementServlet;
@@ -64,13 +63,16 @@
// Create properties on AAS
- // - This factory creates sub model properties and ensures presence of all meta data
- MetaModelElementFactory fac = new MetaModelElementFactory();
// - Add example properties
SubModel submodel = new SubModel();
submodel.setId("urn:de.FHG:devices.es.iese:statusSM:1.0:3:x-509#003");
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop2.setId("prop2");
+ submodel.getProperties().put(prop2);
// - Transfer sub model to server
connSubModel1.setModelPropertyValue("/", submodel);
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASTailoredSupplierSnippet.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASTailoredSupplierSnippet.java
index f1b5b7c..89fb806 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASTailoredSupplierSnippet.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/undoc/aas/dynamic/RunAASTailoredSupplierSnippet.java
@@ -7,7 +7,6 @@
import java.util.function.Supplier;
import org.eclipse.basyx.aas.backend.connector.http.HTTPConnectorProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.SubModel;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.components.servlet.submodel.EmptyVABLambdaElementServlet;
@@ -105,13 +104,18 @@
// Create properties on AAS
- // - This factory creates sub model properties and ensures presence of all meta data
- MetaModelElementFactory fac = new MetaModelElementFactory();
+
// - Add example properties
SubModel submodel = new SubModel();
submodel.setId("urn:de.FHG:devices.es.iese:statusSM:1.0:3:x-509#003");
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop2.setId("prop2");
+ submodel.getProperties().put(prop2);
+
// - Transfer sub model to server
connSubModel1.setModelPropertyValue("/", submodel);
diff --git a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/metamodel/factory/MetaModelElementFactory.java b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/metamodel/factory/MetaModelElementFactory.java
index 7405eda..7635393 100644
--- a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/metamodel/factory/MetaModelElementFactory.java
+++ b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/metamodel/factory/MetaModelElementFactory.java
@@ -5,9 +5,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.function.Consumer;
import java.util.function.Function;
-import java.util.function.Supplier;
import org.eclipse.basyx.aas.api.resources.IElement;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.AssetAdministrationShell;
@@ -17,8 +15,6 @@
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.operation.Operation;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.operation.OperationVariable;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
-import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.valuetypedef.PropertyValueTypeDefHelper;
-import org.eclipse.basyx.vab.provider.lambda.VABLambdaProviderHelper;
/**
* Creates meta model entities <br />
@@ -30,56 +26,6 @@
public class MetaModelElementFactory {
/**
- * Create Property
- *
- * @param prop
- * @param get
- * @param set
- * @return
- */
- public Property create(Property prop, Object value) {
- Property ret = new Property();
- ret.putAll(prop);
- ret.setValue(value);
- return ret;
- }
-
-
- /**
- * Create Property
- *
- * @param prop
- * @param get
- * @param set
- * @return
- */
- public Property create(Property prop, Object value, String id) {
- Property ret = new Property();
- ret.putAll(prop);
- ret.setValue(value);
- ret.setId(id);
- return ret;
- }
-
-
- /**
- * Create Property
- *
- * @param prop
- * @param get
- * @param set
- * @return
- */
- public Property create(Property prop, Supplier<Object> get, Consumer<Object> set) {
- Property ret = new Property();
- ret.putAll(prop);
- Map<String, Object> value = VABLambdaProviderHelper.createSimple(get, set);
- ret.put(Property.VALUE, value);
- ret.put(Property.VALUETYPE, PropertyValueTypeDefHelper.fromObject(get.get()));
- return ret;
- }
-
- /**
* Create Operations w/o endpoint
*
* @param operation
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedAssetAdministrationShell.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedAssetAdministrationShell.java
index c211edb..00b3bb1 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedAssetAdministrationShell.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedAssetAdministrationShell.java
@@ -51,7 +51,7 @@
MetaModelElementFactory factory = new MetaModelElementFactory();
// Create a SubModel containing no operations and one property
- Property p = factory.create(new Property(), propVal);
+ Property p = new Property(propVal);
p.setId(propId);
SubModel sm = factory.create(new SubModel(), Collections.singletonList(p), new ArrayList<>());
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedAssetAdministrationShellManager.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedAssetAdministrationShellManager.java
index e12118b..737c049 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedAssetAdministrationShellManager.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedAssetAdministrationShellManager.java
@@ -85,17 +85,17 @@
connectorProvider.addMapping("", new VABHashmapProvider(new HashMap<>()));
// Create sub model
- // - This factory creates sub model properties and ensures presence of all meta
- // data
- MetaModelElementFactory fac = new MetaModelElementFactory();
-
- // Create sub model
SubModel submodel = new SubModel();
// - Add example properties to sub model
submodel.setId(smId);
- submodel.getProperties().put(fac.create(new Property(), 7, "prop1"));
- submodel.getProperties().put(fac.create(new Property(), "myStr", "prop2"));
+ Property prop1 = new Property(7);
+ prop1.setId("prop1");
+ submodel.getProperties().put(prop1);
+
+ Property prop2 = new Property("myStr");
+ prop1.setId("prop2");
+ submodel.getProperties().put(prop2);
manager.createSubModel(urn, smId, submodel);
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedSubModel.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedSubModel.java
index d000516..9ac2fe1 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedSubModel.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/TestConnectedSubModel.java
@@ -48,7 +48,7 @@
MetaModelElementFactory factory = new MetaModelElementFactory();
// Create a simple value property
- Property propertyMeta = factory.create(new Property(), 100);
+ Property propertyMeta = new Property(100);
propertyMeta.setId(PROP);
// Create an operation
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedCollectionProperty.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedCollectionProperty.java
index 67c87a6..8910c21 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedCollectionProperty.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedCollectionProperty.java
@@ -14,7 +14,6 @@
import org.eclipse.basyx.aas.backend.connected.TypeDestroyer.TypeDestroyer;
import org.eclipse.basyx.aas.backend.connected.aas.submodelelement.property.ConnectedCollectionProperty;
import org.eclipse.basyx.aas.backend.provider.VirtualPathModelProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.testsuite.support.vab.stub.VABConnectionManagerStub;
import org.eclipse.basyx.vab.core.VABConnectionManager;
@@ -33,15 +32,13 @@
@Before
public void build() {
- MetaModelElementFactory factory = new MetaModelElementFactory();
-
// Create collection
collection = new ArrayList<>();
collection.add(1);
collection.add(2);
// Create PropertySingleValued containing the collection
- Property propertySingleValued = factory.create(new Property(), collection);
+ Property propertySingleValued = new Property(collection);
// Create dummy connection manager containing the
// created PropertySingleValued map
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedContainerProperty.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedContainerProperty.java
index 12fecc8..c0b3240 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedContainerProperty.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedContainerProperty.java
@@ -47,7 +47,7 @@
collection.add(2);
// Create PropertySingleValued containing the collection
- Property propertyMeta = factory.create(new Property(), collection);
+ Property propertyMeta = new Property(collection);
propertyMeta.setId(COLLECTIONPROP);
// Create operation
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedMapProperty.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedMapProperty.java
index 7d99fd8..76ea3c3 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedMapProperty.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedMapProperty.java
@@ -13,7 +13,6 @@
import org.eclipse.basyx.aas.backend.connected.TypeDestroyer.TypeDestroyer;
import org.eclipse.basyx.aas.backend.connected.aas.submodelelement.property.ConnectedMapProperty;
import org.eclipse.basyx.aas.backend.provider.VirtualPathModelProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.testsuite.support.vab.stub.VABConnectionManagerStub;
import org.eclipse.basyx.vab.core.VABConnectionManager;
@@ -37,15 +36,13 @@
@Before
public void build() {
- MetaModelElementFactory factory = new MetaModelElementFactory();
-
// Create and fill map
Map<String, Object> map = new HashMap<>();
map.put(MAP_1_KEY, MAP_1_VAL);
map.put(MAP_2_KEY, MAP_2_VAL);
// Create PropertySingleValued containing the map
- Property propertyMeta = factory.create(new Property(), map);
+ Property propertyMeta = new Property(map);
Map<String, Object> destroyType = TypeDestroyer.destroyType(propertyMeta);
// Create dummy connection manager containing the
// created PropertySingleValued map
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedSingleProperty.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedSingleProperty.java
index abd3709..77504eb 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedSingleProperty.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/connected/property/TestConnectedSingleProperty.java
@@ -8,7 +8,6 @@
import org.eclipse.basyx.aas.backend.connected.TypeDestroyer.TypeDestroyer;
import org.eclipse.basyx.aas.backend.connected.aas.submodelelement.property.ConnectedSingleProperty;
import org.eclipse.basyx.aas.backend.provider.VirtualPathModelProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.testsuite.support.vab.stub.VABConnectionManagerStub;
import org.junit.Before;
@@ -27,10 +26,8 @@
@Before
public void build() {
- MetaModelElementFactory factory = new MetaModelElementFactory();
-
// Create PropertySingleValued containing the simple value
- Property propertyMeta = factory.create(new Property(), VALUE);
+ Property propertyMeta = new Property(VALUE);
Map<String, Object> destroyType = TypeDestroyer.destroyType(propertyMeta);
prop = new ConnectedSingleProperty(new VABConnectionManagerStub(new VirtualPathModelProvider(destroyType)).connectToVABElement(""));
}
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/provider/VirtualPathModelProviderTest.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/provider/VirtualPathModelProviderTest.java
index e68c2a9..52bbd19 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/provider/VirtualPathModelProviderTest.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/backend/provider/VirtualPathModelProviderTest.java
@@ -8,7 +8,6 @@
import org.eclipse.basyx.aas.backend.connector.ConnectorProvider;
import org.eclipse.basyx.aas.backend.provider.VirtualPathModelProvider;
-import org.eclipse.basyx.aas.metamodel.factory.MetaModelElementFactory;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.Property;
import org.eclipse.basyx.aas.metamodel.hashmap.aas.submodelelement.property.valuetypedef.PropertyValueTypeDefHelper;
import org.eclipse.basyx.testsuite.regression.vab.provider.TestProvider;
@@ -48,7 +47,7 @@
VABElementProxy submodelElement = getConnectionManager().connectToVABElement(submodelAddr);
// Create element
- Property prop = new MetaModelElementFactory().create(new Property(), 500);
+ Property prop = new Property(500);
submodelElement.createValue("dataElements/newProperty", prop);
// Read back value
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/support/aas/vab/stub/elements/SimpleAASSubmodel.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/support/aas/vab/stub/elements/SimpleAASSubmodel.java
index 526fa8b..1339beb 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/support/aas/vab/stub/elements/SimpleAASSubmodel.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/support/aas/vab/stub/elements/SimpleAASSubmodel.java
@@ -34,11 +34,11 @@
// Create example properties
MetaModelElementFactory fac = new MetaModelElementFactory();
- Property intProp = fac.create(new Property(), 123);
+ Property intProp = new Property(123);
intProp.setId("integerProperty");
addDataElement(intProp);
- Property stringProp = fac.create(new Property(), "Test");
+ Property stringProp = new Property("Test");
stringProp.setId("stringProperty");
addDataElement(stringProp);