Merge pull request #8 from FriedJannik/feat/noExtSubj

Adapts things

Author: FriedJannik

.github/workflows/docker-snapshot-release.yml

@@ -29,38 +29,9 @@ jobs:
     strategy:
       matrix:
         include:
-        - name: aas-environment
-          path: basyx.aasenvironment/basyx.aasenvironment.component
-        - name: aas-repository
-          path: basyx.aasrepository/basyx.aasrepository.component
-        - name: submodel-repository
-          path: basyx.submodelrepository/basyx.submodelrepository.component
-        - name: submodel-service
-          path: basyx.submodelservice/basyx.submodelservice.component
-        - name: conceptdescription-repository
-          path: basyx.conceptdescriptionrepository/basyx.conceptdescriptionrepository.component
-        - name: aas-discovery
-          path: basyx.aasdiscoveryservice/basyx.aasdiscoveryservice.component
-        - name: aasxfileserver
-          path: basyx.aasxfileserver/basyx.aasxfileserver.component
-        - name: aas-registry-kafka-mem
-          path: basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/src/main/docker
-        - name: aas-registry-kafka-mongodb
-          path: basyx.aasregistry/basyx.aasregistry-service-release-kafka-mongodb/src/main/docker
-        - name: aas-registry-log-mem
-          path: basyx.aasregistry/basyx.aasregistry-service-release-log-mem/src/main/docker
         - name: aas-registry-log-mongodb
           path: basyx.aasregistry/basyx.aasregistry-service-release-log-mongodb/src/main/docker
-        - name: submodel-registry-kafka-mem
-          path: basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mem/src/main/docker
-        - name: submodel-registry-kafka-mongodb
-          path: basyx.submodelregistry/basyx.submodelregistry-service-release-kafka-mongodb/src/main/docker
-        - name: submodel-registry-log-mem
-          path: basyx.submodelregistry/basyx.submodelregistry-service-release-log-mem/src/main/docker
-        - name: submodel-registry-log-mongodb
-          path: basyx.submodelregistry/basyx.submodelregistry-service-release-log-mongodb/src/main/docker
-        - name: digitaltwinregistry
-          path: basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component
+
 
     steps:
       - name: Checkout Code

basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/mongodb/MongoDbAasRegistryStorage.java

@@ -92,7 +92,7 @@ public CursorResult<List<AssetAdministrationShellDescriptor>> getAllAasDescripto
 		String cursor = resolveCursor(pRequest, foundDescriptors, AssetAdministrationShellDescriptor::getId);
 		foundDescriptors.forEach(desc -> {
 			List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
-			if (!desc.getSpecificAssetIds().isEmpty()) {
+			if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
 				desc.getSpecificAssetIds().forEach(sId -> {
 					SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
 					if (!sId.getSupplementalSemanticIds().isEmpty()){
@@ -165,7 +165,7 @@ public AssetAdministrationShellDescriptor getAasDescriptor(@NonNull String aasDe
 			throw new AasDescriptorNotFoundException(aasDescriptorId);
 		}
 		List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
-		if (!descriptor.getSpecificAssetIds().isEmpty()) {
+		if (descriptor.getSpecificAssetIds() != null || !descriptor.getSpecificAssetIds().isEmpty()) {
 			descriptor.getSpecificAssetIds().forEach(sId -> {
 				SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
 				if (!sId.getSupplementalSemanticIds().isEmpty()) {