Removes redundancy in IAASRegistryService parameters

Change-Id: I6f3d63221049d70ff9382ba84ce67b07818b081b
Signed-off-by: Daniel Espen <daniel.espen@iese.fraunhofer.de>
diff --git a/components/basys.components/src/main/java/org/eclipse/basyx/components/directory/SQLDirectoryProvider.java b/components/basys.components/src/main/java/org/eclipse/basyx/components/directory/SQLDirectoryProvider.java
index 72e5865..c4d42bf 100644
--- a/components/basys.components/src/main/java/org/eclipse/basyx/components/directory/SQLDirectoryProvider.java
+++ b/components/basys.components/src/main/java/org/eclipse/basyx/components/directory/SQLDirectoryProvider.java
@@ -308,7 +308,7 @@
 			AASDescriptor aasDescriptor = new AASDescriptor((Map<String, Object>) values);
 
 			// Extract AAS ID
-			String aasID = aasDescriptor.getId();
+			String aasID = aasDescriptor.getIdentifier().getId();
 	
 			// Update AAS registry
 			sqlDriver.sqlUpdate("INSERT INTO directory.directory (\"ElementRef\", \"ElementID\") VALUES ('"
diff --git a/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestAASServicecall.java b/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestAASServicecall.java
index 1bf51e9..2ae286c 100644
--- a/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestAASServicecall.java
+++ b/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestAASServicecall.java
@@ -9,7 +9,6 @@
 import org.eclipse.basyx.aas.manager.ConnectedAssetAdministrationShellManager;
 import org.eclipse.basyx.aas.metamodel.map.AssetAdministrationShell;
 import org.eclipse.basyx.aas.metamodel.map.descriptor.AASDescriptor;
-import org.eclipse.basyx.aas.metamodel.map.descriptor.ModelUrn;
 import org.eclipse.basyx.aas.metamodel.map.descriptor.SubmodelDescriptor;
 import org.eclipse.basyx.aas.registration.api.IAASRegistryService;
 import org.eclipse.basyx.aas.registration.preconfigured.PreconfiguredRegistry;
@@ -76,8 +75,7 @@
 		AASDescriptor aasDescriptor = new AASDescriptor(id, "/aas");
 		SubmodelDescriptor smDescriptor = new SubmodelDescriptor("submodel1", IdentifierType.URI, "/aas/submodels/submodel1");
 		aasDescriptor.addSubmodelDescriptor(smDescriptor);
-
-		registry.register(new ModelUrn("coilcar"), aasDescriptor);
+		registry.register(aasDescriptor);
 
 		// setup the connection-manager with the model-provider
 		ConnectorProviderStub connectorProvider = new ConnectorProviderStub();
diff --git a/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestDeviceAdministrationShell.java b/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestDeviceAdministrationShell.java
index 6023e74..f800b40 100644
--- a/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestDeviceAdministrationShell.java
+++ b/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestDeviceAdministrationShell.java
@@ -49,7 +49,7 @@
 		SubmodelDescriptor smDescriptor = new SubmodelDescriptor("submodel1", IdentifierType.URI,
 				"http://localhost:8080/basys.components/Testsuite/Processengine/coilcar/aas/submodels/submodel1");
 		ccDescriptor.addSubmodelDescriptor(smDescriptor);
-		registry.register(coilcarUrn, ccDescriptor);
+		registry.register(ccDescriptor);
 		
 		//set-up the administration shell manager to create connected aas
 		manager = new ConnectedAssetAdministrationShellManager(registry, new HTTPConnectorProvider());
diff --git a/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestTransportProcess_ConfigureEngineProgrammatically.java b/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestTransportProcess_ConfigureEngineProgrammatically.java
index f38e731..436fd60 100644
--- a/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestTransportProcess_ConfigureEngineProgrammatically.java
+++ b/components/basys.components/src/test/java/org/eclipse/basyx/regression/processengineconnector/tests/TestTransportProcess_ConfigureEngineProgrammatically.java
@@ -68,7 +68,7 @@
 		ccDescriptor.addSubmodelDescriptor(smDescriptor);
 
 		// register the aas
-		registry.register(coilcarUrn, ccDescriptor);
+		registry.register(ccDescriptor);
 		manager = new ConnectedAssetAdministrationShellManager(registry, new HTTPConnectorProvider());
 		
 		
diff --git a/examples/basys.examples/src/main/java/org/eclipse/basyx/examples/support/directory/ExampleAASRegistry.java b/examples/basys.examples/src/main/java/org/eclipse/basyx/examples/support/directory/ExampleAASRegistry.java
index 47688d1..e2cf7ca 100644
--- a/examples/basys.examples/src/main/java/org/eclipse/basyx/examples/support/directory/ExampleAASRegistry.java
+++ b/examples/basys.examples/src/main/java/org/eclipse/basyx/examples/support/directory/ExampleAASRegistry.java
@@ -13,29 +13,22 @@
 	public ExampleAASRegistry addAASMapping(String rawUrn, String endpoint) {
 		IIdentifier id = new Identifier(IdentifierType.URI, rawUrn);
 		AASDescriptor aasDescriptor = new AASDescriptor(id, endpoint);
-		ModelUrn aasUrn = new ModelUrn(rawUrn);
-		register(aasUrn, aasDescriptor);
-
+		register(aasDescriptor);
 		return this;
 	}
 
-
-
 	public ExampleAASRegistry addSubmodelMapping(String rawAASUrn, String submodelid, String endpoint) {
 		AASDescriptor aasDescriptor;
 		ModelUrn aasUrn = new ModelUrn(rawAASUrn);
 		SubmodelDescriptor smDes = new SubmodelDescriptor(submodelid, IdentifierType.URI, endpoint);
 
-		if (descriptorMap.keySet().contains(aasUrn.getEncodedURN())) {
-			aasDescriptor = descriptorMap.get(aasUrn.getEncodedURN());
+		if (descriptorMap.keySet().contains(aasUrn.getURN())) {
+			aasDescriptor = descriptorMap.get(aasUrn.getURN());
 		} else {
 			throw new RuntimeException("AASDescriptor for " + rawAASUrn + " missing");
 		}
 		aasDescriptor.addSubmodelDescriptor(smDes);
-
-		register(aasUrn, aasDescriptor);
+		register(aasDescriptor);
 		return this;
 	}
-
-
 }
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/device/SmartBaSyxTCPDeviceMockup.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/device/SmartBaSyxTCPDeviceMockup.java
index 3d581f7..84bf2d5 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/device/SmartBaSyxTCPDeviceMockup.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/device/SmartBaSyxTCPDeviceMockup.java
@@ -165,7 +165,7 @@
 		deviceAASDescriptor.addSubmodelDescriptor(statusSMDescriptor);
 		deviceAASDescriptor.addSubmodelDescriptor(controllerSMDescriptor);
 		// - Push AAS descriptor to server
-		getRegistry().register(lookupURN("AAS"), deviceAASDescriptor);		
+		getRegistry().register(deviceAASDescriptor);
 	}
 
 
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/BaSyxTCPControlManufacturingDeviceManager.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/BaSyxTCPControlManufacturingDeviceManager.java
index 882339d..b18c4cb 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/BaSyxTCPControlManufacturingDeviceManager.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/BaSyxTCPControlManufacturingDeviceManager.java
@@ -73,7 +73,7 @@
 		createDeviceAASAndSubModels();
 		
 		// Register AAS and sub model descriptors in directory (push AAS descriptor to server)
