From 64494d6845bd5577371bd2ad8246400bd5bf23f1 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sun, 17 Nov 2024 18:42:15 +0200 Subject: [PATCH] DDI resource - remove dupplicated annotations (MgmtTargetFilterQueryResource) (#2065) Signed-off-by: Avgustin Marinov --- .../api/MgmtTargetFilterQueryRestApi.java | 7 ++-- .../MgmtTargetFilterQueryResource.java | 36 +++++++++---------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetFilterQueryRestApi.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetFilterQueryRestApi.java index e129384e4..2bb7a5cf8 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetFilterQueryRestApi.java +++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetFilterQueryRestApi.java @@ -164,7 +164,8 @@ public interface MgmtTargetFilterQueryRestApi { @PostMapping(value = MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - ResponseEntity createFilter(@RequestBody MgmtTargetFilterQueryRequestBody filter); + ResponseEntity createFilter( + @RequestBody MgmtTargetFilterQueryRequestBody filter); /** * Handles the PUT request of updating a target filter. The ID is within the URL path of the request. A given ID in the request body is @@ -272,7 +273,7 @@ public interface MgmtTargetFilterQueryRestApi { * Handles the POST request for changing distribution set for auto assignment of a target filter. * * @param filterId of the target to change - * @param dsIdWithActionType id of the distribution set and the action type for auto assignment + * @param autoAssignRequest id of the distribution set and the action type for auto assignment * @return http status */ @Operation(summary = "Set auto assignment of distribution set for a target filter query", @@ -309,7 +310,7 @@ public interface MgmtTargetFilterQueryRestApi { produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity postAssignedDistributionSet( @PathVariable("filterId") Long filterId, - @RequestBody MgmtDistributionSetAutoAssignment dsIdWithActionType); + @RequestBody MgmtDistributionSetAutoAssignment autoAssignRequest); /** * Handles the DELETE request for removing the distribution set for auto assignment of a target filter. diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java index fb089595a..27425233a 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java @@ -18,7 +18,6 @@ import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtDistributionSetAutoA import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQueryRequestBody; import org.eclipse.hawkbit.mgmt.rest.api.MgmtRepresentationMode; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; import org.eclipse.hawkbit.mgmt.rest.api.MgmtTargetFilterQueryRestApi; import org.eclipse.hawkbit.mgmt.rest.resource.util.PagingUtility; import org.eclipse.hawkbit.repository.EntityFactory; @@ -37,9 +36,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; /** @@ -53,7 +49,8 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA private final EntityFactory entityFactory; private final TenantConfigHelper tenantConfigHelper; - MgmtTargetFilterQueryResource(final TargetFilterQueryManagement filterManagement, final EntityFactory entityFactory, + MgmtTargetFilterQueryResource( + final TargetFilterQueryManagement filterManagement, final EntityFactory entityFactory, final SystemSecurityContext systemSecurityContext, final TenantConfigurationManagement tenantConfigurationManagement) { this.filterManagement = filterManagement; @@ -62,7 +59,7 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA } @Override - public ResponseEntity getFilter(@PathVariable("filterId") final Long filterId) { + public ResponseEntity getFilter(final Long filterId) { final TargetFilterQuery findTarget = findFilterWithExceptionIfNotFound(filterId); // to single response include poll status final MgmtTargetFilterQuery response = MgmtTargetFilterQueryMapper.toResponse(findTarget, @@ -74,11 +71,11 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA @Override public ResponseEntity> getFilters( - @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, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_REPRESENTATION_MODE, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_REPRESENTATION_MODE_DEFAULT) String representationModeParam) { + 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.sanitizeTargetFilterQuerySortParam(sortParam); @@ -104,7 +101,7 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA @Override public ResponseEntity createFilter( - @RequestBody final MgmtTargetFilterQueryRequestBody filter) { + final MgmtTargetFilterQueryRequestBody filter) { final TargetFilterQuery createdTarget = filterManagement .create(MgmtTargetFilterQueryMapper.fromRequest(entityFactory, filter)); @@ -116,8 +113,9 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA } @Override - public ResponseEntity updateFilter(@PathVariable("filterId") final Long filterId, - @RequestBody final MgmtTargetFilterQueryRequestBody targetFilterRest) { + public ResponseEntity updateFilter( + final Long filterId, + final MgmtTargetFilterQueryRequestBody targetFilterRest) { log.debug("updating target filter query {}", filterId); final TargetFilterQuery updateFilter = filterManagement @@ -132,14 +130,14 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA } @Override - public ResponseEntity deleteFilter(@PathVariable("filterId") final Long filterId) { + public ResponseEntity deleteFilter(final Long filterId) { filterManagement.delete(filterId); log.debug("{} target filter query deleted, return status {}", filterId, HttpStatus.OK); return ResponseEntity.ok().build(); } @Override - public ResponseEntity getAssignedDistributionSet(@PathVariable("filterId") final Long filterId) { + public ResponseEntity getAssignedDistributionSet(final Long filterId) { final TargetFilterQuery filter = findFilterWithExceptionIfNotFound(filterId); final DistributionSet autoAssignDistributionSet = filter.getAutoAssignDistributionSet(); @@ -155,8 +153,8 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA @Override public ResponseEntity postAssignedDistributionSet( - @PathVariable("filterId") final Long filterId, - @RequestBody final MgmtDistributionSetAutoAssignment autoAssignRequest) { + final Long filterId, + final MgmtDistributionSetAutoAssignment autoAssignRequest) { final boolean confirmationRequired = autoAssignRequest.getConfirmationRequired() == null ? tenantConfigHelper.isConfirmationFlowEnabled() @@ -175,7 +173,7 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA } @Override - public ResponseEntity deleteAssignedDistributionSet(@PathVariable("filterId") final Long filterId) { + public ResponseEntity deleteAssignedDistributionSet(final Long filterId) { filterManagement.updateAutoAssignDS(entityFactory.targetFilterQuery().updateAutoAssign(filterId).ds(null)); return ResponseEntity.noContent().build();