Sonar Fixes (11) (#2223)

Signed-off-by: Avgustin Marinov <[email protected]>
eclipse-hawkbit · Jan 23, 2025 · 1104256 · 1104256
1 parent e608996
commit 1104256
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 124 deletions.
diff --git a/...itory-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java b/...itory-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java
@@ -57,8 +57,8 @@ public interface DistributionSetCreate {
      * @param type for {@link DistributionSet#getType()}
      * @return updated builder instance
      */
-    default DistributionSetCreate type(final DistributionSetType type) {
-        return type(Optional.ofNullable(type).map(DistributionSetType::getKey).orElse(null));
+    default DistributionSetCreate type(@NotNull final DistributionSetType type) {
+        return type(type.getKey());
     }
 
     /**

diff --git a/...pa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetCreate.java b/...pa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetCreate.java
@@ -45,7 +45,7 @@ public class JpaDistributionSetCreate extends AbstractDistributionSetUpdateCreat
 
     @Override
     public DistributionSetCreate type(final String type) {
-        this.type = type == null ? null : type.strip();
+        this.type = type.strip();
         return this;
     }
 

diff --git a/.../eclipse/hawkbit/repository/jpa/management/DistributionSetInvalidationManagementTest.java b/.../eclipse/hawkbit/repository/jpa/management/DistributionSetInvalidationManagementTest.java
@@ -168,16 +168,17 @@ void verifyInvalidateDistributionSetStopAll() {
     void verifyInvalidateIncompleteDistributionSetThrowsException() {
         final DistributionSet distributionSet = testdataFactory.createIncompleteDistributionSet();
 
+        final DistributionSetInvalidation distributionSetInvalidation = new DistributionSetInvalidation(
+                List.of(distributionSet.getId()), CancelationType.SOFT, true);
         assertThatExceptionOfType(IncompleteDistributionSetException.class)
                 .as("Incomplete distributionSet should throw an exception")
-                .isThrownBy(() -> distributionSetInvalidationManagement.invalidateDistributionSet(
-                        new DistributionSetInvalidation(Collections.singletonList(distributionSet.getId()),
-                                CancelationType.SOFT, true)));
+                .isThrownBy(() -> distributionSetInvalidationManagement.invalidateDistributionSet(distributionSetInvalidation));
     }
 
     @Test
     @Description("Verify that invalidating an invalidated distribution set don't throws an exception" +
             " -> should be able to cancel actions again (if previous time there was a problem")
+    @SuppressWarnings("java:S2699") // test that no exception is thrown
     void verifyInvalidateInvalidatedDistributionSetDontThrowsException() {
         final DistributionSet distributionSet = testdataFactory.createAndInvalidateDistributionSet();
         distributionSetInvalidationManagement.invalidateDistributionSet(
@@ -207,12 +208,11 @@ void verifyInvalidateWithReadAndUpdateRepoAndUpdateTargetAuthority() {
         final InvalidationTestData invalidationTestData = systemSecurityContext.runAsSystem(
                 () -> createInvalidationTestData("verifyInvalidateWithUpdateRepoAndUpdateTargetAuthority"));
 
+        final DistributionSetInvalidation distributionSetInvalidation = new DistributionSetInvalidation(
+                List.of(invalidationTestData.getDistributionSet().getId()), CancelationType.SOFT, true);
         assertThatExceptionOfType(InsufficientPermissionException.class)
                 .as("Insufficient permission exception expected")
-                .isThrownBy(() -> distributionSetInvalidationManagement
-                        .invalidateDistributionSet(new DistributionSetInvalidation(
-                                Collections.singletonList(invalidationTestData.getDistributionSet().getId()),
-                                CancelationType.SOFT, true)));
+                .isThrownBy(() -> distributionSetInvalidationManagement.invalidateDistributionSet(distributionSetInvalidation));
 
         distributionSetInvalidationManagement.invalidateDistributionSet(new DistributionSetInvalidation(
                 Collections.singletonList(invalidationTestData.getDistributionSet().getId()), CancelationType.NONE,
@@ -245,6 +245,7 @@ private void assertNoScheduledActionsExist(final Rollout rollout) {
 
     private void assertRolloutGroupsAreFinished(final Rollout rollout) {
         assertThat(rolloutGroupRepository.findByRolloutId(rollout.getId(), PAGE))
+                .isNotEmpty()
                 .allMatch(rolloutGroup -> rolloutGroup.getStatus().equals(RolloutGroupStatus.FINISHED));
     }