Code refactoring of hawkbit-mgmt (#2055)

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

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRestConstants.java

@@ -22,60 +22,48 @@ public final class DdiRestConstants {
      * The base URL mapping of the direct device integration rest resources.
      */
     public static final String BASE_V1_REQUEST_MAPPING = "/{tenant}/controller/v1";
-
     /**
      * Deployment action resources.
      */
     public static final String DEPLOYMENT_BASE_ACTION = "deploymentBase";
-
     /**
      * Confirmation base resource.
      */
     public static final String CONFIRMATION_BASE = "confirmationBase";
-
     /**
      * Activate auto-confirm
      */
     public static final String AUTO_CONFIRM_ACTIVATE = "activateAutoConfirm";
-
     /**
      * Deactivate auto-confirm
      */
     public static final String AUTO_CONFIRM_DEACTIVATE = "deactivateAutoConfirm";
-
     /**
      * Installed action resources.
      */
     public static final String INSTALLED_BASE_ACTION = "installedBase";
-
     /**
      * Cancel action resources.
      */
     public static final String CANCEL_ACTION = "cancelAction";
-
     /**
      * Feedback channel.
      */
     public static final String FEEDBACK = "feedback";
-
     /**
      * File suffix for MDH hash download (see Linux md5sum).
      */
     public static final String ARTIFACT_MD5_DWNL_SUFFIX = ".MD5SUM";
-
     /**
      * Config data action resources.
      */
     public static final String CONFIG_DATA_ACTION = "configData";
-
     /**
-     * Default value specifying that no action history to be sent as part of
-     * response to deploymentBase
+     * Default value specifying that no action history to be sent as part of response to deploymentBase
      * {@link DdiRootControllerRestApi#getControllerDeploymentBaseAction}.
      * {@link DdiRootControllerRestApi#getConfirmationBaseAction}.
      */
     public static final String NO_ACTION_HISTORY = "0";
-
     /**
      * Media type for CBOR content. Unfortunately, there is no other constant we
      * can reuse - even the Jackson data converter simply hardcodes this.

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java

@@ -158,8 +158,8 @@ public interface DdiRootControllerRestApi {
                     " and the client has to wait another second.",
                     content = @Content(mediaType = "application/json", schema = @Schema(hidden = true)))
     })
-    @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING
-            + "/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{fileName}")
+    @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING +
+            "/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{fileName}")
     ResponseEntity<InputStream> downloadArtifact(@PathVariable("tenant") final String tenant,
             @PathVariable("controllerId") final String controllerId,
             @PathVariable("softwareModuleId") final Long softwareModuleId,
@@ -315,7 +315,8 @@ public interface DdiRootControllerRestApi {
     })
     @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.DEPLOYMENT_BASE_ACTION +
             "/{actionId}/" + DdiRestConstants.FEEDBACK, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR })
-    ResponseEntity<Void> postDeploymentBaseActionFeedback(@Valid final DdiActionFeedback feedback,
+    ResponseEntity<Void> postDeploymentBaseActionFeedback(
+            @Valid final DdiActionFeedback feedback,
             @PathVariable("tenant") final String tenant, @PathVariable("controllerId") final String controllerId,
             @PathVariable("actionId") @NotNull final Long actionId);
 
@@ -488,7 +489,8 @@ public interface DdiRootControllerRestApi {
     })
     @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.INSTALLED_BASE_ACTION + "/{actionId}",
             produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR })
-    ResponseEntity<DdiDeploymentBase> getControllerInstalledAction(@PathVariable("tenant") final String tenant,
+    ResponseEntity<DdiDeploymentBase> getControllerInstalledAction(
+            @PathVariable("tenant") final String tenant,
             @PathVariable("controllerId") @NotEmpty final String controllerId,
             @PathVariable("actionId") @NotNull final Long actionId,
             @RequestParam(
@@ -496,10 +498,8 @@ public interface DdiRootControllerRestApi {
                     defaultValue = DdiRestConstants.NO_ACTION_HISTORY) final Integer actionHistoryMessageCount);
 
     /**
-     * Returns the confirmation base with the current auto-confirmation state
-     * for a given controllerId and toggle links. In case there are actions
-     * present where the confirmation is required, a reference to it will be
-     * returned as well.
+     * Returns the confirmation base with the current auto-confirmation state for a given controllerId and toggle links. In case there are
+     * actions present where the confirmation is required, a reference to it will be returned as well.
      *
      * @param tenant the controllerId is corresponding too
      * @param controllerId to check the state for
@@ -582,9 +582,8 @@ public interface DdiRootControllerRestApi {
                     "and the client has to wait another second.",
                     content = @Content(mediaType = "application/json", schema = @Schema(hidden = true)))
     })
-    @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/"
-            + DdiRestConstants.CONFIRMATION_BASE + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE,
-            MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR })
+    @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/{actionId}",
+            produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR })
     ResponseEntity<DdiConfirmationBaseAction> getConfirmationBaseAction(@PathVariable("tenant") final String tenant,
             @PathVariable("controllerId") @NotEmpty final String controllerId,
             @PathVariable("actionId") @NotNull final Long actionId,
@@ -635,7 +634,8 @@ public interface DdiRootControllerRestApi {
                     content = @Content(mediaType = "application/json", schema = @Schema(hidden = true)))
     })
     @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/{actionId}/" +
-            DdiRestConstants.FEEDBACK, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR })
+            DdiRestConstants.FEEDBACK,
+            consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR })
     ResponseEntity<Void> postConfirmationActionFeedback(
             @Valid final DdiConfirmationFeedback feedback,
             @PathVariable("tenant") final String tenant,
@@ -772,7 +772,7 @@ public interface DdiRootControllerRestApi {
     })
     @PutMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.INSTALLED_BASE_ACTION,
             consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR })
-    ResponseEntity<Void> setAsssignedOfflineVersion(
+    ResponseEntity<Void> setAssignedOfflineVersion(
             @Valid DdiAssignedVersion ddiAssignedVersion,
             @PathVariable("tenant") final String tenant,
             @PathVariable("controllerId") final String controllerId);