Applied hawkBit code format

hawkbit-repository/src/test/java/org/eclipse/hawkbit/AbstractIntegrationTest.java

@@ -220,15 +220,12 @@ public abstract class AbstractIntegrationTest implements EnvironmentAware {
 
     @Before
     public void before() throws Exception {
-        mvc = MockMvcBuilders
+        mvc = MockMvcBuilders.webAppContextSetup(context)
-                .webAppContextSetup(context)
+                .addFilter(new DosFilter(100, 10, "127\\.0\\.0\\.1|\\[0:0:0:0:0:0:0:1\\]", "(^192\\.168\\.)",
-                .addFilter(
+                        "X-Forwarded-For"))
-                        new DosFilter(100, 10, "127\\.0\\.0\\.1|\\[0:0:0:0:0:0:0:1\\]", "(^192\\.168\\.)",
+                .addFilter(new ExcludePathAwareShallowETagFilter(
-                                "X-Forwarded-For"))
+                        "/rest/v1/softwaremodules/{smId}/artifacts/{artId}/download", "/*/controller/artifacts/**"))
-                .addFilter(
+                .build();
-                        new ExcludePathAwareShallowETagFilter(
-                                "/rest/v1/softwaremodules/{smId}/artifacts/{artId}/download",
-                                "/*/controller/artifacts/**")).build();
 
         standardDsType = securityRule.runAsPrivileged(() -> systemManagement.getTenantMetadata().getDefaultDsType());
 

hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLActionFieldsTest.java

@@ -80,8 +80,8 @@ public class RSQLActionFieldsTest extends AbstractIntegrationTest {
     private void assertRSQLQuery(final String rsqlParam, final long expectedEntities) {
 
         final Specification<Action> parse = RSQLUtility.parse(rsqlParam, ActionFields.class);
-        final Slice<Action> findEnitity = deploymentManagement.findActionsByTarget(parse, target, new PageRequest(0,
+        final Slice<Action> findEnitity = deploymentManagement.findActionsByTarget(parse, target,
-                100));
+                new PageRequest(0, 100));
         final long countAllEntities = deploymentManagement.countActionsByTarget(parse, target);
         assertThat(findEnitity).isNotNull();
         assertThat(countAllEntities).isEqualTo(expectedEntities);

hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetFieldTest.java

@@ -40,8 +40,8 @@ public class RSQLDistributionSetFieldTest extends AbstractIntegrationTest {
         ds.getMetadata().add(new DistributionSetMetadata("metaKey", ds, "metaValue"));
         distributionSetManagement.updateDistributionSet(ds);
 
-        final DistributionSet ds2 = TestDataUtil.generateDistributionSets("NewDS", 3, softwareManagement,
+        final DistributionSet ds2 = TestDataUtil
-                distributionSetManagement).get(0);
+                .generateDistributionSets("NewDS", 3, softwareManagement, distributionSetManagement).get(0);
 
         ds2.setDescription("DS2");
         ds2.getMetadata().add(new DistributionSetMetadata("metaKey", ds2, "value"));

hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetMetadataFieldsTest.java

@@ -36,8 +36,8 @@ public class RSQLDistributionSetMetadataFieldsTest extends AbstractIntegrationTe
                 distributionSetManagement);
         distributionSetId = distributionSet.getId();
         for (int i = 0; i < 5; i++) {
-            final DistributionSetMetadata distributionSetMetadata = new DistributionSetMetadata("" + i,
+            final DistributionSetMetadata distributionSetMetadata = new DistributionSetMetadata("" + i, distributionSet,
-                    distributionSet, "" + i);
+                    "" + i);
             distributionSet.getMetadata().add(distributionSetMetadata);
         }
 

hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLSoftwareModuleFieldTest.java

@@ -30,13 +30,13 @@ public class RSQLSoftwareModuleFieldTest extends AbstractIntegrationTest {
     @Before
     public void seuptBeforeTest() {
 
-        final SoftwareModule ah = softwareManagement.createSoftwareModule(new SoftwareModule(appType, "agent-hub",
+        final SoftwareModule ah = softwareManagement
-                "1.0.1", "agent-hub", ""));
+                .createSoftwareModule(new SoftwareModule(appType, "agent-hub", "1.0.1", "agent-hub", ""));
         softwareManagement.createSoftwareModule(new SoftwareModule(runtimeType, "oracle-jre", "1.7.2", "aa", ""));
         softwareManagement.createSoftwareModule(new SoftwareModule(osType, "poky", "3.0.2", "aa", ""));
 
-        final SoftwareModule ah2 = softwareManagement.createSoftwareModule(new SoftwareModule(appType, "agent-hub2",
+        final SoftwareModule ah2 = softwareManagement
-                "1.0.1", "agent-hub2", ""));
+                .createSoftwareModule(new SoftwareModule(appType, "agent-hub2", "1.0.1", "agent-hub2", ""));
 
         final SoftwareModuleMetadata softwareModuleMetadata = new SoftwareModuleMetadata("metaKey", ah, "metaValue");
         softwareManagement.createSoftwareModuleMetadata(softwareModuleMetadata);

hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLSoftwareModuleMetadataFieldsTest.java

@@ -32,9 +32,9 @@ public class RSQLSoftwareModuleMetadataFieldsTest extends AbstractIntegrationTes
 
     @Before
     public void setupBeforeTest() {
-        final SoftwareModule softwareModule = softwareManagement.createSoftwareModule(new SoftwareModule(TestDataUtil
+        final SoftwareModule softwareModule = softwareManagement.createSoftwareModule(
-                .findOrCreateSoftwareModuleType(softwareManagement, "application"), "application", "1.0.0", "Desc",
+                new SoftwareModule(TestDataUtil.findOrCreateSoftwareModuleType(softwareManagement, "application"),
-                "vendor Limited, California"));
+                        "application", "1.0.0", "Desc", "vendor Limited, California"));
         softwareModuleId = softwareModule.getId();
 
         for (int i = 0; i < 5; i++) {

hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLTagFieldsTest.java

@@ -33,8 +33,8 @@ public class RSQLTagFieldsTest extends AbstractIntegrationTest {
         for (int i = 0; i < 5; i++) {
             final TargetTag targetTag = new TargetTag("" + i, "" + i, i % 2 == 0 ? "red" : "blue");
             tagManagement.createTargetTag(targetTag);
-            final DistributionSetTag distributionSetTag = new DistributionSetTag("" + i, "" + i, i % 2 == 0 ? "red"
+            final DistributionSetTag distributionSetTag = new DistributionSetTag("" + i, "" + i,
-                    : "blue");
+                    i % 2 == 0 ? "red" : "blue");
             tagManagement.createDistributionSetTag(distributionSetTag);
         }
     }
@@ -101,8 +101,8 @@ public class RSQLTagFieldsTest extends AbstractIntegrationTest {
 
     private void assertRSQLQueryDistributionSet(final String rsqlParam, final long expectedEntities) {
 
-        final Page<DistributionSetTag> findEnitity = tagManagement.findAllDistributionSetTags(
+        final Page<DistributionSetTag> findEnitity = tagManagement
-                RSQLUtility.parse(rsqlParam, TagFields.class), new PageRequest(0, 100));
+                .findAllDistributionSetTags(RSQLUtility.parse(rsqlParam, TagFields.class), new PageRequest(0, 100));
         final long countAllEntities = findEnitity.getTotalElements();
         assertThat(findEnitity).isNotNull();
         assertThat(countAllEntities).isEqualTo(expectedEntities);
@@ -110,8 +110,8 @@ public class RSQLTagFieldsTest extends AbstractIntegrationTest {
 
     private void assertRSQLQueryTarget(final String rsqlParam, final long expectedEntities) {
 
-        final Page<TargetTag> findEnitity = tagManagement.findAllTargetTags(
+        final Page<TargetTag> findEnitity = tagManagement
-                RSQLUtility.parse(rsqlParam, TagFields.class), new PageRequest(0, 100));
+                .findAllTargetTags(RSQLUtility.parse(rsqlParam, TagFields.class), new PageRequest(0, 100));
         final long countAllEntities = findEnitity.getTotalElements();
         assertThat(findEnitity).isNotNull();
         assertThat(countAllEntities).isEqualTo(expectedEntities);

hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLTargetFieldTest.java

@@ -162,8 +162,8 @@ public class RSQLTargetFieldTest extends AbstractIntegrationTest {
     }
 
     private void assertRSQLQuery(final String rsqlParam, final long expcetedTargets) {
-        final Page<Target> findTargetPage = targetManagement.findTargetsAll(
+        final Page<Target> findTargetPage = targetManagement
-                RSQLUtility.parse(rsqlParam, TargetFields.class), new PageRequest(0, 100));
+                .findTargetsAll(RSQLUtility.parse(rsqlParam, TargetFields.class), new PageRequest(0, 100));
         final long countTargetsAll = findTargetPage.getTotalElements();
         assertThat(findTargetPage).isNotNull();
         assertThat(countTargetsAll).isEqualTo(expcetedTargets);