Sonar Fixes

Signed-off-by: Avgustin Marinov <[email protected]>

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RepositoryApplicationConfiguration.java

@@ -783,11 +783,23 @@ ConfirmationManagement confirmationManagement(final TargetRepository targetRepos
      */
     @Bean
     @ConditionalOnMissingBean
-    ControllerManagement controllerManagement(final ScheduledExecutorService executorService,
-            final ActionRepository actionRepository, final ActionStatusRepository actionStatusRepository,
-            final QuotaManagement quotaManagement, final RepositoryProperties repositoryProperties) {
-        return new JpaControllerManagement(executorService, actionRepository, actionStatusRepository, quotaManagement,
-                repositoryProperties);
+    ControllerManagement controllerManagement(
+            final ActionRepository actionRepository, final ActionStatusRepository actionStatusRepository, final QuotaManagement quotaManagement,
+            final RepositoryProperties repositoryProperties,
+            final TargetRepository targetRepository, final TargetTypeManagement targetTypeManagement,
+            final DeploymentManagement deploymentManagement, final ConfirmationManagement confirmationManagement,
+            final SoftwareModuleRepository softwareModuleRepository, final SoftwareModuleMetadataRepository softwareModuleMetadataRepository,
+            final DistributionSetManagement distributionSetManagement,
+            final TenantConfigurationManagement tenantConfigurationManagement,
+            final PlatformTransactionManager txManager, final EntityFactory entityFactory, final EntityManager entityManager,
+            final AfterTransactionCommitExecutor afterCommit, final EventPublisherHolder eventPublisherHolder,
+            final SystemSecurityContext systemSecurityContext, final TenantAware tenantAware,
+            final ScheduledExecutorService executorService) {
+        return new JpaControllerManagement(actionRepository, actionStatusRepository, quotaManagement, repositoryProperties,
+                targetRepository, targetTypeManagement, deploymentManagement, confirmationManagement, softwareModuleRepository,
+                softwareModuleMetadataRepository, distributionSetManagement, tenantConfigurationManagement, txManager,
+                entityFactory, entityManager, afterCommit, eventPublisherHolder, systemSecurityContext, tenantAware,
+                executorService);
     }
 
     @Bean

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaActionManagement.java

@@ -22,6 +22,8 @@
 import org.eclipse.hawkbit.repository.RepositoryProperties;
 import org.eclipse.hawkbit.repository.exception.EntityNotFoundException;
 import org.eclipse.hawkbit.repository.jpa.builder.JpaActionStatusCreate;
+import org.eclipse.hawkbit.repository.jpa.model.AbstractBaseEntity;
+import org.eclipse.hawkbit.repository.jpa.model.AbstractJpaBaseEntity_;
 import org.eclipse.hawkbit.repository.jpa.model.JpaAction;
 import org.eclipse.hawkbit.repository.jpa.model.JpaActionStatus;
 import org.eclipse.hawkbit.repository.jpa.model.JpaAction_;
@@ -47,8 +49,7 @@ public class JpaActionManagement {
     protected final RepositoryProperties repositoryProperties;
 
     public JpaActionManagement(
-            final ActionRepository actionRepository,
-            final ActionStatusRepository actionStatusRepository, final QuotaManagement quotaManagement,
+            final ActionRepository actionRepository, final ActionStatusRepository actionStatusRepository, final QuotaManagement quotaManagement,
             final RepositoryProperties repositoryProperties) {
         this.actionRepository = actionRepository;
         this.actionStatusRepository = actionStatusRepository;
@@ -109,12 +110,14 @@ protected List<Action> findActiveActionsWithHighestWeightConsideringDefault(fina
                         actionRepository.findAll(
                                 ActionSpecifications.byTargetControllerIdAndActiveAndWeightIsNull(controllerId, false),
                                 JpaAction_.GRAPH_ACTION_DS,
-                                PageRequest.of(0, maxActionCount, Sort.by(Sort.Order.desc(JpaAction_.WEIGHT), Sort.Order.asc(JpaAction_.ID)))).stream(),
+                                PageRequest.of(
+                                        0, maxActionCount,
+                                        Sort.by(Sort.Order.desc(JpaAction_.WEIGHT), Sort.Order.asc(AbstractJpaBaseEntity_.ID)))).stream(),
                         // get the oldest actions without weight
                         actionRepository.findAll(
                                 ActionSpecifications.byTargetControllerIdAndActiveAndWeightIsNull(controllerId, true),
                                 JpaAction_.GRAPH_ACTION_DS,
-                                PageRequest.of(0, maxActionCount, Sort.by(Sort.Order.asc(JpaAction_.ID)))).stream())
+                                PageRequest.of(0, maxActionCount, Sort.by(Sort.Order.asc(AbstractJpaBaseEntity_.ID)))).stream())
                 .sorted(Comparator.comparingInt(this::getWeightConsideringDefault).reversed().thenComparing(Action::getId))
                 .limit(maxActionCount)
                 .map(Action.class::cast)

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaArtifactManagement.java

@@ -193,6 +193,7 @@ public long countBySoftwareModule(final long softwareModuleId) {
         return localArtifactRepository.count(ArtifactSpecifications.bySoftwareModuleId(softwareModuleId));
     }
 
+    @SuppressWarnings("java:S2201") // java:S2201 - the idea is to just check if the artifact exists
     @Override
     public Optional<DbArtifact> loadArtifactBinary(final String sha1Hash, final long softwareModuleId, final boolean isEncrypted) {
         assertArtifactRepositoryAvailable();

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaControllerManagement.java

@@ -69,6 +69,7 @@
 import org.eclipse.hawkbit.repository.jpa.builder.JpaActionStatusCreate;
 import org.eclipse.hawkbit.repository.jpa.configuration.Constants;
 import org.eclipse.hawkbit.repository.jpa.executor.AfterTransactionCommitExecutor;
+import org.eclipse.hawkbit.repository.jpa.model.AbstractJpaBaseEntity_;
 import org.eclipse.hawkbit.repository.jpa.model.JpaAction;
 import org.eclipse.hawkbit.repository.jpa.model.JpaActionStatus;
 import org.eclipse.hawkbit.repository.jpa.model.JpaActionStatus_;
@@ -128,42 +129,54 @@ public class JpaControllerManagement extends JpaActionManagement implements Cont
 
     private final BlockingDeque<TargetPoll> queue;
 
-    @Autowired
-    private EntityManager entityManager;
-    @Autowired
+    // TODO - make it final
     private TargetRepository targetRepository;
-    @Autowired
-    private SoftwareModuleRepository softwareModuleRepository;
-    @Autowired
-    private TenantConfigurationManagement tenantConfigurationManagement;
-    @Autowired
-    private SystemSecurityContext systemSecurityContext;
-    @Autowired
-    private EntityFactory entityFactory;
-    @Autowired
-    private EventPublisherHolder eventPublisherHolder;
-    @Autowired
-    private AfterTransactionCommitExecutor afterCommit;
-    @Autowired
-    private SoftwareModuleMetadataRepository softwareModuleMetadataRepository;
-    @Autowired
-    private PlatformTransactionManager txManager;
-    @Autowired
-    private TenantAware tenantAware;
-    @Autowired
-    private ConfirmationManagement confirmationManagement;
-    @Autowired
-    private TargetTypeManagement targetTypeManagement;
-    @Autowired
-    private DeploymentManagement deploymentManagement;
-    @Autowired
-    private DistributionSetManagement distributionSetManagement;
-
-    public JpaControllerManagement(final ScheduledExecutorService executorService,
-            final ActionRepository actionRepository, final ActionStatusRepository actionStatusRepository,
-            final QuotaManagement quotaManagement, final RepositoryProperties repositoryProperties) {
+    private final TargetTypeManagement targetTypeManagement;
+    private final DeploymentManagement deploymentManagement;
+    private final ConfirmationManagement confirmationManagement;
+    private final SoftwareModuleRepository softwareModuleRepository;
+    private final SoftwareModuleMetadataRepository softwareModuleMetadataRepository;
+    private final DistributionSetManagement distributionSetManagement;
+    private final TenantConfigurationManagement tenantConfigurationManagement;
+    private final PlatformTransactionManager txManager;
+    private final EntityFactory entityFactory;
+    private final EntityManager entityManager;
+    private final AfterTransactionCommitExecutor afterCommit;
+    private final EventPublisherHolder eventPublisherHolder;
+    private final SystemSecurityContext systemSecurityContext;
+    private final TenantAware tenantAware;
+
+    @SuppressWarnings("squid:S00107")
+    public JpaControllerManagement(
+            final ActionRepository actionRepository, final ActionStatusRepository actionStatusRepository, final QuotaManagement quotaManagement,
+            final RepositoryProperties repositoryProperties,
+            final TargetRepository targetRepository, final TargetTypeManagement targetTypeManagement,
+            final DeploymentManagement deploymentManagement, final ConfirmationManagement confirmationManagement,
+            final SoftwareModuleRepository softwareModuleRepository, final SoftwareModuleMetadataRepository softwareModuleMetadataRepository,
+            final DistributionSetManagement distributionSetManagement,
+            final TenantConfigurationManagement tenantConfigurationManagement,
+            final PlatformTransactionManager txManager, final EntityFactory entityFactory, final EntityManager entityManager,
+            final AfterTransactionCommitExecutor afterCommit, final EventPublisherHolder eventPublisherHolder,
+            final SystemSecurityContext systemSecurityContext, final TenantAware tenantAware,
+            final ScheduledExecutorService executorService) {
         super(actionRepository, actionStatusRepository, quotaManagement, repositoryProperties);
 
+        this.targetRepository = targetRepository;
+        this.targetTypeManagement = targetTypeManagement;
+        this.deploymentManagement = deploymentManagement;
+        this.confirmationManagement = confirmationManagement;
+        this.softwareModuleRepository = softwareModuleRepository;
+        this.softwareModuleMetadataRepository = softwareModuleMetadataRepository;
+        this.distributionSetManagement = distributionSetManagement;
+        this.tenantConfigurationManagement = tenantConfigurationManagement;
+        this.txManager = txManager;
+        this.entityFactory = entityFactory;
+        this.entityManager = entityManager;
+        this.afterCommit = afterCommit;
+        this.eventPublisherHolder = eventPublisherHolder;
+        this.systemSecurityContext = systemSecurityContext;
+        this.tenantAware = tenantAware;
+
         if (!repositoryProperties.isEagerPollPersistence()) {
             executorService.scheduleWithFixedDelay(this::flushUpdateQueue,
                     repositoryProperties.getPollPersistenceFlushTime(),
@@ -289,11 +302,13 @@ public Optional<Action> findActiveActionWithHighestWeight(final String controlle
                         // get the highest action with weight
                         actionRepository.findAll(
                                 ActionSpecifications.byTargetControllerIdAndActiveAndWeightIsNull(controllerId, false),
-                                PageRequest.of(0, 1, Sort.by(Sort.Order.desc(JpaAction_.WEIGHT), Sort.Order.asc(JpaAction_.ID)))).stream(),
+                                PageRequest.of(
+                                        0, 1,
+                                        Sort.by(Sort.Order.desc(JpaAction_.WEIGHT), Sort.Order.asc(AbstractJpaBaseEntity_.ID)))).stream(),
                         // get the oldest action without weight
                         actionRepository.findAll(
                                 ActionSpecifications.byTargetControllerIdAndActiveAndWeightIsNull(controllerId, false),
-                                PageRequest.of(0, 1, Sort.by(Sort.Order.asc(JpaAction_.ID)))).stream())
+                                PageRequest.of(0, 1, Sort.by(Sort.Order.asc(AbstractJpaBaseEntity_.ID)))).stream())
                 .min(Comparator.comparingInt(this::getWeightConsideringDefault).reversed().thenComparing(Action::getId))
                 .map(Action.class::cast);
     }
@@ -911,28 +926,22 @@ private void assertTargetAttributesQuota(final JpaTarget target) {
      */
     private Action handleRegisterRetrieved(final Long actionId, final String message) {
         final JpaAction action = getActionAndThrowExceptionIfNotFound(actionId);
-        // do a manual query with CriteriaBuilder to avoid unnecessary field
-        // queries and an extra
-        // count query made by spring-data when using pageable requests, we
-        // don't need an extra count
-        // query, we just want to check if the last action status is a retrieved
-        // or not.
+        // do a manual query with CriteriaBuilder to avoid unnecessary field queries and an extra
+        // count query made by spring-data when using pageable requests, we don't need an extra count
+        // query, we just want to check if the last action status is a retrieved or not.
         final CriteriaBuilder cb = entityManager.getCriteriaBuilder();
         final CriteriaQuery<Object[]> queryActionStatus = cb.createQuery(Object[].class);
         final Root<JpaActionStatus> actionStatusRoot = queryActionStatus.from(JpaActionStatus.class);
         final CriteriaQuery<Object[]> query = queryActionStatus
-                .multiselect(actionStatusRoot.get(JpaActionStatus_.id), actionStatusRoot.get(JpaActionStatus_.status))
-                .where(cb.equal(actionStatusRoot.get(JpaActionStatus_.action).get(JpaAction_.id), actionId))
-                .orderBy(cb.desc(actionStatusRoot.get(JpaActionStatus_.id)));
+                .multiselect(actionStatusRoot.get(AbstractJpaBaseEntity_.id), actionStatusRoot.get(JpaActionStatus_.status))
+                .where(cb.equal(actionStatusRoot.get(JpaActionStatus_.action).get(AbstractJpaBaseEntity_.id), actionId))
+                .orderBy(cb.desc(actionStatusRoot.get(AbstractJpaBaseEntity_.id)));
         final List<Object[]> resultList = entityManager.createQuery(query).setFirstResult(0).setMaxResults(1)
                 .getResultList();
 
-        // if the latest status is not in retrieve state then we add a retrieved
-        // state again, we want
-        // to document a deployment retrieved status and a cancel retrieved
-        // status, but multiple
-        // retrieves after the other we don't want to store to protect to
-        // overflood action status in
+        // if the latest status is not in retrieve state then we add a retrieved state again, we want
+        // to document a deployment retrieved status and a cancel retrieved status, but multiple
+        // retrieves after the other we don't want to store to protect to overflood action status in
         // case controller retrieves a action multiple times.
         if (resultList.isEmpty() || (Status.RETRIEVED != resultList.get(0)[1])) {
             // document that the status has been retrieved

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java

@@ -57,9 +57,9 @@
 import org.eclipse.hawkbit.repository.jpa.acm.AccessController;
 import org.eclipse.hawkbit.repository.jpa.configuration.Constants;
 import org.eclipse.hawkbit.repository.jpa.executor.AfterTransactionCommitExecutor;
+import org.eclipse.hawkbit.repository.jpa.model.AbstractJpaBaseEntity_;
 import org.eclipse.hawkbit.repository.jpa.model.JpaAction;
 import org.eclipse.hawkbit.repository.jpa.model.JpaActionStatus;
-import org.eclipse.hawkbit.repository.jpa.model.JpaActionStatus_;
 import org.eclipse.hawkbit.repository.jpa.model.JpaDistributionSet;
 import org.eclipse.hawkbit.repository.jpa.model.JpaTarget;
 import org.eclipse.hawkbit.repository.jpa.model.JpaTarget_;
@@ -162,6 +162,7 @@ public class JpaDeploymentManagement extends JpaActionManagement implements Depl
     private final Database database;
     private final RetryTemplate retryTemplate;
 
+    @SuppressWarnings("java:S107")
     public JpaDeploymentManagement(
             final EntityManager entityManager, final ActionRepository actionRepository,
             final DistributionSetManagement distributionSetManagement, final TargetRepository targetRepository,
@@ -361,7 +362,7 @@ public Page<String> findMessagesByActionStatusId(final Pageable pageable, final
         final Root<JpaActionStatus> as = msgQuery.from(JpaActionStatus.class);
         final ListJoin<JpaActionStatus, String> join = as.joinList("messages", JoinType.LEFT);
         final CriteriaQuery<String> selMsgQuery = msgQuery.select(join);
-        selMsgQuery.where(cb.equal(as.get(JpaActionStatus_.id), actionStatusId));
+        selMsgQuery.where(cb.equal(as.get(AbstractJpaBaseEntity_.id), actionStatusId));
 
         final List<String> result = new ArrayList<>(entityManager.createQuery(selMsgQuery)
                 .setFirstResult((int) pageable.getOffset()).setMaxResults(pageable.getPageSize()).getResultList());

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetInvalidationManagement.java

@@ -51,6 +51,7 @@ public class JpaDistributionSetInvalidationManagement implements DistributionSet
     private final LockRegistry lockRegistry;
     private final SystemSecurityContext systemSecurityContext;
 
+    @SuppressWarnings("java:S107")
     public JpaDistributionSetInvalidationManagement(final DistributionSetManagement distributionSetManagement,
             final RolloutManagement rolloutManagement, final DeploymentManagement deploymentManagement,
             final TargetFilterQueryManagement targetFilterQueryManagement, final ActionRepository actionRepository,

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetManagement.java

@@ -49,6 +49,7 @@
 import org.eclipse.hawkbit.repository.jpa.acm.AccessController;
 import org.eclipse.hawkbit.repository.jpa.builder.JpaDistributionSetCreate;
 import org.eclipse.hawkbit.repository.jpa.configuration.Constants;
+import org.eclipse.hawkbit.repository.jpa.model.AbstractJpaBaseEntity_;
 import org.eclipse.hawkbit.repository.jpa.model.DsMetadataCompositeKey;
 import org.eclipse.hawkbit.repository.jpa.model.JpaDistributionSet;
 import org.eclipse.hawkbit.repository.jpa.model.JpaDistributionSetMetadata;
@@ -115,6 +116,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
     private final Database database;
     private final RepositoryProperties repositoryProperties;
 
+    @SuppressWarnings("java:S107")
     public JpaDistributionSetManagement(
             final EntityManager entityManager,
             final DistributionSetRepository distributionSetRepository,
@@ -175,6 +177,7 @@ public DistributionSet create(final DistributionSetCreate c) {
     @Retryable(retryFor = { ConcurrencyFailureException.class }, maxAttempts = Constants.TX_RT_MAX,
             backoff = @Backoff(delay = Constants.TX_RT_DELAY))
     @PreAuthorize(SpPermission.SpringEvalExpressions.HAS_AUTH_UPDATE_REPOSITORY)
+    @SuppressWarnings("java:S1066") // javaS1066 - better readable that way
     public DistributionSet update(final DistributionSetUpdate u) {
         final GenericDistributionSetUpdate update = (GenericDistributionSetUpdate) u;
 
@@ -767,7 +770,7 @@ private void assertSoftwareModuleQuota(final Long id, final int requested) {
 
     private Specification<JpaDistributionSetMetadata> byDsIdSpec(final long dsId) {
         return (root, query, cb) -> cb
-                .equal(root.get(JpaDistributionSetMetadata_.distributionSet).get(JpaDistributionSet_.id), dsId);
+                .equal(root.get(JpaDistributionSetMetadata_.distributionSet).get(AbstractJpaBaseEntity_.id), dsId);
     }
 
     private void assertDistributionSetIsNotAssignedToTargets(final Long distributionSet) {

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetTagManagement.java

@@ -13,7 +13,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.eclipse.hawkbit.im.authentication.SpPermission;
 import org.eclipse.hawkbit.repository.DistributionSetTagFields;