From b390a0f8ef58e3c4424f6e2a426c845c70926afc Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Fri, 10 Oct 2025 14:32:09 +0300 Subject: [PATCH] Fix sonar findings (#2742) Signed-off-by: Avgustin Marinov --- .../jpa/acm/DistributionSetTypeManagementTest.java | 7 ++++--- .../repository/jpa/acm/TargetManagementTest.java | 9 ++++----- .../repository/jpa/acm/TargetTypeManagementTest.java | 10 ++++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/DistributionSetTypeManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/DistributionSetTypeManagementTest.java index 88c0c2026..10c74d3fa 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/DistributionSetTypeManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/DistributionSetTypeManagementTest.java @@ -96,7 +96,8 @@ class DistributionSetTypeManagementTest extends AbstractAccessControllerManageme final DistributionSetType dsType2 = testdataFactory.findOrCreateDistributionSetType( "DsType2_override", "DistributionSetType-2-override", List.of(smType2), List.of(smType1)); runAs(withAuthorities(READ_PREFIX + DISTRIBUTION_SET_TYPE, UPDATE_PREFIX + DISTRIBUTION_SET_TYPE + "/id==" + dsType1.getId()), () -> { - final List osAndAppTypeIds = List.of(osType.getId(), appType.getId()); + final Long osTypeId = osType.getId(); + final List osAndAppTypeIds = List.of(osTypeId, appType.getId()); // verify distributionSetTypeManagement#assignCompatibleDistributionSetTypes DistributionSetType dsType1Up = distributionSetTypeManagement.assignMandatorySoftwareModuleTypes(dsType1.getId(), osAndAppTypeIds); assertThat(dsType1Up).satisfies( @@ -108,10 +109,10 @@ class DistributionSetTypeManagementTest extends AbstractAccessControllerManageme .isInstanceOf(InsufficientPermissionException.class); assertThat(distributionSetTypeManagement - .unassignSoftwareModuleType(dsType1.getId(), osType.getId())) + .unassignSoftwareModuleType(dsType1.getId(), osTypeId)) .satisfies(updatedType -> assertThat(updatedType.containsModuleType(osType)).isFalse()); assertThatThrownBy( - () -> distributionSetTypeManagement.unassignSoftwareModuleType(dsType2Id, osType.getId())) + () -> distributionSetTypeManagement.unassignSoftwareModuleType(dsType2Id, osTypeId)) .isInstanceOf(InsufficientPermissionException.class); }); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetManagementTest.java index 4a6a5269f..1e2bb9f85 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetManagementTest.java @@ -52,7 +52,7 @@ class TargetManagementTest extends AbstractAccessControllerManagementTest { }); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({ "rawtypes", "unchecked", "java:S5961" }) // better to keep together @Test void verifyRead() { assertThat(assignDistributionSet(ds2Type2, List.of(target1Type1, target2Type2, target3Type2)).getAssigned()).isEqualTo(3); @@ -128,7 +128,6 @@ class TargetManagementTest extends AbstractAccessControllerManagementTest { @Test void verifyReadCompatibleRelated() { -// assertThat(assignDistributionSet(ds2Type2, List.of(target1Type1, target2Type2, target3Type2)).getAssigned()).isEqualTo(3); prepareFinishedUpdates(ds2Type2, target1Type1, target2Type2); final Target target1Type1 = targetManagement.get(super.target1Type1.getId()); runAs(withAuthorities( @@ -250,9 +249,9 @@ class TargetManagementTest extends AbstractAccessControllerManagementTest { assertThatThrownBy(() -> targetManagement.unassignType(noPermissionsTestDataControllerId)) .isInstanceOf(InsufficientPermissionException.class); - assertThat(assignDistributionSet(ds2Type2.getId(), target1Type1.getControllerId()).getAssigned()).isEqualTo(1); - assertThatThrownBy(() -> assignDistributionSet(ds2Type2.getId(), target2Type2ControllerId)).isInstanceOf( - AssertionError.class); + final Long ds2Type2Id = ds2Type2.getId(); + assertThat(assignDistributionSet(ds2Type2Id, target1Type1.getControllerId()).getAssigned()).isEqualTo(1); + assertThatThrownBy(() -> assignDistributionSet(ds2Type2Id, target2Type2ControllerId)).isInstanceOf(AssertionError.class); // bunch assignment skips denied since at least one target without update permissions is present assertThat(assignDistributionSet( ds3Type2.getId(), List.of(target1Type1.getControllerId(), target2Type2ControllerId), Action.ActionType.FORCED) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetTypeManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetTypeManagementTest.java index 7c76304fb..b0ccfe2e9 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetTypeManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetTypeManagementTest.java @@ -76,14 +76,16 @@ class TargetTypeManagementTest extends AbstractAccessControllerManagementTest { final Update targetTypeUpdate = Update.builder().id(targetType2.getId()).description("anotherDesc").build(); assertThatThrownBy(() -> targetTypeManagement.update(targetTypeUpdate)).isInstanceOf(InsufficientPermissionException.class); - targetTypeManagement.assignCompatibleDistributionSetTypes(targetType1.getId(), List.of(dsType2.getId())); + final Long dsType2Id = dsType2.getId(); + final List dsType2IdList = List.of(dsType2Id); + targetTypeManagement.assignCompatibleDistributionSetTypes(targetType1.getId(), dsType2IdList); final Long targetType2Id = targetType2.getId(); assertThatThrownBy( - () -> targetTypeManagement.assignCompatibleDistributionSetTypes(targetType2Id, List.of(dsType2.getId()))) + () -> targetTypeManagement.assignCompatibleDistributionSetTypes(targetType2Id, dsType2IdList)) .isInstanceOf(InsufficientPermissionException.class); - targetTypeManagement.unassignDistributionSetType(targetType1.getId(), dsType2.getId()); - assertThatThrownBy(() -> targetTypeManagement.unassignDistributionSetType(targetType2Id, dsType2.getId())) + targetTypeManagement.unassignDistributionSetType(targetType1.getId(), dsType2Id); + assertThatThrownBy(() -> targetTypeManagement.unassignDistributionSetType(targetType2Id, dsType2Id)) .isInstanceOf(InsufficientPermissionException.class); }); }