From 8cf693ddbe2bc697814c4ebb31eea14e5a57f01b Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sun, 17 Nov 2024 20:31:37 +0200 Subject: [PATCH] Mgmt resources - small code style refactoring (#2071) Signed-off-by: Avgustin Marinov --- .../rest/resource/MgmtActionResource.java | 10 +-- .../rest/resource/MgmtBasicAuthResource.java | 2 +- .../resource/MgmtDeploymentRequestMapper.java | 1 - .../resource/MgmtDistributionSetMapper.java | 4 +- .../resource/MgmtDistributionSetResource.java | 87 +++++++------------ .../MgmtDistributionSetTagResource.java | 10 +-- .../MgmtDistributionSetTypeResource.java | 37 +++----- .../MgmtDownloadArtifactResource.java | 4 +- .../rest/resource/MgmtRolloutResource.java | 41 +++------ .../resource/MgmtSoftwareModuleResource.java | 58 +++---------- .../MgmtSoftwareModuleTypeResource.java | 15 +--- .../MgmtSystemManagementResource.java | 2 +- .../MgmtTargetFilterQueryResource.java | 9 +- .../rest/resource/MgmtTargetResource.java | 72 ++++----------- .../rest/resource/MgmtTargetTagResource.java | 23 ++--- .../rest/resource/MgmtTargetTypeResource.java | 20 ++--- .../MgmtTenantManagementResource.java | 3 +- 17 files changed, 109 insertions(+), 289 deletions(-) diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtActionResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtActionResource.java index c1e6aec80..956139583 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtActionResource.java +++ b/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> 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 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; }); } - -} +} \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtBasicAuthResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtBasicAuthResource.java index 0b9ec000d..3a8adda7a 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtBasicAuthResource.java +++ b/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 validateBasicAuth() { - MgmtUserInfo userInfo = new MgmtUserInfo(); + final MgmtUserInfo userInfo = new MgmtUserInfo(); userInfo.setUsername(tenantAware.getCurrentUsername()); userInfo.setTenant(tenantAware.getCurrentTenant()); return ResponseEntity.ok(userInfo); diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDeploymentRequestMapper.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDeploymentRequestMapper.java index e17d615ad..ad1f22ae5 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDeploymentRequestMapper.java +++ b/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()); } diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetMapper.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetMapper.java index f358b8383..e105ef24a 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetMapper.java +++ b/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 dsFromRequest(final Collection sets, - final EntityFactory entityFactory) { + static List dsFromRequest( + final Collection sets, final EntityFactory entityFactory) { return sets.stream().map(dsRest -> fromRequest(dsRest, entityFactory)).collect(Collectors.toList()); } 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 fc29ccbc9..2f5e50d73 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 @@ -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> getDistributionSets( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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); @@ -196,10 +194,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> getAssignedTargets( final Long distributionSetId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.sanitizeTargetSortParam(sortParam); @@ -221,10 +216,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> getInstalledTargets( final Long distributionSetId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - final String rsqlParam) { + final int pagingOffsetParam, 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> getAutoAssignTargetFilterQueries( final Long distributionSetId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.sanitizeTargetFilterQuerySortParam(sortParam); @@ -268,9 +257,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity createAssignedTarget( - final Long distributionSetId, - final List assignments, - 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)) @@ -295,10 +282,7 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { @Override public ResponseEntity> getMetadata( final Long distributionSetId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.sanitizeDistributionSetMetadataSortParam(sortParam); @@ -314,14 +298,11 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { } return ResponseEntity - .ok(new PagedList<>(MgmtDistributionSetMapper.toResponseDsMetadata(metaDataPage.getContent()), - metaDataPage.getTotalElements())); + .ok(new PagedList<>(MgmtDistributionSetMapper.toResponseDsMetadata(metaDataPage.getContent()), metaDataPage.getTotalElements())); } @Override - public ResponseEntity getMetadataValue( - final Long distributionSetId, - final String metadataKey) { + public ResponseEntity getMetadataValue(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 updateMetadata( - final Long distributionSetId, - final String metadataKey, - 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())); @@ -341,18 +320,14 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { } @Override - public ResponseEntity deleteMetadata( - final Long distributionSetId, - final String metadataKey) { + public ResponseEntity deleteMetadata(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> createMetadata( - final Long distributionSetId, - final List metadataRest) { + public ResponseEntity> createMetadata(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)); @@ -361,18 +336,17 @@ public class MgmtDistributionSetResource implements MgmtDistributionSetRestApi { } @Override - public ResponseEntity assignSoftwareModules( - final Long distributionSetId, - final List softwareModuleIDs) { - distributionSetManagement.assignSoftwareModules(distributionSetId, - softwareModuleIDs.stream().map(MgmtSoftwareModuleAssignment::getId).collect(Collectors.toList())); + public ResponseEntity assignSoftwareModules(final Long distributionSetId, final List softwareModuleIDs) { + distributionSetManagement.assignSoftwareModules( + distributionSetId, + softwareModuleIDs.stream() + .map(MgmtSoftwareModuleAssignment::getId) + .collect(Collectors.toList())); return ResponseEntity.ok().build(); } @Override - public ResponseEntity deleteAssignSoftwareModules( - final Long distributionSetId, - final Long softwareModuleId) { + public ResponseEntity deleteAssignSoftwareModules(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> getAssignedSoftwareModules( final Long distributionSetId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam) { + 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); final Pageable pageable = new OffsetBasedPageRequest(sanitizedOffsetParam, sanitizedLimitParam, sorting); - final Page softwaremodules = softwareModuleManagement.findByAssignedTo(pageable, - distributionSetId); - return ResponseEntity.ok(new PagedList<>(MgmtSoftwareModuleMapper.toResponse(softwaremodules.getContent()), - softwaremodules.getTotalElements())); + final Page softwaremodules = softwareModuleManagement.findByAssignedTo(pageable, distributionSetId); + return ResponseEntity.ok(new PagedList<>(MgmtSoftwareModuleMapper.toResponse( + softwaremodules.getContent()), softwaremodules.getTotalElements())); } @Override public ResponseEntity 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 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 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 invalidateDistributionSet( - final Long distributionSetId, - final MgmtInvalidateDistributionSetRequestBody invalidateRequestBody) { + final Long distributionSetId, 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(); 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 99f51d114..ab29d7861 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 @@ -58,10 +58,7 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity> getDistributionSetTags( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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); @@ -132,10 +129,7 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes @Override public ResponseEntity> getAssignedDistributionSets( final Long distributionsetTagId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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); diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResource.java index 3f7ae8c62..e92318a4e 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResource.java +++ b/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> getDistributionSetTypes( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.sanitizeDistributionSetTypeSortParam(sortParam); @@ -80,8 +77,7 @@ public class MgmtDistributionSetTypeResource implements MgmtDistributionSetTypeR } @Override - public ResponseEntity getDistributionSetType( - final Long distributionSetTypeId) { + public ResponseEntity getDistributionSetType(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 updateDistributionSetType( - final Long distributionSetTypeId, - final MgmtDistributionSetTypeRequestBodyPut restDistributionSetType) { + final Long distributionSetTypeId, 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> getMandatoryModules( - final Long distributionSetTypeId) { + public ResponseEntity> getMandatoryModules(final Long distributionSetTypeId) { final DistributionSetType foundType = findDistributionSetTypeWithExceptionIfNotFound(distributionSetTypeId); return ResponseEntity.ok(MgmtSoftwareModuleTypeMapper.toTypesResponse(foundType.getMandatoryModuleTypes())); } @Override - public ResponseEntity getMandatoryModule( - final Long distributionSetTypeId, - final Long softwareModuleTypeId) { + public ResponseEntity getMandatoryModule(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 getOptionalModule( - final Long distributionSetTypeId, - final Long softwareModuleTypeId) { + public ResponseEntity getOptionalModule(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> getOptionalModules( - final Long distributionSetTypeId) { + public ResponseEntity> getOptionalModules(final Long distributionSetTypeId) { final DistributionSetType foundType = findDistributionSetTypeWithExceptionIfNotFound(distributionSetTypeId); return ResponseEntity.ok(MgmtSoftwareModuleTypeMapper.toTypesResponse(foundType.getOptionalModuleTypes())); } @Override - public ResponseEntity removeMandatoryModule( - final Long distributionSetTypeId, - final Long softwareModuleTypeId) { + public ResponseEntity removeMandatoryModule(final Long distributionSetTypeId, final Long softwareModuleTypeId) { distributionSetTypeManagement.unassignSoftwareModuleType(distributionSetTypeId, softwareModuleTypeId); - return ResponseEntity.ok().build(); } @Override - public ResponseEntity removeOptionalModule( - final Long distributionSetTypeId, - final Long softwareModuleTypeId) { + public ResponseEntity removeOptionalModule(final Long distributionSetTypeId, final Long softwareModuleTypeId) { return removeMandatoryModule(distributionSetTypeId, softwareModuleTypeId); } @@ -186,8 +170,7 @@ public class MgmtDistributionSetTypeResource implements MgmtDistributionSetTypeR } @Override - public ResponseEntity addOptionalModule( - final Long distributionSetTypeId, final MgmtId smtId) { + public ResponseEntity addOptionalModule(final Long distributionSetTypeId, final MgmtId smtId) { distributionSetTypeManagement.assignOptionalSoftwareModuleTypes(distributionSetTypeId, Collections.singletonList(smtId.getId())); return ResponseEntity.ok().build(); diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadArtifactResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadArtifactResource.java index 6c957ba4f..8e664946e 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadArtifactResource.java +++ b/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 downloadArtifact( - final Long softwareModuleId, - final Long artifactId) { + public ResponseEntity downloadArtifact(final Long softwareModuleId, final Long artifactId) { final SoftwareModule module = softwareModuleManagement.get(softwareModuleId) .orElseThrow(() -> new EntityNotFoundException(SoftwareModule.class, softwareModuleId)); if (module.isDeleted()) { diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java index 9fb132cad..d31aaf101 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java +++ b/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> getRollouts( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - final String rsqlParam, + 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.sanitizeRolloutSortParam(sortParam); @@ -125,8 +120,7 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi { } @Override - public ResponseEntity create( - final MgmtRolloutRestRequestBodyPost rolloutRequestBody) { + public ResponseEntity create(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 update( - final Long rolloutId, - final MgmtRolloutRestRequestBodyPut rolloutUpdateBody) { + public ResponseEntity update(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> getRolloutGroups( final Long rolloutId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - final String rsqlParam, + 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); @@ -251,9 +240,7 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi { } @Override - public ResponseEntity getRolloutGroup( - final Long rolloutId, - final Long groupId) { + public ResponseEntity getRolloutGroup(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, - tenantConfigHelper.isConfirmationFlowEnabled())); + return ResponseEntity.ok(MgmtRolloutMapper.toResponseRolloutGroup( + rolloutGroup, true, tenantConfigHelper.isConfirmationFlowEnabled())); } @Override public ResponseEntity> getRolloutGroupTargets( - final Long rolloutId, - final Long groupId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - final String rsqlParam) { + final Long rolloutId, final Long groupId, + 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 isConfirmationRequiredForGroup(final MgmtRolloutGroup group, - final MgmtRolloutRestRequestBodyPost request) { + private Optional isConfirmationRequiredForGroup(final MgmtRolloutGroup group, 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); } } - -} +} \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java index d9dc6b17a..b9f35ee1a 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java +++ b/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 uploadArtifact( - final Long softwareModuleId, - final MultipartFile file, - final String optionalFileName, - final String md5Sum, - final String sha1Sum, - final String sha256Sum) { - + final Long softwareModuleId, final MultipartFile file, 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> getArtifacts( - final Long softwareModuleId, - final String representationModeParam, - final Boolean useArtifactUrlHandler) { + final Long softwareModuleId, 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 getArtifact( - final Long softwareModuleId, - final Long artifactId, - final Boolean useArtifactUrlHandler) { + public ResponseEntity getArtifact(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 deleteArtifact( - final Long softwareModuleId, - final Long artifactId) { + public ResponseEntity deleteArtifact(final Long softwareModuleId, final Long artifactId) { findSoftwareModuleWithExceptionIfNotFound(softwareModuleId, artifactId); artifactManagement.delete(artifactId); @@ -167,10 +155,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi { @Override public ResponseEntity> getSoftwareModules( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.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) - .body(MgmtSoftwareModuleMapper.toResponse(createdSoftwareModules)); + return ResponseEntity.status(HttpStatus.CREATED).body(MgmtSoftwareModuleMapper.toResponse(createdSoftwareModules)); } @Override public ResponseEntity updateSoftwareModule( - final Long softwareModuleId, - final MgmtSoftwareModuleRequestBodyPut restSoftwareModule) { + final Long softwareModuleId, 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> getMetadata( final Long softwareModuleId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - final String rsqlParam) { + final int pagingOffsetParam, 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 getMetadataValue( - final Long softwareModuleId, - final String metadataKey) { + public ResponseEntity getMetadataValue(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 updateMetadata( - final Long softwareModuleId, - final String metadataKey, - final MgmtSoftwareModuleMetadataBodyPut metadata) { + final Long softwareModuleId, 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 deleteMetadata( - final Long softwareModuleId, - final String metadataKey) { + public ResponseEntity deleteMetadata(final Long softwareModuleId, final String metadataKey) { softwareModuleManagement.deleteMetaData(softwareModuleId, metadataKey); - return ResponseEntity.ok().build(); } @Override public ResponseEntity> createMetadata( - final Long softwareModuleId, - final List metadataRest) { + final Long softwareModuleId, final List metadataRest) { final List created = softwareModuleManagement.createMetaData( MgmtSoftwareModuleMapper.fromRequestSwMetadata(entityFactory, softwareModuleId, metadataRest)); @@ -324,9 +296,7 @@ public class MgmtSoftwareModuleResource implements MgmtSoftwareModuleRestApi { }); } - private SoftwareModule findSoftwareModuleWithExceptionIfNotFound(final Long softwareModuleId, - final Long artifactId) { - + private SoftwareModule findSoftwareModuleWithExceptionIfNotFound(final Long softwareModuleId, final Long artifactId) { final SoftwareModule module = softwareModuleManagement.get(softwareModuleId) .orElseThrow(() -> new EntityNotFoundException(SoftwareModule.class, softwareModuleId)); diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java index e0c57efe9..1edc023ca 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java +++ b/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> getTypes( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.sanitizeSoftwareModuleTypeSortParam(sortParam); @@ -72,24 +69,20 @@ public class MgmtSoftwareModuleTypeResource implements MgmtSoftwareModuleTypeRes } @Override - public ResponseEntity getSoftwareModuleType( - final Long softwareModuleTypeId) { + public ResponseEntity getSoftwareModuleType(final Long softwareModuleTypeId) { final SoftwareModuleType foundType = findSoftwareModuleTypeWithExceptionIfNotFound(softwareModuleTypeId); - return ResponseEntity.ok(MgmtSoftwareModuleTypeMapper.toResponse(foundType)); } @Override - public ResponseEntity deleteSoftwareModuleType( - final Long softwareModuleTypeId) { + public ResponseEntity deleteSoftwareModuleType(final Long softwareModuleTypeId) { softwareModuleTypeManagement.delete(softwareModuleTypeId); return ResponseEntity.ok().build(); } @Override public ResponseEntity updateSoftwareModuleType( - final Long softwareModuleTypeId, - final MgmtSoftwareModuleTypeRequestBodyPut restSoftwareModuleType) { + final Long softwareModuleTypeId, final MgmtSoftwareModuleTypeRequestBodyPut restSoftwareModuleType) { final SoftwareModuleType updatedSoftwareModuleType = softwareModuleTypeManagement.update(entityFactory .softwareModuleType().update(softwareModuleTypeId).description(restSoftwareModuleType.getDescription()) .colour(restSoftwareModuleType.getColour())); diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSystemManagementResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSystemManagementResource.java index d992b6dd0..8eb73d5c4 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSystemManagementResource.java +++ b/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; } -} +} \ No newline at end of file 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 27425233a..1d374b980 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 @@ -71,10 +71,7 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA @Override public ResponseEntity> getFilters( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - final String rsqlParam, + 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); @@ -153,8 +150,7 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA @Override public ResponseEntity postAssignedDistributionSet( - final Long filterId, - final MgmtDistributionSetAutoAssignment autoAssignRequest) { + final Long filterId, final MgmtDistributionSetAutoAssignment autoAssignRequest) { final boolean confirmationRequired = autoAssignRequest.getConfirmationRequired() == null ? tenantConfigHelper.isConfirmationFlowEnabled() @@ -175,7 +171,6 @@ public class MgmtTargetFilterQueryResource implements MgmtTargetFilterQueryRestA @Override public ResponseEntity deleteAssignedDistributionSet(final Long filterId) { filterManagement.updateAutoAssignDS(entityFactory.targetFilterQuery().updateAutoAssign(filterId).ds(null)); - return ResponseEntity.noContent().build(); } diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java index d2bb364c0..78aaca79f 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java +++ b/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> getTargets( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.sanitizeTargetSortParam(sortParam); @@ -139,9 +136,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi { } @Override - public ResponseEntity updateTarget( - final String targetId, - final MgmtTargetRequestBody targetRest) { + public ResponseEntity updateTarget(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 assignTargetType(final String targetId, - final MgmtId targetTypeId) { + public ResponseEntity assignTargetType(final String targetId, 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> getActionHistory( final String targetId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - final String rsqlParam) { + final int pagingOffsetParam, 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 getAction( - final String targetId, - final Long actionId) { + public ResponseEntity getAction(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 cancelAction( - final String targetId, - final Long actionId, - final boolean force) { + public ResponseEntity cancelAction(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 updateAction( - final String targetId, - final Long actionId, - final MgmtActionRequestBodyPut actionUpdate) { + public ResponseEntity updateAction(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> getActionStatusList( - final String targetId, - final Long actionId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam) { + final String targetId, final Long actionId, + 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 postAssignedDistributionSet( - final String targetId, - final MgmtDistributionSetAssignments dsAssignments, - final Boolean offline) { + final String targetId, final MgmtDistributionSetAssignments dsAssignments, final Boolean offline) { if (offline != null && offline) { final List> offlineAssignments = dsAssignments.stream() .map(dsAssignment -> new SimpleEntry(targetId, dsAssignment.getId())) @@ -392,10 +370,7 @@ public class MgmtTargetResource implements MgmtTargetRestApi { @Override public ResponseEntity> getMetadata( final String targetId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.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()), - metaDataPage.getTotalElements())); + return ResponseEntity.ok(new PagedList<>(MgmtTargetMapper.toResponseTargetMetadata( + metaDataPage.getContent()), metaDataPage.getTotalElements())); } @Override - public ResponseEntity getMetadataValue( - final String targetId, - final String metadataKey) { + public ResponseEntity getMetadataValue(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 updateMetadata( - final String targetId, - final String metadataKey, - final MgmtMetadataBodyPut metadata) { + public ResponseEntity updateMetadata(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 deleteMetadata( - final String targetId, - final String metadataKey) { + public ResponseEntity deleteMetadata(final String targetId, final String metadataKey) { targetManagement.deleteMetaData(targetId, metadataKey); return ResponseEntity.ok().build(); } @Override - public ResponseEntity> createMetadata( - final String targetId, - final List metadataRest) { + public ResponseEntity> createMetadata(final String targetId, final List metadataRest) { final List 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 activateAutoConfirm( - final String targetId, - final MgmtTargetAutoConfirmUpdate update) { + public ResponseEntity activateAutoConfirm(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); diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResource.java index a21552f5e..506c9b60d 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResource.java +++ b/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> getTargetTags( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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); @@ -103,9 +100,7 @@ public class MgmtTargetTagResource implements MgmtTargetTagRestApi { } @Override - public ResponseEntity updateTargetTag( - final Long targetTagId, - final MgmtTagRequestBodyPut restTargetTagRest) { + public ResponseEntity updateTargetTag(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> getAssignedTargets( final Long targetTagId, - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.sanitizeTargetSortParam(sortParam); @@ -188,8 +180,7 @@ public class MgmtTargetTagResource implements MgmtTargetTagRestApi { @Override public ResponseEntity unassignTargets( - final Long targetTagId, final OnNotFoundPolicy onNotFoundPolicy, - final List controllerIds) { + final Long targetTagId, final OnNotFoundPolicy onNotFoundPolicy, final List 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 toggleTagAssignment( - final Long targetTagId, - final List assignedTargetRequestBodies) { + final Long targetTagId, final List 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> assignTargetsByRequestBody( - final Long targetTagId, - final List assignedTargetRequestBodies) { + final Long targetTagId, final List assignedTargetRequestBodies) { log.debug("Assign targets {} for target tag {}", assignedTargetRequestBodies, targetTagId); final List assignedTarget = this.targetManagement .assignTag(findTargetControllerIds(assignedTargetRequestBodies), targetTagId); diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResource.java index 77b57ff62..153e5ad11 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResource.java +++ b/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> getTargetTypes( - final int pagingOffsetParam, - final int pagingLimitParam, - final String sortParam, - 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.sanitizeTargetTypeSortParam(sortParam); @@ -91,9 +88,7 @@ public class MgmtTargetTypeResource implements MgmtTargetTypeRestApi { } @Override - public ResponseEntity updateTargetType( - final Long targetTypeId, - final MgmtTargetTypeRequestBodyPut restTargetType) { + public ResponseEntity updateTargetType(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> createTargetTypes(final List targetTypes) { - final List createdTargetTypes = targetTypeManagement .create(MgmtTargetTypeMapper.targetFromRequest(entityFactory, targetTypes)); return ResponseEntity.status(HttpStatus.CREATED).body(MgmtTargetTypeMapper.toListResponse(createdTargetTypes)); } @Override - public ResponseEntity> getCompatibleDistributionSets( - final Long targetTypeId) { + public ResponseEntity> getCompatibleDistributionSets(final Long targetTypeId) { final TargetType foundType = findTargetTypeWithExceptionIfNotFound(targetTypeId); return ResponseEntity.ok(MgmtDistributionSetTypeMapper.toListResponse(foundType.getCompatibleDistributionSetTypes())); } @Override - public ResponseEntity removeCompatibleDistributionSet( - final Long targetTypeId, - final Long distributionSetTypeId) { + public ResponseEntity removeCompatibleDistributionSet(final Long targetTypeId, final Long distributionSetTypeId) { targetTypeManagement.unassignDistributionSetType(targetTypeId, distributionSetTypeId); return ResponseEntity.ok().build(); } @Override public ResponseEntity addCompatibleDistributionSets( - final Long targetTypeId, - final List distributionSetTypeIds) { + final Long targetTypeId, final List distributionSetTypeIds) { targetTypeManagement.assignCompatibleDistributionSetTypes( targetTypeId, distributionSetTypeIds.stream().map(MgmtDistributionSetTypeAssignment::getId).collect(Collectors.toList())); return ResponseEntity.ok().build(); diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResource.java index 9e566268b..a2183b7b5 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResource.java +++ b/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 updateTenantConfigurationValue( - final String keyName, - final MgmtSystemTenantConfigurationValueRequest configurationValueRest) { + final String keyName, final MgmtSystemTenantConfigurationValueRequest configurationValueRest) { Serializable configurationValue = configurationValueRest.getValue(); final MgmtSystemTenantConfigurationValue responseUpdatedValue; if (isDefaultDistributionSetTypeKey(keyName)) {