From bcdef6ea660c90a38422e3e68a4a33db53770dbb Mon Sep 17 00:00:00 2001 From: ShehriyarShariq-Fraunhofer Date: Mon, 2 Sep 2024 15:24:52 +0200 Subject: [PATCH] fix: refactor utility url functions --- .../authorization/TestAuthorizedSubmodelRepository.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/basyx.submodelrepository/basyx.submodelrepository-feature-authorization/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/authorization/TestAuthorizedSubmodelRepository.java b/basyx.submodelrepository/basyx.submodelrepository-feature-authorization/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/authorization/TestAuthorizedSubmodelRepository.java index 21a874813..b65f1e8ce 100644 --- a/basyx.submodelrepository/basyx.submodelrepository-feature-authorization/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/authorization/TestAuthorizedSubmodelRepository.java +++ b/basyx.submodelrepository/basyx.submodelrepository-feature-authorization/src/test/java/org/eclipse/digitaltwin/basyx/submodelrepository/feature/authorization/TestAuthorizedSubmodelRepository.java @@ -425,7 +425,7 @@ public void getSubmodelElementValueWithCorrectRoleAndPermission() throws IOExcep DummyCredential dummyCredential = DummyCredentialStore.BASYX_READER_CREDENTIAL; String accessToken = tokenProvider.getAccessToken(dummyCredential.getUsername(), dummyCredential.getPassword()); - + CloseableHttpResponse retrievalResponse = getElementWithAuthorization(getSpecificSubmodelElementValueAccessURL(SPECIFIC_SUBMODEL_ID, SUBMODEL_ELEMENT_IDSHORT_PATH), accessToken); assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode()); } @@ -1218,7 +1218,7 @@ private CloseableHttpResponse getElementWithNoAuthorization(String url) throws I } private String getSpecificSubmodelAccessURL(String submodelId) { - return RepositoryUrlHelper.createRepositoryUrl(RepositoryUrlHelper.createRepositoryUrl(submodelRepositoryBaseUrl, SUBMODEL_REPOSITORY_PATH), SUBMODEL_REPOSITORY_PATH) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(submodelId); + return RepositoryUrlHelper.createRepositoryUrl(submodelRepositoryBaseUrl, SUBMODEL_REPOSITORY_PATH) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(submodelId); } private String getSpecificSubmodelValueOnlyAccessURL(String submodelId) { @@ -1230,7 +1230,7 @@ private String getSpecificSubmodelMetadataAccessURL(String submodelId) { } private String getSpecificSubmodelElementAccessURL(String submodelId, String submodelElementIdShortPath) { - return RepositoryUrlHelper.createRepositoryUrl(RepositoryUrlHelper.createRepositoryUrl(submodelRepositoryBaseUrl, SUBMODEL_REPOSITORY_PATH), SUBMODEL_REPOSITORY_PATH) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(submodelId) + "/submodel-elements/" + submodelElementIdShortPath; + return RepositoryUrlHelper.createRepositoryUrl(submodelRepositoryBaseUrl, SUBMODEL_REPOSITORY_PATH) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(submodelId) + "/submodel-elements/" + submodelElementIdShortPath; } private String getSpecificSubmodelElementValueAccessURL(String submodelId, String submodelElementIdShortPath) { @@ -1258,7 +1258,7 @@ private CloseableHttpResponse requestOperationInvocationNoAuthorization(String u } protected String getAllSubmodelElementsAccessURL(String submodelId) { - return RepositoryUrlHelper.createRepositoryUrl(RepositoryUrlHelper.createRepositoryUrl(submodelRepositoryBaseUrl, SUBMODEL_REPOSITORY_PATH), SUBMODEL_REPOSITORY_PATH) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(submodelId) + "/submodel-elements"; + return RepositoryUrlHelper.createRepositoryUrl(submodelRepositoryBaseUrl, SUBMODEL_REPOSITORY_PATH) + "/" + Base64UrlEncodedIdentifier.encodeIdentifier(submodelId) + "/submodel-elements"; } private static CloseableHttpResponse createElementOnRepositoryWithAuthorization(String url, String submodelJsonContent, String accessToken) throws IOException {