Fix Sonar findings (#1779)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>

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

@@ -668,9 +668,9 @@ public class RepositoryApplicationConfiguration extends JpaBaseConfiguration {
     @Bean
     @ConditionalOnMissingBean
     TargetTagManagement targetTagManagement(final TargetTagRepository targetTagRepository,
-            final TargetRepository targetRepository, final VirtualPropertyReplacer virtualPropertyReplacer,
+            final VirtualPropertyReplacer virtualPropertyReplacer,
             final JpaProperties properties) {
-        return new JpaTargetTagManagement(targetTagRepository, targetRepository, virtualPropertyReplacer,
+        return new JpaTargetTagManagement(targetTagRepository, virtualPropertyReplacer,
                 properties.getDatabase());
     }
 

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

@@ -26,7 +26,6 @@ import org.eclipse.hawkbit.repository.jpa.builder.JpaTagCreate;
 import org.eclipse.hawkbit.repository.jpa.configuration.Constants;
 import org.eclipse.hawkbit.repository.jpa.model.JpaTargetTag;
 import org.eclipse.hawkbit.repository.jpa.model.JpaTargetTag_;
-import org.eclipse.hawkbit.repository.jpa.repository.TargetRepository;
 import org.eclipse.hawkbit.repository.jpa.repository.TargetTagRepository;
 import org.eclipse.hawkbit.repository.jpa.rsql.RSQLUtility;
 import org.eclipse.hawkbit.repository.model.TargetTag;
@@ -49,17 +48,15 @@ import org.springframework.validation.annotation.Validated;
 public class JpaTargetTagManagement implements TargetTagManagement {
 
     private final TargetTagRepository targetTagRepository;
-    private final TargetRepository targetRepository;
 
     private final VirtualPropertyReplacer virtualPropertyReplacer;
     private final Database database;
 
     public JpaTargetTagManagement(
-            final TargetTagRepository targetTagRepository, final TargetRepository targetRepository,
+            final TargetTagRepository targetTagRepository,
             final VirtualPropertyReplacer virtualPropertyReplacer,
             final Database database) {
         this.targetTagRepository = targetTagRepository;
-        this.targetRepository = targetRepository;
         this.virtualPropertyReplacer = virtualPropertyReplacer;
         this.database = database;
     }

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/controller/TargetTypeAccessControllerTest.java

@@ -19,11 +19,8 @@ import org.eclipse.hawkbit.repository.Identifiable;
 import org.eclipse.hawkbit.repository.exception.EntityNotFoundException;
 import org.eclipse.hawkbit.repository.exception.InsufficientPermissionException;
 import org.eclipse.hawkbit.repository.jpa.acm.AccessController;
-import org.eclipse.hawkbit.repository.jpa.model.JpaTarget;
 import org.eclipse.hawkbit.repository.jpa.model.JpaTargetType;
-import org.eclipse.hawkbit.repository.jpa.specifications.TargetSpecifications;
 import org.eclipse.hawkbit.repository.jpa.specifications.TargetTypeSpecification;
-import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.repository.model.TargetType;
 import org.junit.jupiter.api.Test;
 import org.springframework.data.domain.Pageable;
@@ -48,14 +45,6 @@ class TargetTypeAccessControllerTest extends AbstractAccessControllerTest {
         final TargetType hiddenTargetType = targetTypeManagement
                 .create(entityFactory.targetType().create().name("type2"));
 
-        // create target and assign with hidden target type
-        final Target targetWithHiddenTargetType = targetManagement.create(entityFactory.target().create()
-                .controllerId("targetWithUnseeableTargetType").targetType(hiddenTargetType.getId()));
-
-        // create target and assign with permitted target type
-        final Target targetWithPermittedTargetType = targetManagement.create(entityFactory.target().create()
-                .controllerId("targetWithPermittedTargetType").targetType(permittedTargetType.getId()));
-
         // define access controlling rule
         defineAccess(AccessController.Operation.READ, permittedTargetType);
 
@@ -69,9 +58,8 @@ class TargetTypeAccessControllerTest extends AbstractAccessControllerTest {
 
         // verify targetTypeManagement#findByName
         assertThat(targetTypeManagement.findByName(Pageable.unpaged(), permittedTargetType.getName()).getContent())
-                .hasSize(1).satisfies(results -> {
+                .hasSize(1).satisfies(results ->
-                    assertThat(results.get(0).getId()).isEqualTo(permittedTargetType.getId());
+                    assertThat(results.get(0).getId()).isEqualTo(permittedTargetType.getId()));
-                });
         assertThat(targetTypeManagement.findByName(Pageable.unpaged(), hiddenTargetType.getName())).isEmpty();
 
         // verify targetTypeManagement#count
@@ -129,9 +117,8 @@ class TargetTypeAccessControllerTest extends AbstractAccessControllerTest {
         targetTypeManagement.delete(manageableTargetType.getId());
 
         // verify targetTypeManagement#delete for readOnlyTargetType is not possible
-        assertThatThrownBy(() -> {
+        assertThatThrownBy(() -> targetTypeManagement.delete(readOnlyTargetType.getId()))
-            targetTypeManagement.delete(readOnlyTargetType.getId());
+                .isInstanceOfAny(InsufficientPermissionException.class, EntityNotFoundException.class);
-        }).isInstanceOfAny(InsufficientPermissionException.class, EntityNotFoundException.class);
     }
 
     @Test
@@ -155,10 +142,10 @@ class TargetTypeAccessControllerTest extends AbstractAccessControllerTest {
                 .name(manageableTargetType.getName() + "/new").description("newDesc"));
 
         // verify targetTypeManagement#update for readOnlyTargetType is not possible
-        assertThatThrownBy(() -> {
+        assertThatThrownBy(() ->
-            targetTypeManagement.update(entityFactory.targetType().update(readOnlyTargetType.getId())
+                targetTypeManagement.update(entityFactory.targetType().update(readOnlyTargetType.getId())
-                    .name(readOnlyTargetType.getName() + "/new").description("newDesc"));
+                    .name(readOnlyTargetType.getName() + "/new").description("newDesc")))
-        }).isInstanceOf(InsufficientPermissionException.class);
+                .isInstanceOf(InsufficientPermissionException.class);
     }
 
     @Test

pom.xml

@@ -535,12 +535,6 @@
                   </execution>
                </executions>
             </plugin>
-
-<!--            <plugin>-->
-<!--               <groupId>org.bsc.maven</groupId>-->
-<!--               <artifactId>maven-processor-plugin</artifactId>-->
-<!--               <version>${maven.processor.plugin.version}</version>-->
-<!--            </plugin>-->
             <plugin>
                <groupId>com.ethlo.persistence.tools</groupId>
                <artifactId>eclipselink-maven-plugin</artifactId>