Adapts Discovery Integration Feature (#736)

* Fixes possible NPE in DiscoveryIntegration

* Update AuthorizedAasRepositoryDiscoveryIntegrationTest.java

* Adds missing Test

* Update DiscoveryIntegrationAasRepository.java

* Update DiscoveryIntegrationAasRepository.java

---------

Co-authored-by: Aaron Zielstorff <aaron.zi@web.de>

Author: FriedJannik

basyx.aasrepository/basyx.aasrepository-feature-discovery-integration/src/main/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/discoveryintegration/DiscoveryIntegrationAasRepository.java

@@ -58,7 +58,7 @@ public class DiscoveryIntegrationAasRepository implements AasRepository {
 	private AasRepository decorated;
 
 	private final AasDiscoveryService discoveryApi;
-	
+
 	public DiscoveryIntegrationAasRepository(AasRepository decorated, AasDiscoveryService discoveryApi) {
 		this.decorated = decorated;
 		this.discoveryApi = discoveryApi;
@@ -94,6 +94,7 @@ public void deleteAas(String shellId) {
 		try {
 			discoveryApi.deleteAllAssetLinksById(shellId);
 		} catch (Exception e){
+			logger.error("Failed to unlink asset in discovery service for AAS ID {}", shellId, e);
 			throw new RepositoryDiscoveryUnlinkException(shellId, e);
 		}
 	}
@@ -162,30 +163,52 @@ private void updateAssetLinks(String shellId, AssetAdministrationShell shell) {
 	}
 
 	private static DefaultSpecificAssetId getGlobalAssetIdAsSpecificAssetId(AssetAdministrationShell shell) {
-		return new DefaultSpecificAssetId.Builder().name("globalAssetId").value(shell.getAssetInformation().getGlobalAssetId()).build();
+		if (shell.getAssetInformation() == null || shell.getAssetInformation().getGlobalAssetId() == null)
+			throw new IllegalArgumentException("AssetInformation or GlobalAssetId is null");
+
+		return new DefaultSpecificAssetId.Builder()
+				.name("globalAssetId")
+				.value(shell.getAssetInformation().getGlobalAssetId())
+				.build();
 	}
 
 	private void createAssetLinksOnDiscoveryServiceIfNecessary(AssetAdministrationShell shell) {
-		List<SpecificAssetId> linksToAdd = new ArrayList<>(shell.getAssetInformation().getSpecificAssetIds());
-		if(shell.getAssetInformation().getGlobalAssetId() != null){
+		if (shell.getAssetInformation() == null) return;
+
+		List<SpecificAssetId> linksToAdd;
+		if (shell.getAssetInformation().getSpecificAssetIds() != null) {
+			linksToAdd = new ArrayList<>(shell.getAssetInformation().getSpecificAssetIds());
+		} else {
+			linksToAdd = new ArrayList<>();
+		}
+
+		if (shell.getAssetInformation().getGlobalAssetId() != null) {
 			linksToAdd.add(getGlobalAssetIdAsSpecificAssetId(shell));
 		}
-		if(!linksToAdd.isEmpty()){
+
+		if(!linksToAdd.isEmpty()) {
 			try {
 				discoveryApi.createAllAssetLinksById(shell.getId(), linksToAdd);
 			} catch (Exception e) {
 				decorated.deleteAas(shell.getId());
+				logger.error("Failed to link asset in discovery service for AAS ID {}", shell.getId(), e);
 				throw new RepositoryDiscoveryLinkException(shell.getId(), e);
 			}
 		}
 	}
 
 	private static boolean specificAssetIdsUpdated(AssetAdministrationShell shell, AssetAdministrationShell oldShell) {
-		return !(oldShell.getAssetInformation().getSpecificAssetIds() != null && oldShell.getAssetInformation().getSpecificAssetIds().equals(shell.getAssetInformation().getSpecificAssetIds()));
+		return !(oldShell.getAssetInformation() != null &&
+				oldShell.getAssetInformation().getSpecificAssetIds() != null &&
+				oldShell.getAssetInformation().getSpecificAssetIds().equals(
+						shell.getAssetInformation().getSpecificAssetIds()));
 	}
 
 	private static boolean isGlobalAssetIdUpdated(AssetAdministrationShell shell, AssetAdministrationShell oldShell) {
-		return !(oldShell.getAssetInformation().getGlobalAssetId() != null && oldShell.getAssetInformation().getGlobalAssetId().equals(shell.getAssetInformation().getGlobalAssetId()));
+		return !(oldShell.getAssetInformation() != null &&
+				oldShell.getAssetInformation().getGlobalAssetId() != null &&
+				oldShell.getAssetInformation().getGlobalAssetId().equals(
+						shell.getAssetInformation().getGlobalAssetId()));
 	}
 
 }

basyx.aasrepository/basyx.aasrepository-feature-discovery-integration/src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/feature/discoveryintegration/AasRepositoryDiscoveryIntegrationTestSuite.java

@@ -114,6 +114,13 @@ public void updateAAS_withGlobalAndSpecificAssetId() {
         }
     }
 
+    @Test
+    public void updateAAS_withoutChange() {
+        executeCreateTestWithProperties(true, false);
+        executeUpdateTestWithProperties(true, false);
+        assertOnlyGlobalAssetIdIsSet(getDemoAAS(true,false));
+    }
+
     @Test
     public void updateAAS() throws IOException {
         AssetAdministrationShell aas = getDemoAAS(true, true);
@@ -213,6 +220,13 @@ private void assertNewAssetLinksAreSet(AssetAdministrationShell aas) {
         assertEquals("test-specific-asset-id-value-2", assetIds.get(1).getValue());
     }
 
+    private void assertOnlyGlobalAssetIdIsSet(AssetAdministrationShell aas) {
+        List<SpecificAssetId> assetIds = getDiscoveryService().getAllAssetLinksById(aas.getId());
+        assertEquals(1, assetIds.size());
+        assertEquals("globalAssetId", assetIds.get(0).getName());
+        assertEquals("test-global-asset-id", assetIds.get(0).getValue());
+    }
+
     private static void addAssetIdToAAS(AssetAdministrationShell aas) {
         AssetInformation info = aas.getAssetInformation();
         List<SpecificAssetId> assetIds = info.getSpecificAssetIds();