diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/Mapping.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/Mapping.java index 8964cb670..6706a5871 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/Mapping.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/Mapping.java @@ -43,9 +43,6 @@ public final class Mapping { URL_WORKBASKET_ID + "/workbasketAccessItems"; public static final String URL_WORKBASKET_ID_DISTRIBUTION = URL_WORKBASKET_ID + "/distribution-targets"; - // TODO @Deprecated - public static final String URL_WORKBASKET_DISTRIBUTION_ID = - URL_WORKBASKET + "/distribution-targets/{workbasketId}"; public static final String URL_WORKBASKETDEFIITIONS = PRE + "workbasket-definitions"; private Mapping() {} diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java index fc6c982b5..fa9e2cd0e 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java @@ -311,8 +311,7 @@ public class WorkbasketController extends AbstractPagingController { return response; } - // TODO - schema inconsistent with PUT and GET - @DeleteMapping(path = Mapping.URL_WORKBASKET_DISTRIBUTION_ID) + @DeleteMapping(path = Mapping.URL_WORKBASKET_ID_DISTRIBUTION) @Transactional(rollbackFor = Exception.class) public ResponseEntity> removeDistributionTargetForWorkbasketId( diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/WorkbasketControllerRestDocumentation.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/WorkbasketControllerRestDocumentation.java index b568f13ec..12e590964 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/WorkbasketControllerRestDocumentation.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/WorkbasketControllerRestDocumentation.java @@ -400,7 +400,7 @@ class WorkbasketControllerRestDocumentation extends BaseRestDocumentation { .perform( RestDocumentationRequestBuilders.delete( restHelper.toUrl( - Mapping.URL_WORKBASKET_DISTRIBUTION_ID, + Mapping.URL_WORKBASKET_ID_DISTRIBUTION, "WBI:100000000000000000000000000000000007")) .header("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x")) .andExpect(MockMvcResultMatchers.status().isNoContent()) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java index fc9f19fe9..d0edaa73f 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java @@ -230,7 +230,7 @@ class WorkbasketControllerIntTest { ResponseEntity response = template.exchange( restHelper.toUrl( - Mapping.URL_WORKBASKET_DISTRIBUTION_ID, "WBI:100000000000000000000000000000000007"), + Mapping.URL_WORKBASKET_ID_DISTRIBUTION, "WBI:100000000000000000000000000000000007"), HttpMethod.DELETE, restHelper.defaultRequest(), Void.class); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java index 90117850a..a7d245d3d 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java @@ -111,7 +111,7 @@ class WorkbasketResourceAssemblerTest { .isEqualTo(Mapping.URL_WORKBASKET); assertThat(workbasket.getRequiredLink("removeDistributionTargets").getHref()) .isEqualTo( - Mapping.URL_WORKBASKET_DISTRIBUTION_ID.replaceAll( + Mapping.URL_WORKBASKET_ID_DISTRIBUTION.replaceAll( "\\{.*}", workbasket.getWorkbasketId())); }