From 08dc1b933dfc7a4b0221995ac8063211c074488e Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sun, 17 Nov 2024 17:04:56 +0200 Subject: [PATCH] DDI resource - remove dupplicated annotations (#2057) Signed-off-by: Avgustin Marinov --- .../rest/api/DdiRootControllerRestApi.java | 120 +++++++++--------- .../ddi/rest/resource/DdiRootController.java | 101 +++++++-------- .../ddi/rest/resource/DdiConfigDataTest.java | 5 +- 3 files changed, 107 insertions(+), 119 deletions(-) diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java b/hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java index 8e7049e3b..2f5dedfda 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java @@ -84,9 +84,9 @@ public interface DdiRootControllerRestApi { @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/softwaremodules/{softwareModuleId}/artifacts", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity> getSoftwareModulesArtifacts( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("softwareModuleId") final Long softwareModuleId); + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") String controllerId, + @PathVariable("softwareModuleId") Long softwareModuleId); /** * Root resource for an individual {@link Target}. @@ -123,8 +123,8 @@ public interface DdiRootControllerRestApi { @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity getControllerBase( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId); + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") String controllerId); /** * Handles GET {@link DdiArtifact} download request. This could be full or @@ -160,10 +160,11 @@ public interface DdiRootControllerRestApi { }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{fileName}") - ResponseEntity downloadArtifact(@PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("softwareModuleId") final Long softwareModuleId, - @PathVariable("fileName") final String fileName); + ResponseEntity downloadArtifact( + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") String controllerId, + @PathVariable("softwareModuleId") Long softwareModuleId, + @PathVariable("fileName") String fileName); /** * Handles GET {@link DdiArtifact} MD5 checksum file download request. @@ -198,10 +199,10 @@ public interface DdiRootControllerRestApi { @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{fileName}" + DdiRestConstants.ARTIFACT_MD5_DWNL_SUFFIX, produces = MediaType.TEXT_PLAIN_VALUE) ResponseEntity downloadArtifactMd5( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("softwareModuleId") final Long softwareModuleId, - @PathVariable("fileName") final String fileName); + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") String controllerId, + @PathVariable("softwareModuleId") Long softwareModuleId, + @PathVariable("fileName") String fileName); /** * Resource for software module. @@ -260,17 +261,16 @@ public interface DdiRootControllerRestApi { }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.DEPLOYMENT_BASE_ACTION + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) - ResponseEntity getControllerDeploymentBaseAction(@PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId, - @RequestParam(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "c", required = false, defaultValue = "-1") final int resource, - @RequestParam( - value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "actionHistory", - defaultValue = DdiRestConstants.NO_ACTION_HISTORY) + ResponseEntity getControllerDeploymentBaseAction( + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") @NotEmpty String controllerId, + @PathVariable("actionId") @NotNull Long actionId, + @RequestParam(value = "c", required = false, defaultValue = "-1") int resource, + @RequestParam(value = "actionHistory", defaultValue = DdiRestConstants.NO_ACTION_HISTORY) @Schema(description = """ (Optional) GET parameter to retrieve a given number of messages which are previously provided by the device. Useful if the devices sent state information to the feedback channel and never stored them - locally.""") final Integer actionHistoryMessageCount); + locally.""") Integer actionHistoryMessageCount); /** * This is the feedback channel for the {@link DdiDeploymentBase} action. @@ -316,9 +316,10 @@ public interface DdiRootControllerRestApi { @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.DEPLOYMENT_BASE_ACTION + "/{actionId}/" + DdiRestConstants.FEEDBACK, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity postDeploymentBaseActionFeedback( - @Valid final DdiActionFeedback feedback, - @PathVariable("tenant") final String tenant, @PathVariable("controllerId") final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId); + @Valid @RequestBody DdiActionFeedback feedback, + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") String controllerId, + @PathVariable("actionId") @NotNull Long actionId); /** * This is the feedback channel for the config data action. @@ -358,9 +359,9 @@ public interface DdiRootControllerRestApi { @PutMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIG_DATA_ACTION, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity putConfigData( - @Valid final DdiConfigData configData, - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId); + @Valid @RequestBody DdiConfigData configData, + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") String controllerId); /** * RequestMethod.GET method for the {@link DdiCancel} action. @@ -393,9 +394,9 @@ public interface DdiRootControllerRestApi { @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CANCEL_ACTION + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity getControllerCancelAction( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId); + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") @NotEmpty String controllerId, + @PathVariable("actionId") @NotNull Long actionId); /** * RequestMethod.POST method receiving the {@link DdiActionFeedback} from the target. @@ -436,10 +437,10 @@ public interface DdiRootControllerRestApi { @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CANCEL_ACTION + "/{actionId}/" + DdiRestConstants.FEEDBACK, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity postCancelActionFeedback( - @Valid final DdiActionFeedback feedback, - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId); + @Valid @RequestBody DdiActionFeedback feedback, + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") @NotEmpty String controllerId, + @PathVariable("actionId") @NotNull Long actionId); /** * Resource for installed distribution set to retrieve the last successfully finished action. @@ -490,12 +491,10 @@ public interface DdiRootControllerRestApi { @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.INSTALLED_BASE_ACTION + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity getControllerInstalledAction( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId, - @RequestParam( - value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "actionHistory", - defaultValue = DdiRestConstants.NO_ACTION_HISTORY) final Integer actionHistoryMessageCount); + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") @NotEmpty String controllerId, + @PathVariable("actionId") @NotNull Long actionId, + @RequestParam(value = "actionHistory", defaultValue = DdiRestConstants.NO_ACTION_HISTORY) Integer actionHistoryMessageCount); /** * Returns the confirmation base with the current auto-confirmation state for a given controllerId and toggle links. In case there are @@ -534,8 +533,8 @@ public interface DdiRootControllerRestApi { @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity getConfirmationBase( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId); + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") @NotEmpty String controllerId); /** * Resource for confirmation of an action. @@ -584,13 +583,12 @@ public interface DdiRootControllerRestApi { }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) - ResponseEntity getConfirmationBaseAction(@PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId, - @RequestParam(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "c", required = false, defaultValue = "-1") final int resource, - @RequestParam( - value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "actionHistory", - defaultValue = DdiRestConstants.NO_ACTION_HISTORY) final Integer actionHistoryMessageCount); + ResponseEntity getConfirmationBaseAction( + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") @NotEmpty String controllerId, + @PathVariable("actionId") @NotNull Long actionId, + @RequestParam(value = "c", required = false, defaultValue = "-1") int resource, + @RequestParam(value = "actionHistory", defaultValue = DdiRestConstants.NO_ACTION_HISTORY) Integer actionHistoryMessageCount); /** * This is the feedback channel for the {@link DdiConfirmationBaseAction} action. @@ -637,10 +635,10 @@ public interface DdiRootControllerRestApi { DdiRestConstants.FEEDBACK, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity postConfirmationActionFeedback( - @Valid final DdiConfirmationFeedback feedback, - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId); + @Valid @RequestBody DdiConfirmationFeedback feedback, + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") String controllerId, + @PathVariable("actionId") @NotNull Long actionId); /** * Activate auto confirmation for a given controllerId. Will use the provided initiator and remark field from the provided @@ -685,9 +683,9 @@ public interface DdiRootControllerRestApi { @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/" + DdiRestConstants.AUTO_CONFIRM_ACTIVATE, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity activateAutoConfirmation( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId, - @Valid @RequestBody(required = false) final DdiActivateAutoConfirmation body); + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") @NotEmpty String controllerId, + @Valid @RequestBody(required = false) DdiActivateAutoConfirmation body); /** * Deactivate auto confirmation for a given controller id. @@ -728,8 +726,8 @@ public interface DdiRootControllerRestApi { @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/" + DdiRestConstants.AUTO_CONFIRM_DEACTIVATE) ResponseEntity deactivateAutoConfirmation( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId); + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") @NotEmpty String controllerId); /** * Assign an already installed distribution for a target @@ -773,7 +771,7 @@ public interface DdiRootControllerRestApi { @PutMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.INSTALLED_BASE_ACTION, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity setAssignedOfflineVersion( - @Valid DdiAssignedVersion ddiAssignedVersion, - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId); + @Valid @RequestBody DdiAssignedVersion ddiAssignedVersion, + @PathVariable("tenant") String tenant, + @PathVariable("controllerId") String controllerId); } \ No newline at end of file diff --git a/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java b/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java index 0b847cb7c..bf8bce636 100644 --- a/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java +++ b/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java @@ -107,42 +107,31 @@ public class DdiRootController implements DdiRootControllerRestApi { @Autowired private ConfirmationManagement confirmationManagement; - @Autowired private ApplicationEventPublisher eventPublisher; - @Autowired(required = false) private ServiceMatcher serviceMatcher; - @Autowired private BusProperties bus; - @Autowired private ControllerManagement controllerManagement; - @Autowired private ArtifactManagement artifactManagement; - @Autowired private HawkbitSecurityProperties securityProperties; - @Autowired private TenantAware tenantAware; - @Autowired private SystemManagement systemManagement; - @Autowired private ArtifactUrlHandler artifactUrlHandler; - @Autowired private EntityFactory entityFactory; - @Override public ResponseEntity> getSoftwareModulesArtifacts( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("softwareModuleId") final Long softwareModuleId) { + final String tenant, + final String controllerId, + final Long softwareModuleId) { log.debug("getSoftwareModulesArtifacts({})", controllerId); final Target target = findTarget(controllerId); @@ -158,8 +147,8 @@ public class DdiRootController implements DdiRootControllerRestApi { @Override public ResponseEntity getControllerBase( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId) { + final String tenant, + final String controllerId) { log.debug("getControllerBase({})", controllerId); final Target target = controllerManagement.findOrRegisterTargetIfItDoesNotExist(controllerId, IpUtil @@ -179,10 +168,11 @@ public class DdiRootController implements DdiRootControllerRestApi { } @Override - public ResponseEntity downloadArtifact(@PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("softwareModuleId") final Long softwareModuleId, - @PathVariable("fileName") final String fileName) { + public ResponseEntity downloadArtifact( + final String tenant, + final String controllerId, + final Long softwareModuleId, + final String fileName) { final ResponseEntity result; final Target target = findTarget(controllerId); @@ -212,7 +202,6 @@ public class DdiRootController implements DdiRootControllerRestApi { total) -> eventPublisher.publishEvent(new DownloadProgressEvent( tenantAware.getCurrentTenant(), statusId, shippedSinceLastEvent, serviceMatcher != null ? serviceMatcher.getBusId() : bus.getId()))); - } } return result; @@ -253,11 +242,11 @@ public class DdiRootController implements DdiRootControllerRestApi { @Override public ResponseEntity getControllerDeploymentBaseAction( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("actionId") final Long actionId, - @RequestParam(value = "c", required = false, defaultValue = "-1") final int resource, - @RequestParam(value = "actionHistory", defaultValue = DdiRestConstants.NO_ACTION_HISTORY) final Integer actionHistoryMessageCount) { + final String tenant, + final String controllerId, + final Long actionId, + final int resource, + final Integer actionHistoryMessageCount) { log.debug("getControllerDeploymentBaseAction({},{})", controllerId, resource); final Target target = findTarget(controllerId); @@ -280,10 +269,10 @@ public class DdiRootController implements DdiRootControllerRestApi { @Override public ResponseEntity postDeploymentBaseActionFeedback( - @Valid @RequestBody final DdiActionFeedback feedback, - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId) { + final DdiActionFeedback feedback, + final String tenant, + final String controllerId, + final Long actionId) { log.debug("postDeploymentBaseActionFeedback for target [{},{}]: {}", controllerId, actionId, feedback); final Target target = findTarget(controllerId); @@ -305,17 +294,18 @@ public class DdiRootController implements DdiRootControllerRestApi { @Override public ResponseEntity putConfigData( - @Valid @RequestBody final DdiConfigData configData, - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId) { + final DdiConfigData configData, + final String tenant, + final String controllerId) { controllerManagement.updateControllerAttributes(controllerId, configData.getData(), getUpdateMode(configData)); return ResponseEntity.ok().build(); } @Override - public ResponseEntity getControllerCancelAction(@PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId) { + public ResponseEntity getControllerCancelAction( + final String tenant, + final String controllerId, + final Long actionId) { log.debug("getControllerCancelAction({})", controllerId); final Target target = findTarget(controllerId); @@ -336,10 +326,10 @@ public class DdiRootController implements DdiRootControllerRestApi { @Override public ResponseEntity postCancelActionFeedback( - @Valid @RequestBody final DdiActionFeedback feedback, - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") @NotEmpty final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId) { + final DdiActionFeedback feedback, + final String tenant, + final String controllerId, + final Long actionId) { log.debug("provideCancelActionFeedback for target [{}]: {}", controllerId, feedback); final Target target = findTarget(controllerId); @@ -352,9 +342,10 @@ public class DdiRootController implements DdiRootControllerRestApi { @Override public ResponseEntity getControllerInstalledAction( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, @PathVariable("actionId") final Long actionId, - @RequestParam(value = "actionHistory", defaultValue = DdiRestConstants.NO_ACTION_HISTORY) final Integer actionHistoryMessageCount) { + final String tenant, + final String controllerId, + final Long actionId, + final Integer actionHistoryMessageCount) { log.debug("getControllerInstalledAction({})", controllerId); final Target target = findTarget(controllerId); @@ -387,11 +378,11 @@ public class DdiRootController implements DdiRootControllerRestApi { @Override public ResponseEntity getConfirmationBaseAction( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("actionId") final Long actionId, - @RequestParam(value = "c", required = false, defaultValue = "-1") final int resource, - @RequestParam(value = "actionHistory", defaultValue = DdiRestConstants.NO_ACTION_HISTORY) final Integer actionHistoryMessageCount) { + final String tenant, + final String controllerId, + final Long actionId, + final int resource, + final Integer actionHistoryMessageCount) { log.debug("getConfirmationBaseAction({},{})", controllerId, resource); final Target target = findTarget(controllerId); @@ -411,10 +402,10 @@ public class DdiRootController implements DdiRootControllerRestApi { @Override public ResponseEntity postConfirmationActionFeedback( - @Valid @RequestBody final DdiConfirmationFeedback feedback, - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("actionId") @NotNull final Long actionId) { + final DdiConfirmationFeedback feedback, + final String tenant, + final String controllerId, + final Long actionId) { log.debug("provideConfirmationActionFeedback with feedback [controllerId={}, actionId={}]: {}", controllerId, actionId, feedback); final Target target = findTarget(controllerId); @@ -467,9 +458,9 @@ public class DdiRootController implements DdiRootControllerRestApi { @Override public ResponseEntity setAssignedOfflineVersion( - @Valid @RequestBody DdiAssignedVersion ddiAssignedVersion, - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId) { + final DdiAssignedVersion ddiAssignedVersion, + final String tenant, + final String controllerId) { boolean updated = controllerManagement.updateOfflineAssignedVersion(controllerId, ddiAssignedVersion.getName(), ddiAssignedVersion.getVersion()); if (updated) { diff --git a/hawkbit-ddi/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java b/hawkbit-ddi/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java index fe85f6fac..910fb64d0 100644 --- a/hawkbit-ddi/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java +++ b/hawkbit-ddi/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java @@ -349,8 +349,7 @@ class DdiConfigDataTest extends AbstractDDiApiIntegrationTest { .andExpect(status().isOk()); // verify the initial parameters - final Map updatedAttributes = targetManagement - .getControllerAttributes(DdiConfigDataTest.TARGET1_ID); - assertThat(updatedAttributes).containsExactlyEntriesOf(attributes); + final Map updatedAttributes = targetManagement.getControllerAttributes(DdiConfigDataTest.TARGET1_ID); + assertThat(updatedAttributes).containsExactlyInAnyOrderEntriesOf(attributes); } } \ No newline at end of file