Merge pull request #13 from FriedJannik/feat/noExtSubj

Final fix final

Author: FriedJannik

basyx.aasregistry/basyx.aasregistry-feature-search/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/feature/search/SearchAasRegistryApiHTTPController.java

@@ -81,6 +81,7 @@ public ResponseEntity<QueryResponse> queryAssetAdministrationShellDescriptors(In
                     String identifier = ((ObjectNode) id).get("id").asText();
                     AssetAdministrationShellDescriptor desc = backend.getAasDescriptor(identifier);
                     aasDescs.add(desc);
+                    try {
                     if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
                         List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
                         for(SpecificAssetId sId : desc.getSpecificAssetIds()) {
@@ -95,6 +96,7 @@ public ResponseEntity<QueryResponse> queryAssetAdministrationShellDescriptors(In
                         }
                         desc.setSpecificAssetIds(newIdsWithoutExternalSubjectID);
                     }
+            }catch(Exception ignored){}
                 }
                 queryResponse.result = aasDescs.stream()
                         .map(aasDesc -> (Object) aasDesc)

basyx.aasregistry/basyx.aasregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/api/BasyxRegistryApiDelegate.java

@@ -75,20 +75,22 @@ public ResponseEntity<GetAssetAdministrationShellDescriptorsResult> getAllAssetA
 		result.setResult(allDescriptors.getResult());
 		for(int i = 0; i<allDescriptors.getResult().size(); i++) {
 			AssetAdministrationShellDescriptor desc = allDescriptors.getResult().get(i);
-			if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
-				List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
-				for(SpecificAssetId sId : desc.getSpecificAssetIds()) {
-					SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
-					if (sId.getSupplementalSemanticIds() != null) {
-						newId.setSupplementalSemanticIds(sId.getSupplementalSemanticIds());
+			try {
+				if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
+					List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
+					for (SpecificAssetId sId : desc.getSpecificAssetIds()) {
+						SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
+						if (sId.getSupplementalSemanticIds() != null) {
+							newId.setSupplementalSemanticIds(sId.getSupplementalSemanticIds());
+						}
+						if (sId.getSemanticId() != null) {
+							newId.setSemanticId(sId.getSemanticId());
+						}
+						newIdsWithoutExternalSubjectID.add(newId);
 					}
-					if (sId.getSemanticId() != null) {
-						newId.setSemanticId(sId.getSemanticId());
-					}
-					newIdsWithoutExternalSubjectID.add(newId);
+					desc.setSpecificAssetIds(newIdsWithoutExternalSubjectID);
 				}
-				desc.setSpecificAssetIds(newIdsWithoutExternalSubjectID);
-			}
+			}catch(Exception ignored){}
 		}
 		return new ResponseEntity<>(result, HttpStatus.OK);
 	}
@@ -109,20 +111,22 @@ public ResponseEntity<GetSubmodelDescriptorsResult> getAllSubmodelDescriptorsThr
 	public ResponseEntity<AssetAdministrationShellDescriptor> getAssetAdministrationShellDescriptorById(String aasIdentifier) {
 		AssetAdministrationShellDescriptor desc = storage.getAasDescriptor(aasIdentifier);
 
-		if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
-			List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
-			for(SpecificAssetId sId : desc.getSpecificAssetIds()) {
-				SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
-				if (sId.getSupplementalSemanticIds() != null) {
-					newId.setSupplementalSemanticIds(sId.getSupplementalSemanticIds());
-				}
-				if (sId.getSemanticId() != null) {
-					newId.setSemanticId(sId.getSemanticId());
+		try {
+			if (desc.getSpecificAssetIds() != null || !desc.getSpecificAssetIds().isEmpty()) {
+				List<SpecificAssetId> newIdsWithoutExternalSubjectID = new ArrayList<>();
+				for(SpecificAssetId sId : desc.getSpecificAssetIds()) {
+					SpecificAssetId newId = new SpecificAssetId(sId.getName(), sId.getValue());
+					if (sId.getSupplementalSemanticIds() != null) {
+						newId.setSupplementalSemanticIds(sId.getSupplementalSemanticIds());
+					}
+					if (sId.getSemanticId() != null) {
+						newId.setSemanticId(sId.getSemanticId());
+					}
+					newIdsWithoutExternalSubjectID.add(newId);
 				}
-				newIdsWithoutExternalSubjectID.add(newId);
+				desc.setSpecificAssetIds(newIdsWithoutExternalSubjectID);
 			}
-			desc.setSpecificAssetIds(newIdsWithoutExternalSubjectID);
-		}
+		}catch(Exception ignored){}
 		return new ResponseEntity<>(desc, HttpStatus.OK);
 	}