-		getRegistry().register(lookupURN("AAS"), getAASDescriptor());
+		getRegistry().register(getAASDescriptor());
 	}
 
 	
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/ManufacturingDeviceManager.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/ManufacturingDeviceManager.java
index eda3860..7a25f5f 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/ManufacturingDeviceManager.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/ManufacturingDeviceManager.java
@@ -106,7 +106,7 @@
 		createDeviceAASAndSubModels();
 		
 		// Register AAS and sub model descriptors in directory (push AAS descriptor to server)
-		getRegistry().register(lookupURN("AAS"), getAASDescriptor());
+		getRegistry().register(getAASDescriptor());
 	}
 	
 	
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToAASEndpoints.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToAASEndpoints.java
index c843e5a..e3b4ad2 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToAASEndpoints.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToAASEndpoints.java
@@ -80,7 +80,7 @@
 		IAASRegistryService regProxy = new AASRegistryProxy(
 				"http://localhost:8080/basys.examples/Components/Directory/SQL");
 		// - Register AAS descriptor with AAS and sub model endpoints in registry
-		regProxy.register(aasURN, aasDescriptor);
+		regProxy.register(aasDescriptor);
 
 		// Create AAS
 		AssetAdministrationShell aas = new AssetAdministrationShell();
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToSubModelEndpoints.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToSubModelEndpoints.java
index 17d0657..ca32f34 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToSubModelEndpoints.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/ConnectToSubModelEndpoints.java
@@ -94,7 +94,7 @@
 		IAASRegistryService regProxy = new AASRegistryProxy(
 				"http://localhost:8080/basys.examples/Components/Directory/SQL");
 		// - Register AAS descriptor with AAS and sub model endpoints in registry
