Rename and split rest resources ddi, mgmt and system

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 17:33:03 +02:00
parent 8a22ea3df3
commit c3c405c986
169 changed files with 3081 additions and 1871 deletions
--- a/hawkbit-ddi-resource/pom.xml
+++ b/hawkbit-ddi-resource/pom.xml
@@ -1,4 +1,14 @@
-<?xml version="1.0"?>
+<!--
+
+    Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+-->
+
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <modelVersion>4.0.0</modelVersion>
@@ -10,31 +20,26 @@
  <artifactId>hawkbit-ddi-resource</artifactId>
  <name>hawkBit :: DDI Resources</name>
 
-  <dependencies>
-  <dependency>
+   <dependencies>
+      <dependency>
         <groupId>org.eclipse.hawkbit</groupId>
         <artifactId>hawkbit-ddi-api</artifactId>
         <version>${project.version}</version>
      </dependency>
-       <dependency>
+      <dependency>
         <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-rest-resource</artifactId>
+         <artifactId> hawkbit-rest-core</artifactId>
         <version>${project.version}</version>
-      </dependency> 
-    <dependency>
+      </dependency>
+      <dependency>
         <groupId>org.eclipse.hawkbit</groupId>
         <artifactId>hawkbit-repository</artifactId>
         <version>${project.version}</version>
      </dependency>
      
+     
+      
       <!-- Test -->
-         <dependency>
-         <groupId>org.eclipse.hawkbit</groupId>
-         <artifactId>hawkbit-rest-resource</artifactId>
-         <version>${project.version}</version>
-          <scope>test</scope>
-          <classifier>tests</classifier> 
-      </dependency> 
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter</artifactId>
--- a/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/annotation/EnableDdiApi.java
+++ b/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/annotation/EnableDdiApi.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.ddi.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Controller;
+
+/**
+ * Annotation to enable {@link ComponentScan} in the resource package to setup
+ * all {@link Controller} annotated classes and setup the Direct Device API.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Configuration
+@ComponentScan
+public @interface EnableDdiApi {
+
+}
--- a/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/ArtifactStoreController.java
+++ b/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/ArtifactStoreController.java
@@ -6,7 +6,7 @@
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 */
-package org.eclipse.hawkbit.ddi.resource;
+package org.eclipse.hawkbit.ddi.rest.resource;

 import java.io.IOException;
 import java.util.List;
@@ -24,7 +24,7 @@ import org.eclipse.hawkbit.repository.model.Action.Status;
 import org.eclipse.hawkbit.repository.model.ActionStatus;
 import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.Target;
-import org.eclipse.hawkbit.rest.resource.helper.RestResourceConversionHelper;
+import org.eclipse.hawkbit.rest.util.RestResourceConversionHelper;
 import org.eclipse.hawkbit.security.HawkbitSecurityProperties;
 import org.eclipse.hawkbit.util.IpUtil;
 import org.slf4j.Logger;
--- a/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java
+++ b/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java
@@ -6,7 +6,7 @@
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 */
-package org.eclipse.hawkbit.ddi.resource;
+package org.eclipse.hawkbit.ddi.rest.resource;

 import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
 import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
@@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.eclipse.hawkbit.api.ArtifactUrlHandler;
 import org.eclipse.hawkbit.api.UrlProtocol;
 import org.eclipse.hawkbit.ddi.json.model.DdiArtifact;
+import org.eclipse.hawkbit.ddi.json.model.DdiArtifactHash;
 import org.eclipse.hawkbit.ddi.json.model.DdiChunk;
 import org.eclipse.hawkbit.ddi.json.model.DdiConfig;
 import org.eclipse.hawkbit.ddi.json.model.DdiControllerBase;
@@ -30,7 +31,6 @@ import org.eclipse.hawkbit.repository.model.Action;
 import org.eclipse.hawkbit.repository.model.Action.Status;
 import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.Target;
