From b3e32c14b6ab6d92f89bab7af93043f4235ea2dd Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Thu, 7 Aug 2025 09:27:52 +0300 Subject: [PATCH] Fix Sonar Findings (#2596) Signed-off-by: Avgustin Marinov --- .../mgmt/rest/resource/MgmtDistributionSetResource.java | 4 ++-- .../hawkbit/mgmt/rest/resource/MgmtRolloutResource.java | 5 +++-- .../rest/resource/MgmtTargetFilterQueryResource.java | 4 +--- .../repository/jpa/JpaRepositoryConfiguration.java | 8 ++++---- .../jpa/autoassign/AbstractAutoAssignExecutor.java | 9 +++++---- .../repository/jpa/autoassign/AutoAssignChecker.java | 3 ++- .../JpaDistributionSetInvalidationManagement.java | 8 +++++--- 7 files changed, 22 insertions(+), 19 deletions(-) diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java index 19c194dfa..ad10ee0b9 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java @@ -86,7 +86,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { private final DistributionSetTypeManagement distributionSetTypeManagement; private final DistributionSetInvalidationManagement distributionSetInvalidationManagement; private final TargetManagement targetManagement; - private final TargetFilterQueryManagement targetFilterQueryManagement; + private final TargetFilterQueryManagement targetFilterQueryManagement; private final DeploymentManagement deployManagement; private final SystemManagement systemManagement; private final MgmtDistributionSetMapper mgmtDistributionSetMapper; @@ -99,7 +99,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { final DistributionSetManagement distributionSetManagement, final DistributionSetTypeManagement distributionSetTypeManagement, final DistributionSetInvalidationManagement distributionSetInvalidationManagement, - final TargetManagement targetManagement, final TargetFilterQueryManagement targetFilterQueryManagement, + final TargetManagement targetManagement, final TargetFilterQueryManagement targetFilterQueryManagement, final DeploymentManagement deployManagement, final TenantConfigurationManagement tenantConfigurationManagement, final MgmtDistributionSetMapper mgmtDistributionSetMapper, final SystemManagement systemManagement, final SystemSecurityContext systemSecurityContext) { diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java index 9a3f6f998..bf6e41b81 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java @@ -47,6 +47,7 @@ import org.eclipse.hawkbit.repository.model.RolloutGroup; import org.eclipse.hawkbit.repository.model.RolloutGroupConditionBuilder; import org.eclipse.hawkbit.repository.model.RolloutGroupConditions; import org.eclipse.hawkbit.repository.model.Target; +import org.eclipse.hawkbit.repository.model.TargetFilterQuery; import org.eclipse.hawkbit.security.SystemSecurityContext; import org.eclipse.hawkbit.utils.TenantConfigHelper; import org.springframework.data.domain.Page; @@ -65,14 +66,14 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi { private final RolloutManagement rolloutManagement; private final RolloutGroupManagement rolloutGroupManagement; private final DistributionSetManagement distributionSetManagement; - private final TargetFilterQueryManagement targetFilterQueryManagement; + private final TargetFilterQueryManagement targetFilterQueryManagement; private final EntityFactory entityFactory; private final TenantConfigHelper tenantConfigHelper; MgmtRolloutResource( final RolloutManagement rolloutManagement, final RolloutGroupManagement rolloutGroupManagement, final DistributionSetManagement distributionSetManagement, - final TargetFilterQueryManagement targetFilterQueryManagement, final EntityFactory entityFactory, + final TargetFilterQueryManagement targetFilterQueryManagement, final EntityFactory entityFactory, final SystemSecurityContext systemSecurityContext, final TenantConfigurationManagement tenantConfigurationManagement) { this.rolloutManagement = rolloutManagement; diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java index 187651495..4b1d2dde5 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java @@ -49,15 +49,13 @@ import org.springframework.web.bind.annotation.RestController; public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestApi { private final TargetFilterQueryManagement filterManagement; - private final EntityFactory entityFactory; private final TenantConfigHelper tenantConfigHelper; MgmtTargetFilterQueryResource( - final TargetFilterQueryManagement filterManagement, final EntityFactory entityFactory, + final TargetFilterQueryManagement filterManagement, final SystemSecurityContext systemSecurityContext, final TenantConfigurationManagement tenantConfigurationManagement) { this.filterManagement = filterManagement; - this.entityFactory = entityFactory; this.tenantConfigHelper = TenantConfigHelper.usingContext(systemSecurityContext, tenantConfigurationManagement); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java index c4e1e74ee..992da6835 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java @@ -463,11 +463,11 @@ public class JpaRepositoryConfiguration { */ @Bean @ConditionalOnMissingBean - AutoAssignExecutor autoAssignExecutor(final TargetFilterQueryManagement targetFilterQueryManagement, - final TargetManagement targetManagement, final DeploymentManagement deploymentManagement, + AutoAssignExecutor autoAssignExecutor( + final TargetFilterQueryManagement targetFilterQueryManagement, final TargetManagement targetManagement, + final DeploymentManagement deploymentManagement, final PlatformTransactionManager transactionManager, final ContextAware contextAware) { - return new AutoAssignChecker(targetFilterQueryManagement, targetManagement, deploymentManagement, - transactionManager, contextAware); + return new AutoAssignChecker(targetFilterQueryManagement, targetManagement, deploymentManagement, transactionManager, contextAware); } /** diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AbstractAutoAssignExecutor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AbstractAutoAssignExecutor.java index 5f77ef460..0601dd306 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AbstractAutoAssignExecutor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AbstractAutoAssignExecutor.java @@ -46,7 +46,7 @@ public abstract class AbstractAutoAssignExecutor implements AutoAssignExecutor { */ private static final int PAGE_SIZE = 1000; - private final TargetFilterQueryManagement targetFilterQueryManagement; + private final TargetFilterQueryManagement targetFilterQueryManagement; private final DeploymentManagement deploymentManagement; private final PlatformTransactionManager transactionManager; private final ContextAware contextAware; @@ -59,9 +59,10 @@ public abstract class AbstractAutoAssignExecutor implements AutoAssignExecutor { * @param transactionManager to run transactions * @param contextAware to handle the context */ - protected AbstractAutoAssignExecutor(final TargetFilterQueryManagement targetFilterQueryManagement, - final DeploymentManagement deploymentManagement, final PlatformTransactionManager transactionManager, - final ContextAware contextAware) { + protected AbstractAutoAssignExecutor( + final TargetFilterQueryManagement targetFilterQueryManagement, + final DeploymentManagement deploymentManagement, + final PlatformTransactionManager transactionManager, final ContextAware contextAware) { this.targetFilterQueryManagement = targetFilterQueryManagement; this.deploymentManagement = deploymentManagement; this.transactionManager = transactionManager; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java index c860ab324..7bcae7db2 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java @@ -49,7 +49,8 @@ public class AutoAssignChecker extends AbstractAutoAssignExecutor { * @param transactionManager to run transactions * @param contextAware to handle the context */ - public AutoAssignChecker(final TargetFilterQueryManagement targetFilterQueryManagement, + public AutoAssignChecker( + final TargetFilterQueryManagement targetFilterQueryManagement, final TargetManagement targetManagement, final DeploymentManagement deploymentManagement, final PlatformTransactionManager transactionManager, final ContextAware contextAware) { super(targetFilterQueryManagement, deploymentManagement, transactionManager, contextAware); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetInvalidationManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetInvalidationManagement.java index ceb55a737..13dc07667 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetInvalidationManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetInvalidationManagement.java @@ -29,6 +29,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.DistributionSetInvalidation; import org.eclipse.hawkbit.repository.model.DistributionSetInvalidation.CancelationType; import org.eclipse.hawkbit.repository.model.DistributionSetInvalidationCount; +import org.eclipse.hawkbit.repository.model.TargetFilterQuery; import org.eclipse.hawkbit.security.SystemSecurityContext; import org.eclipse.hawkbit.tenancy.TenantAware; import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty; @@ -47,7 +48,7 @@ public class JpaDistributionSetInvalidationManagement implements DistributionSet private final DistributionSetManagement distributionSetManagement; private final RolloutManagement rolloutManagement; private final DeploymentManagement deploymentManagement; - private final TargetFilterQueryManagement targetFilterQueryManagement; + private final TargetFilterQueryManagement targetFilterQueryManagement; private final ActionRepository actionRepository; private final PlatformTransactionManager txManager; private final RepositoryProperties repositoryProperties; @@ -56,9 +57,10 @@ public class JpaDistributionSetInvalidationManagement implements DistributionSet private final SystemSecurityContext systemSecurityContext; @SuppressWarnings("java:S107") - protected JpaDistributionSetInvalidationManagement(final DistributionSetManagement distributionSetManagement, + protected JpaDistributionSetInvalidationManagement( + final DistributionSetManagement distributionSetManagement, final RolloutManagement rolloutManagement, final DeploymentManagement deploymentManagement, - final TargetFilterQueryManagement targetFilterQueryManagement, final ActionRepository actionRepository, + final TargetFilterQueryManagement targetFilterQueryManagement, final ActionRepository actionRepository, final PlatformTransactionManager txManager, final RepositoryProperties repositoryProperties, final TenantAware tenantAware, final LockRegistry lockRegistry, final SystemSecurityContext systemSecurityContext) {