Remove unnecessary JsonProperty annotations (#2296)

Signed-off-by: Avgustin Marinov <[email protected]>

Author: avgustinmm

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedback.java

@@ -71,5 +71,4 @@ public DdiActionFeedback(
     public DdiActionFeedback(final DdiStatus status) {
         this(status, null);
     }
-
 }

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistory.java

@@ -16,8 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
+import lombok.Data;
 import org.eclipse.hawkbit.ddi.rest.api.DdiRootControllerRestApi;
 
 /**
@@ -30,31 +29,28 @@
  * </ol>
  * that were sent to server earlier by the controller using {@link DdiActionFeedback}.
  */
-@EqualsAndHashCode
-@ToString
+@Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonPropertyOrder({ "status", "messages" })
 public class DdiActionHistory {
 
-    @JsonProperty("status")
     @Schema(description = "Status of the deployment based on previous feedback by the device", example = "RUNNING")
-    private final String actionStatus;
+    private final String status;
 
-    @JsonProperty("messages")
     @Schema(description = "Messages are previously sent to the feedback channel in LIFO order by the device. Note: The first status message is set by the system and describes the trigger of the deployment")
     private final List<String> messages;
 
     /**
      * Parameterized constructor for creating {@link DdiActionHistory}.
      *
-     * @param actionStatus is the current action status at the server
+     * @param status is the current action status at the server
      * @param messages is a list of messages retrieved from action history.
      */
     @JsonCreator
     public DdiActionHistory(
-            @JsonProperty("status") final String actionStatus,
-            @JsonProperty("messages") List<String> messages) {
-        this.actionStatus = actionStatus;
+            @JsonProperty("status") final String status,
+            @JsonProperty("messages") final List<String> messages) {
+        this.status = status;
         this.messages = messages;
     }
 }

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActivateAutoConfirmation.java

@@ -19,12 +19,10 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DdiActivateAutoConfirmation {
 
-    @JsonProperty
     @Schema(description = "Individual value (e.g. username) stored as initiator and automatically used as confirmed" +
             " user in future actions", example = "exampleUser")
     private final String initiator;
 
-    @JsonProperty
     @Schema(description = "Individual value to attach a remark which will be persisted when automatically " +
             "confirming future actions", example = "exampleRemark")
     private final String remark;

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifact.java

@@ -11,6 +11,7 @@
 
 import jakarta.validation.constraints.NotNull;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -59,15 +60,22 @@
 public class DdiArtifact extends RepresentationModel<DdiArtifact> {
 
     @NotNull
-    @JsonProperty
     @Schema(description = "File name", example = "binary.tgz")
-    private String filename;
+    private final String filename;
 
-    @JsonProperty
     @Schema(description = "Artifact hashes")
-    private DdiArtifactHash hashes;
+    private final DdiArtifactHash hashes;
 
-    @JsonProperty
     @Schema(description = "Artifact size", example = "3")
-    private Long size;
+    private final Long size;
+
+    @JsonCreator
+    public DdiArtifact(
+            @JsonProperty("filename") final String filename,
+            @JsonProperty("hashes") final DdiArtifactHash hashes,
+            @JsonProperty("size") final Long size) {
+        this.filename = filename;
+        this.hashes = hashes;
+        this.size = size;
+    }
 }

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHash.java

@@ -9,38 +9,30 @@
  */
 package org.eclipse.hawkbit.ddi.json.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.Data;
 
 /**
  * Hashes for given Artifact
  */
-@NoArgsConstructor // needed for json create
-@Getter
-@EqualsAndHashCode
-@ToString
+@Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DdiArtifactHash {
 
-    @JsonProperty
     @Schema(description = "SHA1 hash of the artifact in Base 16 format", example = "2d86c2a659e364e9abba49ea6ffcd53dd5559f05")
-    private String sha1;
+    private final String sha1;
 
-    @JsonProperty
     @Schema(description = "MD5 hash of the artifact", example = "0d1b08c34858921bc7c662b228acb7ba")
-    private String md5;
+    private final String md5;
 
-    @JsonProperty
     @JsonInclude(Include.NON_NULL)
     @Schema(description = "SHA-256 hash of the artifact in Base 16 format", example = "a03b221c6c6eae7122ca51695d456d5222e524889136394944b2f9763b483615")
-    private String sha256;
+    private final String sha256;
 
     /**
      * Public constructor.
@@ -49,7 +41,11 @@ public class DdiArtifactHash {
      * @param md5 md5 hash of the artifact
      * @param sha256 sha256 hash of the artifact
      */
-    public DdiArtifactHash(final String sha1, final String md5, final String sha256) {
+    @JsonCreator
+    public DdiArtifactHash(
+            @JsonProperty("sha1") final String sha1,
+            @JsonProperty("md5") final String md5,
+            @JsonProperty ("sha256") final String sha256) {
         this.sha1 = sha1;
         this.md5 = md5;
         this.sha256 = sha256;

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAssignedVersion.java

@@ -14,6 +14,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.Getter;
 
 /**
  * Allow a target to declare running distribution set version
@@ -41,9 +42,4 @@ public DdiAssignedVersion(
         this.name = name;
         this.version = version;
     }
-
-    @Override
-    public String toString() {
-        return "DdiInstalledVersion{" + "name='" + name + '\'' + ", version='" + version + '\'' + '}';
-    }
 }

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAutoConfirmationState.java

@@ -11,17 +11,17 @@
 
 import jakarta.validation.constraints.NotNull;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.springframework.hateoas.RepresentationModel;
 
-@NoArgsConstructor // needed for json create
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -32,25 +32,26 @@ public class DdiAutoConfirmationState extends RepresentationModel<DdiAutoConfirm
 
     @NotNull
     @Schema(example = "true")
-    private boolean active;
+    private final boolean active;
 
     @Schema(example = "exampleUserId")
-    private String initiator;
+    private final String initiator;
 
     @Schema(example = "exampleRemark")
-    private String remark;
+    private final String remark;
 
     @Schema(example = "1691065895439")
-    private Long activatedAt;
-
-    public static DdiAutoConfirmationState active(final long activatedAt) {
-        final DdiAutoConfirmationState state = new DdiAutoConfirmationState();
-        state.setActive(true);
-        state.setActivatedAt(activatedAt);
-        return state;
-    }
-
-    public static DdiAutoConfirmationState disabled() {
-        return new DdiAutoConfirmationState();
+    private final Long activatedAt;
+
+    @JsonCreator
+    public DdiAutoConfirmationState(
+            @JsonProperty("active") final boolean active,
+            @JsonProperty("initiator") final String initiator,
+            @JsonProperty("remark") final String remark,
+            @JsonProperty("activatedAt") final Long activatedAt) {
+        this.active = active;
+        this.initiator = initiator;
+        this.remark = remark;
+        this.activatedAt = activatedAt;
     }
 }

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiChunk.java

@@ -14,54 +14,43 @@
 
 import jakarta.validation.constraints.NotNull;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.Data;
 
 /**
  * Deployment chunks.
  */
-@NoArgsConstructor // needed for json create
-@Getter
-@EqualsAndHashCode
-@ToString
+@Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DdiChunk {
 
-    @JsonProperty("part")
     @NotNull
     @Schema(description = "Type of the chunk, e.g. firmware, bundle, app. In update server mapped to Software Module Type")
-    private String part;
+    private final String part;
 
-    @JsonProperty("version")
     @NotNull
     @Schema(description = "Software version of the chunk", example = "1.2.0")
-    private String version;
+    private final String version;
 
-    @JsonProperty("name")
     @NotNull
     @Schema(description = "Name of the chunk")
-    private String name;
+    private final String name;
 
-    @JsonProperty("encrypted")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Schema(description = "If encrypted")
-    private Boolean encrypted;
+    private final Boolean encrypted;
 
-    @JsonProperty("artifacts")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Schema(description = "List of artifacts")
-    private List<DdiArtifact> artifacts;
+    private final List<DdiArtifact> artifacts;
 
-    @JsonProperty("metadata")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Schema(description = "Meta data of the respective software module that has been marked with 'target visible'")
-    private List<DdiMetadata> metadata;
+    private final List<DdiMetadata> metadata;
 
     /**
      * Constructor.
@@ -73,9 +62,14 @@ public class DdiChunk {
      * @param artifacts download information
      * @param metadata optional as additional information for the target/device
      */
+    @JsonCreator
     public DdiChunk(
-            final String part, final String version, final String name, final Boolean encrypted,
-            final List<DdiArtifact> artifacts, final List<DdiMetadata> metadata) {
+            @JsonProperty("part") final String part,
+            @JsonProperty("version") final String version,
+            @JsonProperty("name") final String name,
+            @JsonProperty("encrypted") final Boolean encrypted,
+            @JsonProperty("artifacts") final List<DdiArtifact> artifacts,
+            @JsonProperty("metadata") final List<DdiMetadata> metadata) {
         this.part = part;
         this.version = version;
         this.name = name;

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfig.java

@@ -9,37 +9,32 @@
  */
 package org.eclipse.hawkbit.ddi.json.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.Data;
 
 /**
  * Standard configuration for the target.
  */
-@NoArgsConstructor // needed for json deserialization
-@Getter
-@EqualsAndHashCode
-@ToString
+@Data
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 @Schema(description = "DDI controller configuration")
 public class DdiConfig {
 
-    @JsonProperty
-    private DdiPolling polling;
+    private final DdiPolling polling;
 
     /**
      * Constructor.
      *
      * @param polling configuration of the polling for the target
      */
-    public DdiConfig(final DdiPolling polling) {
+    @JsonCreator
+    public DdiConfig(@JsonProperty("polling") final DdiPolling polling) {
         this.polling = polling;
     }
 }