From 05def2ef1be063537ce2bb8f4649aa009cb237ac Mon Sep 17 00:00:00 2001 From: Stanislav Trailov Date: Tue, 24 Oct 2023 08:36:46 +0300 Subject: [PATCH] Fix retryRollout input parameter in order to comply with the API (#1461) * Fix retryRollout input parameter in order to comply with the API Signed-off-by: Stanislav Trailov * make exception more informative Signed-off-by: Stanislav Trailov --------- Signed-off-by: Stanislav Trailov --- .../eclipse/hawkbit/mgmt/rest/api/MgmtRolloutRestApi.java | 2 +- .../hawkbit/mgmt/rest/resource/MgmtRolloutResource.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRolloutRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRolloutRestApi.java index 3fe9355c4..a3827ea01 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRolloutRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRolloutRestApi.java @@ -426,6 +426,6 @@ public interface MgmtRolloutRestApi { }) @PostMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/retry", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE}) - ResponseEntity retryRollout(@PathVariable("rolloutId") final String rolloutId); + ResponseEntity retryRollout(@PathVariable("rolloutId") final Long rolloutId); } diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java index 3048fae05..8c534aafe 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java @@ -313,9 +313,9 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi { } @Override - public ResponseEntity retryRollout(final String rolloutId) { - final Rollout rolloutForRetry = this.rolloutManagement.get(Long.parseLong(rolloutId)) - .orElseThrow(EntityNotFoundException::new); + public ResponseEntity retryRollout(final Long rolloutId) { + final Rollout rolloutForRetry = this.rolloutManagement.get(rolloutId) + .orElseThrow(() -> new EntityNotFoundException(Rollout.class, rolloutId)); if (rolloutForRetry.isDeleted()) { throw new EntityNotFoundException(Rollout.class, rolloutId);