From 42b0bc06a997f38357ab68675d0723ffe1222907 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Tue, 26 Aug 2025 09:32:43 +0300 Subject: [PATCH] Fix Sonar findings (#2630) Signed-off-by: Avgustin Marinov --- .github/dependabot.yml | 2 +- .../resource/MgmtSoftwareModuleResourceTest.java | 4 ---- .../jpa/AbstractJpaIntegrationTest.java | 4 ---- .../acm/DistributionSetAccessControllerTest.java | 16 ++++++++-------- .../jpa/management/ArtifactManagementTest.java | 4 +--- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4516a46b3..d86cb46c4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -16,7 +16,7 @@ updates: interval: "daily" # Enable version updates for github actions - package-ecosystem: "github-actions" - directory: "/.3rd-party" + directory: "/" # Check daily schedule: interval: "daily" diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java index 272009329..032885470 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java @@ -1539,10 +1539,6 @@ class MgmtSoftwareModuleResourceTest extends AbstractManagementApiIntegrationTes // hashes final DbArtifactHash hash = artifact.getHashes(); assertThat(hash.getSha1()).as("Wrong sha1 hash").isEqualTo(HashGeneratorUtils.generateSHA1(random)); - // sha1 hashes are not used via loaded artifact -// assertThat(hash.getMd5()).as("Wrong md5 hash").isEqualTo(HashGeneratorUtils.generateMD5(random)); -// assertThat(hash.getSha256()).as("Wrong sha256 hash").isEqualTo(HashGeneratorUtils.generateSHA256(random)); - // metadata assertThat(softwareModuleManagement.find(sm.getId()).orElseThrow().getArtifacts().get(0).getFilename()) .as("wrong metadata of the filename").isEqualTo("origFilename"); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/AbstractJpaIntegrationTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/AbstractJpaIntegrationTest.java index 214b142a3..dd3cc503d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/AbstractJpaIntegrationTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/AbstractJpaIntegrationTest.java @@ -83,10 +83,6 @@ public abstract class AbstractJpaIntegrationTest extends AbstractIntegrationTest protected static final String NOT_EXIST_ID = "12345678990"; protected static final long NOT_EXIST_IDL = Long.parseLong(NOT_EXIST_ID); - private static final List REPOSITORY_AND_TARGET_PERMISSIONS = List.of(SpPermission.READ_REPOSITORY, SpPermission.CREATE_REPOSITORY, - SpPermission.UPDATE_REPOSITORY, SpPermission.DELETE_REPOSITORY, SpPermission.READ_TARGET, SpPermission.CREATE_TARGET, - SpPermission.UPDATE_TARGET, SpPermission.DELETE_TARGET); - @Autowired protected TargetRepository targetRepository; @Autowired diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/DistributionSetAccessControllerTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/DistributionSetAccessControllerTest.java index 51be91042..01f09c5d9 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/DistributionSetAccessControllerTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/DistributionSetAccessControllerTest.java @@ -246,14 +246,14 @@ class DistributionSetAccessControllerTest extends AbstractJpaIntegrationTest { UPDATE_DISTRIBUTION_SET + "/id==" + permitted.getId(), // read / update target needed to update target filter query READ_TARGET, UPDATE_TARGET), () -> { -// assertThat(targetFilterQueryManagement -// .updateAutoAssignDS(new AutoAssignDistributionSetUpdate(targetFilterQuery.getId()).ds(permitted.getId()) -// .actionType(Action.ActionType.FORCED).confirmationRequired(false)) -// .getAutoAssignDistributionSet().getId()).isEqualTo(permitted.getId()); -// targetFilterQueryManagement -// .updateAutoAssignDS(new AutoAssignDistributionSetUpdate(targetFilterQuery.getId()) -// .ds(readOnly.getId()).actionType(Action.ActionType.FORCED).confirmationRequired(false)) -// .getAutoAssignDistributionSet().getId(); + assertThat(targetFilterQueryManagement + .updateAutoAssignDS(new AutoAssignDistributionSetUpdate(targetFilterQuery.getId()).ds(permitted.getId()) + .actionType(Action.ActionType.FORCED).confirmationRequired(false)) + .getAutoAssignDistributionSet().getId()).isEqualTo(permitted.getId()); + targetFilterQueryManagement + .updateAutoAssignDS(new AutoAssignDistributionSetUpdate(targetFilterQuery.getId()) + .ds(readOnly.getId()).actionType(Action.ActionType.FORCED).confirmationRequired(false)) + .getAutoAssignDistributionSet().getId(); final AutoAssignDistributionSetUpdate autoAssignDistributionSetUpdate = new AutoAssignDistributionSetUpdate(targetFilterQuery.getId()) .ds(hidden.getId()).actionType(Action.ActionType.FORCED).confirmationRequired(false); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java index 602051c06..78bce8d56 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java @@ -133,10 +133,8 @@ class ArtifactManagementTest extends AbstractJpaIntegrationTest { final DbArtifact dbArtifact = artifactManagement.loadArtifactBinary( HashGeneratorUtils.generateSHA1(randomBytes), sm.getId(), sm.isEncrypted()); final DbArtifactHash hash = dbArtifact.getHashes(); + // md5 and sha256 are kept in local artifact db and should not be provided by "load", test only sha1 assertThat(hash.getSha1()).isEqualTo(HashGeneratorUtils.generateSHA1(randomBytes)); - // md5 and sha256 are kept in local artifact db and should not be provided by "load" -// assertThat(hash.getMd5()).isEqualTo(HashGeneratorUtils.generateMD5(randomBytes)); -// assertThat(hash.getSha256()).isEqualTo(HashGeneratorUtils.generateSHA256(randomBytes)); assertThat(artifactRepository.findAll()).hasSize(4); assertThat(softwareModuleRepository.findAll()).hasSize(3);