Remove unnecessary JsonProperty annotations

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

@@ -36,25 +36,23 @@
 @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

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

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

@@ -12,7 +12,6 @@
 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;
@@ -29,15 +28,12 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DdiArtifactHash {
 
-    @JsonProperty
     @Schema(description = "SHA1 hash of the artifact in Base 16 format", example = "2d86c2a659e364e9abba49ea6ffcd53dd5559f05")
     private String sha1;
 
-    @JsonProperty
     @Schema(description = "MD5 hash of the artifact", example = "0d1b08c34858921bc7c662b228acb7ba")
     private String md5;
 
-    @JsonProperty
     @JsonInclude(Include.NON_NULL)
     @Schema(description = "SHA-256 hash of the artifact in Base 16 format", example = "a03b221c6c6eae7122ca51695d456d5222e524889136394944b2f9763b483615")
     private String sha256;

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

@@ -41,9 +41,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/DdiChunk.java

@@ -16,7 +16,6 @@
 
 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;
@@ -33,32 +32,26 @@
 @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;
 
-    @JsonProperty("version")
     @NotNull
     @Schema(description = "Software version of the chunk", example = "1.2.0")
     private String version;
 
-    @JsonProperty("name")
     @NotNull
     @Schema(description = "Name of the chunk")
     private String name;
 
-    @JsonProperty("encrypted")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Schema(description = "If encrypted")
     private Boolean encrypted;
 
-    @JsonProperty("artifacts")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Schema(description = "List of artifacts")
     private 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;

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

@@ -12,7 +12,6 @@
 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;
@@ -31,7 +30,6 @@
 @Schema(description = "DDI controller configuration")
 public class DdiConfig {
 
-    @JsonProperty
     private DdiPolling polling;
 
     /**

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

@@ -12,7 +12,6 @@
 import jakarta.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
@@ -54,7 +53,6 @@
                 }""")
 public class DdiConfirmationBase extends RepresentationModel<DdiConfirmationBase> {
 
-    @JsonProperty("autoConfirm")
     @NotNull
     private DdiAutoConfirmationState autoConfirm;
 

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

@@ -13,7 +13,6 @@
 
 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.EqualsAndHashCode;
@@ -201,21 +200,17 @@
                 }""")
 public class DdiConfirmationBaseAction extends RepresentationModel<DdiConfirmationBaseAction> {
 
-    @JsonProperty("id")
     @NotNull
     @Schema(description = "Id of the action", example = "6")
     private String id;
 
-    @JsonProperty("confirmation")
     @NotNull
     @Schema(description = "Deployment confirmation operation")
     private DdiDeployment confirmation;
 
     /**
-     * Action history containing current action status and a list of feedback
-     * messages received earlier from the controller.
+     * Action history containing current action status and a list of feedback messages received earlier from the controller.
      */
-    @JsonProperty("actionHistory")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Schema(description = """
             (Optional) GET parameter to retrieve a given number of messages which are previously

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

@@ -12,7 +12,6 @@
 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;
@@ -56,7 +55,6 @@
                 }""")
 public class DdiControllerBase extends RepresentationModel<DdiControllerBase> {
 
-    @JsonProperty
     private DdiConfig config;
 
     /**

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

@@ -16,7 +16,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
@@ -45,7 +44,6 @@ Handling for the update part of the provisioning process ('skip': do not update
             'attempt': server asks to update, 'forced': server requests immediate update)""")
     private HandlingType update;
 
-    @JsonProperty("chunks")
     @NotNull
     @Schema(description = "Software chunks of an update. In server mapped by Software Module")
     private List<DdiChunk> chunks;

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

@@ -13,7 +13,6 @@
 
 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.EqualsAndHashCode;
@@ -198,12 +197,10 @@
         }""")
 public class DdiDeploymentBase extends RepresentationModel<DdiDeploymentBase> {
 
-    @JsonProperty("id")
     @NotNull
     @Schema(description = "Id of the action", example = "8")
     private String id;
 
-    @JsonProperty("deployment")
     @NotNull
     @Schema(description = "Detailed deployment operation")
     private DdiDeployment deployment;
@@ -212,7 +209,6 @@ public class DdiDeploymentBase extends RepresentationModel<DdiDeploymentBase> {
      * Action history containing current action status and a list of feedback
      * messages received earlier from the controller.
      */
-    @JsonProperty("actionHistory")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @Schema(description = "Current deployment state")
     private DdiActionHistory actionHistory;

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

@@ -24,12 +24,10 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DdiMetadata {
 
-    @JsonProperty
     @NotNull
     @Schema(description = "Key of meta data entry")
     private final String key;
 
-    @JsonProperty
     @NotNull
     @Schema(description = "Value of meta data entry")
     private final String value;

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

@@ -12,7 +12,6 @@
 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;
@@ -31,7 +30,6 @@
 @Schema(description = "Suggested sleep time between polls")
 public class DdiPolling {
 
-    @JsonProperty
     @Schema(description = "Sleep time in HH:MM:SS notation", pattern = "HH:MM:SS", example = "12:00:00")
     private String sleep;
 

hawkbit-ddi/hawkbit-ddi-security/src/main/java/org/eclipse/hawkbit/security/controller/ControllerSecurityToken.java

@@ -29,15 +29,10 @@ public class ControllerSecurityToken {
 
     public static final String AUTHORIZATION_HEADER = "Authorization";
 
-    @JsonProperty
     private final Long tenantId;
-    @JsonProperty
     private final Long targetId;
-    @JsonProperty
     private final String controllerId;
-    @JsonProperty
     private String tenant;
-    @JsonProperty
     private Map<String, String> headers;
 
     /**

hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfActionRequest.java

@@ -12,7 +12,6 @@
 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 lombok.Data;
 
 /**
@@ -23,6 +22,5 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DmfActionRequest {
 
-    @JsonProperty
     private Long actionId;
 }

hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfActionUpdateStatus.java

@@ -36,14 +36,11 @@ public class DmfActionUpdateStatus {
     private final DmfActionStatus actionStatus;
     private final long timestamp;
 
-    @JsonProperty
     private Long softwareModuleId;
 
     @Setter(AccessLevel.NONE)
-    @JsonProperty
     private List<String> message;
 
-    @JsonProperty
     private Integer code;
 
     public DmfActionUpdateStatus(@JsonProperty(value = "actionId", required = true) final Long actionId,

hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfArtifact.java

@@ -15,7 +15,6 @@
 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 lombok.Data;
 
 /**
@@ -26,15 +25,10 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DmfArtifact {
 
-    @JsonProperty
     private String filename;
-    @JsonProperty
     private DmfArtifactHash hashes;
-    @JsonProperty
     private long size;
-    @JsonProperty
     private long lastModified;
-    @JsonProperty
     private Map<String, String> urls;
 
     public Map<String, String> getUrls() {

hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfArtifactHash.java

@@ -19,9 +19,7 @@
 @Data
 public class DmfArtifactHash {
 
-    @JsonProperty
     private String sha1;
-    @JsonProperty
     private String md5;
 
     /**