Mgmt resources - small code style refactoring (#2071)

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

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtActionResource.java

@@ -41,7 +41,6 @@ public class MgmtActionResource implements MgmtActionRestApi {
     public ResponseEntity<PagedList<MgmtAction>> getActions(
             final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam,
             final String representationModeParam) {
-
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeActionSortParam(sortParam);
@@ -58,15 +57,11 @@ public class MgmtActionResource implements MgmtActionRestApi {
         }
 
         final MgmtRepresentationMode repMode = getRepresentationModeFromString(representationModeParam);
-
+        return ResponseEntity.ok(new PagedList<>(MgmtActionMapper.toResponse(actions.getContent(), repMode), totalActionCount));
-        return ResponseEntity
-                .ok(new PagedList<>(MgmtActionMapper.toResponse(actions.getContent(), repMode), totalActionCount));
-
     }
 
     @Override
     public ResponseEntity<MgmtAction> getAction(final Long actionId) {
-
         final Action action = deploymentManagement.findAction(actionId)
                 .orElseThrow(() -> new EntityNotFoundException(Action.class, actionId));
 
@@ -81,5 +76,4 @@ public class MgmtActionResource implements MgmtActionRestApi {
                     return MgmtRepresentationMode.COMPACT;
                 });
     }
-
+}
-}

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtBasicAuthResource.java

