From 4299377769f732841827484e65e0a129a6ba9522 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sat, 9 Nov 2024 17:58:10 +0200 Subject: [PATCH] Fix sonar findings ... (#1987) Signed-off-by: Avgustin Marinov --- .../repository/jpa/JpaRolloutExecutor.java | 33 +++++++++---------- .../jpa/management/JpaRolloutManagement.java | 2 +- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java index bd06edacb..c17cfc7ec 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java @@ -85,7 +85,6 @@ public class JpaRolloutExecutor implements RolloutExecutor { * Max amount of targets that are handled in one transaction. */ private static final int TRANSACTION_TARGETS = 5_000; - /** * Maximum amount of actions that are deleted in one transaction. */ @@ -94,14 +93,16 @@ public class JpaRolloutExecutor implements RolloutExecutor { /** * Action statuses that result in a terminated action */ - private static final List DEFAULT_ACTION_TERMINATION_STATUSES = Arrays.asList(Status.ERROR, Status.FINISHED, - Status.CANCELED); + private static final List DEFAULT_ACTION_TERMINATION_STATUSES = List.of( + Status.ERROR, Status.FINISHED, Status.CANCELED); /** * In case of DOWNLOAD_ONLY, actions can be finished with DOWNLOADED status. */ - private static final List DOWNLOAD_ONLY_ACTION_TERMINATION_STATUSES = Arrays.asList(Status.ERROR, - Status.FINISHED, Status.CANCELED, Status.DOWNLOADED); + private static final List DOWNLOAD_ONLY_ACTION_TERMINATION_STATUSES = List.of( + Status.ERROR, Status.FINISHED, Status.CANCELED, Status.DOWNLOADED); private static final Comparator DESC_COMP = Comparator.comparingLong(RolloutGroup::getId).reversed(); + private static final String TRANSACTION_ASSIGNING_TARGETS_TO_ROLLOUT_GROUP_FAILED = "Transaction assigning Targets to RolloutGroup failed"; + private final ActionRepository actionRepository; private final RolloutGroupRepository rolloutGroupRepository; private final RolloutTargetGroupRepository rolloutTargetGroupRepository; @@ -343,11 +344,9 @@ public class JpaRolloutExecutor implements RolloutExecutor { private void handleRunningRollout(final JpaRollout rollout) { log.debug("handleRunningRollout called for rollout {}", rollout.getId()); - if (rollout.isDynamic()) { - if (fillDynamicRolloutGroupsWithTargets(rollout)) { - log.debug("Dynamic group created for rollout {}", rollout.getId()); - return; - } + if (rollout.isDynamic() && fillDynamicRolloutGroupsWithTargets(rollout)) { + log.debug("Dynamic group created for rollout {}", rollout.getId()); + return; } final List runningGroups = @@ -382,9 +381,9 @@ public class JpaRolloutExecutor implements RolloutExecutor { if (hasScheduledActions) { try { - final Iterable iterable = scheduledActions::iterator; - final List actionIds = StreamSupport.stream(iterable.spliterator(), false).map(Action::getId) - .collect(Collectors.toList()); + final List actionIds = StreamSupport.stream(scheduledActions.spliterator(), false) + .map(Action::getId) + .toList(); actionRepository.deleteByIdIn(actionIds); afterCommit.afterCommit(() -> eventPublisherHolder.getEventPublisher() .publishEvent(new RolloutUpdatedEvent(rollout, eventPublisherHolder.getApplicationId()))); @@ -647,7 +646,7 @@ public class JpaRolloutExecutor implements RolloutExecutor { return rolloutGroupRepository.save(group); } catch (final TransactionException e) { - log.warn("Transaction assigning Targets to RolloutGroup failed", e); + log.warn(TRANSACTION_ASSIGNING_TARGETS_TO_ROLLOUT_GROUP_FAILED, e); return group; } } @@ -728,7 +727,7 @@ public class JpaRolloutExecutor implements RolloutExecutor { return true; } } catch (final TransactionException e) { - log.warn("Transaction assigning Targets to RolloutGroup failed", e); + log.warn(TRANSACTION_ASSIGNING_TARGETS_TO_ROLLOUT_GROUP_FAILED, e); } // set to skip for some time @@ -839,7 +838,7 @@ public class JpaRolloutExecutor implements RolloutExecutor { } while (actionsCreated > 0); } catch (final TransactionException e) { - log.warn("Transaction assigning Targets to RolloutGroup failed", e); + log.warn(TRANSACTION_ASSIGNING_TARGETS_TO_ROLLOUT_GROUP_FAILED, e); return 0; } return totalActionsCreated; @@ -878,7 +877,7 @@ public class JpaRolloutExecutor implements RolloutExecutor { // is already scheduled and a next action is created then cancel the // current scheduled action to cancel. E.g. a new scheduled action is // created. - final List targetIds = targets.stream().map(Target::getId).collect(Collectors.toList()); + final List targetIds = targets.stream().map(Target::getId).toList(); deploymentManagement.cancelInactiveScheduledActionsForTargets(targetIds); return targets.stream() .map(target -> { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java index fe21bc29e..5ae1427f5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java @@ -578,7 +578,7 @@ public class JpaRolloutManagement implements RolloutManagement { RolloutHelper.verifyRolloutInStatus(rollout, RolloutStatus.CREATING); RolloutHelper.verifyRolloutGroupConditions(conditions); - RolloutGroup lastSavedGroup = null; + JpaRolloutGroup lastSavedGroup = null; if (amountOfGroups == 0) { if (dynamicRolloutGroupTemplate == null) { throw new ConstraintDeclarationException(