Merge "Adds test for MetamodelToAASXConverter" into development
diff --git a/components/basys.components/basyx.components.docker/basyx.components.AASServer/Dockerfile b/components/basys.components/basyx.components.docker/basyx.components.AASServer/Dockerfile
index e199c91..247c7c7 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.AASServer/Dockerfile
+++ b/components/basys.components/basyx.components.docker/basyx.components.AASServer/Dockerfile
@@ -1,5 +1,7 @@
# Add java runtime environment for execution
-FROM java:8-jdk-alpine
+FROM alpine
+
+RUN apk update && apk add openjdk8
# Copy built jar to image using the jar name specified in the pom.xml (JAR_FILE)
ARG JAR_FILE
diff --git a/components/basys.components/basyx.components.docker/basyx.components.AASServer/pom.xml b/components/basys.components/basyx.components.docker/basyx.components.AASServer/pom.xml
index d73f236..4928e9a 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.AASServer/pom.xml
+++ b/components/basys.components/basyx.components.docker/basyx.components.AASServer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.docker</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>basyx.components.AASServer</artifactId>
diff --git a/components/basys.components/basyx.components.docker/basyx.components.AASServer/src/test/resources/.env b/components/basys.components/basyx.components.docker/basyx.components.AASServer/src/test/resources/.env
index dc2072c..8c196ad 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.AASServer/src/test/resources/.env
+++ b/components/basys.components/basyx.components.docker/basyx.components.AASServer/src/test/resources/.env
@@ -28,7 +28,7 @@
# ##################
# The image tag of the image that is build for this component
-BASYX_IMAGE_TAG=1.0.0
+BASYX_IMAGE_TAG=1.1.0-SNAPSHOT
# ##################
# Container Name
diff --git a/components/basys.components/basyx.components.docker/basyx.components.registry/Dockerfile b/components/basys.components/basyx.components.docker/basyx.components.registry/Dockerfile
index c9f4b78..7180794 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.registry/Dockerfile
+++ b/components/basys.components/basyx.components.docker/basyx.components.registry/Dockerfile
@@ -1,5 +1,7 @@
# Add java runtime environment for execution
-FROM java:8-jdk-alpine
+FROM alpine
+
+RUN apk update && apk add openjdk8
# Copy built jar to image using the jar name specified in the pom.xml (JAR_FILE)
ARG JAR_FILE
diff --git a/components/basys.components/basyx.components.docker/basyx.components.registry/pom.xml b/components/basys.components/basyx.components.docker/basyx.components.registry/pom.xml
index 454e2d0..4f075cd 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.registry/pom.xml
+++ b/components/basys.components/basyx.components.docker/basyx.components.registry/pom.xml
@@ -6,12 +6,11 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.docker</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>basyx.components.registry</artifactId>
<name>BaSyx Registry</name>
- <version>1.0.2</version>
<properties>
<basyx.components.executable>org.eclipse.basyx.components.registry.executable.RegistryExecutable</basyx.components.executable>
diff --git a/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/resources/.env b/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/resources/.env
index 36083e8..dcd1e6c 100644
--- a/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/resources/.env
+++ b/components/basys.components/basyx.components.docker/basyx.components.registry/src/test/resources/.env
@@ -28,7 +28,7 @@
# ##################
# The image tag of the image that is build for this component
-BASYX_IMAGE_TAG=1.0.2
+BASYX_IMAGE_TAG=1.1.0-SNAPSHOT
# ##################
# Container Name
diff --git a/components/basys.components/basyx.components.docker/pom.xml b/components/basys.components/basyx.components.docker/pom.xml
index 6afe083..1ec8ce1 100644
--- a/components/basys.components/basyx.components.docker/pom.xml
+++ b/components/basys.components/basyx.components.docker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>basyx.components.docker</artifactId>
@@ -178,7 +178,7 @@
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.lib</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/components/basys.components/basyx.components.lib/pom.xml b/components/basys.components/basyx.components.lib/pom.xml
index ff64f46..b3add26 100644
--- a/components/basys.components/basyx.components.lib/pom.xml
+++ b/components/basys.components/basyx.components.lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>basyx.components.lib</artifactId>
diff --git a/components/basys.components/pom.xml b/components/basys.components/pom.xml
index 9dd688e..e515498 100644
--- a/components/basys.components/pom.xml
+++ b/components/basys.components/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>BaSyx Components</name>
<packaging>pom</packaging>
diff --git a/components/basyx.tck/basyx.tck.AASServer/pom.xml b/components/basyx.tck/basyx.tck.AASServer/pom.xml
index f4b0326..4956e64 100644
--- a/components/basyx.tck/basyx.tck.AASServer/pom.xml
+++ b/components/basyx.tck/basyx.tck.AASServer/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.tck</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>basyx.tck.AASServer</artifactId>
diff --git a/components/basyx.tck/basyx.tck.registry/pom.xml b/components/basyx.tck/basyx.tck.registry/pom.xml
index b609541..60a6b57 100644
--- a/components/basyx.tck/basyx.tck.registry/pom.xml
+++ b/components/basyx.tck/basyx.tck.registry/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.tck</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>basyx.tck.registry</artifactId>
diff --git a/components/basyx.tck/pom.xml b/components/basyx.tck/pom.xml
index 443ef33..40a489e 100644
--- a/components/basyx.tck/pom.xml
+++ b/components/basyx.tck/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.tck</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/examples/basys.examples/pom.xml b/examples/basys.examples/pom.xml
index 8094d94..7dd6aec 100644
--- a/examples/basys.examples/pom.xml
+++ b/examples/basys.examples/pom.xml
@@ -104,21 +104,21 @@
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.lib</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<!-- Add explicit SQLRegistry dependency -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.registry</artifactId>
- <version>1.0.2</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<!-- Add explicit AAS Server component dependency -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.AASServer</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<!-- Adds additional classes of the BaSys SDK for tests -->
diff --git a/examples/basyx.aasWrapper/Dockerfile b/examples/basyx.aasWrapper/Dockerfile
index 5c98c98..3782744 100644
--- a/examples/basyx.aasWrapper/Dockerfile
+++ b/examples/basyx.aasWrapper/Dockerfile
@@ -1,5 +1,7 @@
# Add java runtime environment for execution
-FROM java:8-jdk-alpine
+FROM alpine
+
+RUN apk update && apk add openjdk8
# Copy built jar to image using the jar name specified in the pom.xml (JAR_FILE)
ARG JAR_FILE
diff --git a/examples/basyx.aasWrapper/pom.xml b/examples/basyx.aasWrapper/pom.xml
index 599b939..a9e6d24 100644
--- a/examples/basyx.aasWrapper/pom.xml
+++ b/examples/basyx.aasWrapper/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.docker</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>basyx.components.AASWrapper</artifactId>
diff --git a/examples/basyx.dashboardAAS/Dockerfile b/examples/basyx.dashboardAAS/Dockerfile
index 1a26b27..4b872c0 100644
--- a/examples/basyx.dashboardAAS/Dockerfile
+++ b/examples/basyx.dashboardAAS/Dockerfile
@@ -1,5 +1,7 @@
# Add java runtime environment for execution
-FROM java:8-jdk-alpine
+FROM alpine
+
+RUN apk update && apk add openjdk8
# Copy built jar to image using the jar name specified in the pom.xml (JAR_FILE)
ARG JAR_FILE
diff --git a/examples/basyx.dashboardAAS/pom.xml b/examples/basyx.dashboardAAS/pom.xml
index 183dff4..a0a29b7 100644
--- a/examples/basyx.dashboardAAS/pom.xml
+++ b/examples/basyx.dashboardAAS/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.docker</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>basyx.components.dashboardAAS</artifactId>
diff --git a/examples/basyx.hello_world/pom.xml b/examples/basyx.hello_world/pom.xml
index d5aa122..faec705 100644
--- a/examples/basyx.hello_world/pom.xml
+++ b/examples/basyx.hello_world/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.hello_world</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>BaSyx Hello World</name>
<properties>
@@ -32,21 +32,21 @@
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.lib</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<!-- Add Registry Server component dependency -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.registry</artifactId>
- <version>1.0.2</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<!-- Add AAS Server component dependency -->
<dependency>
<groupId>org.eclipse.basyx</groupId>
<artifactId>basyx.components.AASServer</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
diff --git a/examples/basyx.nodered/build.bat b/examples/basyx.nodered/build.bat
index 2e8d0e9..c6cb94e 100644
--- a/examples/basyx.nodered/build.bat
+++ b/examples/basyx.nodered/build.bat
@@ -1 +1 @@
-docker build -t eclipsebasyx/examples-dataflow-node-red:1.1.0-SNAPSHOT .
\ No newline at end of file
+docker build -t eclipsebasyx/examples-dataflow-nodered:1.1.0-SNAPSHOT .
\ No newline at end of file
diff --git a/examples/basyx.nodered/build.sh b/examples/basyx.nodered/build.sh
index c669e76..040f564 100644
--- a/examples/basyx.nodered/build.sh
+++ b/examples/basyx.nodered/build.sh
@@ -1,2 +1,2 @@
#!/usr/bin/env sh
-docker build -t eclipsebasyx/examples-dataflow-node-red:1.1.0-SNAPSHOT .
\ No newline at end of file
+docker build -t eclipsebasyx/examples-dataflow-nodered:1.1.0-SNAPSHOT .
\ No newline at end of file
diff --git a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/restapi/OperationProvider.java b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/restapi/OperationProvider.java
index 0eb9899..f69366a 100644
--- a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/restapi/OperationProvider.java
+++ b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/restapi/OperationProvider.java
@@ -20,11 +20,11 @@
import org.eclipse.basyx.submodel.metamodel.api.submodelelement.operation.IOperationVariable;
import org.eclipse.basyx.submodel.metamodel.map.submodelelement.SubmodelElement;
-import org.eclipse.basyx.submodel.metamodel.map.submodelelement.operation.DelegatedInvocationHelper;
import org.eclipse.basyx.submodel.metamodel.map.submodelelement.operation.Operation;
import org.eclipse.basyx.submodel.metamodel.map.submodelelement.operation.OperationVariable;
import org.eclipse.basyx.submodel.restapi.operation.AsyncOperationHandler;
import org.eclipse.basyx.submodel.restapi.operation.CallbackResponse;
+import org.eclipse.basyx.submodel.restapi.operation.DelegatedInvocationHelper;
import org.eclipse.basyx.submodel.restapi.operation.ExecutionState;
import org.eclipse.basyx.submodel.restapi.operation.InvocationRequest;
import org.eclipse.basyx.submodel.restapi.operation.InvocationResponse;
diff --git a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/metamodel/map/submodelelement/operation/DelegatedInvocationHelper.java b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/restapi/operation/DelegatedInvocationHelper.java
similarity index 82%
rename from sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/metamodel/map/submodelelement/operation/DelegatedInvocationHelper.java
rename to sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/restapi/operation/DelegatedInvocationHelper.java
index a0985dd..f304e05 100644
--- a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/metamodel/map/submodelelement/operation/DelegatedInvocationHelper.java
+++ b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/submodel/restapi/operation/DelegatedInvocationHelper.java
@@ -9,13 +9,14 @@
* SPDX-License-Identifier: EPL-2.0
******************************************************************************/
-package org.eclipse.basyx.submodel.metamodel.map.submodelelement.operation;
+package org.eclipse.basyx.submodel.restapi.operation;
import java.util.Collection;
import java.util.Map;
import org.eclipse.basyx.submodel.metamodel.api.qualifier.qualifiable.IConstraint;
import org.eclipse.basyx.submodel.metamodel.map.qualifier.qualifiable.Qualifier;
+import org.eclipse.basyx.submodel.metamodel.map.submodelelement.operation.Operation;
import org.eclipse.basyx.vab.protocol.http.connector.HTTPConnectorFactory;
/**
@@ -37,12 +38,12 @@
/**
* Invokes delegated operation using delegated URL
- * @param operaiton
+ * @param operation
* @param parameters
* @return
*/
- public static Object invokeDelegatedOperation(Operation operaiton, Object... parameters) {
- String delegatedUrl = getDelegatedURL(operaiton);
+ public static Object invokeDelegatedOperation(Operation operation, Object... parameters) {
+ String delegatedUrl = getDelegatedURL(operation);
return new HTTPConnectorFactory()
.getConnector(delegatedUrl)
.invokeOperation("", parameters);
@@ -73,10 +74,14 @@
Collection<IConstraint> constraints = operation.getQualifiers();
for (IConstraint constraint : constraints) {
Qualifier qualifier = Qualifier.createAsFacade((Map<String, Object>)constraint);
- if (qualifier.getType() != null && qualifier.getType().equalsIgnoreCase(DELEGATION_TYPE)) {
+ if (isDelegationQualifier(qualifier)) {
return qualifier;
}
}
return null;
}
+
+ private static boolean isDelegationQualifier(Qualifier qualifier) {
+ return qualifier.getType() != null && qualifier.getType().equalsIgnoreCase(DELEGATION_TYPE);
+ }
}
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/submodel/restapi/OperationProviderTest.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/submodel/restapi/OperationProviderTest.java
index e4382dd..6bc351c 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/submodel/restapi/OperationProviderTest.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/submodel/restapi/OperationProviderTest.java
@@ -24,11 +24,11 @@
import org.eclipse.basyx.submodel.metamodel.api.submodelelement.operation.IOperationVariable;
import org.eclipse.basyx.submodel.metamodel.map.qualifier.qualifiable.Qualifier;
import org.eclipse.basyx.submodel.metamodel.map.submodelelement.dataelement.property.Property;
-import org.eclipse.basyx.submodel.metamodel.map.submodelelement.operation.DelegatedInvocationHelper;
import org.eclipse.basyx.submodel.metamodel.map.submodelelement.operation.Operation;
import org.eclipse.basyx.submodel.metamodel.map.submodelelement.operation.OperationVariable;
import org.eclipse.basyx.submodel.restapi.OperationProvider;
import org.eclipse.basyx.submodel.restapi.operation.CallbackResponse;
+import org.eclipse.basyx.submodel.restapi.operation.DelegatedInvocationHelper;
import org.eclipse.basyx.submodel.restapi.operation.InvocationRequest;
import org.eclipse.basyx.submodel.restapi.operation.InvocationResponse;
import org.eclipse.basyx.vab.exception.provider.MalformedRequestException;
