Merge remote-tracking branch 'eclipse/master' into MECS-1444-CREATE_UNIT_TEST_FOR_ENUM_FIELDS

2016-01-27 14:58:30 +01:00
parent b877faed24 ff13a047a9
commit 41984f7e55
107 changed files with 1225 additions and 1210 deletions
--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/DeploymentManagementTest.java
@@ -44,16 +44,16 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort.Direction;

-import ru.yandex.qatools.allure.annotations.Description;
-import ru.yandex.qatools.allure.annotations.Features;
-import ru.yandex.qatools.allure.annotations.Issue;
-import ru.yandex.qatools.allure.annotations.Stories;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;

+import ru.yandex.qatools.allure.annotations.Description;
+import ru.yandex.qatools.allure.annotations.Features;
+import ru.yandex.qatools.allure.annotations.Issue;
+import ru.yandex.qatools.allure.annotations.Stories;
+
 /**
 * Test class testing the functionality of triggering a deployment of
 * {@link DistributionSet}s to {@link Target}s.
@@ -129,21 +129,19 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        final DistributionSet cancelDs = TestDataUtil.generateDistributionSet("Canceled DS", "1.0", softwareManagement,
                distributionSetManagement, new ArrayList<DistributionSetTag>());

-        final DistributionSet cancelDs2 = TestDataUtil.generateDistributionSet("Canceled DS", "1.2",
-                softwareManagement, distributionSetManagement, new ArrayList<DistributionSetTag>());
+        final DistributionSet cancelDs2 = TestDataUtil.generateDistributionSet("Canceled DS", "1.2", softwareManagement,
+                distributionSetManagement, new ArrayList<DistributionSetTag>());

-        List<Target> targets = targetManagement.createTargets(TestDataUtil
-                .generateTargets(Constants.MAX_ENTRIES_IN_STATEMENT + 10));
+        List<Target> targets = targetManagement
+                .createTargets(TestDataUtil.generateTargets(Constants.MAX_ENTRIES_IN_STATEMENT + 10));

        targets = deploymentManagement.assignDistributionSet(cancelDs, targets).getAssignedTargets();
        targets = deploymentManagement.assignDistributionSet(cancelDs2, targets).getAssignedTargets();

-        targetManagement.findAllTargetIds().forEach(
-                targetIdName -> {
-                    assertThat(
-                            deploymentManagement.findActiveActionsByTarget(targetManagement
-                                    .findTargetByControllerID(targetIdName.getControllerId()))).hasSize(2);
-                });
+        targetManagement.findAllTargetIds().forEach(targetIdName -> {
+            assertThat(deploymentManagement.findActiveActionsByTarget(
+                    targetManagement.findTargetByControllerID(targetIdName.getControllerId()))).hasSize(2);
+        });
    }

    @Test
@@ -164,8 +162,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        target = targetManagement.createTarget(target);

        // check initial status
-        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus()).isEqualTo(
-                TargetUpdateStatus.UNKNOWN);
+        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
+                .isEqualTo(TargetUpdateStatus.UNKNOWN);

        // assign the two sets in a row
        Action firstAction = assignSet(target, dsFirst);
@@ -184,8 +182,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
                new ActionStatus(secondAction, Status.CANCELED, System.currentTimeMillis()), secondAction);
        assertThat(actionStatusRepository.findAll()).hasSize(4);
        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet()).isEqualTo(dsFirst);
-        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus()).isEqualTo(
-                TargetUpdateStatus.PENDING);
+        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
+                .isEqualTo(TargetUpdateStatus.PENDING);

        // we cancel first -> back to installed
        deploymentManagement.cancelAction(firstAction,
@@ -196,10 +194,10 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        controllerManagement.addCancelActionStatus(
                new ActionStatus(firstAction, Status.CANCELED, System.currentTimeMillis()), firstAction);
        assertThat(actionStatusRepository.findAll()).hasSize(6);
-        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet()).isEqualTo(
-                dsInstalled);
-        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus()).isEqualTo(
-                TargetUpdateStatus.IN_SYNC);
+        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet())
+                .isEqualTo(dsInstalled);
+        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
+                .isEqualTo(TargetUpdateStatus.IN_SYNC);
    }

    @Test
@@ -220,8 +218,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        target = targetManagement.createTarget(target);

        // check initial status
-        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus()).isEqualTo(
-                TargetUpdateStatus.UNKNOWN);
+        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
+                .isEqualTo(TargetUpdateStatus.UNKNOWN);

        // assign the two sets in a row
        Action firstAction = assignSet(target, dsFirst);
@@ -240,8 +238,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
                new ActionStatus(firstAction, Status.CANCELED, System.currentTimeMillis()), firstAction);
        assertThat(actionStatusRepository.findAll()).hasSize(4);
        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet()).isEqualTo(dsSecond);
-        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus()).isEqualTo(
-                TargetUpdateStatus.PENDING);
+        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
+                .isEqualTo(TargetUpdateStatus.PENDING);

        // we cancel second -> remain assigned until finished cancellation
        deploymentManagement.cancelAction(secondAction,
@@ -254,10 +252,10 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        controllerManagement.addCancelActionStatus(
                new ActionStatus(secondAction, Status.CANCELED, System.currentTimeMillis()), secondAction);
        // cancelled success -> back to dsInstalled
-        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet()).isEqualTo(
-                dsInstalled);
-        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus()).isEqualTo(
-                TargetUpdateStatus.IN_SYNC);
+        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet())
+                .isEqualTo(dsInstalled);
+        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
+                .isEqualTo(TargetUpdateStatus.IN_SYNC);
    }

    @Test
@@ -270,12 +268,13 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        target.getTargetInfo().setInstalledDistributionSet(dsInstalled);
        target = targetManagement.createTarget(target);

-        final DistributionSet ds = TestDataUtil.generateDistributionSet("newDS", softwareManagement,
-                distributionSetManagement, true).setRequiredMigrationStep(true);
+        final DistributionSet ds = TestDataUtil
+                .generateDistributionSet("newDS", softwareManagement, distributionSetManagement, true)
+                .setRequiredMigrationStep(true);

        // verify initial status
-        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus()).isEqualTo(
-                TargetUpdateStatus.UNKNOWN);
+        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
+                .isEqualTo(TargetUpdateStatus.UNKNOWN);

        Action assigningAction = assignSet(target, ds);

@@ -295,10 +294,10 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {

        // verify
        assertThat(assigningAction.getStatus()).isEqualTo(Status.CANCELED);
-        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet()).isEqualTo(
-                dsInstalled);
-        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus()).isEqualTo(
-                TargetUpdateStatus.IN_SYNC);
+        assertThat(targetManagement.findTargetByControllerID("4712").getAssignedDistributionSet())
+                .isEqualTo(dsInstalled);
+        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
+                .isEqualTo(TargetUpdateStatus.IN_SYNC);
    }

    @Test
@@ -311,12 +310,13 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        target.getTargetInfo().setInstalledDistributionSet(dsInstalled);
        target = targetManagement.createTarget(target);

-        final DistributionSet ds = TestDataUtil.generateDistributionSet("newDS", softwareManagement,
-                distributionSetManagement, true).setRequiredMigrationStep(true);
+        final DistributionSet ds = TestDataUtil
+                .generateDistributionSet("newDS", softwareManagement, distributionSetManagement, true)
+                .setRequiredMigrationStep(true);

        // verify initial status
-        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus()).isEqualTo(
-                TargetUpdateStatus.UNKNOWN);
+        assertThat(targetManagement.findTargetByControllerID("4712").getTargetInfo().getUpdateStatus())
+                .isEqualTo(TargetUpdateStatus.UNKNOWN);

        final Action assigningAction = assignSet(target, ds);

@@ -337,7 +337,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        deploymentManagement.assignDistributionSet(ds.getId(), new String[] { target.getControllerId() });
        assertThat(
                targetManagement.findTargetByControllerID(target.getControllerId()).getTargetInfo().getUpdateStatus())
-                .isEqualTo(TargetUpdateStatus.PENDING);
+                        .isEqualTo(TargetUpdateStatus.PENDING);
        assertThat(targetManagement.findTargetByControllerID(target.getControllerId()).getAssignedDistributionSet())
                .isEqualTo(ds);
        final Action action = actionRepository.findByTargetAndDistributionSet(pageReq, target, ds).getContent().get(0);
@@ -360,12 +360,12 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        eventBus.register(eventHandlerMock);

        final String myCtrlIDPref = "myCtrlID";
-        final Iterable<Target> savedNakedTargets = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(10,
-                myCtrlIDPref, "first description"));
+        final Iterable<Target> savedNakedTargets = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(10, myCtrlIDPref, "first description"));

        final String myDeployedCtrlIDPref = "myDeployedCtrlID";
-        final List<Target> savedDeployedTargets = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(20,
-                myDeployedCtrlIDPref, "first description"));
+        final List<Target> savedDeployedTargets = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(20, myDeployedCtrlIDPref, "first description"));

        final DistributionSet ds = TestDataUtil.generateDistributionSet("", softwareManagement,
                distributionSetManagement);
@@ -409,15 +409,15 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {

        final List<Target> targets = targetManagement.createTargets(TestDataUtil.generateTargets(10));

-        final SoftwareModule ah = softwareManagement.createSoftwareModule(new SoftwareModule(appType, "agent-hub",
-                "1.0.1", null, ""));
-        final SoftwareModule jvm = softwareManagement.createSoftwareModule(new SoftwareModule(runtimeType,
-                "oracle-jre", "1.7.2", null, ""));
-        final SoftwareModule os = softwareManagement.createSoftwareModule(new SoftwareModule(osType, "poky", "3.0.2",
-                null, ""));
+        final SoftwareModule ah = softwareManagement
+                .createSoftwareModule(new SoftwareModule(appType, "agent-hub", "1.0.1", null, ""));
+        final SoftwareModule jvm = softwareManagement
+                .createSoftwareModule(new SoftwareModule(runtimeType, "oracle-jre", "1.7.2", null, ""));
+        final SoftwareModule os = softwareManagement
+                .createSoftwareModule(new SoftwareModule(osType, "poky", "3.0.2", null, ""));

-        final DistributionSet incomplete = distributionSetManagement.createDistributionSet(new DistributionSet(
-                "incomplete", "v1", "", standardDsType, Lists.newArrayList(ah, jvm)));
+        final DistributionSet incomplete = distributionSetManagement.createDistributionSet(
+                new DistributionSet("incomplete", "v1", "", standardDsType, Lists.newArrayList(ah, jvm)));

        try {
            deploymentManagement.assignDistributionSet(incomplete, targets);
@@ -487,18 +487,18 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        final Iterable<Target> undeployedTargetsFromDB = targetRepository.findAll(undeployedTargetIDs);

        // test that number of Targets
-        assertThat(allFoundTargets.spliterator().getExactSizeIfKnown()).isEqualTo(
-                deployedTargetsFromDB.spliterator().getExactSizeIfKnown()
+        assertThat(allFoundTargets.spliterator().getExactSizeIfKnown())
+                .isEqualTo(deployedTargetsFromDB.spliterator().getExactSizeIfKnown()
                        + undeployedTargetsFromDB.spliterator().getExactSizeIfKnown());
        assertThat(deployedTargetsFromDB.spliterator().getExactSizeIfKnown()).isEqualTo(noOfDeployedTargets);
        assertThat(undeployedTargetsFromDB.spliterator().getExactSizeIfKnown()).isEqualTo(noOfUndeployedTargets);

        // test the content of different lists
        assertThat(allFoundTargets).containsAll(deployedTargetsFromDB).containsAll(undeployedTargetsFromDB);
-        assertThat(deployedTargetsFromDB).containsAll(savedDeployedTargets).doesNotContain(
-                Iterables.toArray(undeployedTargetsFromDB, Target.class));
-        assertThat(undeployedTargetsFromDB).containsAll(savedNakedTargets).doesNotContain(
-                Iterables.toArray(deployedTargetsFromDB, Target.class));
+        assertThat(deployedTargetsFromDB).containsAll(savedDeployedTargets)
+                .doesNotContain(Iterables.toArray(undeployedTargetsFromDB, Target.class));
+        assertThat(undeployedTargetsFromDB).containsAll(savedNakedTargets)
+                .doesNotContain(Iterables.toArray(deployedTargetsFromDB, Target.class));

        // For each of the 4 targets 1 distribution sets gets assigned
        eventHandlerMock.getEvents(10, TimeUnit.SECONDS);
@@ -532,21 +532,18 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        // verifying the correctness of the assignments
        for (final Target t : deployResWithDsA.getDeployedTargets()) {
            assertThat(t.getAssignedDistributionSet().getId()).isEqualTo(dsA.getId());
-            assertThat(
-                    targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                            .getInstalledDistributionSet()).isNull();
+            assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
+                    .getInstalledDistributionSet()).isNull();
        }
        for (final Target t : deployResWithDsB.getDeployedTargets()) {
            assertThat(t.getAssignedDistributionSet().getId()).isEqualTo(dsB.getId());
-            assertThat(
-                    targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                            .getInstalledDistributionSet()).isNull();
+            assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
+                    .getInstalledDistributionSet()).isNull();
        }
        for (final Target t : deployResWithDsC.getDeployedTargets()) {
            assertThat(t.getAssignedDistributionSet().getId()).isEqualTo(dsC.getId());
-            assertThat(
-                    targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                            .getInstalledDistributionSet()).isNull();
+            assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
+                    .getInstalledDistributionSet()).isNull();
            assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo().getUpdateStatus())
                    .isEqualTo(TargetUpdateStatus.PENDING);
        }
@@ -559,9 +556,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        for (final Target t_ : updatedTsDsA) {
            final Target t = targetManagement.findTargetByControllerID(t_.getControllerId());
            assertThat(t.getAssignedDistributionSet()).isEqualTo(dsA);
-            assertThat(
-                    targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                            .getInstalledDistributionSet()).isEqualTo(dsA);
+            assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
+                    .getInstalledDistributionSet()).isEqualTo(dsA);
            assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo().getUpdateStatus())
                    .isEqualTo(TargetUpdateStatus.IN_SYNC);
            assertThat(deploymentManagement.findActiveActionsByTarget(t)).hasSize(0);
@@ -571,8 +567,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        // remove updActB from
        // activeActions, add a corresponding cancelAction and another
        // UpdateAction for dsA
-        final Iterable<Target> deployed2DS = deploymentManagement.assignDistributionSet(dsA,
-                deployResWithDsB.getDeployedTargets()).getAssignedTargets();
+        final Iterable<Target> deployed2DS = deploymentManagement
+                .assignDistributionSet(dsA, deployResWithDsB.getDeployedTargets()).getAssignedTargets();
        final Action updActA2 = actionRepository.findByDistributionSet(pageRequest, dsA).getContent().get(1);

        assertThat(deployed2DS).containsAll(deployResWithDsB.getDeployedTargets());
@@ -581,9 +577,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        for (final Target t_ : deployed2DS) {
            final Target t = targetManagement.findTargetByControllerID(t_.getControllerId());
            assertThat(t.getAssignedDistributionSet()).isEqualTo(dsA);
-            assertThat(
-                    targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
-                            .getInstalledDistributionSet()).isNull();
+            assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo()
+                    .getInstalledDistributionSet()).isNull();
            assertThat(targetManagement.findTargetByControllerID(t.getControllerId()).getTargetInfo().getUpdateStatus())
                    .isEqualTo(TargetUpdateStatus.PENDING);

@@ -640,8 +635,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
                    "blabla alles gut");
        }
        // try to delete again
-        distributionSetManagement.deleteDistributionSet(deploymentResult.getDistributionSetIDs().toArray(
-                new Long[deploymentResult.getDistributionSetIDs().size()]));
+        distributionSetManagement.deleteDistributionSet(deploymentResult.getDistributionSetIDs()
+                .toArray(new Long[deploymentResult.getDistributionSetIDs().size()]));
        // verify that the result is the same, even though distributionSet dsA
        // has been installed
        // successfully and no activeAction is referring to created distribution
@@ -676,8 +671,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        assertThat(targetManagement.countTargetsAll()).isNotZero();
        assertThat(actionStatusRepository.count()).isNotZero();

-        targetManagement.deleteTargets(deploymentResult.getUndeployedTargetIDs().toArray(
-                new Long[noOfUndeployedTargets]));
+        targetManagement
+                .deleteTargets(deploymentResult.getUndeployedTargetIDs().toArray(new Long[noOfUndeployedTargets]));
        targetManagement.deleteTargets(deploymentResult.getDeployedTargetIDs().toArray(new Long[noOfDeployedTargets]));

        assertThat(targetManagement.countTargetsAll()).isZero();
@@ -768,8 +763,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        targ = targs.iterator().next();

        assertEquals(1, deploymentManagement.findActiveActionsByTarget(targ).size());
-        assertEquals(TargetUpdateStatus.PENDING, targetManagement.findTargetByControllerID(targ.getControllerId())
-                .getTargetInfo().getUpdateStatus());
+        assertEquals(TargetUpdateStatus.PENDING,
+                targetManagement.findTargetByControllerID(targ.getControllerId()).getTargetInfo().getUpdateStatus());
        assertEquals(dsB, targ.getAssignedDistributionSet());
        assertEquals(dsA.getId(), targetManagement.findTargetByControllerIDWithDetails(targ.getControllerId())
                .getTargetInfo().getInstalledDistributionSet().getId());
@@ -808,8 +803,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        final DistributionSet ds = TestDataUtil.generateDistributionSet("a", softwareManagement,
                distributionSetManagement);
        // assign ds to create an action
-        final DistributionSetAssignmentResult assignDistributionSet = deploymentManagement.assignDistributionSet(
-                ds.getId(), ActionType.SOFT, Action.NO_FORCE_TIME, target.getControllerId());
+        final DistributionSetAssignmentResult assignDistributionSet = deploymentManagement
+                .assignDistributionSet(ds.getId(), ActionType.SOFT, Action.NO_FORCE_TIME, target.getControllerId());
        final Action action = assignDistributionSet.getActions().get(0);
        // verify preparation
        Action findAction = deploymentManagement.findAction(action.getId());
@@ -831,8 +826,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
        final DistributionSet ds = TestDataUtil.generateDistributionSet("a", softwareManagement,
                distributionSetManagement);
        // assign ds to create an action
-        final DistributionSetAssignmentResult assignDistributionSet = deploymentManagement.assignDistributionSet(
-                ds.getId(), ActionType.FORCED, Action.NO_FORCE_TIME, target.getControllerId());
+        final DistributionSetAssignmentResult assignDistributionSet = deploymentManagement
+                .assignDistributionSet(ds.getId(), ActionType.FORCED, Action.NO_FORCE_TIME, target.getControllerId());
        final Action action = assignDistributionSet.getActions().get(0);
        // verify perparation
        Action findAction = deploymentManagement.findAction(action.getId());
@@ -874,11 +869,11 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
    private DeploymentResult prepareComplexRepo(final String undeployedTargetPrefix, final int noOfUndeployedTargets,
            final String deployedTargetPrefix, final int noOfDeployedTargets, final int noOfDistributionSets,
            final String distributionSetPrefix) {
-        final Iterable<Target> nakedTargets = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(
-                noOfUndeployedTargets, undeployedTargetPrefix, "first description"));
+        final Iterable<Target> nakedTargets = targetManagement.createTargets(
+                TestDataUtil.buildTargetFixtures(noOfUndeployedTargets, undeployedTargetPrefix, "first description"));

-        List<Target> deployedTargets = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(
-                noOfDeployedTargets, deployedTargetPrefix, "first description"));
+        List<Target> deployedTargets = targetManagement.createTargets(
+                TestDataUtil.buildTargetFixtures(noOfDeployedTargets, deployedTargetPrefix, "first description"));

        // creating 10 DistributionSets
        final List<DistributionSet> dsList = TestDataUtil.generateDistributionSets(distributionSetPrefix,
@@ -907,10 +902,10 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
                    found = true;
                    final List<Action> activeActionsByTarget = deploymentManagement.findActiveActionsByTarget(myt);
                    assertThat(activeActionsByTarget).isNotEmpty();
-                    assertThat(event.getActionId()).isEqualTo(activeActionsByTarget.get(0).getId()).as(
-                            "Action id in database and event do not match");
-                    assertThat(event.getSoftwareModules()).containsOnly(
-                            ds.getModules().toArray(new SoftwareModule[ds.getModules().size()]));
+                    assertThat(event.getActionId()).isEqualTo(activeActionsByTarget.get(0).getId())
+                            .as("Action id in database and event do not match");
+                    assertThat(event.getSoftwareModules())
+                            .containsOnly(ds.getModules().toArray(new SoftwareModule[ds.getModules().size()]));
                }
            }
            assertThat(found).isTrue().as("No event found for controller " + myt.getControllerId());
@@ -1078,8 +1073,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
            latch.await(timeout, unit);
            final List<TargetAssignDistributionSetEvent> handledEvents = new LinkedList<TargetAssignDistributionSetEvent>(
                    events);
-            assertThat(handledEvents).hasSize(expectedNumberOfEvents).as(
-                    "Did not receive the expected amount of events (" + expectedNumberOfEvents
+            assertThat(handledEvents).hasSize(expectedNumberOfEvents)
+                    .as("Did not receive the expected amount of events (" + expectedNumberOfEvents
                            + ") within timeout. Received events are " + handledEvents);
            return handledEvents;
        }
@@ -1106,8 +1101,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
                throws InterruptedException {
            latch.await(timeout, unit);
            final List<CancelTargetAssignmentEvent> handledEvents = new LinkedList<CancelTargetAssignmentEvent>(events);
-            assertThat(handledEvents).hasSize(expectedNumberOfEvents).as(
-                    "Did not receive the expected amount of events (" + expectedNumberOfEvents
+            assertThat(handledEvents).hasSize(expectedNumberOfEvents)
+                    .as("Did not receive the expected amount of events (" + expectedNumberOfEvents
                            + ") within timeout. Received events are " + handledEvents);
            return handledEvents;
        }
--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/SystemManagementTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/SystemManagementTest.java
@@ -96,8 +96,8 @@ public class SystemManagementTest extends AbstractIntegrationTestWithMongoDB {
                new TenantUsage("tenant1").setTargets(100).setActions(200));
    }

-    private byte[] createTestTenantsForSystemStatistics(final int tenants, final int artifactSize, final int targets, final int updates)
-            throws Exception {
+    private byte[] createTestTenantsForSystemStatistics(final int tenants, final int artifactSize, final int targets,
+            final int updates) throws Exception {
        final Random randomgen = new Random();
        final byte random[] = new byte[artifactSize];
        randomgen.nextBytes(random);
--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TagManagementTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TagManagementTest.java
@@ -25,12 +25,12 @@ import org.eclipse.hawkbit.repository.model.TargetTag;
 import org.junit.Test;
 import org.slf4j.LoggerFactory;

+import com.google.common.collect.Lists;
+
 import ru.yandex.qatools.allure.annotations.Description;
 import ru.yandex.qatools.allure.annotations.Features;
 import ru.yandex.qatools.allure.annotations.Stories;

-import com.google.common.collect.Lists;
-
 /**
 * Test class for {@link TagManagement}.
 *
@@ -90,32 +90,34 @@ public class TagManagementTest extends AbstractIntegrationTest {
        DistributionSetFilterBuilder distributionSetFilterBuilder;

        // search for not deleted
-        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(true).setTagNames(
-                Lists.newArrayList(tagA.getName()));
-        assertEquals(dsAs.spliterator().getExactSizeIfKnown() + dsABs.spliterator().getExactSizeIfKnown()
-                + dsACs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
+        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(true)
+                .setTagNames(Lists.newArrayList(tagA.getName()));
+        assertEquals(
+                dsAs.spliterator().getExactSizeIfKnown() + dsABs.spliterator().getExactSizeIfKnown()
+                        + dsACs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
                distributionSetManagement.findDistributionSetsByFilters(pageReq, distributionSetFilterBuilder.build())
                        .getTotalElements());

-        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(true).setTagNames(
-                Lists.newArrayList(tagB.getName()));
-        assertEquals(dsBs.spliterator().getExactSizeIfKnown() + dsABs.spliterator().getExactSizeIfKnown()
-                + dsBCs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
+        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(true)
+                .setTagNames(Lists.newArrayList(tagB.getName()));
+        assertEquals(
+                dsBs.spliterator().getExactSizeIfKnown() + dsABs.spliterator().getExactSizeIfKnown()
+                        + dsBCs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
                distributionSetManagement.findDistributionSetsByFilters(pageReq, distributionSetFilterBuilder.build())
                        .getTotalElements());

-        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(true).setTagNames(
-                Lists.newArrayList(tagC.getName()));
-        assertEquals(dsCs.spliterator().getExactSizeIfKnown() + dsACs.spliterator().getExactSizeIfKnown()
-                + dsBCs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
+        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(true)
+                .setTagNames(Lists.newArrayList(tagC.getName()));
+        assertEquals(
+                dsCs.spliterator().getExactSizeIfKnown() + dsACs.spliterator().getExactSizeIfKnown()
+                        + dsBCs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
                distributionSetManagement.findDistributionSetsByFilters(pageReq, distributionSetFilterBuilder.build())
                        .getTotalElements());

-        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(true).setTagNames(
-                Lists.newArrayList(tagX.getName()));
-        assertEquals(0,
-                distributionSetManagement.findDistributionSetsByFilters(pageReq, distributionSetFilterBuilder.build())
-                        .getTotalElements());
+        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(true)
+                .setTagNames(Lists.newArrayList(tagX.getName()));
+        assertEquals(0, distributionSetManagement
+                .findDistributionSetsByFilters(pageReq, distributionSetFilterBuilder.build()).getTotalElements());

        assertEquals(5, distributionSetTagRepository.findAll().spliterator().getExactSizeIfKnown());

@@ -127,23 +129,24 @@ public class TagManagementTest extends AbstractIntegrationTest {
        tagManagement.deleteDistributionSetTag(tagB.getName());
        assertEquals(2, distributionSetTagRepository.findAll().spliterator().getExactSizeIfKnown());

-        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(Boolean.TRUE).setTagNames(
-                Lists.newArrayList(tagA.getName()));
-        assertEquals(dsAs.spliterator().getExactSizeIfKnown() + dsABs.spliterator().getExactSizeIfKnown()
-                + dsACs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
+        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(Boolean.TRUE)
+                .setTagNames(Lists.newArrayList(tagA.getName()));
+        assertEquals(
+                dsAs.spliterator().getExactSizeIfKnown() + dsABs.spliterator().getExactSizeIfKnown()
+                        + dsACs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
                distributionSetManagement.findDistributionSetsByFilters(pageReq, distributionSetFilterBuilder.build())
                        .getTotalElements());

-        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(Boolean.TRUE).setTagNames(
-                Lists.newArrayList(tagB.getName()));
-        assertEquals(0,
-                distributionSetManagement.findDistributionSetsByFilters(pageReq, distributionSetFilterBuilder.build())
-                        .getTotalElements());
+        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(Boolean.TRUE)
+                .setTagNames(Lists.newArrayList(tagB.getName()));
+        assertEquals(0, distributionSetManagement
+                .findDistributionSetsByFilters(pageReq, distributionSetFilterBuilder.build()).getTotalElements());

-        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(Boolean.TRUE).setTagNames(
-                Lists.newArrayList(tagC.getName()));
-        assertEquals(dsCs.spliterator().getExactSizeIfKnown() + dsACs.spliterator().getExactSizeIfKnown()
-                + dsBCs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
+        distributionSetFilterBuilder = getDistributionSetFilterBuilder().setIsComplete(Boolean.TRUE)
+                .setTagNames(Lists.newArrayList(tagC.getName()));
+        assertEquals(
+                dsCs.spliterator().getExactSizeIfKnown() + dsACs.spliterator().getExactSizeIfKnown()
+                        + dsBCs.spliterator().getExactSizeIfKnown() + dsABCs.spliterator().getExactSizeIfKnown(),
                distributionSetManagement.findDistributionSetsByFilters(pageReq, distributionSetFilterBuilder.build())
                        .getTotalElements());
    }
@@ -206,8 +209,8 @@ public class TagManagementTest extends AbstractIntegrationTest {

        // check
        for (final Target target : targetRepository.findAll()) {
-            assertThat(targetManagement.findTargetByControllerID(target.getControllerId()).getTags()).doesNotContain(
-                    toDelete);
+            assertThat(targetManagement.findTargetByControllerID(target.getControllerId()).getTags())
+                    .doesNotContain(toDelete);
        }
        assertThat(targetTagRepository.findOne(toDelete.getId())).isNull();
        assertThat(tagManagement.findAllTargetTags()).hasSize(19);
@@ -278,8 +281,8 @@ public class TagManagementTest extends AbstractIntegrationTest {
        final DistributionSetTag toDelete = tags.iterator().next();

        for (final DistributionSet set : distributionSetRepository.findAll()) {
-            assertThat(distributionSetManagement.findDistributionSetByIdWithDetails(set.getId()).getTags()).contains(
-                    toDelete);
+            assertThat(distributionSetManagement.findDistributionSetByIdWithDetails(set.getId()).getTags())
+                    .contains(toDelete);
        }

        // delete
@@ -359,8 +362,8 @@ public class TagManagementTest extends AbstractIntegrationTest {

        final List<DistributionSet> sets = TestDataUtil.generateDistributionSets(20, softwareManagement,
                distributionSetManagement);
-        final Iterable<DistributionSetTag> tags = tagManagement.createDistributionSetTags(TestDataUtil
-                .generateDistributionSetTags(20));
+        final Iterable<DistributionSetTag> tags = tagManagement
+                .createDistributionSetTags(TestDataUtil.generateDistributionSetTags(20));

        tags.forEach(tag -> distributionSetManagement.toggleTagAssignment(sets, tag));

--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagenmentTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagenmentTest.java
@@ -73,8 +73,8 @@ public class TargetFilterQueryManagenmentTest extends AbstractIntegrationTest {
        final String newQuery = "status==UNKNOWN";
        targetFilterQuery.setQuery(newQuery);
        targetFilterQueryManagement.updateTargetFilterQuery(targetFilterQuery);
-        assertEquals("Returns updated target filter query", newQuery, targetFilterQueryManagement
-                .findTargetFilterQueryByName(filterName).getQuery());
+        assertEquals("Returns updated target filter query", newQuery,
+                targetFilterQueryManagement.findTargetFilterQueryByName(filterName).getQuery());

    }

--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TargetManagementTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TargetManagementTest.java
@@ -44,12 +44,12 @@ import org.eclipse.hawkbit.repository.model.TargetTag;
 import org.junit.Test;
 import org.springframework.data.domain.PageRequest;

+import com.google.common.collect.Iterables;
+
 import ru.yandex.qatools.allure.annotations.Description;
 import ru.yandex.qatools.allure.annotations.Features;
 import ru.yandex.qatools.allure.annotations.Stories;

-import com.google.common.collect.Iterables;
-
@Features("Component Tests - Repository")
@Stories("Target Management")
 public class TargetManagementTest extends AbstractIntegrationTest {
@@ -158,8 +158,8 @@ public class TargetManagementTest extends AbstractIntegrationTest {

        final Action action = result.getActions().get(0);
        action.setStatus(Status.FINISHED);
-        controllerManagament.addUpdateActionStatus(new ActionStatus(action, Status.FINISHED,
-                System.currentTimeMillis(), "message"), action);
+        controllerManagament.addUpdateActionStatus(
+                new ActionStatus(action, Status.FINISHED, System.currentTimeMillis(), "message"), action);
        deploymentManagement.assignDistributionSet(set2.getId(), "4711");

        target = targetManagement.findTargetByControllerIDWithDetails("4711");
@@ -341,8 +341,8 @@ public class TargetManagementTest extends AbstractIntegrationTest {
        targetManagement.deleteTargets(deletedTargetIDs);

        allFound = targetManagement.findTargetsAll(new PageRequest(0, 200)).getContent();
-        assertEquals(firstSaved.spliterator().getExactSizeIfKnown() - nr2Del, allFound.spliterator()
-                .getExactSizeIfKnown());
+        assertEquals(firstSaved.spliterator().getExactSizeIfKnown() - nr2Del,
+                allFound.spliterator().getExactSizeIfKnown());

        // verify that all undeleted are still found
        assertThat(allFound).doesNotContain(deletedTargets);
@@ -351,8 +351,8 @@ public class TargetManagementTest extends AbstractIntegrationTest {
    @Test
    @Description("Stores target attributes and verfies existence in the repository.")
    public void savingTargetControllerAttributes() {
-        Iterable<Target> ts = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(100, "myCtrlID",
-                "first description"));
+        Iterable<Target> ts = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(100, "myCtrlID", "first description"));

        final Map<String, String> attribs = new HashMap<String, String>();
        attribs.put("a.b.c", "abc");
@@ -438,8 +438,8 @@ public class TargetManagementTest extends AbstractIntegrationTest {
                final Target tNoAttrib = targetManagement.findTargetByControllerID(tNoAttribl.getControllerId());

                if (tNoAttrib.getControllerId().equals(target.getControllerId())) {
-                    assertThat(target.getTargetInfo().getControllerAttributes().keySet().toArray()).doesNotContain(
-                            attribs2Del.toArray());
+                    assertThat(target.getTargetInfo().getControllerAttributes().keySet().toArray())
+                            .doesNotContain(attribs2Del.toArray());
                    continue restTarget_;
                }
            }
@@ -452,14 +452,14 @@ public class TargetManagementTest extends AbstractIntegrationTest {
        Target t1 = TestDataUtil.buildTargetFixture("id-1", "blablub");
        final int noT2Tags = 4;
        final int noT1Tags = 3;
-        final List<TargetTag> t1Tags = tagManagement.createTargetTags(TestDataUtil.buildTargetTagFixtures(noT1Tags,
-                "tag1"));
+        final List<TargetTag> t1Tags = tagManagement
+                .createTargetTags(TestDataUtil.buildTargetTagFixtures(noT1Tags, "tag1"));
        t1.getTags().addAll(t1Tags);
        t1 = targetManagement.createTarget(t1);

        Target t2 = TestDataUtil.buildTargetFixture("id-2", "blablub");
-        final List<TargetTag> t2Tags = tagManagement.createTargetTags(TestDataUtil.buildTargetTagFixtures(noT2Tags,
-                "tag2"));
+        final List<TargetTag> t2Tags = tagManagement
+                .createTargetTags(TestDataUtil.buildTargetTagFixtures(noT2Tags, "tag2"));
        t2.getTags().addAll(t2Tags);
        t2 = targetManagement.createTarget(t2);

@@ -475,18 +475,18 @@ public class TargetManagementTest extends AbstractIntegrationTest {
    @Test
    @Description("Tests the assigment of tags to multiple targets.")
    public void targetTagBulkAssignments() {
-        final List<Target> tagATargets = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(10,
-                "tagATargets", "first description"));
-        final List<Target> tagBTargets = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(10,
-                "tagBTargets", "first description"));
-        final List<Target> tagCTargets = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(10,
-                "tagCTargets", "first description"));
+        final List<Target> tagATargets = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(10, "tagATargets", "first description"));
+        final List<Target> tagBTargets = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(10, "tagBTargets", "first description"));
+        final List<Target> tagCTargets = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(10, "tagCTargets", "first description"));

-        final List<Target> tagABTargets = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(10,
-                "tagABTargets", "first description"));
+        final List<Target> tagABTargets = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(10, "tagABTargets", "first description"));

-        final List<Target> tagABCTargets = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(10,
-                "tagABCTargets", "first description"));
+        final List<Target> tagABCTargets = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(10, "tagABCTargets", "first description"));

        final TargetTag tagA = tagManagement.createTargetTag(new TargetTag("A"));
        final TargetTag tagB = tagManagement.createTargetTag(new TargetTag("B"));
@@ -534,12 +534,12 @@ public class TargetManagementTest extends AbstractIntegrationTest {
        checkTargetHasNotTags(tagCTargets, tagA, tagB);

        // check again target lists refreshed from DB
-        assertThat(targetManagement.countTargetByFilters(null, null, null, Boolean.FALSE, "A")).isEqualTo(
-                targetWithTagA.size());
-        assertThat(targetManagement.countTargetByFilters(null, null, null, Boolean.FALSE, "B")).isEqualTo(
-                targetWithTagB.size());
-        assertThat(targetManagement.countTargetByFilters(null, null, null, Boolean.FALSE, "C")).isEqualTo(
-                targetWithTagC.size());
+        assertThat(targetManagement.countTargetByFilters(null, null, null, Boolean.FALSE, "A"))
+                .isEqualTo(targetWithTagA.size());
+        assertThat(targetManagement.countTargetByFilters(null, null, null, Boolean.FALSE, "B"))
+                .isEqualTo(targetWithTagB.size());
+        assertThat(targetManagement.countTargetByFilters(null, null, null, Boolean.FALSE, "C"))
+                .isEqualTo(targetWithTagC.size());
    }

    @Test
@@ -549,21 +549,21 @@ public class TargetManagementTest extends AbstractIntegrationTest {
        final TargetTag targTagB = tagManagement.createTargetTag(new TargetTag("Targ-B-Tag"));
        final TargetTag targTagC = tagManagement.createTargetTag(new TargetTag("Targ-C-Tag"));

-        final List<Target> targAs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(25, "target-id-A",
-                "first description"));
-        final List<Target> targBs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(20, "target-id-B",
-                "first description"));
-        final List<Target> targCs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(15, "target-id-C",
-                "first description"));
+        final List<Target> targAs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(25, "target-id-A", "first description"));
+        final List<Target> targBs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(20, "target-id-B", "first description"));
+        final List<Target> targCs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(15, "target-id-C", "first description"));

-        final List<Target> targABs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(12,
-                "target-id-AB", "first description"));
-        final List<Target> targACs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(13,
-                "target-id-AC", "first description"));
-        final List<Target> targBCs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(7, "target-id-BC",
-                "first description"));
-        final List<Target> targABCs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(17,
-                "target-id-ABC", "first description"));
+        final List<Target> targABs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(12, "target-id-AB", "first description"));
+        final List<Target> targACs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(13, "target-id-AC", "first description"));
+        final List<Target> targBCs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(7, "target-id-BC", "first description"));
+        final List<Target> targABCs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(17, "target-id-ABC", "first description"));

        targetManagement.toggleTagAssignment(targAs, targTagA);
        targetManagement.toggleTagAssignment(targABs, targTagA);
@@ -610,29 +610,27 @@ public class TargetManagementTest extends AbstractIntegrationTest {
    public void findTargetsByControllerIDsWithTags() {
        final TargetTag targTagA = tagManagement.createTargetTag(new TargetTag("Targ-A-Tag"));

-        final List<Target> targAs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(25, "target-id-A",
-                "first description"));
+        final List<Target> targAs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(25, "target-id-A", "first description"));

        targetManagement.toggleTagAssignment(targAs, targTagA);

-        assertThat(
-                targetManagement.findTargetsByControllerIDsWithTags(targAs.stream()
-                        .map(target -> target.getControllerId()).collect(Collectors.toList()))).hasSize(25);
+        assertThat(targetManagement.findTargetsByControllerIDsWithTags(
+                targAs.stream().map(target -> target.getControllerId()).collect(Collectors.toList()))).hasSize(25);

        // no lazy loading exception and tag correctly assigned
-        assertThat(
-                targetManagement
-                        .findTargetsByControllerIDsWithTags(
-                                targAs.stream().map(target -> target.getControllerId()).collect(Collectors.toList()))
-                        .stream().map(target -> target.getTags().contains(targTagA)).collect(Collectors.toList()))
-                .containsOnly(true);
+        assertThat(targetManagement
+                .findTargetsByControllerIDsWithTags(
+                        targAs.stream().map(target -> target.getControllerId()).collect(Collectors.toList()))
+                .stream().map(target -> target.getTags().contains(targTagA)).collect(Collectors.toList()))
+                        .containsOnly(true);
    }

    @Test
    @Description("Test the optimized quere for retrieving all ID/name pairs of targets.")
    public void findAllTargetIdNamePaiss() {
-        final List<Target> targAs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(25, "target-id-A",
-                "first description"));
+        final List<Target> targAs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(25, "target-id-A", "first description"));
        final String[] createdTargetIds = targAs.stream().map(t -> t.getControllerId())
                .toArray(size -> new String[size]);

@@ -648,15 +646,15 @@ public class TargetManagementTest extends AbstractIntegrationTest {
    public void findTargetsWithNoTag() {

        final TargetTag targTagA = tagManagement.createTargetTag(new TargetTag("Targ-A-Tag"));
-        final List<Target> targAs = targetManagement.createTargets(TestDataUtil.buildTargetFixtures(25, "target-id-A",
-                "first description"));
+        final List<Target> targAs = targetManagement
+                .createTargets(TestDataUtil.buildTargetFixtures(25, "target-id-A", "first description"));
        targetManagement.toggleTagAssignment(targAs, targTagA);

        targetManagement.createTargets(TestDataUtil.buildTargetFixtures(25, "target-id-B", "first description"));

        final String[] tagNames = null;
-        final List<Target> targetsListWithNoTag = targetManagement.findTargetByFilters(new PageRequest(0, 500), null,
-                null, null, Boolean.TRUE, tagNames).getContent();
+        final List<Target> targetsListWithNoTag = targetManagement
+                .findTargetByFilters(new PageRequest(0, 500), null, null, null, Boolean.TRUE, tagNames).getContent();

        // Total targets
        assertEquals(50, targetManagement.findAllTargetIds().size());
--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLUtilityTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLUtilityTest.java
@@ -144,8 +144,8 @@ public class RSQLUtilityTest {
        when(baseSoftwareModuleRootMock.get("version")).thenReturn(baseSoftwareModuleRootMock);
        when(baseSoftwareModuleRootMock.getJavaType()).thenReturn((Class) SoftwareModule.class);
        when(criteriaBuilderMock.equal(any(Root.class), anyString())).thenReturn(mock(Predicate.class));
-        when(criteriaBuilderMock.<String> greaterThanOrEqualTo(any(Expression.class), any(String.class))).thenReturn(
-                mock(Predicate.class));
+        when(criteriaBuilderMock.<String> greaterThanOrEqualTo(any(Expression.class), any(String.class)))
+                .thenReturn(mock(Predicate.class));

        // test
        RSQLUtility.parse(correctRsql, SoftwareModuleFields.class).toPredicate(baseSoftwareModuleRootMock,
@@ -162,8 +162,8 @@ public class RSQLUtilityTest {
        when(baseSoftwareModuleRootMock.get("name")).thenReturn(baseSoftwareModuleRootMock);
        when(baseSoftwareModuleRootMock.getJavaType()).thenReturn((Class) SoftwareModule.class);
        when(criteriaBuilderMock.equal(any(Root.class), anyString())).thenReturn(mock(Predicate.class));
-        when(criteriaBuilderMock.<String> greaterThanOrEqualTo(any(Expression.class), any(String.class))).thenReturn(
-                mock(Predicate.class));
+        when(criteriaBuilderMock.<String> greaterThanOrEqualTo(any(Expression.class), any(String.class)))
+                .thenReturn(mock(Predicate.class));
        // test
        RSQLUtility.parse(correctRsql, SoftwareModuleFields.class).toPredicate(baseSoftwareModuleRootMock,
                criteriaQueryMock, criteriaBuilderMock);
@@ -180,8 +180,8 @@ public class RSQLUtilityTest {
        when(baseSoftwareModuleRootMock.get("name")).thenReturn(baseSoftwareModuleRootMock);
        when(baseSoftwareModuleRootMock.getJavaType()).thenReturn((Class) SoftwareModule.class);
        when(criteriaBuilderMock.equal(any(Root.class), anyString())).thenReturn(mock(Predicate.class));
-        when(criteriaBuilderMock.<String> greaterThanOrEqualTo(any(Expression.class), any(String.class))).thenReturn(
-                mock(Predicate.class));
+        when(criteriaBuilderMock.<String> greaterThanOrEqualTo(any(Expression.class), any(String.class)))
+                .thenReturn(mock(Predicate.class));
        // test
        RSQLUtility.parse(correctRsql, SoftwareModuleFields.class).toPredicate(baseSoftwareModuleRootMock,
                criteriaQueryMock, criteriaBuilderMock);
@@ -198,10 +198,10 @@ public class RSQLUtilityTest {
        when(baseSoftwareModuleRootMock.get("name")).thenReturn(baseSoftwareModuleRootMock);
        when(baseSoftwareModuleRootMock.getJavaType()).thenReturn((Class) SoftwareModule.class);
        when(criteriaBuilderMock.equal(any(Root.class), anyString())).thenReturn(mock(Predicate.class));
-        when(criteriaBuilderMock.<String> greaterThanOrEqualTo(any(Expression.class), any(String.class))).thenReturn(
-                mock(Predicate.class));
-        when(criteriaBuilderMock.upper(eq(pathOfString(baseSoftwareModuleRootMock)))).thenReturn(
-                pathOfString(baseSoftwareModuleRootMock));
+        when(criteriaBuilderMock.<String> greaterThanOrEqualTo(any(Expression.class), any(String.class)))
+                .thenReturn(mock(Predicate.class));
+        when(criteriaBuilderMock.upper(eq(pathOfString(baseSoftwareModuleRootMock))))
+                .thenReturn(pathOfString(baseSoftwareModuleRootMock));
        // test
        RSQLUtility.parse(correctRsql, SoftwareModuleFields.class).toPredicate(baseSoftwareModuleRootMock,
                criteriaQueryMock, criteriaBuilderMock);