-		regProxy.register(aasURN, aasDescriptor);
+		regProxy.register(aasDescriptor);
 		
 		// Create sub model
 		SubModel submodel = new SubModel();
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/RegisterRetrieveAASEndpoints.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/RegisterRetrieveAASEndpoints.java
index f526e28..a33b6de 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/RegisterRetrieveAASEndpoints.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/snippets/aas/registry/RegisterRetrieveAASEndpoints.java
@@ -83,7 +83,7 @@
 		IAASRegistryService regProxy = new AASRegistryProxy(
 				"http://localhost:8080/basys.examples/Components/Directory/SQL");
 		// - Register AAS descriptor with AAS and sub model endpoints in registry
-		regProxy.register(aasURN, aasDescriptor);
+		regProxy.register(aasDescriptor);
 
 		
 		// Lookup AAS descriptor
diff --git a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/metamodel/map/descriptor/AASDescriptor.java b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/metamodel/map/descriptor/AASDescriptor.java
index 4b20587..eccfa8a 100644
--- a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/metamodel/map/descriptor/AASDescriptor.java
+++ b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/metamodel/map/descriptor/AASDescriptor.java
@@ -83,25 +83,9 @@
 	 * Return AAS ID
 	 */
 	@SuppressWarnings("unchecked")
-	public String getId() {
+	public IIdentifier getIdentifier() {
 		Map<String, Object> identifierModel = (Map<String, Object>) get(Identifiable.IDENTIFICATION);
-		return new IdentifierFacade(identifierModel).getId();
-	}
-	
-	/**
-	 * Return AAS short ID
-	 */
-	public String getShortId() {
-		return (String) get(Referable.IDSHORT);
-	}
-	
-	/**
-	 * Return AAS ID type
-	 */
-	@SuppressWarnings("unchecked")
-	public String getIdType() {
-		Map<String, Object> identifierModel = (Map<String, Object>) get(Identifiable.IDENTIFICATION);
-		return new IdentifierFacade(identifierModel).getIdType();
+		return new IdentifierFacade(identifierModel);
 	}
 	
 	/**
diff --git a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/api/IAASRegistryService.java b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/api/IAASRegistryService.java
index a15ba57..ba99349 100644
--- a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/api/IAASRegistryService.java
+++ b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/api/IAASRegistryService.java
@@ -1,7 +1,7 @@
 package org.eclipse.basyx.aas.registration.api;
 
 import org.eclipse.basyx.aas.metamodel.map.descriptor.AASDescriptor;
-import org.eclipse.basyx.aas.metamodel.map.descriptor.ModelUrn;
+import org.eclipse.basyx.submodel.metamodel.api.identifier.IIdentifier;
 
 
 
@@ -17,7 +17,7 @@
 	/**
 	 * Register AAS descriptor in registry, delete old registration 
 	 */
-	public void register(ModelUrn aasID, AASDescriptor deviceAASDescriptor);
+	public void register(AASDescriptor deviceAASDescriptor);
 	
 	/**
 	 * Only register AAS descriptor in registry
@@ -28,12 +28,12 @@
 	/**
 	 * Delete AAS descriptor from registry
 	 */
-	public void delete(ModelUrn aasID);
+	public void delete(IIdentifier aasID);
 	
 	
 	/**
 	 * Lookup device AAS
 	 */
-	public AASDescriptor lookupAAS(ModelUrn aasID);
+	public AASDescriptor lookupAAS(IIdentifier aasID);
 }
 
