Fix sonar findings: Removed since added (#1984)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

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;
 
 /**

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<String> 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);
 }

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<DistributionSet> {
 

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<Target> {
 

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;
 

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<A extends Enum<A> & RsqlQueryField, T> extends AbstractRSQLVisitor<A>
         implements RSQLVisitor<List<Predicate>, String> {

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)

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)

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

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

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<MgmtDistributionSetTagAssigmentResult> toggleTagAssignment(
             @PathVariable("distributionsetTagId") Long distributionsetTagId,
             List<MgmtAssignedDistributionSetRequestBody> 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<List<MgmtDistributionSet>> assignDistributionSetsByRequestBody(
             @PathVariable("distributionsetTagId") Long distributionsetTagId,
             List<MgmtAssignedDistributionSetRequestBody> assignedDSRequestBodies);

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<MgmtTargetTagAssigmentResult> toggleTagAssignment(@PathVariable("targetTagId") Long targetTagId,
             List<MgmtAssignedTargetRequestBody> 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<List<MgmtTarget>> assignTargetsByRequestBody(@PathVariable("targetTagId") Long targetTagId,
             List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies);