Adds AAS Discovery Integration for AAS Repository

.github/workflows/basyx_test.yml

@@ -39,6 +39,9 @@ jobs:
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
 
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -91,6 +94,9 @@ jobs:
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
 
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -156,6 +162,9 @@ jobs:
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
 
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -221,6 +230,9 @@ jobs:
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
 
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -285,7 +297,10 @@ jobs:
 
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
-
+
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -340,7 +355,10 @@ jobs:
 
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
-
+
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -405,7 +423,10 @@ jobs:
 
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
-
+
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -460,7 +481,10 @@ jobs:
 
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
-
+
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -525,7 +549,10 @@ jobs:
 
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
-
+
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -591,6 +618,9 @@ jobs:
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
 
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 
@@ -656,6 +686,9 @@ jobs:
       - name: Build BaSyx
         run: mvn clean install ${MVN_ARGS_BUILD_BASYX}
 
+      - name: Build Discovery Service
+        run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.aasdiscoveryservice.component"
+
       - name: Build Submodel Repository
         run: mvn package -DskipTests -Ddocker.namespace=eclipsebasyx --pl "org.eclipse.digitaltwin.basyx:basyx.submodelrepository.component"
 

basyx.aasdiscoveryservice/basyx.aasdiscoveryservice-client/src/main/java/org/eclipse/digitaltwin/basyx/aasdiscoveryservice/client/ConnectedAasDiscoveryService.java

@@ -61,7 +61,7 @@ public CursorResult<List<String>> getAllAssetAdministrationShellIdsByAssetLink(P
             return discoveryApi.getAllAssetAdministrationShellIdsByAssetLink(assetIds, pInfo.getLimit(), pInfo.getCursor());
         } catch (ApiException e) {
             if(e.getCode() == HttpStatus.NOT_FOUND.value()){
-                throw new AssetLinkDoesNotExistException("No matching element for given assetIds");
+                throw new AssetLinkDoesNotExistException();
             } else {
                 throw new RuntimeException("Error while getting all Asset Administration Shell IDs by Asset Link", e);
             }
@@ -74,7 +74,7 @@ public List<SpecificAssetId> getAllAssetLinksById(String shellIdentifier) {
             return discoveryApi.getAllAssetLinksById(shellIdentifier);
         } catch (ApiException e) {
             if(e.getCode() == HttpStatus.NOT_FOUND.value()){
-                throw new AssetLinkDoesNotExistException("Element with id "+shellIdentifier+" does not exist");
+                throw new AssetLinkDoesNotExistException(shellIdentifier);
             } else {
                 throw new RuntimeException("Error while getting all Asset Links by ID", e);
             }
@@ -87,7 +87,7 @@ public List<SpecificAssetId> createAllAssetLinksById(String shellIdentifier, Lis
             return discoveryApi.postAllAssetLinksById(shellIdentifier, assetIds);
         } catch (ApiException e) {
             if(e.getCode() == HttpStatus.CONFLICT.value()){
-                throw new CollidingAssetLinkException("Asset Links for shell "+shellIdentifier+" already exists");
+                throw new CollidingAssetLinkException(shellIdentifier);
             } else {
                 throw new RuntimeException("Error while creating all Asset Links by ID", e);
             }
@@ -100,7 +100,7 @@ public void deleteAllAssetLinksById(String shellIdentifier) {
             discoveryApi.deleteAllAssetLinksById(shellIdentifier);
         } catch (ApiException e) {
             if(e.getCode() == HttpStatus.NOT_FOUND.value()){
-                throw new AssetLinkDoesNotExistException("Element with id "+shellIdentifier+" does not exist");
+                throw new AssetLinkDoesNotExistException(shellIdentifier);
             } else {
                 throw new RuntimeException("Error while deleting all Asset Links by ID", e);
             }

basyx.aasenvironment/basyx.aasenvironment.component/src/main/resources/application.properties

@@ -73,4 +73,25 @@ basyx.backend = InMemory
 ####################################################################################
 # To define the total request size for a multipart/form-data (default 10 MB)
 
-# spring.servlet.multipart.max-request-size=128KB
+# spring.servlet.multipart.max-request-size=128KB
+
+####################################################################################
+# Feature: Registry Integration
+####################################################################################
+#basyx.aasrepository.feature.registryintegration=http://localhost:8050
+#basyx.externalurl=http://localhost:8081
+#basyx.aasrepository.feature.registryintegration.authorization.enabled=true
+#basyx.aasrepository.feature.registryintegration.authorization.token-endpoint=http://localhost/realms/BaSyx/protocol/openid-connect/token
+#basyx.aasrepository.feature.registryintegration.authorization.grant-type = CLIENT_CREDENTIALS
+#basyx.aasrepository.feature.registryintegration.authorization.client-id=workstation-1
+#basyx.aasrepository.feature.registryintegration.authorization.client-secret=nY0mjyECF60DGzNmQUjL81XurSl8etom
+
+####################################################################################
+# Feature: Discovery Integration
+####################################################################################
+#basyx.aasrepository.feature.discoveryintegration=http://localhost:8084
+#basyx.aasrepository.feature.discoveryintegration.authorization.enabled=true
+#basyx.aasrepository.feature.discoveryintegration.authorization.token-endpoint=http://localhost/realms/BaSyx/protocol/openid-connect/token
+#basyx.aasrepository.feature.discoveryintegration.authorization.grant-type = CLIENT_CREDENTIALS
+#basyx.aasrepository.feature.discoveryintegration.authorization.client-id=workstation-1
+#basyx.aasrepository.feature.discoveryintegration.authorization.client-secret=nY0mjyECF60DGzNmQUjL81XurSl8etom

basyx.aasrepository/basyx.aasrepository-feature-discovery-integration/pom.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.eclipse.digitaltwin.basyx</groupId>
+        <artifactId>basyx.aasrepository</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>basyx.aasrepository-feature-discovery-integration</artifactId>
+    <name>BaSyx AAS Repository feature-discovery-integration</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.digitaltwin.basyx</groupId>
+            <artifactId>basyx.aasdiscoveryservice-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.digitaltwin.basyx</groupId>
+            <artifactId>basyx.aasrepository-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.digitaltwin.basyx</groupId>
+            <artifactId>basyx.http</artifactId>
+            <scope>test</scope>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.digitaltwin.basyx</groupId>
+            <artifactId>basyx.http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.digitaltwin.basyx</groupId>
+            <artifactId>basyx.aasrepository-http</artifactId>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.digitaltwin.basyx</groupId>
+            <artifactId>basyx.filerepository-backend-inmemory</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.digitaltwin.basyx</groupId>
+            <artifactId>basyx.aasrepository-http</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.digitaltwin.basyx</groupId>
+            <artifactId>basyx.aasservice-backend-inmemory</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.digitaltwin.basyx</groupId>
+            <artifactId>basyx.aasrepository-backend-inmemory</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>