eclipse-basyx · aaronzi · Nov 5, 2024 · Jul 9, 2024 · Jul 9, 2024 · Jul 9, 2024
diff --git a/...se/digitaltwin/basyx/aasrepository/feature/registry/integration/AasDescriptorFactory.java b/...se/digitaltwin/basyx/aasrepository/feature/registry/integration/AasDescriptorFactory.java
@@ -192,10 +192,19 @@ private String getProtocol(String endpoint) {
 		}
 	}
 
-	private String createAasRepositoryUrl(String aasRepositoryBaseURL) {
+	public static String createAasRepositoryUrl(String aasRepositoryBaseURL) {
 
 		try {
-			return new URL(new URL(aasRepositoryBaseURL), AAS_REPOSITORY_PATH).toString();
+			URL url = new URL(aasRepositoryBaseURL);
+            String path = url.getPath();
+
+            if (path.endsWith("/") && AAS_REPOSITORY_PATH.startsWith("/")) {
+                path = path.substring(0, path.length() - 1);
+            } else if (!path.endsWith("/") && !AAS_REPOSITORY_PATH.startsWith("/")) {
+            	path += "/";
+            }
+
+            return new URL(url.getProtocol(), url.getHost(), url.getPort(), path + AAS_REPOSITORY_PATH).toString();
 		} catch (MalformedURLException e) {
 			throw new RuntimeException("The AAS Repository Base url is malformed.\n" + e.getMessage());
 		}

diff --git a/.../basyx/aasrepository/feature/registry/integration/AasRepositoryRegistryLinkTestSuite.java b/.../basyx/aasrepository/feature/registry/integration/AasRepositoryRegistryLinkTestSuite.java
@@ -30,8 +30,6 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.List;
 
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
@@ -51,7 +49,6 @@
  */
 public abstract class AasRepositoryRegistryLinkTestSuite {
 
-	private static final String AAS_REPOSITORY_PATH = "/shells";
 	private static final String DUMMY_GLOBAL_ASSETID = "globalAssetId";
 	private static final String DUMMY_IDSHORT = "ExampleMotor";
 	private static final String DUMMY_AAS_ID = "customIdentifier";
@@ -120,20 +117,10 @@ private String getAas1JSONString() throws FileNotFoundException, IOException {
 	}
 
 	private CloseableHttpResponse createAasOnRepo(String aasJsonContent) throws IOException {
-		return BaSyxHttpTestUtils.executePostOnURL(createAasRepositoryUrl(getAasRepoBaseUrl()), aasJsonContent);
+		return BaSyxHttpTestUtils.executePostOnURL(AasDescriptorFactory.createAasRepositoryUrl(getAasRepoBaseUrl()), aasJsonContent);
 	}
 
 	private String getSpecificAasAccessURL(String aasId) {
-		return createAasRepositoryUrl(getAasRepoBaseUrl()) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(aasId);
+		return AasDescriptorFactory.createAasRepositoryUrl(getAasRepoBaseUrl()) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(aasId);
 	}
-
-	private static String createAasRepositoryUrl(String aasRepositoryBaseURL) {
-
-		try {
-			return new URL(new URL(aasRepositoryBaseURL), AAS_REPOSITORY_PATH).toString();
-		} catch (MalformedURLException e) {
-			throw new RuntimeException("The AAS Repository Base url is malformed. " + e.getMessage());
-		}
-	}
-
 }
diff --git a/...gitaltwin/basyx/aasrepository/feature/registry/integration/DummyAasDescriptorFactory.java b/...gitaltwin/basyx/aasrepository/feature/registry/integration/DummyAasDescriptorFactory.java
@@ -41,8 +41,6 @@
  *
  */
 public class DummyAasDescriptorFactory {
-	private static final String AAS_REPOSITORY_PATH = "/shells";
-
 	public static AssetAdministrationShellDescriptor createDummyDescriptor(String aasId, String idShort, String globalAssetId, String aasRepoBaseUrl) {
 
 		AssetAdministrationShellDescriptor descriptor = new AssetAdministrationShellDescriptor();
@@ -75,7 +73,7 @@ private static ProtocolInformation createProtocolInformation(String aasId, Strin
 	}
 
 	private static String createHref(String aasId, String aasRepoBaseUrl) {
-		return String.format("%s/%s", createAasRepositoryUrl(aasRepoBaseUrl), Base64UrlEncodedIdentifier.encodeIdentifier(aasId));
+		return String.format("%s/%s", AasDescriptorFactory.createAasRepositoryUrl(aasRepoBaseUrl), Base64UrlEncodedIdentifier.encodeIdentifier(aasId));
 	}
 
 	private static String getProtocol(String endpoint) {
@@ -85,14 +83,4 @@ private static String getProtocol(String endpoint) {
 			throw new RuntimeException();
 		}
 	}
-
-	private static String createAasRepositoryUrl(String aasRepositoryBaseURL) {
-
-		try {
-			return new URL(new URL(aasRepositoryBaseURL), AAS_REPOSITORY_PATH).toString();
-		} catch (MalformedURLException e) {
-			throw new RuntimeException("The AAS Repository Base url is malformed. " + e.getMessage());
-		}
-	}
-
 }
diff --git a/...igitaltwin/basyx/aasrepository/feature/registry/integration/TestAasDescriptorFactory.java b/...igitaltwin/basyx/aasrepository/feature/registry/integration/TestAasDescriptorFactory.java
@@ -0,0 +1,41 @@
+package org.eclipse.digitaltwin.basyx.aasrepository.feature.registry.integration;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TestAasDescriptorFactory {
+
+	private static final String AAS_REPO_URL = "http://localhost:8081";
+
+	private static final String AAS_REPOSITORY_PATH_WITH_SLASH = "/shells";
+	private static final String AAS_REPOSITORY_PATH_WITHOUT_SLASH = "shells";
+
+	@Test
+    public void testUrlWithTrailingSlashAndPathWithoutLeadingSlash() {
+        String baseURLWithSlash = AAS_REPO_URL + "/";
+
+        assertEquals(baseURLWithSlash + AAS_REPOSITORY_PATH_WITHOUT_SLASH, AasDescriptorFactory.createAasRepositoryUrl(baseURLWithSlash));
+    }
+
+	@Test
+    public void testUrlWithTrailingSlashAndPathWithLeadingSlash() {
+        String baseURLWithSlash = AAS_REPO_URL + "/";
+
+        assertEquals(baseURLWithSlash + AAS_REPOSITORY_PATH_WITHOUT_SLASH, AasDescriptorFactory.createAasRepositoryUrl(baseURLWithSlash));
+    }
+
+    @Test
+    public void testUrlWithoutTrailingSlashAndPathWithoutLeadingSlash() {
+        String baseURLWithoutSlash = AAS_REPO_URL;
+
+        assertEquals(baseURLWithoutSlash + AAS_REPOSITORY_PATH_WITH_SLASH , AasDescriptorFactory.createAasRepositoryUrl(baseURLWithoutSlash));
+    }
+
+    @Test
+    public void testUrlWithoutTrailingSlashAndPathWithLeadingSlash() {
+        String baseURLWithoutSlash = AAS_REPO_URL;
+
+        assertEquals(baseURLWithoutSlash + AAS_REPOSITORY_PATH_WITH_SLASH , AasDescriptorFactory.createAasRepositoryUrl(baseURLWithoutSlash));
+    }
+}
diff --git a/...twin/basyx/submodelrepository/feature/authorization/TestAuthorizedSubmodelRepository.java b/...twin/basyx/submodelrepository/feature/authorization/TestAuthorizedSubmodelRepository.java
@@ -1303,11 +1303,19 @@ private static String getAdminAccessToken() {
 	}
 
 	private static String createSubmodelRepositoryUrl(String submodelRepositoryBaseURL) {
-
 		try {
-			return new URL(new URL(submodelRepositoryBaseURL), SUBMODEL_REPOSITORY_PATH).toString();
+			URL url = new URL(submodelRepositoryBaseURL);
+            String path = url.getPath();
+
+            if (path.endsWith("/") && SUBMODEL_REPOSITORY_PATH.startsWith("/")) {
+                path = path.substring(0, path.length() - 1);
+            } else if (!path.endsWith("/") && !SUBMODEL_REPOSITORY_PATH.startsWith("/")) {
+            	path += "/";
+            }
+
+            return new URL(url.getProtocol(), url.getHost(), url.getPort(), path + SUBMODEL_REPOSITORY_PATH).toString();
 		} catch (MalformedURLException e) {
-			throw new RuntimeException("The Submodel Repository Base url is malformed. " + e.getMessage());
+			throw new RuntimeException("The Submodel Repository Base url is malformed.\n " + e.getMessage());
 		}
 	}
 

diff --git a/...twin/basyx/submodelrepository/feature/registry/integration/SubmodelDescriptorFactory.java b/...twin/basyx/submodelrepository/feature/registry/integration/SubmodelDescriptorFactory.java
@@ -182,10 +182,19 @@ private String getProtocol(String endpoint) {
 		}
 	}
 
-	private String createSubmodelRepositoryUrl(String submodelRepositoryBaseURL) {
+	public static String createSubmodelRepositoryUrl(String submodelRepositoryBaseURL) {
 
 		try {
-			return new URL(new URL(submodelRepositoryBaseURL), SUBMODEL_REPOSITORY_PATH).toString();
+			URL url = new URL(submodelRepositoryBaseURL);
+            String path = url.getPath();
+
+            if (path.endsWith("/") && SUBMODEL_REPOSITORY_PATH.startsWith("/")) {
+                path = path.substring(0, path.length() - 1);
+            } else if (!path.endsWith("/") && !SUBMODEL_REPOSITORY_PATH.startsWith("/")) {
+            	path += "/";
+            }
+
+            return new URL(url.getProtocol(), url.getHost(), url.getPort(), path + SUBMODEL_REPOSITORY_PATH).toString();
 		} catch (MalformedURLException e) {
 			throw new RuntimeException("The Submodel Repository Base url is malformed.\n" + e.getMessage());
 		}

diff --git a/...basyx/submodelrepository/feature/registry/integration/DummySubmodelDescriptorFactory.java b/...basyx/submodelrepository/feature/registry/integration/DummySubmodelDescriptorFactory.java
@@ -45,8 +45,6 @@
  *
  */
 public class DummySubmodelDescriptorFactory {
-	private static final String SUBMODEL_REPOSITORY_PATH = "/submodels";
-
 	public static SubmodelDescriptor createDummyDescriptor(String smId, String idShort, String smRepoBaseUrl, Reference semanticId) {
 
 		SubmodelDescriptor descriptor = new SubmodelDescriptor();
@@ -82,7 +80,7 @@ private static ProtocolInformation createProtocolInformation(String smId, String
 	}
 
 	private static String createHref(String smId, String smRepoBaseUrl) {
-		return String.format("%s/%s", createSubmodelRepositoryUrl(smRepoBaseUrl), Base64UrlEncodedIdentifier.encodeIdentifier(smId));
+		return String.format("%s/%s", SubmodelDescriptorFactory.createSubmodelRepositoryUrl(smRepoBaseUrl), Base64UrlEncodedIdentifier.encodeIdentifier(smId));
 	}
 
 	private static String getProtocol(String endpoint) {
@@ -92,13 +90,4 @@ private static String getProtocol(String endpoint) {
 			throw new RuntimeException();
 		}
 	}
-
-	private static String createSubmodelRepositoryUrl(String smRepositoryBaseURL) {
-
-		try {
-			return new URL(new URL(smRepositoryBaseURL), SUBMODEL_REPOSITORY_PATH).toString();
-		} catch (MalformedURLException e) {
-			throw new RuntimeException("The Submodel Repository Base url is malformed.\n " + e.getMessage());
-		}
-	}
 }
diff --git a/...modelrepository/feature/registry/integration/SubmodelRepositoryRegistryLinkTestSuite.java b/...modelrepository/feature/registry/integration/SubmodelRepositoryRegistryLinkTestSuite.java
@@ -30,8 +30,6 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.List;
 
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
@@ -51,9 +49,6 @@
  * @author danish
  */
 public abstract class SubmodelRepositoryRegistryLinkTestSuite {
-
-	private static final String SUBMODEL_REPOSITORY_PATH = "/submodels";
-
 	private static final String DUMMY_SUBMODEL_IDSHORT = "TechnicalData";
 	private static final String DUMMY_SUBMODEL_ID = "7A7104BDAB57E184";
 
@@ -145,7 +140,7 @@ private String getExpectedSubmodel() throws FileNotFoundException, IOException {
 	}
 
 	private CloseableHttpResponse createSubmodelOnRepo(String submodelJsonContent) throws IOException {
-		return BaSyxHttpTestUtils.executePostOnURL(createSubmodelRepositoryUrl(getSubmodelRepoBaseUrl()), submodelJsonContent);
+		return BaSyxHttpTestUtils.executePostOnURL(SubmodelDescriptorFactory.createSubmodelRepositoryUrl(getSubmodelRepoBaseUrl()), submodelJsonContent);
 	}
 
 	private CloseableHttpResponse createSubmodelElementOnRepo(String submodelElementJsonContent) throws IOException {
@@ -155,16 +150,6 @@ private CloseableHttpResponse createSubmodelElementOnRepo(String submodelElement
 	}
 
 	private String getSpecificSubmodelAccessURL(String submodelId) {
-		return createSubmodelRepositoryUrl(getSubmodelRepoBaseUrl()) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(submodelId);
-	}
-
-	private static String createSubmodelRepositoryUrl(String smRepositoryBaseURL) {
-
-		try {
-			return new URL(new URL(smRepositoryBaseURL), SUBMODEL_REPOSITORY_PATH).toString();
-		} catch (MalformedURLException e) {
-			throw new RuntimeException("The Submodel Repository Base url is malformed.\n " + e.getMessage());
-		}
+		return SubmodelDescriptorFactory.createSubmodelRepositoryUrl(getSubmodelRepoBaseUrl()) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(submodelId);
 	}
-
 }
diff --git a/.../basyx/submodelrepository/feature/registry/integration/TestSubmodelDescriptorFactory.java b/.../basyx/submodelrepository/feature/registry/integration/TestSubmodelDescriptorFactory.java
@@ -0,0 +1,42 @@
+package org.eclipse.digitaltwin.basyx.submodelrepository.feature.registry.integration;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TestSubmodelDescriptorFactory {
+
+	private static final String SUBMODEL_REPO_URL = "http://localhost:8081";
+
+
+	private static final String SUBMODEL_REPOSITORY_PATH_WITH_SLASH = "/submodels";
+	private static final String SUBMODEL_REPOSITORY_PATH_WITHOUT_SLASH = "submodels";
+
+	@Test
+    public void testUrlWithTrailingSlashAndPathWithoutLeadingSlash() {
+        String baseURLWithSlash = SUBMODEL_REPO_URL + "/";
+
+        assertEquals(baseURLWithSlash + SUBMODEL_REPOSITORY_PATH_WITHOUT_SLASH, SubmodelDescriptorFactory.createSubmodelRepositoryUrl(baseURLWithSlash));
+    }
+
+	@Test
+    public void testUrlWithTrailingSlashAndPathWithLeadingSlash() {
+        String baseURLWithSlash = SUBMODEL_REPO_URL + "/";
+
+        assertEquals(baseURLWithSlash + SUBMODEL_REPOSITORY_PATH_WITHOUT_SLASH, SubmodelDescriptorFactory.createSubmodelRepositoryUrl(baseURLWithSlash));
+    }
+
+    @Test
+    public void testUrlWithoutTrailingSlashAndPathWithoutLeadingSlash() {
+        String baseURLWithoutSlash = SUBMODEL_REPO_URL;
+
+        assertEquals(baseURLWithoutSlash + SUBMODEL_REPOSITORY_PATH_WITH_SLASH , SubmodelDescriptorFactory.createSubmodelRepositoryUrl(baseURLWithoutSlash));
+    }
+
+    @Test
+    public void testUrlWithoutTrailingSlashAndPathWithLeadingSlash() {
+        String baseURLWithoutSlash = SUBMODEL_REPO_URL;
+
+        assertEquals(baseURLWithoutSlash + SUBMODEL_REPOSITORY_PATH_WITH_SLASH , SubmodelDescriptorFactory.createSubmodelRepositoryUrl(baseURLWithoutSlash));
+    }
+}