diff --git a/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java b/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java index bf8bce636..2b2735861 100644 --- a/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java +++ b/hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java @@ -19,9 +19,6 @@ import java.util.Optional; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; import org.eclipse.hawkbit.artifact.repository.model.DbArtifact; @@ -84,9 +81,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.util.CollectionUtils; -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; import org.springframework.web.context.WebApplicationContext; @@ -211,10 +205,10 @@ public class DdiRootController implements DdiRootControllerRestApi { @SuppressWarnings("squid:S3655") @Override public ResponseEntity downloadArtifactMd5( - @PathVariable("tenant") final String tenant, - @PathVariable("controllerId") final String controllerId, - @PathVariable("softwareModuleId") final Long softwareModuleId, - @PathVariable("fileName") final String fileName) { + final String tenant, + final String controllerId, + final Long softwareModuleId, + final String fileName) { final Target target = findTarget(controllerId); final SoftwareModule module = controllerManagement.getSoftwareModule(softwareModuleId) diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java index 16c9d31ea..b2312c572 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java +++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java @@ -167,7 +167,7 @@ public interface MgmtDistributionSetTagRestApi { @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - ResponseEntity> createDistributionSetTags(List tags); + ResponseEntity> createDistributionSetTags(@RequestBody List tags); /** * Handles the PUT request of updating a single distribution set tag. @@ -209,7 +209,7 @@ public interface MgmtDistributionSetTagRestApi { produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity updateDistributionSetTag( @PathVariable("distributionsetTagId") Long distributionsetTagId, - MgmtTagRequestBodyPut restDSTagRest); + @RequestBody MgmtTagRequestBodyPut restDSTagRest); /** * Handles the DELETE request for a single distribution set tag. @@ -427,7 +427,7 @@ public interface MgmtDistributionSetTagRestApi { * Handles the DELETE request to unassign one distribution set from the given tag id. * * @param distributionsetTagId the ID of the distribution set tag - * @param distributionsetId the ID of the distribution set to unassign + * @param distributionsetIds the IDs of the distribution set to unassign * @return http status code */ @Operation(summary = "Unassign multiple distribution sets from the given tag id", @@ -456,7 +456,7 @@ public interface MgmtDistributionSetTagRestApi { MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING) ResponseEntity unassignDistributionSets( @PathVariable("distributionsetTagId") Long distributionsetTagId, - @RequestBody List distributionsetId); + @RequestBody List distributionsetIds); /** * Handles the POST request to toggle the assignment of distribution sets by @@ -499,7 +499,7 @@ public interface MgmtDistributionSetTagRestApi { @Deprecated(forRemoval = true, since = "0.6.0") ResponseEntity toggleTagAssignment( @PathVariable("distributionsetTagId") Long distributionsetTagId, - List assignedDSRequestBodies); + @RequestBody List assignedDSRequestBodies); /** * Handles the POST request to assign distribution sets to the given tag id. @@ -542,5 +542,5 @@ public interface MgmtDistributionSetTagRestApi { @Deprecated(forRemoval = true, since = "0.6.0") ResponseEntity> assignDistributionSetsByRequestBody( @PathVariable("distributionsetTagId") Long distributionsetTagId, - List assignedDSRequestBodies); + @RequestBody List assignedDSRequestBodies); } \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java index 1e98f20fb..99f51d114 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java @@ -20,7 +20,6 @@ import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtDistributionSetTagAssigmentRe import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTag; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTagRequestBodyPut; import org.eclipse.hawkbit.mgmt.rest.api.MgmtDistributionSetTagRestApi; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; import org.eclipse.hawkbit.mgmt.rest.resource.util.PagingUtility; import org.eclipse.hawkbit.repository.DistributionSetManagement; import org.eclipse.hawkbit.repository.DistributionSetTagManagement; @@ -36,9 +35,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; /** @@ -62,10 +58,10 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity> getDistributionSetTags( - @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.sanitizeTagSortParam(sortParam); @@ -88,7 +84,7 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity getDistributionSetTag( - @PathVariable("distributionsetTagId") final Long distributionsetTagId) { + final Long distributionsetTagId) { final DistributionSetTag distributionSetTag = findDistributionTagById(distributionsetTagId); final MgmtTag response = MgmtTagMapper.toResponse(distributionSetTag); @@ -99,7 +95,7 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity> createDistributionSetTags( - @RequestBody final List tags) { + final List tags) { log.debug("creating {} ds tags", tags.size()); final List createdTags = distributionSetTagManagement.create(MgmtTagMapper.mapTagFromRequest(entityFactory, tags)); @@ -109,8 +105,8 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity updateDistributionSetTag( - @PathVariable("distributionsetTagId") final Long distributionsetTagId, - @RequestBody final MgmtTagRequestBodyPut restDSTagRest) { + final Long distributionsetTagId, + final MgmtTagRequestBodyPut restDSTagRest) { final DistributionSetTag distributionSetTag = distributionSetTagManagement .update(entityFactory.tag().update(distributionsetTagId).name(restDSTagRest.getName()) @@ -124,7 +120,7 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity deleteDistributionSetTag( - @PathVariable("distributionsetTagId") final Long distributionsetTagId) { + final Long distributionsetTagId) { log.debug("Delete {} distribution set tag", distributionsetTagId); final DistributionSetTag tag = findDistributionTagById(distributionsetTagId); @@ -135,11 +131,11 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity> getAssignedDistributionSets( - @PathVariable("distributionsetTagId") final Long distributionsetTagId, - @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 distributionsetTagId, + 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.sanitizeTagSortParam(sortParam); @@ -158,8 +154,8 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity assignDistributionSet( - @PathVariable("distributionsetTagId") final Long distributionsetTagId, - @PathVariable("distributionsetId") final Long distributionsetId) { + final Long distributionsetTagId, + final Long distributionsetId) { log.debug("Assign ds {} for ds tag {}", distributionsetId, distributionsetTagId); this.distributionSetManagement.assignTag(List.of(distributionsetId), distributionsetTagId); return ResponseEntity.ok().build(); @@ -175,8 +171,8 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity unassignDistributionSet( - @PathVariable("distributionsetTagId") final Long distributionsetTagId, - @PathVariable("distributionsetId") final Long distributionsetId) { + final Long distributionsetTagId, + final Long distributionsetId) { log.debug("Unassign ds {} for ds tag {}", distributionsetId, distributionsetTagId); this.distributionSetManagement.unassignTag(List.of(distributionsetId), distributionsetTagId); return ResponseEntity.ok().build(); @@ -184,8 +180,8 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity unassignDistributionSets( - @PathVariable("distributionsetTagId") final Long distributionsetTagId, - @RequestBody final List distributionsetIds) { + final Long distributionsetTagId, + final List distributionsetIds) { log.debug("Unassign DistributionSet {} for ds tag {}", distributionsetIds.size(), distributionsetTagId); final List assignedDs = this.distributionSetManagement.unassignTag(distributionsetIds, distributionsetTagId); log.debug("Unassigned DistributionSet {}", assignedDs.size()); @@ -194,8 +190,8 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity toggleTagAssignment( - @PathVariable("distributionsetTagId") final Long distributionsetTagId, - @RequestBody final List assignedDSRequestBodies) { + final Long distributionsetTagId, + final List assignedDSRequestBodies) { log.debug("Toggle distribution set assignment {} for ds tag {}", assignedDSRequestBodies.size(), distributionsetTagId); final DistributionSetTag tag = findDistributionTagById(distributionsetTagId); @@ -216,8 +212,8 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity> assignDistributionSetsByRequestBody( - @PathVariable("distributionsetTagId") final Long distributionsetTagId, - @RequestBody final List assignedDSRequestBodies) { + final Long distributionsetTagId, + final List assignedDSRequestBodies) { log.debug("Assign DistributionSet {} for ds tag {}", assignedDSRequestBodies.size(), distributionsetTagId); final List assignedDs = this.distributionSetManagement .assignTag(findDistributionSetIds(assignedDSRequestBodies), distributionsetTagId); @@ -235,4 +231,4 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes return distributionSetTagManagement.get(distributionsetTagId) .orElseThrow(() -> new EntityNotFoundException(DistributionSetTag.class, distributionsetTagId)); } -} +} \ No newline at end of file