Code format hawkbit-runtime (#1947)

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

hawkbit-runtime/hawkbit-mgmt-server/README.md

@@ -1,5 +1,7 @@
 # hawkBit Management Server (EXPERIMENTAL!)
-The hawkBit Management Server is a standalone spring-boot application with an embedded servlet container. It should be started with at least one (or both) of the device interface servers - hawkbit-ddi-server or/and hawkbit-dmf-server.
+
+The hawkBit Management Server is a standalone spring-boot application with an embedded servlet container. It should be
+started with at least one (or both) of the device interface servers - hawkbit-ddi-server or/and hawkbit-dmf-server.
 
 ## On your own workstation
 
@@ -18,14 +20,22 @@ run org.eclipse.hawkbit.app.mgmt.MgmtServerStart
 ```
 
 ### Usage
+
 The Management API can be accessed via http://localhost:8080/rest/v1
 The root url http://localhost:8080 will redirect directly to the Swagger Management UI
 
 ### Clustering (Experimental!!!)
-The micro-service instances are configured to communicate via Spring Cloud Bus. You could run multiple instances of any micro-service but hawkbit-mgmt-server. Management server run some schedulers which shall not run simultaneously - e.g. auto assignment checker and rollouts executor. To run multiple management server instances you shall do some extensions of hawkbit to ensure that they wont run schedulers simultaneously or you shall configure all instances but one to do not run schedulers! 
+
+The micro-service instances are configured to communicate via Spring Cloud Bus. You could run multiple instances of any
+micro-service but hawkbit-mgmt-server. Management server run some schedulers which shall not run simultaneously - e.g.
+auto assignment checker and rollouts executor. To run multiple management server instances you shall do some extensions
+of hawkbit to ensure that they wont run schedulers simultaneously or you shall configure all instances but one to do not
+run schedulers!
 
 ## Optional Protostuff for Sprign cloud bus
-The micro-service instances are configured to communicate via Spring Cloud Bus. Optionally, you could use [Protostuff](https://github.com/protostuff/protostuff) based message payload serialization for improved performance.
+
+The micro-service instances are configured to communicate via Spring Cloud Bus. Optionally, you could
+use [Protostuff](https://github.com/protostuff/protostuff) based message payload serialization for improved performance.
 
 **Note**: If Protostuff is enabled it shall be enabled on all microservices!
 

hawkbit-runtime/hawkbit-mgmt-server/pom.xml

@@ -9,7 +9,7 @@
     SPDX-License-Identifier: EPL-2.0
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

hawkbit-runtime/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/ErrorController.java

@@ -36,11 +36,9 @@ public class ErrorController extends BasicErrorController {
 
     /**
      * A new {@link ErrorController}.
-     * 
-     * @param errorAttributes
-     *            the error attributes
-     * @param serverProperties
-     *            configuration properties
+     *
+     * @param errorAttributes the error attributes
+     * @param serverProperties configuration properties
      */
     public ErrorController(final ErrorAttributes errorAttributes, final ServerProperties serverProperties) {
         super(errorAttributes, serverProperties.getError());

hawkbit-runtime/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/MgmtServerStart.java

@@ -22,7 +22,6 @@ import org.springframework.web.servlet.view.RedirectView;
 /**
  * A {@link SpringBootApplication} annotated class with a main method to start.
  * The minimal configuration for the stand alone hawkBit server.
- *
  */
 @SpringBootApplication(scanBasePackages = "org.eclipse.hawkbit")
 @EnableHawkbitManagedSecurityConfiguration

hawkbit-runtime/hawkbit-mgmt-server/src/test/java/org/eclipse/hawkbit/app/mgmt/AbstractSecurityTest.java

@@ -24,11 +24,10 @@ import org.springframework.web.context.WebApplicationContext;
 @ExtendWith(SharedSqlTestDatabaseExtension.class)
 public abstract class AbstractSecurityTest {
 
+    protected MockMvc mvc;
     @Autowired
     private WebApplicationContext context;
 
-    protected MockMvc mvc;
-
     @BeforeEach
     public void setup() {
         final DefaultMockMvcBuilder builder = MockMvcBuilders.webAppContextSetup(context)

hawkbit-runtime/hawkbit-mgmt-server/src/test/java/org/eclipse/hawkbit/app/mgmt/AllowedHostNamesTest.java

@@ -9,17 +9,14 @@
  */
 package org.eclipse.hawkbit.app.mgmt;
 
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import io.qameta.allure.Description;
-import org.junit.jupiter.api.Test;
-import org.springframework.http.HttpHeaders;
-import org.springframework.security.web.firewall.RequestRejectedException;
-
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.TestPropertySource;
 
 @TestPropertySource(properties = { "hawkbit.server.security.allowedHostNames=localhost",

hawkbit-runtime/hawkbit-mgmt-server/src/test/java/org/eclipse/hawkbit/app/mgmt/CorsTest.java

@@ -14,19 +14,17 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import io.qameta.allure.Description;
+import io.qameta.allure.Feature;
+import io.qameta.allure.Story;
 import org.eclipse.hawkbit.im.authentication.SpRole;
 import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants;
-
 import org.eclipse.hawkbit.repository.test.util.WithUser;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.web.servlet.ResultActions;
 
-import io.qameta.allure.Description;
-import io.qameta.allure.Feature;
-import io.qameta.allure.Story;
-
 @SpringBootTest(
         properties = {
                 "hawkbit.dmf.rabbitmq.enabled=false",
@@ -35,7 +33,7 @@ import io.qameta.allure.Story;
                         CorsTest.ALLOWED_ORIGIN_FIRST + "," +
                         CorsTest.ALLOWED_ORIGIN_SECOND,
                 "hawkbit.server.security.cors.exposedHeaders=" +
-                        HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN})
+                        HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN })
 @Feature("Integration Test - Security")
 @Story("CORS")
 public class CorsTest extends AbstractSecurityTest {
@@ -63,8 +61,8 @@ public class CorsTest extends AbstractSecurityTest {
 
         final String invalidCorsUrlResponseBody = performOptionsRequestToUrlWithOrigin(
                 MgmtRestConstants.BASE_SYSTEM_MAPPING, ALLOWED_ORIGIN_FIRST).andExpect(status().isForbidden())
-                        .andExpect(header().doesNotExist(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)).andReturn()
-                        .getResponse().getContentAsString();
+                .andExpect(header().doesNotExist(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)).andReturn()
+                .getResponse().getContentAsString();
         assertThat(invalidCorsUrlResponseBody).isEqualTo(INVALID_CORS_REQUEST);
     }
 

hawkbit-runtime/hawkbit-mgmt-server/src/test/java/org/eclipse/hawkbit/app/mgmt/PreAuthorizeEnabledTest.java

@@ -9,6 +9,11 @@
  */
 package org.eclipse.hawkbit.app.mgmt;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+import java.util.HashMap;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.qameta.allure.Description;
 import io.qameta.allure.Feature;
@@ -19,26 +24,21 @@ import org.eclipse.hawkbit.repository.test.util.WithUser;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
 
-import java.util.HashMap;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-
 @Feature("Integration Test - Security")
 @Story("PreAuthorized enabled")
 public class PreAuthorizeEnabledTest extends AbstractSecurityTest {
 
     @Test
     @Description("Tests whether request fail if a role is forbidden for the user")
-    @WithUser(authorities = { SpPermission.READ_TARGET } )
+    @WithUser(authorities = { SpPermission.READ_TARGET })
     public void failIfNoRole() throws Exception {
         mvc.perform(get("/rest/v1/distributionsets")).andExpect(result ->
-            assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.FORBIDDEN.value()));
+                assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.FORBIDDEN.value()));
     }
 
     @Test
     @Description("Tests whether request succeed if a role is granted for the user")
-    @WithUser(authorities =  { SpPermission.READ_REPOSITORY })
+    @WithUser(authorities = { SpPermission.READ_REPOSITORY })
     public void successIfHasRole() throws Exception {
         mvc.perform(get("/rest/v1/distributionsets")).andExpect(result -> {
             assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.OK.value());
@@ -47,7 +47,7 @@ public class PreAuthorizeEnabledTest extends AbstractSecurityTest {
 
     @Test
     @Description("Tests whether request succeed if a role is granted for the user")
-    @WithUser(authorities =  { SpRole.TENANT_ADMIN })
+    @WithUser(authorities = { SpRole.TENANT_ADMIN })
     public void successIfHasTenantAdminRole() throws Exception {
         mvc.perform(get("/rest/v1/distributionsets")).andExpect(result -> {
             assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.OK.value());
@@ -57,7 +57,7 @@ public class PreAuthorizeEnabledTest extends AbstractSecurityTest {
     @Test
     @Description("Tests whether read tenant config request fail if a tenant config (or read read) is not " +
             "granted for the user")
-    @WithUser(authorities = { SpPermission.READ_TARGET } )
+    @WithUser(authorities = { SpPermission.READ_TARGET })
     public void onlyDSIfNoTenantConfig() throws Exception {
         mvc.perform(get("/rest/v1/system/configs")).andExpect(result -> {
             // returns default DS type because of READ_TARGET
@@ -72,9 +72,9 @@ public class PreAuthorizeEnabledTest extends AbstractSecurityTest {
     @Test
     @Description("Tests whether read tenant config request succeed if a tenant config (not read explicitly) is " +
             "granted for the user")
-    @WithUser(authorities =  { SpPermission.TENANT_CONFIGURATION })
+    @WithUser(authorities = { SpPermission.TENANT_CONFIGURATION })
     public void successIfHasTenantConfig() throws Exception {
         mvc.perform(get("/rest/v1/system/configs")).andExpect(result ->
-            assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.OK.value()));
+                assertThat(result.getResponse().getStatus()).isEqualTo(HttpStatus.OK.value()));
     }
 }