From bb8095e84a5ead1feab490489c32d84458342a7a Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sat, 9 Nov 2024 20:43:21 +0200 Subject: [PATCH] Fix sonar findings: optional rest params boolean -> Boolean (#1990) Signed-off-by: Avgustin Marinov --- .../hawkbit/repository/test/util/SecurityContextSwitch.java | 3 ++- .../hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java | 6 +++--- .../eclipse/hawkbit/mgmt/rest/api/MgmtTargetRestApi.java | 2 +- .../mgmt/rest/resource/MgmtDistributionSetResource.java | 6 +++--- .../hawkbit/mgmt/rest/resource/MgmtTargetResource.java | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SecurityContextSwitch.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SecurityContextSwitch.java index eee818d29..fd6a6bc06 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SecurityContextSwitch.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/SecurityContextSwitch.java @@ -136,7 +136,8 @@ public class SecurityContextSwitch { @Serial private static final long serialVersionUID = 1L; - private final WithUser annotation; + + private transient final WithUser annotation; public WithUserSecurityContext(final WithUser annotation) { this.annotation = annotation; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java index 6f8975eb4..9d7d48b24 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java @@ -495,12 +495,12 @@ public interface MgmtDistributionSetRestApi { ResponseEntity createAssignedTarget( @PathVariable("distributionSetId") Long distributionSetId, final List targetIds, - @RequestParam(value = "offline", required = false) boolean offline); + @RequestParam(value = "offline", required = false) Boolean offline); /** - * Gets a paged list of meta data for a distribution set. + * Gets a paged list of meta-data for a distribution set. * - * @param distributionSetId the ID of the distribution set for the meta data + * @param distributionSetId the ID of the distribution set for the meta-data * @param pagingOffsetParam the offset of list of targets for pagination, might not be * present in the rest request then default value will be applied * @param pagingLimitParam the limit of the paged request, might not be present in the diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetRestApi.java index a87d8f8a2..321dbf72f 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetRestApi.java @@ -646,7 +646,7 @@ public interface MgmtTargetRestApi { defaults set in factory, manual updates or migrations from other update systems. A completed action is added to the history of the target(s). Target is set to IN_SYNC state as both assigned and installed DS are set. Note: only executed if the target has currently no running update""") - boolean offline); + Boolean offline); /** * Handles the GET request of retrieving the installed distribution set of diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java index a1e9c6548..43548b886 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java @@ -289,10 +289,10 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { public ResponseEntity createAssignedTarget( @PathVariable("distributionSetId") final Long distributionSetId, @RequestBody final List assignments, - @RequestParam(value = "offline", required = false) final boolean offline) { - if (offline) { + @RequestParam(value = "offline", required = false) final Boolean offline) { + if (offline != null && offline) { final List> offlineAssignments = assignments.stream() - .map(assignment -> new SimpleEntry(assignment.getId(), distributionSetId)) + .map(assignment -> new SimpleEntry<>(assignment.getId(), distributionSetId)) .collect(Collectors.toList()); return ResponseEntity.ok(MgmtDistributionSetMapper .toResponse(deployManagament.offlineAssignedDistributionSets(offlineAssignments))); diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java index 39ad508a6..f7ce5c3a7 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java @@ -351,8 +351,8 @@ public class MgmtTargetResource implements MgmtTargetRestApi { public ResponseEntity postAssignedDistributionSet( @PathVariable("targetId") final String targetId, @RequestBody final MgmtDistributionSetAssignments dsAssignments, - @RequestParam(value = "offline", required = false) final boolean offline) { - if (offline) { + @RequestParam(value = "offline", required = false) final Boolean offline) { + if (offline != null && offline) { final List> offlineAssignments = dsAssignments.stream() .map(dsAssignment -> new SimpleEntry(targetId, dsAssignment.getId())) .collect(Collectors.toList());