Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetBuilder.java

@@ -24,6 +24,7 @@ public class DistributionSetBuilder {
     private String name;
     private String version;
     private String type;
+    private String description;
     private final List<MgmtSoftwareModuleAssigment> modules = new ArrayList<>();
 
     /**
@@ -63,10 +64,20 @@ public class DistributionSetBuilder {
         return this;
     }
 
+    /**
+     * @param description
+     *            the description
+     * @return the builder itself
+     */
+    public DistributionSetBuilder description(final String description) {
+        this.description = description;
+        return this;
+    }
+
     /**
      * Builds a list with a single entry of
-     * {@link MgmtDistributionSetRequestBodyPost} which can directly be used to post
+     * {@link MgmtDistributionSetRequestBodyPost} which can directly be used to
-     * on the RESTful-API.
+     * post on the RESTful-API.
      * 
      * @return a single entry list of {@link MgmtDistributionSetRequestBodyPost}
      */
@@ -98,6 +109,7 @@ public class DistributionSetBuilder {
         body.setName(prefixName);
         body.setVersion(version);
         body.setType(type);
+        body.setDescription(description);
         body.setModules(modules);
         return body;
     }

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetTypeBuilder.java

@@ -25,6 +25,7 @@ public class DistributionSetTypeBuilder {
 
     private String key;
     private String name;
+    private String description;
     private final List<MgmtSoftwareModuleTypeAssigment> mandatorymodules = Lists.newArrayList();
     private final List<MgmtSoftwareModuleTypeAssigment> optionalmodules = Lists.newArrayList();
 
@@ -48,6 +49,16 @@ public class DistributionSetTypeBuilder {
         return this;
     }
 
+    /**
+     * @param description
+     *            the description
+     * @return the builder itself
+     */
+    public DistributionSetTypeBuilder description(final String description) {
+        this.description = description;
+        return this;
+    }
+
     /**
      * @param softwareModuleTypeIds
      *            the IDs of the software module types which should be mandatory
@@ -81,20 +92,21 @@ public class DistributionSetTypeBuilder {
 
     /**
      * Builds a list with a single entry of
-     * {@link MgmtDistributionSetTypeRequestBodyPost} which can directly be used in
+     * {@link MgmtDistributionSetTypeRequestBodyPost} which can directly be used
-     * the RESTful-API.
+     * in the RESTful-API.
      * 
-     * @return a single entry list of {@link MgmtDistributionSetTypeRequestBodyPost}
+     * @return a single entry list of
+     *         {@link MgmtDistributionSetTypeRequestBodyPost}
      */
     public List<MgmtDistributionSetTypeRequestBodyPost> build() {
         return Lists.newArrayList(doBuild(name, key));
     }
 
     /**
-     * Builds a list of multiple {@link MgmtDistributionSetTypeRequestBodyPost} to
+     * Builds a list of multiple {@link MgmtDistributionSetTypeRequestBodyPost}
-     * create multiple distribution set types at once. An increasing number will
+     * to create multiple distribution set types at once. An increasing number
-     * be added to the name and key of the distribution set type. The optional
+     * will be added to the name and key of the distribution set type. The
-     * and mandatory software module types will remain the same.
+     * optional and mandatory software module types will remain the same.
      * 
      * @param count
      *            the amount of distribution sets type body which should be
@@ -114,6 +126,7 @@ public class DistributionSetTypeBuilder {
         final MgmtDistributionSetTypeRequestBodyPost body = new MgmtDistributionSetTypeRequestBodyPost();
         body.setKey(prefixKey);
         body.setName(prefixName);
+        body.setDescription(description);
         body.setMandatorymodules(mandatorymodules);
         body.setOptionalmodules(optionalmodules);
         return body;

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/RolloutBuilder.java

@@ -9,8 +9,8 @@
 package org.eclipse.hawkbit.mgmt.client.resource.builder;
 
 import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutCondition;
-import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutRestRequestBody;
 import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutCondition.Condition;
+import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutRestRequestBody;
 
 /**
  * 
@@ -25,6 +25,7 @@ public class RolloutBuilder {
     private long distributionSetId;
     private String successThreshold;
     private String errorThreshold;
+    private String description;
 
     /**
      * @param name
@@ -57,6 +58,16 @@ public class RolloutBuilder {
         return this;
     }
 
+    /**
+     * @param description
+     *            the description
+     * @return the builder itself
+     */
+    public RolloutBuilder description(final String description) {
+        this.description = description;
+        return this;
+    }
+
     /**
      * @param distributionSetId
      *            the ID of the distribution set to assign to the target in the
@@ -105,6 +116,7 @@ public class RolloutBuilder {
         body.setAmountGroups(groupSize);
         body.setTargetFilterQuery(targetFilterQuery);
         body.setDistributionSetId(distributionSetId);
+        body.setDescription(description);
         body.setSuccessCondition(new MgmtRolloutCondition(Condition.THRESHOLD, successThreshold));
         body.setErrorCondition(new MgmtRolloutCondition(Condition.THRESHOLD, errorThreshold));
         return body;

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleBuilder.java

@@ -26,6 +26,8 @@ public class SoftwareModuleBuilder {
     private String name;
     private String version;
     private String type;
+    private String vendor;
+    private String description;
 
     /**
      * @param name
@@ -58,10 +60,30 @@ public class SoftwareModuleBuilder {
         return this;
     }
 
+    /**
+     * @param vendor
+     *            the vendor
+     * @return the builder itself
+     */
+    public SoftwareModuleBuilder vendor(final String vendor) {
+        this.vendor = vendor;
+        return this;
+    }
+
+    /**
+     * @param description
+     *            the description
+     * @return the builder itself
+     */
+    public SoftwareModuleBuilder description(final String description) {
+        this.description = description;
+        return this;
+    }
+
     /**
      * Builds a list with a single entry of
-     * {@link MgmtSoftwareModuleRequestBodyPost} which can directly be used in the
+     * {@link MgmtSoftwareModuleRequestBodyPost} which can directly be used in
-     * RESTful-API.
+     * the RESTful-API.
      * 
      * @return a single entry list of {@link MgmtSoftwareModuleRequestBodyPost}
      */
@@ -70,10 +92,10 @@ public class SoftwareModuleBuilder {
     }
 
     /**
-     * Builds a list of multiple {@link MgmtSoftwareModuleRequestBodyPost} to create
+     * Builds a list of multiple {@link MgmtSoftwareModuleRequestBodyPost} to
-     * multiple software module at once. An increasing number will be added to
+     * create multiple software module at once. An increasing number will be
-     * the name of the software module. The version and type will remain the
+     * added to the name of the software module. The version and type will
-     * same.
+     * remain the same.
      * 
      * @param count
      *            the amount of software module body which should be created
@@ -93,6 +115,8 @@ public class SoftwareModuleBuilder {
         body.setName(prefixName);
         body.setVersion(version);
         body.setType(type);
+        body.setVendor(vendor);
+        body.setDescription(description);
         return body;
     }
 

hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSoftwareModuleRestApi.java

@@ -53,7 +53,8 @@ public interface MgmtSoftwareModuleRestApi {
      *         failure the JsonResponseExceptionHandler is handling the
      *         response.
      */
-    @RequestMapping(method = RequestMethod.POST, value = "/{softwareModuleId}/artifacts")
+    @RequestMapping(method = RequestMethod.POST, value = "/{softwareModuleId}/artifacts", produces = {
+            "application/hal+json", MediaType.APPLICATION_JSON_VALUE })
     ResponseEntity<MgmtArtifact> uploadArtifact(@PathVariable("softwareModuleId") final Long softwareModuleId,
             @RequestParam("file") final MultipartFile file,
             @RequestParam(value = "filename", required = false) final String optionalFileName,