@@ -29,7 +29,7 @@ public class MgmtBasicAuthResource implements MgmtBasicAuthRestApi {
 
     @Override
     public ResponseEntity<MgmtUserInfo> validateBasicAuth() {
-        MgmtUserInfo userInfo = new MgmtUserInfo();
+        final MgmtUserInfo userInfo = new MgmtUserInfo();
         userInfo.setUsername(tenantAware.getCurrentUsername());
         userInfo.setTenant(tenantAware.getCurrentTenant());
         return ResponseEntity.ok(userInfo);

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDeploymentRequestMapper.java

@@ -34,7 +34,6 @@ public final class MgmtDeploymentRequestMapper {
      */
     public static DeploymentRequestBuilder createAssignmentRequestBuilder(
             final MgmtDistributionSetAssignment dsAssignment, final String targetId) {
-
         return createAssignmentRequestBuilder(targetId, dsAssignment.getId(), dsAssignment.getType(),
                 dsAssignment.getForcetime(), dsAssignment.getWeight(), dsAssignment.getMaintenanceWindow());
     }

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetMapper.java

@@ -49,8 +49,8 @@ public final class MgmtDistributionSetMapper {
      * @param sets to convert
      * @return converted list of {@link DistributionSet}s
      */
-    static List<DistributionSetCreate> dsFromRequest(final Collection<MgmtDistributionSetRequestBodyPost> sets,
+    static List<DistributionSetCreate> dsFromRequest(
-            final EntityFactory entityFactory) {
+            final Collection<MgmtDistributionSetRequestBodyPost> sets, final EntityFactory entityFactory) {
         return sets.stream().map(dsRest -> fromRequest(dsRest, entityFactory)).collect(Collectors.toList());
     }
 

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java

@@ -13,6 +13,7 @@ import java.text.MessageFormat;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -110,10 +111,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
 
     @Override
     public ResponseEntity<PagedList<MgmtDistributionSet>> getDistributionSets(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeDistributionSetSortParam(sortParam);
@@ -196,10 +194,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtTarget>> getAssignedTargets(
             final Long distributionSetId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeTargetSortParam(sortParam);
@@ -221,10 +216,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtTarget>> getInstalledTargets(
             final Long distributionSetId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         // check if distribution set exists otherwise throw exception
         // immediately
         distributionSetManagement.getOrElseThrowException(distributionSetId);
@@ -249,10 +241,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtTargetFilterQuery>> getAutoAssignTargetFilterQueries(
             final Long distributionSetId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeTargetFilterQuerySortParam(sortParam);
@@ -268,9 +257,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
 
     @Override
     public ResponseEntity<MgmtTargetAssignmentResponseBody> createAssignedTarget(
-            final Long distributionSetId,
+            final Long distributionSetId, final List<MgmtTargetAssignmentRequestBody> assignments, final Boolean offline) {
-            final List<MgmtTargetAssignmentRequestBody> assignments,
-            final Boolean offline) {
         if (offline != null && offline) {
             final List<Entry<String, Long>> offlineAssignments = assignments.stream()
                     .map(assignment -> new SimpleEntry<>(assignment.getId(), distributionSetId))
@@ -295,10 +282,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtMetadata>> getMetadata(
             final Long distributionSetId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeDistributionSetMetadataSortParam(sortParam);
@@ -314,14 +298,11 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
         }
 
         return ResponseEntity
-                .ok(new PagedList<>(MgmtDistributionSetMapper.toResponseDsMetadata(metaDataPage.getContent()),
+                .ok(new PagedList<>(MgmtDistributionSetMapper.toResponseDsMetadata(metaDataPage.getContent()), metaDataPage.getTotalElements()));
-                        metaDataPage.getTotalElements()));
     }
 
     @Override
-    public ResponseEntity<MgmtMetadata> getMetadataValue(
+    public ResponseEntity<MgmtMetadata> getMetadataValue(final Long distributionSetId, final String metadataKey) {
-            final Long distributionSetId,
-            final String metadataKey) {
         // check if distribution set exists otherwise throw exception immediately
         final DistributionSetMetadata findOne = distributionSetManagement
                 .getMetaDataByDistributionSetId(distributionSetId, metadataKey)
@@ -331,9 +312,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
 
     @Override
     public ResponseEntity<MgmtMetadata> updateMetadata(
-            final Long distributionSetId,
+            final Long distributionSetId, final String metadataKey, final MgmtMetadataBodyPut metadata) {
-            final String metadataKey,
-            final MgmtMetadataBodyPut metadata) {
         // check if distribution set exists otherwise throw exception immediately
         final DistributionSetMetadata updated = distributionSetManagement.updateMetaData(distributionSetId,
                 entityFactory.generateDsMetadata(metadataKey, metadata.getValue()));
@@ -341,18 +320,14 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
     }
 
     @Override
-    public ResponseEntity<Void> deleteMetadata(
+    public ResponseEntity<Void> deleteMetadata(final Long distributionSetId, final String metadataKey) {
-            final Long distributionSetId,
-            final String metadataKey) {
         // check if distribution set exists otherwise throw exception immediately
         distributionSetManagement.deleteMetaData(distributionSetId, metadataKey);
         return ResponseEntity.ok().build();
     }
 
     @Override
-    public ResponseEntity<List<MgmtMetadata>> createMetadata(
+    public ResponseEntity<List<MgmtMetadata>> createMetadata(final Long distributionSetId, final List<MgmtMetadata> metadataRest) {
-            final Long distributionSetId,
-            final List<MgmtMetadata> metadataRest) {
         // check if distribution set exists otherwise throw exception immediately
         final List<DistributionSetMetadata> created = distributionSetManagement.createMetaData(distributionSetId,
                 MgmtDistributionSetMapper.fromRequestDsMetadata(metadataRest, entityFactory));
@@ -361,18 +336,17 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
     }
 
     @Override
-    public ResponseEntity<Void> assignSoftwareModules(
+    public ResponseEntity<Void> assignSoftwareModules(final Long distributionSetId, final List<MgmtSoftwareModuleAssignment> softwareModuleIDs) {
-            final Long distributionSetId,
+        distributionSetManagement.assignSoftwareModules(
-            final List<MgmtSoftwareModuleAssignment> softwareModuleIDs) {
+                distributionSetId,
-        distributionSetManagement.assignSoftwareModules(distributionSetId,
+                softwareModuleIDs.stream()
-                softwareModuleIDs.stream().map(MgmtSoftwareModuleAssignment::getId).collect(Collectors.toList()));
+                        .map(MgmtSoftwareModuleAssignment::getId)
+                        .collect(Collectors.toList()));
         return ResponseEntity.ok().build();
     }
 
     @Override
-    public ResponseEntity<Void> deleteAssignSoftwareModules(
+    public ResponseEntity<Void> deleteAssignSoftwareModules(final Long distributionSetId, final Long softwareModuleId) {
-            final Long distributionSetId,
-            final Long softwareModuleId) {
         distributionSetManagement.unassignSoftwareModule(distributionSetId, softwareModuleId);
         return ResponseEntity.ok().build();
     }
@@ -380,22 +354,19 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtSoftwareModule>> getAssignedSoftwareModules(
             final Long distributionSetId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam) {
-            final int pagingLimitParam,
-            final String sortParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeSoftwareModuleSortParam(sortParam);
         final Pageable pageable = new OffsetBasedPageRequest(sanitizedOffsetParam, sanitizedLimitParam, sorting);
-        final Page<SoftwareModule> softwaremodules = softwareModuleManagement.findByAssignedTo(pageable,
+        final Page<SoftwareModule> softwaremodules = softwareModuleManagement.findByAssignedTo(pageable, distributionSetId);
-                distributionSetId);
+        return ResponseEntity.ok(new PagedList<>(MgmtSoftwareModuleMapper.toResponse(
-        return ResponseEntity.ok(new PagedList<>(MgmtSoftwareModuleMapper.toResponse(softwaremodules.getContent()),
+                softwaremodules.getContent()), softwaremodules.getTotalElements()));
-                softwaremodules.getTotalElements()));
     }
 
     @Override
     public ResponseEntity<MgmtDistributionSetStatistics> getRolloutsCountByStatusForDistributionSet(final Long distributionSetId) {
-        MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false);
+        final MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false);
         distributionSetManagement.countRolloutsByStatusForDistributionSet(distributionSetId).forEach(statistic ->
                 statistics.addTotalRolloutPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString())));
         return ResponseEntity.ok(statistics.build());
@@ -411,14 +382,14 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
 
     @Override
     public ResponseEntity<MgmtDistributionSetStatistics> getAutoAssignmentsCountForDistributionSet(final Long distributionSetId) {
-        MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false);
+        final MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false);
         statistics.addTotalAutoAssignments(distributionSetManagement.countAutoAssignmentsForDistributionSet(distributionSetId));
         return ResponseEntity.ok(statistics.build());
     }
 
     @Override
     public ResponseEntity<MgmtDistributionSetStatistics> getStatisticsForDistributionSet(final Long distributionSetId) {
-        MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(true);
+        final MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(true);
         distributionSetManagement.countRolloutsByStatusForDistributionSet(distributionSetId).forEach(statistic ->
                 statistics.addTotalRolloutPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString())));
         distributionSetManagement.countActionsByStatusForDistributionSet(distributionSetId).forEach(statistic ->
@@ -429,10 +400,10 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi {
 
     @Override
     public ResponseEntity<Void> invalidateDistributionSet(
-            final Long distributionSetId,
+            final Long distributionSetId, final MgmtInvalidateDistributionSetRequestBody invalidateRequestBody) {
-            final MgmtInvalidateDistributionSetRequestBody invalidateRequestBody) {
         distributionSetInvalidationManagement
-                .invalidateDistributionSet(new DistributionSetInvalidation(Arrays.asList(distributionSetId),
+                .invalidateDistributionSet(
+                        new DistributionSetInvalidation(Collections.singletonList(distributionSetId),
                         MgmtRestModelMapper.convertCancelationType(invalidateRequestBody.getActionCancelationType()),
                         invalidateRequestBody.isCancelRollouts()));
         return ResponseEntity.ok().build();

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java

@@ -58,10 +58,7 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes
 
     @Override
     public ResponseEntity<PagedList<MgmtTag>> getDistributionSetTags(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeTagSortParam(sortParam);
@@ -132,10 +129,7 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes
     @Override
     public ResponseEntity<PagedList<MgmtDistributionSet>> getAssignedDistributionSets(
             final Long distributionsetTagId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeTagSortParam(sortParam);

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResource.java

@@ -56,10 +56,7 @@ public class MgmtDistributionSetTypeResource implements MgmtDistributionSetTypeR
 
     @Override
     public ResponseEntity<PagedList<MgmtDistributionSetType>> getDistributionSetTypes(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeDistributionSetTypeSortParam(sortParam);
@@ -80,8 +77,7 @@ public class MgmtDistributionSetTypeResource implements MgmtDistributionSetTypeR
     }
 
     @Override
-    public ResponseEntity<MgmtDistributionSetType> getDistributionSetType(
+    public ResponseEntity<MgmtDistributionSetType> getDistributionSetType(final Long distributionSetTypeId) {
-            final Long distributionSetTypeId) {
         final DistributionSetType foundType = findDistributionSetTypeWithExceptionIfNotFound(distributionSetTypeId);
 
         final MgmtDistributionSetType response = MgmtDistributionSetTypeMapper.toResponse(foundType);
@@ -99,8 +95,7 @@ public class MgmtDistributionSetTypeResource implements MgmtDistributionSetTypeR
 
     @Override
     public ResponseEntity<MgmtDistributionSetType> updateDistributionSetType(
-            final Long distributionSetTypeId,
+            final Long distributionSetTypeId, final MgmtDistributionSetTypeRequestBodyPut restDistributionSetType) {
-            final MgmtDistributionSetTypeRequestBodyPut restDistributionSetType) {
         final DistributionSetType updated = distributionSetTypeManagement.update(entityFactory.distributionSetType()
                 .update(distributionSetTypeId).description(restDistributionSetType.getDescription())
                 .colour(restDistributionSetType.getColour()));
@@ -122,16 +117,13 @@ public class MgmtDistributionSetTypeResource implements MgmtDistributionSetTypeR
     }
 
     @Override
-    public ResponseEntity<List<MgmtSoftwareModuleType>> getMandatoryModules(
+    public ResponseEntity<List<MgmtSoftwareModuleType>> getMandatoryModules(final Long distributionSetTypeId) {
-            final Long distributionSetTypeId) {
         final DistributionSetType foundType = findDistributionSetTypeWithExceptionIfNotFound(distributionSetTypeId);
         return ResponseEntity.ok(MgmtSoftwareModuleTypeMapper.toTypesResponse(foundType.getMandatoryModuleTypes()));
     }
 
     @Override
-    public ResponseEntity<MgmtSoftwareModuleType> getMandatoryModule(
+    public ResponseEntity<MgmtSoftwareModuleType> getMandatoryModule(final Long distributionSetTypeId, final Long softwareModuleTypeId) {
-            final Long distributionSetTypeId,
-            final Long softwareModuleTypeId) {
         final DistributionSetType foundType = findDistributionSetTypeWithExceptionIfNotFound(distributionSetTypeId);
         final SoftwareModuleType foundSmType = findSoftwareModuleTypeWithExceptionIfNotFound(softwareModuleTypeId);
 
@@ -143,9 +135,7 @@ public class MgmtDistributionSetTypeResource implements MgmtDistributionSetTypeR
     }
 
     @Override
-    public ResponseEntity<MgmtSoftwareModuleType> getOptionalModule(
+    public ResponseEntity<MgmtSoftwareModuleType> getOptionalModule(final Long distributionSetTypeId, final Long softwareModuleTypeId) {
-            final Long distributionSetTypeId,
-            final Long softwareModuleTypeId) {
         final DistributionSetType foundType = findDistributionSetTypeWithExceptionIfNotFound(distributionSetTypeId);
         final SoftwareModuleType foundSmType = findSoftwareModuleTypeWithExceptionIfNotFound(softwareModuleTypeId);
 
@@ -157,25 +147,19 @@ public class MgmtDistributionSetTypeResource implements MgmtDistributionSetTypeR
     }
 
     @Override
-    public ResponseEntity<List<MgmtSoftwareModuleType>> getOptionalModules(
+    public ResponseEntity<List<MgmtSoftwareModuleType>> getOptionalModules(final Long distributionSetTypeId) {
-            final Long distributionSetTypeId) {
         final DistributionSetType foundType = findDistributionSetTypeWithExceptionIfNotFound(distributionSetTypeId);
         return ResponseEntity.ok(MgmtSoftwareModuleTypeMapper.toTypesResponse(foundType.getOptionalModuleTypes()));
     }
 
     @Override
-    public ResponseEntity<Void> removeMandatoryModule(
+    public ResponseEntity<Void> removeMandatoryModule(final Long distributionSetTypeId, final Long softwareModuleTypeId) {
-            final Long distributionSetTypeId,
-            final Long softwareModuleTypeId) {
         distributionSetTypeManagement.unassignSoftwareModuleType(distributionSetTypeId, softwareModuleTypeId);
-
         return ResponseEntity.ok().build();
     }
 
     @Override
-    public ResponseEntity<Void> removeOptionalModule(
+    public ResponseEntity<Void> removeOptionalModule(final Long distributionSetTypeId, final Long softwareModuleTypeId) {
-            final Long distributionSetTypeId,
-            final Long softwareModuleTypeId) {
         return removeMandatoryModule(distributionSetTypeId, softwareModuleTypeId);
     }
 
@@ -186,8 +170,7 @@ public class MgmtDistributionSetTypeResource implements MgmtDistributionSetTypeR
     }
 
     @Override
-    public ResponseEntity<Void> addOptionalModule(
+    public ResponseEntity<Void> addOptionalModule(final Long distributionSetTypeId, final MgmtId smtId) {
-            final Long distributionSetTypeId, final MgmtId smtId) {
         distributionSetTypeManagement.assignOptionalSoftwareModuleTypes(distributionSetTypeId, Collections.singletonList(smtId.getId()));
 
         return ResponseEntity.ok().build();

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadArtifactResource.java

@@ -50,9 +50,7 @@ public class MgmtDownloadArtifactResource implements MgmtDownloadArtifactRestApi
      * @return responseEntity with status ok if successful
      */
     @Override
-    public ResponseEntity<InputStream> downloadArtifact(
+    public ResponseEntity<InputStream> downloadArtifact(final Long softwareModuleId, final Long artifactId) {
-            final Long softwareModuleId,
-            final Long artifactId) {
         final SoftwareModule module = softwareModuleManagement.get(softwareModuleId)
                 .orElseThrow(() -> new EntityNotFoundException(SoftwareModule.class, softwareModuleId));
         if (module.isDeleted()) {

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java

@@ -25,7 +25,6 @@ import org.eclipse.hawkbit.mgmt.json.model.rolloutgroup.MgmtRolloutGroup;
 import org.eclipse.hawkbit.mgmt.json.model.rolloutgroup.MgmtRolloutGroupResponseBody;
 import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget;
 import org.eclipse.hawkbit.mgmt.rest.api.MgmtRepresentationMode;
-import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants;
 import org.eclipse.hawkbit.mgmt.rest.api.MgmtRolloutRestApi;
 import org.eclipse.hawkbit.mgmt.rest.resource.util.PagingUtility;
 import org.eclipse.hawkbit.repository.DistributionSetManagement;
@@ -84,12 +83,8 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi {
 
     @Override
     public ResponseEntity<PagedList<MgmtRolloutResponseBody>> getRollouts(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam,
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam,
             final String representationModeParam) {
-
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeRolloutSortParam(sortParam);
@@ -125,8 +120,7 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi {
     }
 
     @Override
-    public ResponseEntity<MgmtRolloutResponseBody> create(
+    public ResponseEntity<MgmtRolloutResponseBody> create(final MgmtRolloutRestRequestBodyPost rolloutRequestBody) {
-            final MgmtRolloutRestRequestBodyPost rolloutRequestBody) {
         // first check the given RSQL query if it's well-formed, otherwise and exception is thrown
         final String targetFilterQuery = rolloutRequestBody.getTargetFilterQuery();
         if (targetFilterQuery == null) {
@@ -170,9 +164,7 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi {
     }
 
     @Override
-    public ResponseEntity<MgmtRolloutResponseBody> update(
+    public ResponseEntity<MgmtRolloutResponseBody> update(final Long rolloutId, final MgmtRolloutRestRequestBodyPut rolloutUpdateBody) {
-            final Long rolloutId,
-            final MgmtRolloutRestRequestBodyPut rolloutUpdateBody) {
         final Rollout updated = rolloutManagement.update(MgmtRolloutMapper.fromRequest(entityFactory, rolloutUpdateBody, rolloutId));
         return ResponseEntity.ok(MgmtRolloutMapper.toResponseRollout(updated, true));
     }
@@ -216,10 +208,7 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtRolloutGroupResponseBody>> getRolloutGroups(
             final Long rolloutId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam,
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam,
             final String representationModeParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
@@ -251,9 +240,7 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi {
     }
 
     @Override
-    public ResponseEntity<MgmtRolloutGroupResponseBody> getRolloutGroup(
+    public ResponseEntity<MgmtRolloutGroupResponseBody> getRolloutGroup(final Long rolloutId, final Long groupId) {
-            final Long rolloutId,
-            final Long groupId) {
         findRolloutOrThrowException(rolloutId);
 
         final RolloutGroup rolloutGroup = rolloutGroupManagement.getWithDetailedStatus(groupId)
@@ -263,18 +250,14 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi {
             throw new EntityNotFoundException(RolloutGroup.class, groupId);
         }
 
-        return ResponseEntity.ok(MgmtRolloutMapper.toResponseRolloutGroup(rolloutGroup, true,
+        return ResponseEntity.ok(MgmtRolloutMapper.toResponseRolloutGroup(
-                tenantConfigHelper.isConfirmationFlowEnabled()));
+                rolloutGroup, true, tenantConfigHelper.isConfirmationFlowEnabled()));
     }
 
     @Override
     public ResponseEntity<PagedList<MgmtTarget>> getRolloutGroupTargets(
-            final Long rolloutId,
+            final Long rolloutId, final Long groupId,
-            final Long groupId,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingOffsetParam,
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         findRolloutOrThrowException(rolloutId);
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
@@ -329,8 +312,7 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi {
         });
     }
 
-    private Optional<Boolean> isConfirmationRequiredForGroup(final MgmtRolloutGroup group,
+    private Optional<Boolean> isConfirmationRequiredForGroup(final MgmtRolloutGroup group, final MgmtRolloutRestRequestBodyPost request) {
-            final MgmtRolloutRestRequestBodyPost request) {
         if (group.getConfirmationRequired() != null) {
             return Optional.of(group.getConfirmationRequired());
         } else if (request.getConfirmationRequired() != null) {
@@ -344,5 +326,4 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi {
             throw new EntityNotFoundException(Rollout.class, rolloutId);
         }
     }
-
+}
-}

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java

@@ -81,13 +81,8 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
 
     @Override
     public ResponseEntity<MgmtArtifact> uploadArtifact(
-            final Long softwareModuleId,
+            final Long softwareModuleId, final MultipartFile file, final String optionalFileName,
-            final MultipartFile file,
+            final String md5Sum, final String sha1Sum, final String sha256Sum) {
-            final String optionalFileName,
-            final String md5Sum,
-            final String sha1Sum,
-            final String sha256Sum) {
-
         if (file.isEmpty()) {
             return ResponseEntity.badRequest().build();
         }
@@ -114,9 +109,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
 
     @Override
     public ResponseEntity<List<MgmtArtifact>> getArtifacts(
-            final Long softwareModuleId,
+            final Long softwareModuleId, final String representationModeParam, final Boolean useArtifactUrlHandler) {
-            final String representationModeParam,
-            final Boolean useArtifactUrlHandler) {
         final SoftwareModule module = findSoftwareModuleWithExceptionIfNotFound(softwareModuleId, null);
 
         final boolean isFullMode = parseRepresentationMode(representationModeParam) == MgmtRepresentationMode.FULL;
@@ -136,10 +129,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
     // Exception squid:S3655 - Optional access is checked in findSoftwareModuleWithExceptionIfNotFound subroutine
     @SuppressWarnings("squid:S3655")
     @Override
-    public ResponseEntity<MgmtArtifact> getArtifact(
+    public ResponseEntity<MgmtArtifact> getArtifact(final Long softwareModuleId, final Long artifactId, final Boolean useArtifactUrlHandler) {
-            final Long softwareModuleId,
-            final Long artifactId,
-            final Boolean useArtifactUrlHandler) {
         final SoftwareModule module = findSoftwareModuleWithExceptionIfNotFound(softwareModuleId, artifactId);
 
         final MgmtArtifact response = MgmtSoftwareModuleMapper.toResponse(module.getArtifact(artifactId).get());
@@ -156,9 +146,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
     }
 
     @Override
-    public ResponseEntity<Void> deleteArtifact(
+    public ResponseEntity<Void> deleteArtifact(final Long softwareModuleId, final Long artifactId) {
-            final Long softwareModuleId,
-            final Long artifactId) {
         findSoftwareModuleWithExceptionIfNotFound(softwareModuleId, artifactId);
         artifactManagement.delete(artifactId);
 
@@ -167,10 +155,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
 
     @Override
     public ResponseEntity<PagedList<MgmtSoftwareModule>> getSoftwareModules(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeSoftwareModuleSortParam(sortParam);
@@ -219,14 +204,12 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
                 .create(MgmtSoftwareModuleMapper.smFromRequest(entityFactory, softwareModules));
         log.debug("{} softwareModules created, return status {}", softwareModules.size(), HttpStatus.CREATED);
 
-        return ResponseEntity.status(HttpStatus.CREATED)
+        return ResponseEntity.status(HttpStatus.CREATED).body(MgmtSoftwareModuleMapper.toResponse(createdSoftwareModules));
-                .body(MgmtSoftwareModuleMapper.toResponse(createdSoftwareModules));
     }
 
     @Override
     public ResponseEntity<MgmtSoftwareModule> updateSoftwareModule(
-            final Long softwareModuleId,
+            final Long softwareModuleId, final MgmtSoftwareModuleRequestBodyPut restSoftwareModule) {
-            final MgmtSoftwareModuleRequestBodyPut restSoftwareModule) {
         final SoftwareModule module = softwareModuleManagement
                 .update(entityFactory.softwareModule().update(softwareModuleId)
                         .description(restSoftwareModule.getDescription())
@@ -250,10 +233,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtSoftwareModuleMetadata>> getMetadata(
             final Long softwareModuleId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         // check if software module exists otherwise throw exception immediately
         findSoftwareModuleWithExceptionIfNotFound(softwareModuleId, null);
 
@@ -275,9 +255,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
     }
 
     @Override
-    public ResponseEntity<MgmtSoftwareModuleMetadata> getMetadataValue(
+    public ResponseEntity<MgmtSoftwareModuleMetadata> getMetadataValue(final Long softwareModuleId, final String metadataKey) {
-            final Long softwareModuleId,
-            final String metadataKey) {
         final SoftwareModuleMetadata findOne = softwareModuleManagement
                 .getMetaDataBySoftwareModuleId(softwareModuleId, metadataKey).orElseThrow(
                         () -> new EntityNotFoundException(SoftwareModuleMetadata.class, softwareModuleId, metadataKey));
@@ -287,9 +265,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
 
     @Override
     public ResponseEntity<MgmtSoftwareModuleMetadata> updateMetadata(
-            final Long softwareModuleId,
+            final Long softwareModuleId, final String metadataKey, final MgmtSoftwareModuleMetadataBodyPut metadata) {
-            final String metadataKey,
-            final MgmtSoftwareModuleMetadataBodyPut metadata) {
         final SoftwareModuleMetadata updated = softwareModuleManagement
                 .updateMetaData(entityFactory.softwareModuleMetadata().update(softwareModuleId, metadataKey)
                         .value(metadata.getValue()).targetVisible(metadata.getTargetVisible()));
@@ -298,18 +274,14 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
     }
 
     @Override
-    public ResponseEntity<Void> deleteMetadata(
+    public ResponseEntity<Void> deleteMetadata(final Long softwareModuleId, final String metadataKey) {
-            final Long softwareModuleId,
-            final String metadataKey) {
         softwareModuleManagement.deleteMetaData(softwareModuleId, metadataKey);
-
         return ResponseEntity.ok().build();
     }
 
     @Override
     public ResponseEntity<List<MgmtSoftwareModuleMetadata>> createMetadata(
-            final Long softwareModuleId,
+            final Long softwareModuleId, final List<MgmtSoftwareModuleMetadata> metadataRest) {
-            final List<MgmtSoftwareModuleMetadata> metadataRest) {
         final List<SoftwareModuleMetadata> created = softwareModuleManagement.createMetaData(
                 MgmtSoftwareModuleMapper.fromRequestSwMetadata(entityFactory, softwareModuleId, metadataRest));
 
@@ -324,9 +296,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi {
         });
     }
 
-    private SoftwareModule findSoftwareModuleWithExceptionIfNotFound(final Long softwareModuleId,
+    private SoftwareModule findSoftwareModuleWithExceptionIfNotFound(final Long softwareModuleId, final Long artifactId) {
-            final Long artifactId) {
-
         final SoftwareModule module = softwareModuleManagement.get(softwareModuleId)
                 .orElseThrow(() -> new EntityNotFoundException(SoftwareModule.class, softwareModuleId));
 

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java

@@ -47,10 +47,7 @@ public class MgmtSoftwareModuleTypeResource implements MgmtSoftwareModuleTypeRes
 
     @Override
     public ResponseEntity<PagedList<MgmtSoftwareModuleType>> getTypes(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeSoftwareModuleTypeSortParam(sortParam);
@@ -72,24 +69,20 @@ public class MgmtSoftwareModuleTypeResource implements MgmtSoftwareModuleTypeRes
     }
 
     @Override
-    public ResponseEntity<MgmtSoftwareModuleType> getSoftwareModuleType(
+    public ResponseEntity<MgmtSoftwareModuleType> getSoftwareModuleType(final Long softwareModuleTypeId) {
-            final Long softwareModuleTypeId) {
         final SoftwareModuleType foundType = findSoftwareModuleTypeWithExceptionIfNotFound(softwareModuleTypeId);
-
         return ResponseEntity.ok(MgmtSoftwareModuleTypeMapper.toResponse(foundType));
     }
 
     @Override
-    public ResponseEntity<Void> deleteSoftwareModuleType(
+    public ResponseEntity<Void> deleteSoftwareModuleType(final Long softwareModuleTypeId) {
-            final Long softwareModuleTypeId) {
         softwareModuleTypeManagement.delete(softwareModuleTypeId);
         return ResponseEntity.ok().build();
     }
 
     @Override
     public ResponseEntity<MgmtSoftwareModuleType> updateSoftwareModuleType(
-            final Long softwareModuleTypeId,
+            final Long softwareModuleTypeId, final MgmtSoftwareModuleTypeRequestBodyPut restSoftwareModuleType) {
-            final MgmtSoftwareModuleTypeRequestBodyPut restSoftwareModuleType) {
         final SoftwareModuleType updatedSoftwareModuleType = softwareModuleTypeManagement.update(entityFactory
                 .softwareModuleType().update(softwareModuleTypeId).description(restSoftwareModuleType.getDescription())
                 .colour(restSoftwareModuleType.getColour()));

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSystemManagementResource.java

@@ -118,4 +118,4 @@ public class MgmtSystemManagementResource implements MgmtSystemManagementRestApi
         }
         return result;
     }
-}
+}

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java

@@ -71,10 +71,7 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA
 
     @Override
     public ResponseEntity<PagedList<MgmtTargetFilterQuery>> getFilters(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam,
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam,
             final String representationModeParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
@@ -153,8 +150,7 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA
 
     @Override
     public ResponseEntity<MgmtTargetFilterQuery> postAssignedDistributionSet(
-            final Long filterId,
+            final Long filterId, final MgmtDistributionSetAutoAssignment autoAssignRequest) {
-            final MgmtDistributionSetAutoAssignment autoAssignRequest) {
 
         final boolean confirmationRequired = autoAssignRequest.getConfirmationRequired() == null
                 ? tenantConfigHelper.isConfirmationFlowEnabled()
@@ -175,7 +171,6 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA
     @Override
     public ResponseEntity<Void> deleteAssignedDistributionSet(final Long filterId) {
         filterManagement.updateAutoAssignDS(entityFactory.targetFilterQuery().updateAutoAssign(filterId).ds(null));
-
         return ResponseEntity.noContent().build();
     }
 

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java

@@ -105,10 +105,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
 
     @Override
     public ResponseEntity<PagedList<MgmtTarget>> getTargets(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeTargetSortParam(sortParam);
@@ -139,9 +136,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
     }
 
     @Override
-    public ResponseEntity<MgmtTarget> updateTarget(
+    public ResponseEntity<MgmtTarget> updateTarget(final String targetId, final MgmtTargetRequestBody targetRest) {
-            final String targetId,
-            final MgmtTargetRequestBody targetRest) {
         if (targetRest.getRequestAttributes() != null) {
             if (targetRest.getRequestAttributes()) {
                 targetManagement.requestControllerAttributes(targetId);
@@ -188,8 +183,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
     }
 
     @Override
-    public ResponseEntity<Void> assignTargetType(final String targetId,
+    public ResponseEntity<Void> assignTargetType(final String targetId, final MgmtId targetTypeId) {
-            final MgmtId targetTypeId) {
         this.targetManagement.assignType(targetId, targetTypeId.getId());
         return ResponseEntity.ok().build();
     }
@@ -210,10 +204,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtAction>> getActionHistory(
             final String targetId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         findTargetWithExceptionIfNotFound(targetId);
 
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
@@ -235,9 +226,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
     }
 
     @Override
-    public ResponseEntity<MgmtAction> getAction(
+    public ResponseEntity<MgmtAction> getAction(final String targetId, final Long actionId) {
-            final String targetId,
-            final Long actionId) {
         final Action action = deploymentManagement.findAction(actionId)
                 .orElseThrow(() -> new EntityNotFoundException(Action.class, actionId));
         if (!action.getTarget().getControllerId().equals(targetId)) {
@@ -249,10 +238,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
     }
 
     @Override
-    public ResponseEntity<Void> cancelAction(
+    public ResponseEntity<Void> cancelAction(final String targetId, final Long actionId, final boolean force) {
-            final String targetId,
-            final Long actionId,
-            final boolean force) {
         final Action action = deploymentManagement.findAction(actionId)
                 .orElseThrow(() -> new EntityNotFoundException(Action.class, actionId));
 
@@ -273,10 +259,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
     }
 
     @Override
-    public ResponseEntity<MgmtAction> updateAction(
+    public ResponseEntity<MgmtAction> updateAction(final String targetId, final Long actionId, final MgmtActionRequestBodyPut actionUpdate) {
-            final String targetId,
-            final Long actionId,
-            final MgmtActionRequestBodyPut actionUpdate) {
 
         Action action = deploymentManagement.findAction(actionId)
                 .orElseThrow(() -> new EntityNotFoundException(Action.class, actionId));
@@ -296,11 +279,8 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
 
     @Override
     public ResponseEntity<PagedList<MgmtActionStatus>> getActionStatusList(
-            final String targetId,
+            final String targetId, final Long actionId,
-            final Long actionId,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam) {
-            final int pagingOffsetParam,
-            final int pagingLimitParam,
-            final String sortParam) {
         final Target target = findTargetWithExceptionIfNotFound(targetId);
 
         final Action action = deploymentManagement.findAction(actionId)
@@ -341,9 +321,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
 
     @Override
     public ResponseEntity<MgmtTargetAssignmentResponseBody> postAssignedDistributionSet(
-            final String targetId,
+            final String targetId, final MgmtDistributionSetAssignments dsAssignments, final Boolean offline) {
-            final MgmtDistributionSetAssignments dsAssignments,
-            final Boolean offline) {
         if (offline != null && offline) {
             final List<Entry<String, Long>> offlineAssignments = dsAssignments.stream()
                     .map(dsAssignment -> new SimpleEntry<String, Long>(targetId, dsAssignment.getId()))
@@ -392,10 +370,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtMetadata>> getMetadata(
             final String targetId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeDistributionSetMetadataSortParam(sortParam);
@@ -409,41 +384,32 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
             metaDataPage = targetManagement.findMetaDataByControllerId(pageable, targetId);
         }
 
-        return ResponseEntity.ok(new PagedList<>(MgmtTargetMapper.toResponseTargetMetadata(metaDataPage.getContent()),
+        return ResponseEntity.ok(new PagedList<>(MgmtTargetMapper.toResponseTargetMetadata(
-                metaDataPage.getTotalElements()));
+                metaDataPage.getContent()), metaDataPage.getTotalElements()));
     }
 
     @Override
-    public ResponseEntity<MgmtMetadata> getMetadataValue(
+    public ResponseEntity<MgmtMetadata> getMetadataValue(final String targetId, final String metadataKey) {
-            final String targetId,
-            final String metadataKey) {
         final TargetMetadata findOne = targetManagement.getMetaDataByControllerId(targetId, metadataKey)
                 .orElseThrow(() -> new EntityNotFoundException(TargetMetadata.class, targetId, metadataKey));
         return ResponseEntity.ok(MgmtTargetMapper.toResponseTargetMetadata(findOne));
     }
 
     @Override
-    public ResponseEntity<MgmtMetadata> updateMetadata(
+    public ResponseEntity<MgmtMetadata> updateMetadata(final String targetId, final String metadataKey, final MgmtMetadataBodyPut metadata) {
-            final String targetId,
-            final String metadataKey,
-            final MgmtMetadataBodyPut metadata) {
         final TargetMetadata updated = targetManagement.updateMetadata(targetId,
                 entityFactory.generateTargetMetadata(metadataKey, metadata.getValue()));
         return ResponseEntity.ok(MgmtTargetMapper.toResponseTargetMetadata(updated));
     }
 
     @Override
-    public ResponseEntity<Void> deleteMetadata(
+    public ResponseEntity<Void> deleteMetadata(final String targetId, final String metadataKey) {
-            final String targetId,
-            final String metadataKey) {
         targetManagement.deleteMetaData(targetId, metadataKey);
         return ResponseEntity.ok().build();
     }
 
     @Override
-    public ResponseEntity<List<MgmtMetadata>> createMetadata(
+    public ResponseEntity<List<MgmtMetadata>> createMetadata(final String targetId, final List<MgmtMetadata> metadataRest) {
-            final String targetId,
-            final List<MgmtMetadata> metadataRest) {
         final List<TargetMetadata> created = targetManagement.createMetaData(targetId,
                 MgmtTargetMapper.fromRequestTargetMetadata(metadataRest, entityFactory));
         return new ResponseEntity<>(MgmtTargetMapper.toResponseTargetMetadata(created), HttpStatus.CREATED);
@@ -457,9 +423,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
     }
 
     @Override
-    public ResponseEntity<Void> activateAutoConfirm(
+    public ResponseEntity<Void> activateAutoConfirm(final String targetId, final MgmtTargetAutoConfirmUpdate update) {
-            final String targetId,
-            final MgmtTargetAutoConfirmUpdate update) {
         final String initiator = getNullIfEmpty(update, MgmtTargetAutoConfirmUpdate::getInitiator);
         final String remark = getNullIfEmpty(update, MgmtTargetAutoConfirmUpdate::getRemark);
         confirmationManagement.activateAutoConfirmation(targetId, initiator, remark);

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResource.java

@@ -65,10 +65,7 @@ public class MgmtTargetTagResource implements MgmtTargetTagRestApi {
 
     @Override
     public ResponseEntity<PagedList<MgmtTag>> getTargetTags(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeTagSortParam(sortParam);
@@ -103,9 +100,7 @@ public class MgmtTargetTagResource implements MgmtTargetTagRestApi {
     }
 
     @Override
-    public ResponseEntity<MgmtTag> updateTargetTag(
+    public ResponseEntity<MgmtTag> updateTargetTag(final Long targetTagId, final MgmtTagRequestBodyPut restTargetTagRest) {
-            final Long targetTagId,
-            final MgmtTagRequestBodyPut restTargetTagRest) {
         log.debug("update {} target tag", restTargetTagRest);
 
         final TargetTag updateTargetTag = tagManagement
@@ -133,10 +128,7 @@ public class MgmtTargetTagResource implements MgmtTargetTagRestApi {
     @Override
     public ResponseEntity<PagedList<MgmtTarget>> getAssignedTargets(
             final Long targetTagId,
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeTargetSortParam(sortParam);
@@ -188,8 +180,7 @@ public class MgmtTargetTagResource implements MgmtTargetTagRestApi {
 
     @Override
     public ResponseEntity<Void> unassignTargets(
-            final Long targetTagId, final OnNotFoundPolicy onNotFoundPolicy,
+            final Long targetTagId, final OnNotFoundPolicy onNotFoundPolicy, final List<String> controllerIds) {
-            final List<String> controllerIds) {
         log.debug("Unassign {} targets for target tag {}", controllerIds.size(), targetTagId);
         if (onNotFoundPolicy == OnNotFoundPolicy.FAIL) {
             this.targetManagement.unassignTag(controllerIds, targetTagId);
@@ -208,8 +199,7 @@ public class MgmtTargetTagResource implements MgmtTargetTagRestApi {
 
     @Override
     public ResponseEntity<MgmtTargetTagAssigmentResult> toggleTagAssignment(
-            final Long targetTagId,
+            final Long targetTagId, final List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies) {
-            final List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies) {
         log.debug("Toggle Target assignment {} for target tag {}", assignedTargetRequestBodies.size(), targetTagId);
 
         final TargetTag targetTag = findTargetTagById(targetTagId);
@@ -226,8 +216,7 @@ public class MgmtTargetTagResource implements MgmtTargetTagRestApi {
 
     @Override
     public ResponseEntity<List<MgmtTarget>> assignTargetsByRequestBody(
-            final Long targetTagId,
+            final Long targetTagId, final List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies) {
-            final List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies) {
         log.debug("Assign targets {} for target tag {}", assignedTargetRequestBodies, targetTagId);
         final List<Target> assignedTarget = this.targetManagement
                 .assignTag(findTargetControllerIds(assignedTargetRequestBodies), targetTagId);

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResource.java

@@ -52,10 +52,7 @@ public class MgmtTargetTypeResource implements MgmtTargetTypeRestApi {
 
     @Override
     public ResponseEntity<PagedList<MgmtTargetType>> getTargetTypes(
-            final int pagingOffsetParam,
+            final int pagingOffsetParam, final int pagingLimitParam, final String sortParam, final String rsqlParam) {
-            final int pagingLimitParam,
-            final String sortParam,
-            final String rsqlParam) {
         final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam);
         final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam);
         final Sort sorting = PagingUtility.sanitizeTargetTypeSortParam(sortParam);
@@ -91,9 +88,7 @@ public class MgmtTargetTypeResource implements MgmtTargetTypeRestApi {
     }
 
     @Override
-    public ResponseEntity<MgmtTargetType> updateTargetType(
+    public ResponseEntity<MgmtTargetType> updateTargetType(final Long targetTypeId, final MgmtTargetTypeRequestBodyPut restTargetType) {
-            final Long targetTypeId,
-            final MgmtTargetTypeRequestBodyPut restTargetType) {
         final TargetType updated = targetTypeManagement
                 .update(entityFactory.targetType().update(targetTypeId).name(restTargetType.getName())
                         .description(restTargetType.getDescription()).colour(restTargetType.getColour()));
@@ -104,31 +99,26 @@ public class MgmtTargetTypeResource implements MgmtTargetTypeRestApi {
 
     @Override
     public ResponseEntity<List<MgmtTargetType>> createTargetTypes(final List<MgmtTargetTypeRequestBodyPost> targetTypes) {
-
         final List<TargetType> createdTargetTypes = targetTypeManagement
                 .create(MgmtTargetTypeMapper.targetFromRequest(entityFactory, targetTypes));
         return ResponseEntity.status(HttpStatus.CREATED).body(MgmtTargetTypeMapper.toListResponse(createdTargetTypes));
     }
 
     @Override
-    public ResponseEntity<List<MgmtDistributionSetType>> getCompatibleDistributionSets(
+    public ResponseEntity<List<MgmtDistributionSetType>> getCompatibleDistributionSets(final Long targetTypeId) {
-            final Long targetTypeId) {
         final TargetType foundType = findTargetTypeWithExceptionIfNotFound(targetTypeId);
         return ResponseEntity.ok(MgmtDistributionSetTypeMapper.toListResponse(foundType.getCompatibleDistributionSetTypes()));
     }
 
     @Override
-    public ResponseEntity<Void> removeCompatibleDistributionSet(
+    public ResponseEntity<Void> removeCompatibleDistributionSet(final Long targetTypeId, final Long distributionSetTypeId) {
-            final Long targetTypeId,
-            final Long distributionSetTypeId) {
         targetTypeManagement.unassignDistributionSetType(targetTypeId, distributionSetTypeId);
         return ResponseEntity.ok().build();
     }
 
     @Override
     public ResponseEntity<Void> addCompatibleDistributionSets(
-            final Long targetTypeId,
+            final Long targetTypeId, final List<MgmtDistributionSetTypeAssignment> distributionSetTypeIds) {
-            final List<MgmtDistributionSetTypeAssignment> distributionSetTypeIds) {
         targetTypeManagement.assignCompatibleDistributionSetTypes(
                 targetTypeId, distributionSetTypeIds.stream().map(MgmtDistributionSetTypeAssignment::getId).collect(Collectors.toList()));
         return ResponseEntity.ok().build();

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResource.java

@@ -91,8 +91,7 @@ public class MgmtTenantManagementResource implements MgmtTenantManagementRestApi
 
     @Override
     public ResponseEntity<MgmtSystemTenantConfigurationValue> updateTenantConfigurationValue(
-            final String keyName,
+            final String keyName, final MgmtSystemTenantConfigurationValueRequest configurationValueRest) {
-            final MgmtSystemTenantConfigurationValueRequest configurationValueRest) {
         Serializable configurationValue = configurationValueRest.getValue();
         final MgmtSystemTenantConfigurationValue responseUpdatedValue;
         if (isDefaultDistributionSetTypeKey(keyName)) {