Skip to content

Change deleteSubmodelReferenceByIdAasRepository to return NO_CONTENT #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronzi merged 3 commits into from
Jan 28, 2026
Merged

Change deleteSubmodelReferenceByIdAasRepository to return NO_CONTENT #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dff586f
Change deleteSubmodelReferenceByIdAasRepository to return NO_CONTENT …
dk-emag Jan 21, 2026
4679067
Fix delete response assertion to expect NO_CONTENT status
dk-emag Jan 28, 2026
93234d7
Fix delete response assertion to expect NO_CONTENT status
dk-emag Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...se/digitaltwin/basyx/aasrepository/feature/authorization/TestAuthorizedAasRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ public void removeSubmodelReferenceWithCorrectRoleAndPermission() throws IOExcep
String accessToken = getAccessToken(DummyCredentialStore.BASYX_ASSET_UPDATER_CREDENTIAL);

CloseableHttpResponse retrievalResponse = deleteElementWithAuthorization(getSpecificSubmodelReferenceUrl(SPECIFIC_SHELL_ID_2, "http://i40.customer.com/type/1/1/testSubmodel"), accessToken);
assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
assertEquals(HttpStatus.NO_CONTENT.value(), retrievalResponse.getCode());

deleteElementWithAuthorization(getSpecificAasAccessURL(SPECIFIC_SHELL_ID_2), getAccessToken(DummyCredentialStore.ADMIN_CREDENTIAL));
}
Expand All @@ -439,7 +439,7 @@ public void removeSubmodelReferenceWithCorrectRoleAndSpecificAasPermission() thr
String accessToken = getAccessToken(DummyCredentialStore.BASYX_ASSET_UPDATER_TWO_CREDENTIAL);

CloseableHttpResponse retrievalResponse = deleteElementWithAuthorization(getSpecificSubmodelReferenceUrl(SPECIFIC_SHELL_ID_2, "http://i40.customer.com/type/1/1/testSubmodel"), accessToken);
assertEquals(HttpStatus.OK.value(), retrievalResponse.getCode());
assertEquals(HttpStatus.NO_CONTENT.value(), retrievalResponse.getCode());

deleteElementWithAuthorization(getSpecificAasAccessURL(SPECIFIC_SHELL_ID_2), getAccessToken(DummyCredentialStore.ADMIN_CREDENTIAL));
}
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/eclipse/digitaltwin/basyx/aasrepository/http/AasRepositoryApiHTTPController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public ResponseEntity<Void> putAssetAdministrationShellById(
@Override
public ResponseEntity<Void> deleteSubmodelReferenceByIdAasRepository(Base64UrlEncodedIdentifier aasIdentifier, Base64UrlEncodedIdentifier submodelIdentifier) {
aasRepository.removeSubmodelReference(aasIdentifier.getIdentifier(), submodelIdentifier.getIdentifier());
return new ResponseEntity<Void>(HttpStatus.OK);
return new ResponseEntity<Void>(HttpStatus.NO_CONTENT);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/eclipse/digitaltwin/basyx/aasrepository/http/AasRepositoryHTTPSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public void removeSubmodelReference() throws FileNotFoundException, IOException,
CloseableHttpResponse deleteResponse = BaSyxHttpTestUtils.executeDeleteOnURL(url);
CloseableHttpResponse getResponse = BaSyxHttpTestUtils.executeGetOnURL(getSpecificAasSubmodelRefAccessURL(dummyAasId));

assertEquals(200, deleteResponse.getCode());
assertEquals(204, deleteResponse.getCode());

String response = BaSyxHttpTestUtils.getResponseAsString(getResponse);
BaSyxHttpTestUtils.assertSameJSONContent(getSMReferenceRemovalJson(), getJSONWithoutCursorInfo(response));
Expand Down