Rename DMF model classes to avoid name clashes with the repository.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

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

@@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public enum ActionStatus {
+public enum DmfActionStatus {
     /**
      * Action requests download by this target which has now started.
      */

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

@@ -23,10 +23,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ActionUpdateStatus {
+public class DmfActionUpdateStatus {
 
     private final Long actionId;
-    private final ActionStatus actionStatus;
+    private final DmfActionStatus actionStatus;
 
     @JsonProperty
     private Long softwareModuleId;
@@ -34,8 +34,8 @@ public class ActionUpdateStatus {
     @JsonProperty
     private List<String> message;
 
-    public ActionUpdateStatus(@JsonProperty(value = "actionId", required = true) Long actionId,
-            @JsonProperty(value = "actionStatus", required = true) ActionStatus actionStatus) {
+    public DmfActionUpdateStatus(@JsonProperty(value = "actionId", required = true) Long actionId,
+            @JsonProperty(value = "actionStatus", required = true) DmfActionStatus actionStatus) {
         this.actionId = actionId;
         this.actionStatus = actionStatus;
     }
@@ -52,7 +52,7 @@ public class ActionUpdateStatus {
         this.softwareModuleId = softwareModuleId;
     }
 
-    public ActionStatus getActionStatus() {
+    public DmfActionStatus getActionStatus() {
         return actionStatus;
     }
 

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

@@ -24,12 +24,12 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Artifact {
+public class DmfArtifact {
     @JsonProperty
     private String filename;
 
     @JsonProperty
-    private ArtifactHash hashes;
+    private DmfArtifactHash hashes;
 
     @JsonProperty
     private Long size;
@@ -57,11 +57,11 @@ public class Artifact {
         this.filename = filename;
     }
 
-    public ArtifactHash getHashes() {
+    public DmfArtifactHash getHashes() {
         return hashes;
     }
 
-    public void setHashes(final ArtifactHash hashes) {
+    public void setHashes(final DmfArtifactHash hashes) {
         this.hashes = hashes;
     }
 

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

@@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 /**
  * JSON representation of artifact hash.
  */
-public class ArtifactHash {
+public class DmfArtifactHash {
 
     @JsonProperty
     private String sha1;
@@ -31,7 +31,7 @@ public class ArtifactHash {
      *            the md5 hash
      */
     @JsonCreator
-    public ArtifactHash(@JsonProperty("sha1") final String sha1, @JsonProperty("md5") final String md5) {
+    public DmfArtifactHash(@JsonProperty("sha1") final String sha1, @JsonProperty("md5") final String md5) {
         super();
         this.sha1 = sha1;
         this.md5 = md5;

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

@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class AttributeUpdate {
+public class DmfAttributeUpdate {
     @JsonProperty
     private final Map<String, String> attributes = new HashMap<>();
 

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

@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class DownloadAndUpdateRequest {
+public class DmfDownloadAndUpdateRequest {
     @JsonProperty
     private Long actionId;
 
@@ -31,7 +31,7 @@ public class DownloadAndUpdateRequest {
     private String targetSecurityToken;
 
     @JsonProperty
-    private List<SoftwareModule> softwareModules;
+    private List<DmfSoftwareModule> softwareModules;
 
     public Long getActionId() {
         return actionId;
@@ -49,7 +49,7 @@ public class DownloadAndUpdateRequest {
         this.targetSecurityToken = targetSecurityToken;
     }
 
-    public List<SoftwareModule> getSoftwareModules() {
+    public List<DmfSoftwareModule> getSoftwareModules() {
         if (softwareModules == null) {
             return Collections.emptyList();
         }
@@ -63,7 +63,7 @@ public class DownloadAndUpdateRequest {
      * @param createSoftwareModule
      *            the module
      */
-    public void addSoftwareModule(final SoftwareModule createSoftwareModule) {
+    public void addSoftwareModule(final DmfSoftwareModule createSoftwareModule) {
         if (softwareModules == null) {
             softwareModules = new ArrayList<>();
         }

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

@@ -21,13 +21,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class DownloadResponse {
+public class DmfDownloadResponse {
 
     @JsonProperty
     private String downloadUrl;
 
     @JsonProperty
-    private Artifact artifact;
+    private DmfArtifact artifact;
 
     @JsonProperty
     private int responseCode;
@@ -59,11 +59,11 @@ public class DownloadResponse {
         this.downloadUrl = downloadUrl;
     }
 
-    public Artifact getArtifact() {
+    public DmfArtifact getArtifact() {
         return artifact;
     }
 
-    public void setArtifact(final Artifact artifact) {
+    public void setArtifact(final DmfArtifact artifact) {
         this.artifact = artifact;
     }
 }

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

@@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class SoftwareModule {
+public class DmfSoftwareModule {
 
     @JsonProperty
     private Long moduleId;
@@ -35,7 +35,7 @@ public class SoftwareModule {
     @JsonProperty
     private String moduleVersion;
     @JsonProperty
-    private List<Artifact> artifacts;
+    private List<DmfArtifact> artifacts;
 
     public String getModuleType() {
         return moduleType;
@@ -53,7 +53,7 @@ public class SoftwareModule {
         this.moduleVersion = moduleVersion;
     }
 
-    public List<Artifact> getArtifacts() {
+    public List<DmfArtifact> getArtifacts() {
         if (artifacts == null) {
             return Collections.emptyList();
         }
@@ -70,7 +70,7 @@ public class SoftwareModule {
         this.moduleId = moduleId;
     }
 
-    public void setArtifacts(final List<Artifact> artifacts) {
+    public void setArtifacts(final List<DmfArtifact> artifacts) {
         this.artifacts = artifacts;
     }
 

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

@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class TenantSecurityToken {
+public class DmfTenantSecurityToken {
 
     public static final String AUTHORIZATION_HEADER = "Authorization";
 
@@ -58,7 +58,7 @@ public class TenantSecurityToken {
      *            the file to obtain
      */
     @JsonCreator
-    public TenantSecurityToken(@JsonProperty("tenant") final String tenant,
+    public DmfTenantSecurityToken(@JsonProperty("tenant") final String tenant,
             @JsonProperty("tenantId") final Long tenantId, @JsonProperty("controllerId") final String controllerId,
             @JsonProperty("targetId") final Long targetId,
             @JsonProperty("fileResource") final FileResource fileResource) {
@@ -79,7 +79,7 @@ public class TenantSecurityToken {
      * @param fileResource
      *            the file to obtain
      */
-    public TenantSecurityToken(final String tenant, final String controllerId, final FileResource fileResource) {
+    public DmfTenantSecurityToken(final String tenant, final String controllerId, final FileResource fileResource) {
         this(tenant, null, controllerId, null, fileResource);
     }
 
@@ -93,7 +93,7 @@ public class TenantSecurityToken {
      * @param fileResource
      *            the file to obtain
      */
-    public TenantSecurityToken(final Long tenantId, final Long targetId, final FileResource fileResource) {
+    public DmfTenantSecurityToken(final Long tenantId, final Long targetId, final FileResource fileResource) {
         this(null, tenantId, null, targetId, fileResource);
     }