From ee7caa06c755d7713c0dbb1c1511798151ec3d07 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sat, 9 Nov 2024 15:22:59 +0200 Subject: [PATCH] Fix sonar findings: Removed since added (#1984) Signed-off-by: Avgustin Marinov --- .../java/org/eclipse/hawkbit/exception/SpServerError.java | 1 - .../java/org/eclipse/hawkbit/repository/TargetManagement.java | 4 ++-- .../repository/model/DistributionSetTagAssignmentResult.java | 2 +- .../hawkbit/repository/model/TargetTagAssignmentResult.java | 2 +- .../org/eclipse/hawkbit/repository/rsql/RsqlConfigHolder.java | 4 ++-- .../hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitor.java | 2 +- .../model/tag/MgmtAssignedDistributionSetRequestBody.java | 2 +- .../mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java | 2 +- .../json/model/tag/MgmtDistributionSetTagAssigmentResult.java | 2 +- .../mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java | 2 +- .../hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java | 4 ++-- .../eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java | 4 ++-- 12 files changed, 15 insertions(+), 16 deletions(-) diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java index 05873fd5b..1daf93307 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java @@ -9,7 +9,6 @@ */ package org.eclipse.hawkbit.exception; -import lombok.Data; import lombok.Getter; /** diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java index 8a65dbba8..3bd284975 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java @@ -800,7 +800,7 @@ public interface TargetManagement { * @throws EntityNotFoundException if tag with given name does not exist * @deprecated since 0.6.0 - not very usable with very unclear logic */ - @Deprecated + @Deprecated(forRemoval = true, since = "0.6.0") @PreAuthorize(SpringEvalExpressions.HAS_AUTH_UPDATE_TARGET) TargetTagAssignmentResult toggleTagAssignment(@NotEmpty Collection controllerIds, @NotEmpty String tagName); @@ -813,7 +813,7 @@ public interface TargetManagement { * @throws EntityNotFoundException if TAG with given ID does not exist * @deprecated since 0.6.0 - use {@link #unassignTag(Collection, long)} (List, long)} instead */ - @Deprecated(forRemoval = true) + @Deprecated(forRemoval = true, since = "0.6.0") @PreAuthorize(SpringEvalExpressions.HAS_AUTH_UPDATE_TARGET) Target unassignTag(@NotEmpty String controllerId, long targetTagId); } \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java index 2e0a55034..1316ef2fc 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java @@ -18,7 +18,7 @@ import lombok.Data; * * @deprecated since 0.6.0 with toggle deprecation */ -@Deprecated(forRemoval = true) +@Deprecated(forRemoval = true, since = "0.6.0") @Data public class DistributionSetTagAssignmentResult extends AbstractAssignmentResult { diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java index b88490d56..9dd677e32 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java @@ -18,7 +18,7 @@ import lombok.Data; * * @deprecated since 0.6.0 with deprecation of toggle assignments */ -@Deprecated(forRemoval = true) +@Deprecated(forRemoval = true, since = "0.6.0") @Data public class TargetTagAssignmentResult extends AbstractAssignmentResult { diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlConfigHolder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlConfigHolder.java index cefdc6068..c077b1dc8 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlConfigHolder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlConfigHolder.java @@ -43,9 +43,9 @@ public final class RsqlConfigHolder { private RsqlVisitorFactory rsqlVisitorFactory; /** - * @deprecated in favour of G2 RSQL visitor. + * @deprecated in favour of G2 RSQL visitor. since 0.6.0 */ - @Deprecated + @Deprecated(forRemoval = true, since = "0.6.0") @Value("${hawkbit.rsql.legacyRsqlVisitor:false}") private boolean legacyRsqlVisitor; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitor.java index 971e9c440..1cc83d76d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitor.java @@ -65,7 +65,7 @@ import org.springframework.util.ObjectUtils; * It will be kept for some time in order to keep backward compatibility and to allow for a smooth transition. Also, in case of * problems with the new implementation, this one can be used as a fallback. */ -@Deprecated(forRemoval = true) +@Deprecated(forRemoval = true, since = "0.6.0") @Slf4j public class JpaQueryRsqlVisitor & RsqlQueryField, T> extends AbstractRSQLVisitor implements RSQLVisitor, String> { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedDistributionSetRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedDistributionSetRequestBody.java index fc39a1d58..5cd246c39 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedDistributionSetRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedDistributionSetRequestBody.java @@ -28,7 +28,7 @@ import lombok.experimental.Accessors; @ToString @JsonInclude(Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -@Deprecated(forRemoval = true) +@Deprecated(forRemoval = true, since = "0.6.0") public class MgmtAssignedDistributionSetRequestBody { @JsonProperty(value = "id", required = true) diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java index 8637a5cbe..c7d80afb6 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java @@ -26,7 +26,7 @@ import lombok.experimental.Accessors; @ToString @JsonInclude(Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -@Deprecated(forRemoval = true) +@Deprecated(forRemoval = true, since = "0.6.0") public class MgmtAssignedTargetRequestBody { @JsonProperty(required = true) diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtDistributionSetTagAssigmentResult.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtDistributionSetTagAssigmentResult.java index 0f0acc914..32ce5521a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtDistributionSetTagAssigmentResult.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtDistributionSetTagAssigmentResult.java @@ -31,7 +31,7 @@ import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet; @ToString @JsonInclude(Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -@Deprecated(forRemoval = true) +@Deprecated(forRemoval = true, since = "0.6.0") public class MgmtDistributionSetTagAssigmentResult { @JsonProperty diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java index 38f2d4a26..63e52880a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java @@ -31,7 +31,7 @@ import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget; @ToString @JsonInclude(Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -@Deprecated(forRemoval = true) +@Deprecated(forRemoval = true, since = "0.6.0") public class MgmtTargetTagAssigmentResult { @JsonProperty diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java index 286d22dae..202f32664 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java @@ -514,7 +514,7 @@ public interface MgmtDistributionSetTagRestApi { }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING + "/toggleTagAssignment") - @Deprecated(forRemoval = true) + @Deprecated(forRemoval = true, since = "0.6.0") ResponseEntity toggleTagAssignment( @PathVariable("distributionsetTagId") Long distributionsetTagId, List assignedDSRequestBodies); @@ -558,7 +558,7 @@ public interface MgmtDistributionSetTagRestApi { + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - @Deprecated(forRemoval = true) + @Deprecated(forRemoval = true, since = "0.6.0") ResponseEntity> assignDistributionSetsByRequestBody( @PathVariable("distributionsetTagId") Long distributionsetTagId, List assignedDSRequestBodies); diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java index 0d2786e65..85f399838 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java @@ -427,7 +427,7 @@ public interface MgmtTargetTagRestApi { + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING + "/toggleTagAssignment", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - @Deprecated(forRemoval = true) + @Deprecated(forRemoval = true, since = "0.6.0") ResponseEntity toggleTagAssignment(@PathVariable("targetTagId") Long targetTagId, List assignedTargetRequestBodies); @@ -461,7 +461,7 @@ public interface MgmtTargetTagRestApi { + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - @Deprecated(forRemoval = true) + @Deprecated(forRemoval = true, since = "0.6.0") ResponseEntity> assignTargetsByRequestBody(@PathVariable("targetTagId") Long targetTagId, List assignedTargetRequestBodies);