-import org.eclipse.hawkbit.rest.resource.model.artifact.ArtifactHash;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.hateoas.Link;
@@ -85,7 +85,7 @@ public final class DataConversionHelper {
        final List<DdiArtifact> files = new ArrayList<>();
        module.getLocalArtifacts().forEach(artifact -> {
            final DdiArtifact file = new DdiArtifact();
-            file.setHashes(new ArtifactHash(artifact.getSha1Hash(), artifact.getMd5Hash()));
+            file.setHashes(new DdiArtifactHash(artifact.getSha1Hash(), artifact.getMd5Hash()));
            file.setFilename(artifact.getFilename());
            file.setSize(artifact.getSize());
            final String linkHttp = artifactUrlHandler.getUrl(targetid, artifact.getSoftwareModule().getId(),
@@ -104,7 +104,8 @@ public final class DataConversionHelper {

    static DdiControllerBase fromTarget(final Target target, final List<Action> actions,
            final String defaultControllerPollTime, final TenantAware tenantAware) {
-        final DdiControllerBase result = new DdiControllerBase(new DdiConfig(new DdiPolling(defaultControllerPollTime)));
+        final DdiControllerBase result = new DdiControllerBase(
+                new DdiConfig(new DdiPolling(defaultControllerPollTime)));

        boolean addedUpdate = false;
        boolean addedCancel = false;
--- a/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/RootController.java
+++ b/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/RootController.java
@@ -6,7 +6,7 @@
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 */
-package org.eclipse.hawkbit.ddi.resource;
+package org.eclipse.hawkbit.ddi.rest.resource;

 import java.io.IOException;
 import java.util.List;
@@ -40,7 +40,7 @@ import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.SoftwareModule;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.repository.model.TargetUpdateStatus;
-import org.eclipse.hawkbit.rest.resource.helper.RestResourceConversionHelper;
+import org.eclipse.hawkbit.rest.util.RestResourceConversionHelper;
 import org.eclipse.hawkbit.security.HawkbitSecurityProperties;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.eclipse.hawkbit.util.IpUtil;
--- a/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java
+++ b/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java
@@ -6,7 +6,7 @@
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 */
-package org.eclipse.hawkbit.ddi.resource;
+package org.eclipse.hawkbit.ddi.rest.resource;

 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -60,10 +60,10 @@ import ru.yandex.qatools.allure.annotations.Stories;
@ActiveProfiles({ "im", "test" })
@Features("Component Tests - Direct Device Integration API")
@Stories("Artifact Download Resource")
-public class ArtifactDownloadTest extends AbstractIntegrationTestWithMongoDB {
+public class DdiArtifactDownloadTest extends AbstractIntegrationTestWithMongoDB {

-    public ArtifactDownloadTest() {
-        LOG = LoggerFactory.getLogger(ArtifactDownloadTest.class);
+    public DdiArtifactDownloadTest() {
+        LOG = LoggerFactory.getLogger(DdiArtifactDownloadTest.class);
    }

    private volatile int downLoadProgress = 0;
--- a/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java
+++ b/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java
@@ -6,7 +6,7 @@
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 */
-package org.eclipse.hawkbit.ddi.resource;
+package org.eclipse.hawkbit.ddi.rest.resource;

 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -23,13 +23,11 @@ import java.util.ArrayList;
 import java.util.List;

 import org.eclipse.hawkbit.AbstractIntegrationTest;
-import org.eclipse.hawkbit.MockMvcResultPrinter;
 import org.eclipse.hawkbit.TestDataUtil;
 import org.eclipse.hawkbit.repository.model.Action;
 import org.eclipse.hawkbit.repository.model.Action.Status;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.repository.model.Target;
-import org.eclipse.hawkbit.rest.resource.JsonBuilder;
 import org.junit.Test;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.http.MediaType;
@@ -45,7 +43,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
@ActiveProfiles({ "im", "test" })
@Features("Component Tests - Direct Device Integration API")
@Stories("Cancel Action Resource")
-public class CancelActionTest extends AbstractIntegrationTest {
+public class DdiCancelActionTest extends AbstractIntegrationTest {

    @Test
    @Description("Test of the controller can continue a started update even after a cancel command if it so desires.")
--- a/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java
+++ b/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java
@@ -6,7 +6,7 @@
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 */
-package org.eclipse.hawkbit.ddi.resource;
+package org.eclipse.hawkbit.ddi.rest.resource;

 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -22,9 +22,7 @@ import java.util.HashMap;
 import java.util.Map;

 import org.eclipse.hawkbit.AbstractIntegrationTest;
-import org.eclipse.hawkbit.MockMvcResultPrinter;
 import org.eclipse.hawkbit.repository.model.Target;
-import org.eclipse.hawkbit.rest.resource.JsonBuilder;
 import org.junit.Test;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.http.MediaType;
@@ -40,7 +38,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
@ActiveProfiles({ "im", "test" })
@Features("Component Tests - Direct Device Integration API")
@Stories("Config Data Resource")
-public class ConfigDataTest extends AbstractIntegrationTest {
+public class DdiConfigDataTest extends AbstractIntegrationTest {

    @Test
    @Description("We verify that the config data (i.e. device attributes like serial number, hardware revision etc.) "
--- a/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java
+++ b/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java
@@ -6,7 +6,7 @@
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 */
-package org.eclipse.hawkbit.ddi.resource;
+package org.eclipse.hawkbit.ddi.rest.resource;

 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -26,7 +26,6 @@ import java.util.List;

 import org.apache.commons.lang3.RandomUtils;
 import org.eclipse.hawkbit.AbstractIntegrationTestWithMongoDB;
-import org.eclipse.hawkbit.MockMvcResultPrinter;
 import org.eclipse.hawkbit.TestDataUtil;
 import org.eclipse.hawkbit.repository.model.Action;
 import org.eclipse.hawkbit.repository.model.Action.ActionType;
@@ -36,7 +35,6 @@ import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.repository.model.TargetUpdateStatus;
-import org.eclipse.hawkbit.rest.resource.JsonBuilder;
 import org.fest.assertions.core.Condition;
 import org.junit.Test;
 import org.springframework.data.domain.PageRequest;
@@ -57,7 +55,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
@ActiveProfiles({ "im", "test" })
@Features("Component Tests - Direct Device Integration API")
@Stories("Deployment Action Resource")
-public class DeploymentBaseTest extends AbstractIntegrationTestWithMongoDB {
+public class DdiDeploymentBaseTest extends AbstractIntegrationTestWithMongoDB {

    @Test()
    @Description("Ensures that artifacts are not found, when softare module does not exists.")
--- a/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java
+++ b/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java
@@ -6,7 +6,7 @@
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 */
-package org.eclipse.hawkbit.ddi.resource;
+package org.eclipse.hawkbit.ddi.rest.resource;

 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.List;

 import org.eclipse.hawkbit.AbstractIntegrationTestWithMongoDB;
-import org.eclipse.hawkbit.MockMvcResultPrinter;
 import org.eclipse.hawkbit.TestDataUtil;
 import org.eclipse.hawkbit.WithSpringAuthorityRule;
 import org.eclipse.hawkbit.WithUser;
@@ -33,7 +32,6 @@ import org.eclipse.hawkbit.repository.model.Action;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.repository.model.TargetUpdateStatus;
-import org.eclipse.hawkbit.rest.resource.JsonBuilder;
 import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey;
 import org.eclipse.hawkbit.util.IpUtil;
 import org.junit.Test;
@@ -51,7 +49,7 @@ import ru.yandex.qatools.allure.annotations.Stories;
@ActiveProfiles({ "im", "test" })
@Features("Component Tests - Direct Device Integration API")
@Stories("Root Poll Resource")
-public class RootControllerTest extends AbstractIntegrationTestWithMongoDB {
+public class DdiRootControllerTest extends AbstractIntegrationTestWithMongoDB {

    @Test
    @Description("Ensures that targets cannot be created e.g. in plug'n play scenarios when tenant does not exists but can be created if the tenant exists.")
--- a/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/JsonBuilder.java
+++ b/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/JsonBuilder.java
@@ -0,0 +1,466 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.ddi.rest.resource;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.eclipse.hawkbit.repository.model.DistributionSet;
+import org.eclipse.hawkbit.repository.model.DistributionSetType;
+import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupConditions;
+import org.eclipse.hawkbit.repository.model.SoftwareModule;
+import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
+import org.eclipse.hawkbit.repository.model.Target;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Builder class for building certain json strings.
+ *
+ *
+ *
+ */
+public abstract class JsonBuilder {
+
+    public static String softwareModules(final List<SoftwareModule> modules) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final SoftwareModule module : modules) {
+            try {
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("type", module.getType().getKey())
+                        .put("id", Long.MAX_VALUE).put("vendor", module.getVendor())
+                        .put("version", module.getVersion()).put("createdAt", "0").put("updatedAt", "0")
+                        .put("createdBy", "fghdfkjghdfkjh").put("updatedBy", "fghdfkjghdfkjh").toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < modules.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String softwareModulesCreatableFieldsOnly(final List<SoftwareModule> modules) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final SoftwareModule module : modules) {
+            try {
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("type", module.getType().getKey())
+                        .put("vendor", module.getVendor()).put("version", module.getVersion()).toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < modules.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String softwareModuleUpdatableFieldsOnly(final SoftwareModule module) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append(new JSONObject().put("description", module.getDescription()).put("vendor", module.getVendor())
+                .toString());
+
+        return builder.toString();
+
+    }
+
+    public static String softwareModuleTypes(final List<SoftwareModuleType> types) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final SoftwareModuleType module : types) {
+            try {
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("id", Long.MAX_VALUE)
+                        .put("key", module.getKey()).put("maxAssignments", module.getMaxAssignments())
+                        .put("createdAt", "0").put("updatedAt", "0").put("createdBy", "fghdfkjghdfkjh")
+                        .put("updatedBy", "fghdfkjghdfkjh").toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < types.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String softwareModuleTypesCreatableFieldsOnly(final List<SoftwareModuleType> types)
+            throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final SoftwareModuleType module : types) {
+            try {
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("key", module.getKey())
+                        .put("maxAssignments", module.getMaxAssignments()).toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < types.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    /**
+     * builds a json string for the feedback for the execution "proceeding".
+     *
+     * @param id
+     *            of the Action feedback refers to
+     * @return the built string
+     * @throws JSONException
+     */
+    public static String deploymentActionInProgressFeedback(final String id) throws JSONException {
+        return deploymentActionFeedback(id, "proceeding");
+    }
+
+    /**
+     * builds a certain json string for a action feedback.
+     *
+     * @param id
+     *            of the action the feedback refers to
+     * @param execution
+     *            see ExecutionStatus
+     * @return the build json string
+     * @throws JSONException
+     */
+    public static String deploymentActionFeedback(final String id, final String execution) throws JSONException {
+        return deploymentActionFeedback(id, execution, "none", RandomStringUtils.randomAscii(1000));
+
+    }
+
+    public static String deploymentActionFeedback(final String id, final String execution, final String message)
+            throws JSONException {
+        return deploymentActionFeedback(id, execution, "none", message);
+
+    }
+
+    public static String deploymentActionFeedback(final String id, final String execution, final String finished,
+            final String message) throws JSONException {
+        final List<String> messages = new ArrayList<String>();
+        messages.add(message);
+
+        return new JSONObject()
+                .put("id", id)
+                .put("time", "20140511T121314")
+                .put("status",
+                        new JSONObject()
+                                .put("execution", execution)
+                                .put("result",
+                                        new JSONObject().put("finished", finished).put("progress",
+                                                new JSONObject().put("cnt", 2).put("of", 5))).put("details", messages))
+                .toString();
+
+    }
+
+    /**
+     * @param types
+     * @return
+     */
+    public static String distributionSetTypes(final List<DistributionSetType> types) {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final DistributionSetType module : types) {
+
+            try {
+
+                final JSONArray osmTypes = new JSONArray();
+                module.getOptionalModuleTypes().forEach(smt -> osmTypes.put(new JSONObject().put("id", smt.getId())));
+
+                final JSONArray msmTypes = new JSONArray();
+                module.getMandatoryModuleTypes().forEach(smt -> msmTypes.put(new JSONObject().put("id", smt.getId())));
+
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("id", Long.MAX_VALUE)
+                        .put("key", module.getKey()).put("createdAt", "0").put("updatedAt", "0")
+                        .put("createdBy", "fghdfkjghdfkjh").put("optionalmodules", osmTypes)
+                        .put("mandatorymodules", msmTypes).put("updatedBy", "fghdfkjghdfkjh").toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < types.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+    }
+
+    public static String distributionSetTypesCreateValidFieldsOnly(final List<DistributionSetType> types) {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final DistributionSetType module : types) {
+
+            try {
+
+                final JSONArray osmTypes = new JSONArray();
+                module.getOptionalModuleTypes().forEach(smt -> osmTypes.put(new JSONObject().put("id", smt.getId())));
+
+                final JSONArray msmTypes = new JSONArray();
+                module.getMandatoryModuleTypes().forEach(smt -> msmTypes.put(new JSONObject().put("id", smt.getId())));
+
+                builder.append(new JSONObject().put("name", module.getName())
+                        .put("description", module.getDescription()).put("key", module.getKey())
+                        .put("optionalmodules", osmTypes).put("mandatorymodules", msmTypes).toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < types.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+    }
+
+    public static String distributionSets(final List<DistributionSet> sets) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final DistributionSet set : sets) {
+            try {
+                builder.append(distributionSet(set));
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < sets.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String distributionSetsCreateValidFieldsOnly(final List<DistributionSet> sets) throws JSONException {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final DistributionSet set : sets) {
+            try {
+                builder.append(distributionSetCreateValidFieldsOnly(set));
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < sets.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+
+    }
+
+    public static String distributionSetCreateValidFieldsOnly(final DistributionSet set) throws JSONException {
+
+        final List<JSONObject> modules = set.getModules().stream().map(module -> {
+            try {
+                return new JSONObject().put("id", module.getId());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            return null;
+        }).collect(Collectors.toList());
+
+        return new JSONObject().put("name", set.getName()).put("description", set.getDescription())
+                .put("type", set.getType() == null ? null : set.getType().getKey()).put("version", set.getVersion())
+                .put("requiredMigrationStep", set.isRequiredMigrationStep()).put("modules", modules).toString();
+
+    }
+
+    public static String distributionSetUpdateValidFieldsOnly(final DistributionSet set) throws JSONException {
+
+        final List<JSONObject> modules = set.getModules().stream().map(module -> {
+            try {
+                return new JSONObject().put("id", module.getId());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            return null;
+        }).collect(Collectors.toList());
+
+        return new JSONObject().put("name", set.getName()).put("description", set.getDescription())
+                .put("version", set.getVersion()).toString();
+
+    }
+
+    public static String distributionSet(final DistributionSet set) throws JSONException {
+
+        final List<JSONObject> modules = set.getModules().stream().map(module -> {
+            try {
+                return new JSONObject().put("id", module.getId());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            return null;
+        }).collect(Collectors.toList());
+
+        return new JSONObject().put("name", set.getName()).put("description", set.getDescription())
+                .put("type", set.getType() == null ? null : set.getType().getKey()).put("id", Long.MAX_VALUE)
+                .put("version", set.getVersion()).put("createdAt", "0").put("updatedAt", "0")
+                .put("createdBy", "fghdfkjghdfkjh").put("updatedBy", "fghdfkjghdfkjh")
+                .put("requiredMigrationStep", set.isRequiredMigrationStep()).put("modules", modules).toString();
+
+    }
+
+    /**
+     * @param targets
+     * @return
+     */
+    public static String targets(final List<Target> targets) {
+        final StringBuilder builder = new StringBuilder();
+
+        builder.append("[");
+        int i = 0;
+        for (final Target target : targets) {
+            try {
+                builder.append(new JSONObject().put("controllerId", target.getControllerId())
+                        .put("description", target.getDescription()).put("name", target.getName())
+                        .put("createdAt", "0").put("updatedAt", "0").put("createdBy", "fghdfkjghdfkjh")
+                        .put("updatedBy", "fghdfkjghdfkjh").toString());
+            } catch (final Exception e) {
+                e.printStackTrace();
+            }
+
+            if (++i < targets.size()) {
+                builder.append(",");
+            }
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+    }
+
+    public static String rollout(final String name, final String description, final int groupSize,
+            final long distributionSetId, final String targetFilterQuery, final RolloutGroupConditions conditions) {
+        final JSONObject json = new JSONObject();
+        json.put("name", name);
+        json.put("description", description);
+        json.put("amountGroups", groupSize);
+        json.put("distributionSetId", distributionSetId);
+        json.put("targetFilterQuery", targetFilterQuery);
+
+        if (conditions != null) {
+            final JSONObject successCondition = new JSONObject();
+            json.put("successCondition", successCondition);
+            successCondition.put("condition", conditions.getSuccessCondition().toString());
+            successCondition.put("expression", conditions.getSuccessConditionExp().toString());
+
+            final JSONObject successAction = new JSONObject();
+            json.put("successAction", successAction);
+            successAction.put("action", conditions.getSuccessAction().toString());
+            successAction.put("expression", conditions.getSuccessActionExp().toString());
+
+            final JSONObject errorCondition = new JSONObject();
+            json.put("errorCondition", errorCondition);
+            errorCondition.put("condition", conditions.getErrorCondition().toString());
+            errorCondition.put("expression", conditions.getErrorConditionExp().toString());
+
+            final JSONObject errorAction = new JSONObject();
+            json.put("errorAction", errorAction);
+            errorAction.put("action", conditions.getErrorAction().toString());
+            errorAction.put("expression", conditions.getErrorActionExp().toString());
+        }
+
+        return json.toString();
+    }
+
+    public static String cancelActionFeedback(final String id, final String execution) throws JSONException {
+        return cancelActionFeedback(id, execution, RandomStringUtils.randomAscii(1000));
+
+    }
+
+    public static String cancelActionFeedback(final String id, final String execution, final String message)
+            throws JSONException {
+        final List<String> messages = new ArrayList<String>();
+        messages.add(message);
+        return new JSONObject()
+                .put("id", id)
+                .put("time", "20140511T121314")
+                .put("status",
+                        new JSONObject().put("execution", execution)
+                                .put("result", new JSONObject().put("finished", "success")).put("details", messages))
+                .toString();
+
+    }
+
+    public static String configData(final String id, final Map<String, String> attributes, final String execution)
+            throws JSONException {
+        return new JSONObject()
+                .put("id", id)
+                .put("time", "20140511T121314")
+                .put("status",
+                        new JSONObject().put("execution", execution)
+                                .put("result", new JSONObject().put("finished", "success"))
+                                .put("details", new ArrayList<String>())).put("data", attributes).toString();
+
+    }
+
+}
--- a/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/MockMvcResultPrinter.java
+++ b/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/MockMvcResultPrinter.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.ddi.rest.resource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultHandler;
+import org.springframework.test.web.servlet.result.PrintingResultHandler;
+import org.springframework.util.CollectionUtils;
+
+public abstract class MockMvcResultPrinter {
+    private static final Logger LOG = LoggerFactory.getLogger(MockMvcResultPrinter.class);
+
+    private MockMvcResultPrinter() {
+    }
+
+    /**
+     * Print {@link MvcResult} details to the "standard" output stream.
+     */
+    public static ResultHandler print() {
+        return new ConsolePrintingResultHandler();
+    }
+
+    /**
+     * An {@link PrintingResultHandler} that writes to the "standard" output
+     * stream
+     */
+    private static class ConsolePrintingResultHandler extends PrintingResultHandler {
+
+        public ConsolePrintingResultHandler() {
+            super(new ResultValuePrinter() {
+
+                @Override
+                public void printHeading(final String heading) {
+                    LOG.debug(String.format("%20s:", heading));
+                }
+
+                @Override
+                public void printValue(final String label, Object value) {
+                    if (value != null && value.getClass().isArray()) {
+                        value = CollectionUtils.arrayToList(value);
+                    }
+                    LOG.debug(String.format("%20s = %s", label, value));
+                }
+            });
+        }
+    }
+}