diff --git a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/preconfigured/PreconfiguredRegistry.java b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/preconfigured/PreconfiguredRegistry.java
index 494d67e..01d2de0 100644
--- a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/preconfigured/PreconfiguredRegistry.java
+++ b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/preconfigured/PreconfiguredRegistry.java
@@ -4,8 +4,8 @@
 import java.util.Map;
 
 import org.eclipse.basyx.aas.metamodel.map.descriptor.AASDescriptor;
-import org.eclipse.basyx.aas.metamodel.map.descriptor.ModelUrn;
 import org.eclipse.basyx.aas.registration.api.IAASRegistryService;
+import org.eclipse.basyx.submodel.metamodel.api.identifier.IIdentifier;
 
 /**
  * Implements a preconfigured local registry
@@ -14,29 +14,30 @@
 	protected Map<String, AASDescriptor> descriptorMap = new HashMap<>();
 
 	@Override
-	public void register(ModelUrn aasID, AASDescriptor deviceAASDescriptor) {
-		if (descriptorMap.containsKey(aasID.getEncodedURN())) {
-			descriptorMap.remove(aasID.getEncodedURN());
+	public void register(AASDescriptor aasDescriptor) {
+		String aasId = aasDescriptor.getIdentifier().getId();
+		if (descriptorMap.containsKey(aasId)) {
+			descriptorMap.remove(aasId);
 		}
 
-		descriptorMap.put(aasID.getEncodedURN(), deviceAASDescriptor);
+		descriptorMap.put(aasId, aasDescriptor);
 	}
 
 	@Override
-	public void registerOnly(AASDescriptor deviceAASDescriptor) {
-		descriptorMap.put(deviceAASDescriptor.getId(), deviceAASDescriptor);
+	public void registerOnly(AASDescriptor aasDescriptor) {
+		String aasId = aasDescriptor.getIdentifier().getId();
+		descriptorMap.put(aasId, aasDescriptor);
 	}
 
 	@Override
-	public void delete(ModelUrn aasID) {
-		descriptorMap.remove(aasID.getEncodedURN());
+	public void delete(IIdentifier aasIdentifier) {
+		descriptorMap.remove(aasIdentifier.getId());
 
 	}
 
 	@Override
-	public AASDescriptor lookupAAS(ModelUrn aasID) {
-
-		return descriptorMap.get(aasID.getEncodedURN());
+	public AASDescriptor lookupAAS(IIdentifier aasIdentifier) {
+		return descriptorMap.get(aasIdentifier.getId());
 	}
 
 }
diff --git a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/proxy/AASRegistryProxy.java b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/proxy/AASRegistryProxy.java
index f4818fd..a0c54dc 100644
--- a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/proxy/AASRegistryProxy.java
+++ b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/aas/registration/proxy/AASRegistryProxy.java
@@ -5,8 +5,8 @@
 import java.util.Map;
 
 import org.eclipse.basyx.aas.metamodel.map.descriptor.AASDescriptor;
-import org.eclipse.basyx.aas.metamodel.map.descriptor.ModelUrn;
 import org.eclipse.basyx.aas.registration.api.IAASRegistryService;
+import org.eclipse.basyx.submodel.metamodel.api.identifier.IIdentifier;
 import org.eclipse.basyx.vab.coder.json.connector.JSONConnector;
 import org.eclipse.basyx.vab.directory.proxy.VABDirectoryProxy;
 import org.eclipse.basyx.vab.modelprovider.VABElementProxy;
@@ -47,8 +47,8 @@
 	 * Register AAS descriptor in registry, delete old registration
 	 */
 	@Override
