diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java index 74b351e1d..d05bc84d8 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java +++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java @@ -42,6 +42,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** @@ -174,7 +175,7 @@ public interface MgmtDistributionSetRestApi { @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - ResponseEntity> createDistributionSets(List sets); + ResponseEntity> createDistributionSets(@RequestBody List sets); /** * Handles the DELETE request for a single DistributionSet . @@ -243,8 +244,9 @@ public interface MgmtDistributionSetRestApi { @PutMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaType.APPLICATION_JSON_VALUE, MediaTypes.HAL_JSON_VALUE }) - ResponseEntity updateDistributionSet(@PathVariable("distributionSetId") Long distributionSetId, - MgmtDistributionSetRequestBodyPut toUpdate); + ResponseEntity updateDistributionSet( + @PathVariable("distributionSetId") Long distributionSetId, + @RequestBody MgmtDistributionSetRequestBodyPut toUpdate); /** * Handles the GET request of retrieving assigned targets to a specific distribution set. @@ -281,7 +283,8 @@ public interface MgmtDistributionSetRestApi { }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedTargets", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - ResponseEntity> getAssignedTargets(@PathVariable("distributionSetId") Long distributionSetId, + ResponseEntity> getAssignedTargets( + @PathVariable("distributionSetId") Long distributionSetId, @RequestParam( value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) @@ -340,7 +343,8 @@ public interface MgmtDistributionSetRestApi { }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/installedTargets", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - ResponseEntity> getInstalledTargets(@PathVariable("distributionSetId") Long distributionSetId, + ResponseEntity> getInstalledTargets( + @PathVariable("distributionSetId") Long distributionSetId, @RequestParam( value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) @@ -428,7 +432,7 @@ public interface MgmtDistributionSetRestApi { * Handles the POST request of assigning multiple targets to a single distribution set. * * @param distributionSetId the ID of the distribution set within the URL path parameter - * @param targetIds the IDs of the target which should get assigned to the distribution set given in the response body + * @param assignments the IDs of the target which should get assigned to the distribution set given in the response body * @param offline to true if update was executed offline, i.e. not managed by hawkBit. * @return status OK if the assignment of the targets was successful and a complex return body which contains information about the assigned * targets and the already assigned targets counters @@ -466,7 +470,7 @@ public interface MgmtDistributionSetRestApi { MediaType.APPLICATION_JSON_VALUE }) ResponseEntity createAssignedTarget( @PathVariable("distributionSetId") Long distributionSetId, - final List targetIds, + @RequestBody List assignments, @RequestParam(value = "offline", required = false) Boolean offline); /** @@ -503,7 +507,8 @@ public interface MgmtDistributionSetRestApi { }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - ResponseEntity> getMetadata(@PathVariable("distributionSetId") Long distributionSetId, + ResponseEntity> getMetadata( + @PathVariable("distributionSetId") Long distributionSetId, @RequestParam( value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) @@ -557,7 +562,8 @@ public interface MgmtDistributionSetRestApi { }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata/{metadataKey}", produces = { MediaType.APPLICATION_JSON_VALUE }) - ResponseEntity getMetadataValue(@PathVariable("distributionSetId") Long distributionSetId, + ResponseEntity getMetadataValue( + @PathVariable("distributionSetId") Long distributionSetId, @PathVariable("metadataKey") String metadataKey); /** @@ -597,8 +603,10 @@ public interface MgmtDistributionSetRestApi { }) @PutMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata/{metadataKey}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - ResponseEntity updateMetadata(@PathVariable("distributionSetId") Long distributionSetId, - @PathVariable("metadataKey") String metadataKey, MgmtMetadataBodyPut metadata); + ResponseEntity updateMetadata( + @PathVariable("distributionSetId") Long distributionSetId, + @PathVariable("metadataKey") String metadataKey, + @RequestBody MgmtMetadataBodyPut metadata); /** * Deletes a single meta data entry from the distribution set. @@ -672,7 +680,7 @@ public interface MgmtDistributionSetRestApi { produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> createMetadata( @PathVariable("distributionSetId") Long distributionSetId, - List metadataRest); + @RequestBody List metadataRest); /** * Assigns a list of software modules to a distribution set. @@ -715,7 +723,7 @@ public interface MgmtDistributionSetRestApi { produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity assignSoftwareModules( @PathVariable("distributionSetId") Long distributionSetId, - List softwareModuleIDs); + @RequestBody List softwareModuleIDs); /** * Deletes the assignment of the software module form the distribution set. @@ -977,5 +985,5 @@ public interface MgmtDistributionSetRestApi { produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity invalidateDistributionSet( @PathVariable("distributionSetId") Long distributionSetId, - @Valid MgmtInvalidateDistributionSetRequestBody invalidateRequestBody); -} + @Valid @RequestBody MgmtInvalidateDistributionSetRequestBody invalidateRequestBody); +} \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java index 2d8278da0..fc29ccbc9 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResource.java @@ -18,7 +18,6 @@ import java.util.Map.Entry; import java.util.Optional; import java.util.stream.Collectors; -import jakarta.validation.Valid; import jakarta.validation.ValidationException; import lombok.extern.slf4j.Slf4j; @@ -37,7 +36,6 @@ import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleAssi import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery; import org.eclipse.hawkbit.mgmt.rest.api.MgmtDistributionSetRestApi; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; import org.eclipse.hawkbit.mgmt.rest.resource.util.PagingUtility; import org.eclipse.hawkbit.repository.DeploymentManagement; import org.eclipse.hawkbit.repository.DistributionSetInvalidationManagement; @@ -68,9 +66,6 @@ import org.springframework.data.domain.Slice; import org.springframework.data.domain.Sort; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; /** @@ -115,11 +110,10 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> getDistributionSets( - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) final int pagingOffsetParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) final int pagingLimitParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) final String sortParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) final String rsqlParam) { - + final int pagingOffsetParam, + 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); @@ -141,7 +135,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity getDistributionSet( - @PathVariable("distributionSetId") final Long distributionSetId) { + final Long distributionSetId) { final DistributionSet foundDs = distributionSetManagement.getOrElseThrowException(distributionSetId); final MgmtDistributionSet response = MgmtDistributionSetMapper.toResponse(foundDs); @@ -152,8 +146,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> createDistributionSets( - @RequestBody final List sets) { - + final List sets) { log.debug("creating {} distribution sets", sets.size()); // set default Ds type if ds type is null final String defaultDsKey = systemSecurityContext @@ -180,15 +173,15 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { } @Override - public ResponseEntity deleteDistributionSet(@PathVariable("distributionSetId") final Long distributionSetId) { + public ResponseEntity deleteDistributionSet(final Long distributionSetId) { distributionSetManagement.delete(distributionSetId); return ResponseEntity.ok().build(); } @Override public ResponseEntity updateDistributionSet( - @PathVariable("distributionSetId") final Long distributionSetId, - @RequestBody final MgmtDistributionSetRequestBodyPut toUpdate) { + final Long distributionSetId, + final MgmtDistributionSetRequestBodyPut toUpdate) { final DistributionSet updated = distributionSetManagement.update(entityFactory.distributionSet() .update(distributionSetId).name(toUpdate.getName()).description(toUpdate.getDescription()) .version(toUpdate.getVersion()).locked(toUpdate.getLocked()) @@ -202,12 +195,11 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> getAssignedTargets( - @PathVariable("distributionSetId") final Long distributionSetId, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) final int pagingOffsetParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) final int pagingLimitParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) final String sortParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) final String rsqlParam) { - + final Long distributionSetId, + final int pagingOffsetParam, + 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); @@ -228,11 +220,11 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> getInstalledTargets( - @PathVariable("distributionSetId") final Long distributionSetId, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) final int pagingOffsetParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) final int pagingLimitParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) final String sortParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) final String rsqlParam) { + final Long distributionSetId, + final int pagingOffsetParam, + final int pagingLimitParam, + final String sortParam, + final String rsqlParam) { // check if distribution set exists otherwise throw exception // immediately distributionSetManagement.getOrElseThrowException(distributionSetId); @@ -256,11 +248,11 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> getAutoAssignTargetFilterQueries( - @PathVariable("distributionSetId") final Long distributionSetId, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) final int pagingOffsetParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) final int pagingLimitParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) final String sortParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) final String rsqlParam) { + final Long distributionSetId, + final int pagingOffsetParam, + 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); @@ -276,9 +268,9 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity createAssignedTarget( - @PathVariable("distributionSetId") final Long distributionSetId, - @RequestBody final List assignments, - @RequestParam(value = "offline", required = false) final Boolean offline) { + final Long distributionSetId, + final List assignments, + final Boolean offline) { if (offline != null && offline) { final List> offlineAssignments = assignments.stream() .map(assignment -> new SimpleEntry<>(assignment.getId(), distributionSetId)) @@ -302,12 +294,11 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> getMetadata( - @PathVariable("distributionSetId") final Long distributionSetId, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) final int pagingOffsetParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) final int pagingLimitParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) final String sortParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) final String rsqlParam) { - + final Long distributionSetId, + final int pagingOffsetParam, + 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); @@ -329,8 +320,8 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity getMetadataValue( - @PathVariable("distributionSetId") final Long distributionSetId, - @PathVariable("metadataKey") 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) @@ -340,8 +331,9 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity updateMetadata( - @PathVariable("distributionSetId") final Long distributionSetId, - @PathVariable("metadataKey") final String metadataKey, @RequestBody final MgmtMetadataBodyPut metadata) { + final Long distributionSetId, + 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())); @@ -350,8 +342,8 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity deleteMetadata( - @PathVariable("distributionSetId") final Long distributionSetId, - @PathVariable("metadataKey") 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(); @@ -359,8 +351,8 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> createMetadata( - @PathVariable("distributionSetId") final Long distributionSetId, - @RequestBody final List metadataRest) { + final Long distributionSetId, + final List metadataRest) { // check if distribution set exists otherwise throw exception immediately final List created = distributionSetManagement.createMetaData(distributionSetId, MgmtDistributionSetMapper.fromRequestDsMetadata(metadataRest, entityFactory)); @@ -370,8 +362,8 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity assignSoftwareModules( - @PathVariable("distributionSetId") final Long distributionSetId, - @RequestBody final List softwareModuleIDs) { + final Long distributionSetId, + final List softwareModuleIDs) { distributionSetManagement.assignSoftwareModules(distributionSetId, softwareModuleIDs.stream().map(MgmtSoftwareModuleAssignment::getId).collect(Collectors.toList())); return ResponseEntity.ok().build(); @@ -379,19 +371,18 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity deleteAssignSoftwareModules( - @PathVariable("distributionSetId") final Long distributionSetId, - @PathVariable("softwareModuleId") final Long softwareModuleId) { + final Long distributionSetId, + final Long softwareModuleId) { distributionSetManagement.unassignSoftwareModule(distributionSetId, softwareModuleId); return ResponseEntity.ok().build(); } @Override public ResponseEntity> getAssignedSoftwareModules( - @PathVariable("distributionSetId") final Long distributionSetId, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) final int pagingOffsetParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) final int pagingLimitParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) final String sortParam) { - + final Long distributionSetId, + final int pagingOffsetParam, + final int pagingLimitParam, + final String sortParam) { final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam); final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam); final Sort sorting = PagingUtility.sanitizeSoftwareModuleSortParam(sortParam); @@ -403,7 +394,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { } @Override - public ResponseEntity getRolloutsCountByStatusForDistributionSet(Long distributionSetId) { + public ResponseEntity getRolloutsCountByStatusForDistributionSet(final Long distributionSetId) { MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false); distributionSetManagement.countRolloutsByStatusForDistributionSet(distributionSetId).forEach(statistic -> statistics.addTotalRolloutPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString()))); @@ -411,7 +402,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { } @Override - public ResponseEntity getActionsCountByStatusForDistributionSet(Long distributionSetId) { + public ResponseEntity getActionsCountByStatusForDistributionSet(final Long distributionSetId) { MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false); distributionSetManagement.countActionsByStatusForDistributionSet(distributionSetId).forEach(statistic -> statistics.addTotalActionPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString()))); @@ -419,14 +410,14 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { } @Override - public ResponseEntity getAutoAssignmentsCountForDistributionSet(Long distributionSetId) { + public ResponseEntity getAutoAssignmentsCountForDistributionSet(final Long distributionSetId) { MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(false); statistics.addTotalAutoAssignments(distributionSetManagement.countAutoAssignmentsForDistributionSet(distributionSetId)); return ResponseEntity.ok(statistics.build()); } @Override - public ResponseEntity getStatisticsForDistributionSet(Long distributionSetId) { + public ResponseEntity getStatisticsForDistributionSet(final Long distributionSetId) { MgmtDistributionSetStatistics.Builder statistics = new MgmtDistributionSetStatistics.Builder(true); distributionSetManagement.countRolloutsByStatusForDistributionSet(distributionSetId).forEach(statistic -> statistics.addTotalRolloutPerStatus(String.valueOf(statistic.getName()), Long.parseLong(statistic.getData().toString()))); @@ -438,8 +429,8 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity invalidateDistributionSet( - @PathVariable("distributionSetId") final Long distributionSetId, - @Valid @RequestBody final MgmtInvalidateDistributionSetRequestBody invalidateRequestBody) { + final Long distributionSetId, + final MgmtInvalidateDistributionSetRequestBody invalidateRequestBody) { distributionSetInvalidationManagement .invalidateDistributionSet(new DistributionSetInvalidation(Arrays.asList(distributionSetId), MgmtRestModelMapper.convertCancelationType(invalidateRequestBody.getActionCancelationType()),