exclusion optimization and discovery behaviour adjust acc to actual

Author: faheem

basyx.aasdigitaltwinregistry/basyx.digitaltwinregistry.component/src/main/java/org/eclipse/digitaltwin/basyx/digitaltwinregistry/component/DigitalTwinRegistry.java

@@ -25,13 +25,9 @@
 
 package org.eclipse.digitaltwin.basyx.digitaltwinregistry.component;
 
-
 import org.eclipse.digitaltwin.basyx.aasdiscoveryservice.component.AasDiscoveryServiceComponent;
-import org.eclipse.digitaltwin.basyx.aasdiscoveryservice.component.AasDiscoveryServiceFeaturePrinter;
-
 import org.eclipse.digitaltwin.basyx.aasregistry.service.api.*;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.configuration.HomeController;
-import org.eclipse.digitaltwin.basyx.aasregistry.service.configuration.MongoDbConfiguration;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.events.RegistryEventLogSink;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -98,17 +94,10 @@
 						type = FilterType.ASSIGNABLE_TYPE,
 						value = org.eclipse.digitaltwin.basyx.aasregistry.service.configuration.SpringDocConfiguration.class
 				),
-				@ComponentScan.Filter(
-						type = FilterType.ASSIGNABLE_TYPE,
-						value = AasDiscoveryServiceFeaturePrinter.class
-				),
+
 				@ComponentScan.Filter(
 						type = FilterType.ASSIGNABLE_TYPE,
 						value = org.eclipse.digitaltwin.basyx.aasdiscoveryservice.http.documentation.AasDiscoveryServiceApiDocumentationConfiguration.class
-				),
-				@ComponentScan.Filter(
-						type = FilterType.ASSIGNABLE_TYPE,
-						value = MongoDbConfiguration.class
 				)
 		}
 )

basyx.aasregistry/basyx.aasregistry-feature-discovery-integration/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/feature/discovery/integration/DiscoveryIntegrationAasRegistry.java

@@ -72,7 +72,6 @@ public AssetAdministrationShellDescriptor getAasDescriptor(@NonNull String aasDe
 	@Override
 	public void insertAasDescriptor(AssetAdministrationShellDescriptor descr) throws AasDescriptorAlreadyExistsException {
 		decorated.insertAasDescriptor(descr);
-		String encodedId = Base64.getEncoder().encodeToString(descr.getId().getBytes());
 				@Valid List<org.eclipse.digitaltwin.basyx.aasregistry.model.@Valid SpecificAssetId> ids = descr.getSpecificAssetIds();
 				List<SpecificAssetId> specificAssetIds = ids.stream()
 						.map(rId -> {
@@ -81,15 +80,12 @@ public void insertAasDescriptor(AssetAdministrationShellDescriptor descr) throws
 							assetId.setValue(rId.getValue());
 							return assetId;
 						}).collect(Collectors.toList());
-
-		discoveryApi.createAllAssetLinksById(encodedId, specificAssetIds);
+		discoveryApi.createAllAssetLinksById(descr.getId(), specificAssetIds);
 	}
 
 	@Override
 	public void replaceAasDescriptor(@NonNull String aasDescriptorId, @NonNull AssetAdministrationShellDescriptor descriptor) throws AasDescriptorNotFoundException {
 		decorated.replaceAasDescriptor(aasDescriptorId, descriptor);
-		String encodedId = Base64.getEncoder().encodeToString(aasDescriptorId.getBytes());
-
 		List<SpecificAssetId> specificAssetIds = descriptor.getSpecificAssetIds().stream()
 				.map(rId -> {
 					SpecificAssetId assetId = new DefaultSpecificAssetId();
@@ -98,14 +94,14 @@ public void replaceAasDescriptor(@NonNull String aasDescriptorId, @NonNull Asset
 					return assetId;
 				}).collect(Collectors.toList());
 
-		discoveryApi.deleteAllAssetLinksById(encodedId);
-		discoveryApi.createAllAssetLinksById(encodedId, specificAssetIds);
+		discoveryApi.deleteAllAssetLinksById(aasDescriptorId);
+		discoveryApi.createAllAssetLinksById(aasDescriptorId, specificAssetIds);
 	}
 
 	@Override
 	public void removeAasDescriptor(@NonNull String aasDescriptorId) throws AasDescriptorNotFoundException {
 		decorated.removeAasDescriptor(aasDescriptorId);
-		discoveryApi.deleteAllAssetLinksById(Base64.getEncoder().encodeToString(aasDescriptorId.getBytes()));
+		discoveryApi.deleteAllAssetLinksById(aasDescriptorId);
 	}
 
 	@Override