-	public void register(ModelUrn aasID, AASDescriptor deviceAASDescriptor) {
-		delete(aasID);
+	public void register(AASDescriptor deviceAASDescriptor) {
+		delete(deviceAASDescriptor.getIdentifier());
 		registerOnly(deviceAASDescriptor);
 	}
 
@@ -58,7 +58,6 @@
 	@Override
 	public void registerOnly(AASDescriptor deviceAASDescriptor) {
 		// Add a mapping from the AAS id to the serialized descriptor
-		System.out.println("Registering at path " + deviceAASDescriptor.getId());
 		try {
 			provider.createValue("", deviceAASDescriptor);
 		} catch (Exception e) {
@@ -70,9 +69,9 @@
 	 * Delete AAS descriptor from registry
 	 */
 	@Override
-	public void delete(ModelUrn aasID) {
+	public void delete(IIdentifier aasIdentifier) {
 		try {
-			this.removeMapping(URLEncoder.encode(aasID.getURN(), "UTF-8"));
+			this.removeMapping(URLEncoder.encode(aasIdentifier.getId(), "UTF-8"));
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
@@ -82,10 +81,10 @@
 	 * Lookup device AAS
 	 */
 	@Override @SuppressWarnings("unchecked")
-	public AASDescriptor lookupAAS(ModelUrn aasID) {
+	public AASDescriptor lookupAAS(IIdentifier aasIdentifier) {
 		Object result = null;
 		try {
-			result = provider.getModelPropertyValue(aasID.getEncodedURN());
+			result = provider.getModelPropertyValue(URLEncoder.encode(aasIdentifier.getId(), "UTF-8"));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/manager/TestAASHTTP.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/manager/TestAASHTTP.java
index b549653..178a529 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/manager/TestAASHTTP.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/manager/TestAASHTTP.java
@@ -61,7 +61,7 @@
 
 		// Create aas descriptor for the aas registry
 		IIdentifier id = new Identifier(IdentifierType.URI, StubAASServlet.AASURN.getURN());
-		AASDescriptor aasDesriptor = new AASDescriptor(id,
+		AASDescriptor aasDescriptor = new AASDescriptor(id,
 				"http://localhost:8080/basys.sdk/Testsuite/StubAAS/aas");
 
 		// Create the submodel descriptor
@@ -69,10 +69,10 @@
 				"http://localhost:8080/basys.sdk/Testsuite/StubAAS/aas/submodels/" + StubAASServlet.SMID);
 
 		// add submodel descriptor to the aas descriptor
-		aasDesriptor.addSubmodelDescriptor(submodelDescriptor);
+		aasDescriptor.addSubmodelDescriptor(submodelDescriptor);
 
 		// register the aas in the registry
-		registry.register(StubAASServlet.AASURN, aasDesriptor);
+		registry.register(aasDescriptor);
 		
 		// Create manager using the directory stub an the HTTPConnectorProvider
 		manager = new ConnectedAssetAdministrationShellManager(registry, new HTTPConnectorProvider());
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/manager/TestConnectedAssetAdministrationShellManager.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/manager/TestConnectedAssetAdministrationShellManager.java
index 80763c6..4925282 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/manager/TestConnectedAssetAdministrationShellManager.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/manager/TestConnectedAssetAdministrationShellManager.java
@@ -61,7 +61,7 @@
 
 		// Register AAS at directory
 		IIdentifier id = new Identifier(IdentifierType.URI, aasId);
-		registry.register(urn, new AASDescriptor(id, "/aas"));
+		registry.register(new AASDescriptor(id, "/aas"));
 		connectorProvider.addMapping("/aas", new VABMultiSubmodelProvider());
 
 		// Create an AAS containing a reference to the created SubModel
@@ -87,7 +87,7 @@
 		IIdentifier id = new Identifier(IdentifierType.URI, aasId);
 		AASDescriptor desc = new AASDescriptor(id, "/aas");
 		desc.addSubmodelDescriptor(new SubmodelDescriptor(smId, IdentifierType.URI, "/aas/submodels/" + smId));
-		registry.register(urn, desc);
+		registry.register(desc);
 		IModelProvider provider = new VABMultiSubmodelProvider(new AASModelProvider(new HashMap<>()));
 		connectorProvider.addMapping("/aas", provider);
 		connectorProvider.addMapping("/aas/submodels/" + smId, provider);
diff --git a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/metamodel/connected/TestConnectedAssetAdministrationShell.java b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/metamodel/connected/TestConnectedAssetAdministrationShell.java
index 7bd13c9..e0e0084 100644
--- a/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/metamodel/connected/TestConnectedAssetAdministrationShell.java
+++ b/sdks/java/basys.sdk/src/test/java/org/eclipse/basyx/testsuite/regression/aas/metamodel/connected/TestConnectedAssetAdministrationShell.java
@@ -82,7 +82,7 @@
 		// Add Submodel descriptor to aas descriptor
 		aasDescriptor.addSubmodelDescriptor(smDescriptor);
 
-		registry.register(new ModelUrn(aasId), aasDescriptor);
+		registry.register(aasDescriptor);
 
 		// Create connector provider stub, map address to provider
 		ConnectorProviderStub connectorProvider = new ConnectorProviderStub();