hawkBit rest docs (management & DDI API) (#688)

* hawkBit REST docs.

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

* Fiy gitignore.

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

* Add to website.

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

* Switch to generated docs.

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

* Fix typos.

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

* Review findings.

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

* Otimizations.

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

* Revert accidental checkin.

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

* Add security link.

hawkbit-rest/hawkbit-mgmt-api/README.md

@@ -0,0 +1,17 @@
+# Eclipse.IoT hawkBit - Management API - Model and Resources
+
+This Management (Mgmt) API is used to manage and monitor the HawkBit Update Server via HTTP. This API allows Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software).
+
+# Version 1
+
+The model follows [semantic versioning](http://semver.org) with MAJOR version, i.e. breaking changes will result in a new MAJOR version.
+
+# Compile
+
+#### Build hawkbit-mgmt-api
+
+```
+$ cd hawkbit/hawkbit-mgmt-api
+$ mvn clean install
+```
+

hawkbit-rest/hawkbit-mgmt-api/pom.xml

@@ -0,0 +1,48 @@
+<!--
+
+    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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.eclipse.hawkbit</groupId>
+      <artifactId>hawkbit-rest-parent</artifactId>
+      <version>0.2.0-SNAPSHOT</version>
+   </parent>
+   <artifactId>hawkbit-mgmt-api</artifactId>
+   <name>hawkBit :: REST :: Management API</name>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.springframework.hateoas</groupId>
+         <artifactId>spring-hateoas</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>com.fasterxml.jackson.core</groupId>
+         <artifactId>jackson-annotations</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>javax.validation</groupId>
+         <artifactId>validation-api</artifactId>
+      </dependency>
+
+      <!-- Test -->
+      <dependency>
+         <groupId>org.springframework.boot</groupId>
+         <artifactId>spring-boot-starter-test</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>ru.yandex.qatools.allure</groupId>
+         <artifactId>allure-junit-adaptor</artifactId>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+</project>

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtBaseEntity.java

@@ -0,0 +1,97 @@
+/**
+ * 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.mgmt.json.model;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A json annotated rest model for BaseEntity to RESTful API representation.
+ *
+ */
+public abstract class MgmtBaseEntity extends ResourceSupport {
+
+    @JsonProperty
+    private String createdBy;
+
+    @JsonProperty
+    private Long createdAt;
+
+    @JsonProperty
+    private String lastModifiedBy;
+
+    @JsonProperty
+    private Long lastModifiedAt;
+
+    /**
+     * @return the createdBy
+     */
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    /**
+     * @param createdBy
+     *            the createdBy to set
+     */
+    @JsonIgnore
+    public void setCreatedBy(final String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * @return the createdAt
+     */
+    public Long getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * @param createdAt
+     *            the createdAt to set
+     */
+    @JsonIgnore
+    public void setCreatedAt(final Long createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    /**
+     * @return the lastModifiedBy
+     */
+    public String getLastModifiedBy() {
+        return lastModifiedBy;
+    }
+
+    /**
+     * @param lastModifiedBy
+     *            the lastModifiedBy to set
+     */
+    @JsonIgnore
+    public void setLastModifiedBy(final String lastModifiedBy) {
+        this.lastModifiedBy = lastModifiedBy;
+    }
+
+    /**
+     * @return the lastModifiedAt
+     */
+    public Long getLastModifiedAt() {
+        return lastModifiedAt;
+    }
+
+    /**
+     * @param lastModifiedAt
+     *            the lastModifiedAt to set
+     */
+    @JsonIgnore
+    public void setLastModifiedAt(final Long lastModifiedAt) {
+        this.lastModifiedAt = lastModifiedAt;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtId.java

@@ -0,0 +1,41 @@
+/**
+ * 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.mgmt.json.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A generic abstract rest model which contains only a ID for use-case e.g.
+ * which allows only posting or putting an ID into the request body, e.g. for
+ * assignments.
+ *
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtId {
+
+    @JsonProperty
+    private Long id;
+
+    /**
+     * @return the id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     *            the id to set
+     */
+    public void setId(final Long id) {
+        this.id = id;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindow.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) Siemens AG, 2018
+ *
+ * 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.mgmt.json.model;
+
+import java.util.concurrent.TimeUnit;
+
+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;
+
+/**
+ * JSON model for Management API to define the maintenance window.
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtMaintenanceWindow extends MgmtMaintenanceWindowRequestBody {
+
+    /**
+     * Time in {@link TimeUnit#MILLISECONDS} of the next maintenance window
+     * start
+     */
+    @JsonProperty
+    private long nextStartAt;
+
+    public long getNextStartAt() {
+        return nextStartAt;
+    }
+
+    public void setNextStartAt(final long nextStartAt) {
+        this.nextStartAt = nextStartAt;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindowRequestBody.java

@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2018 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.mgmt.json.model;
+
+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;
+
+/**
+ * Request body for maintenance window PUT/POST commands, based on a schedule
+ * defined as cron expression, duration in HH:mm:ss format and time zone as
+ * offset from UTC.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtMaintenanceWindowRequestBody {
+    @JsonProperty
+    private String schedule;
+
+    @JsonProperty
+    private String duration;
+
+    @JsonProperty
+    private String timezone;
+
+    public String getSchedule() {
+        return schedule;
+    }
+
+    /**
+     * @param schedule
+     *            is the cron expression to be used for scheduling maintenance
+     *            window(s). Expression has 6 mandatory fields and a last
+     *            optional field: "second minute hour dayofmonth month weekday
+     *            year".
+     */
+    public void setSchedule(final String schedule) {
+        this.schedule = schedule;
+    }
+
+    public String getDuration() {
+        return duration;
+    }
+
+    /**
+     * @param duration
+     *            in HH:mm:ss format specifying the duration of a maintenance
+     *            window, for example 00:30:00 for 30 minutes.
+     */
+    public void setDuration(final String duration) {
+        this.duration = duration;
+    }
+
+    public String getTimezone() {
+        return timezone;
+    }
+
+    /**
+     * @param timezone
+     *            is the time zone specified as +/-hh:mm offset from UTC. For
+     *            example +02:00 for CET summer time and +00:00 for UTC. The
+     *            start time of a maintenance window calculated based on the
+     *            cron expression is relative to this time zone.
+     */
+    public void setTimezone(final String timezone) {
+        this.timezone = timezone;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadata.java

@@ -0,0 +1,44 @@
+/**
+ * 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.mgmt.json.model;
+
+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;
+
+/**
+ * The representation of an meta data in the REST API for POST/Create.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtMetadata {
+
+    @JsonProperty(required = true)
+    private String key;
+    @JsonProperty
+    private String value;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(final String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(final String value) {
+        this.value = value;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadataBodyPut.java

@@ -0,0 +1,34 @@
+/**
+ * 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.mgmt.json.model;
+
+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;
+
+/**
+ * The representation of an meta data in the REST API for PUT/Update.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtMetadataBodyPut {
+
+    @JsonProperty
+    private String value;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(final String value) {
+        this.value = value;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtNamedEntity.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.mgmt.json.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A json annotated rest model for NamedEntity to RESTful API representation.
+ *
+ */
+public abstract class MgmtNamedEntity extends MgmtBaseEntity {
+
+    @JsonProperty(required = true)
+    private String name;
+
+    @JsonProperty
+    private String description;
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     *            the name to set
+     */
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return the description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @param description
+     *            the description to set
+     */
+    public void setDescription(final String description) {
+        this.description = description;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtPollStatus.java

@@ -0,0 +1,80 @@
+/**
+ * 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.mgmt.json.model;
+
+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;
+
+/**
+ * A json annotated rest model for PollStatus to RESTful API representation.
+ *
+ *
+ *
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtPollStatus {
+
+    @JsonProperty
+    private Long lastRequestAt;
+
+    @JsonProperty
+    private Long nextExpectedRequestAt;
+
+    @JsonProperty
+    private boolean overdue;
+
+    /**
+     * @return the lastRequestAt
+     */
+    public Long getLastRequestAt() {
+        return lastRequestAt;
+    }
+
+    /**
+     * @param lastRequestAt
+     *            the lastRequestAt to set
+     */
+    public void setLastRequestAt(final Long lastRequestAt) {
+        this.lastRequestAt = lastRequestAt;
+    }
+
+    /**
+     * @return the nextExpectedRequestAt
+     */
+    public Long getNextExpectedRequestAt() {
+        return nextExpectedRequestAt;
+    }
+
+    /**
+     * @param nextExpectedRequestAt
+     *            the nextExpectedRequestAt to set
+     */
+    public void setNextExpectedRequestAt(final Long nextExpectedRequestAt) {
+        this.nextExpectedRequestAt = nextExpectedRequestAt;
+    }
+
+    /**
+     * @return the overdue
+     */
+    public boolean isOverdue() {
+        return overdue;
+    }
+
+    /**
+     * @param overdue
+     *            the overdue to set
+     */
+    public void setOverdue(final boolean overdue) {
+        this.overdue = overdue;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/PagedList.java

@@ -0,0 +1,79 @@
+/**
+ * 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.mgmt.json.model;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import org.springframework.hateoas.ResourceSupport;
+
+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;
+
+/**
+ * A list representation with meta data for pagination, e.g. containing the
+ * total elements and size of content. The content of the actual list is stored
+ * in the {@link #content} field.
+ *
+ * @param <T>
+ *            the type of elements in this list
+ *
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL)
+public class PagedList<T> extends ResourceSupport {
+
+    @JsonProperty
+    private final List<T> content;
+    @JsonProperty
+    private final long total;
+    private final int size;
+
+    /**
+     * creates a new paged list with the given {@code content} and {@code total}
+     * .
+     *
+     * @param content
+     *            the actual content of the list
+     * @param total
+     *            the total amount of elements
+     * @throws NullPointerException
+     *             in case {@code content} is {@code null}.
+     */
+    @JsonCreator
+    public PagedList(@JsonProperty("content") @NotNull final List<T> content, @JsonProperty("total") final long total) {
+        this.size = content.size();
+        this.total = total;
+        this.content = content;
+    }
+
+    /**
+     * @return the size of the content list
+     */
+    public int getSize() {
+        return size;
+    }
+
+    /**
+     * @return the total amount of elements
+     */
+    public long getTotal() {
+        return total;
+    }
+
+    public List<T> getContent() {
+        return Collections.unmodifiableList(content);
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtAction.java

@@ -0,0 +1,114 @@
+/**
+ * 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.mgmt.json.model.action;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtBaseEntity;
+import org.eclipse.hawkbit.mgmt.json.model.MgmtMaintenanceWindow;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType;
+
+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;
+
+/**
+ * A json annotated rest model for Action to RESTful API representation.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtAction extends MgmtBaseEntity {
+
+    /**
+     * API definition for action in update mode.
+     */
+    public static final String ACTION_UPDATE = "update";
+
+    /**
+     * API definition for action in canceling.
+     */
+    public static final String ACTION_CANCEL = "cancel";
+
+    /**
+     * API definition for action completed.
+     */
+    public static final String ACTION_FINISHED = "finished";
+
+    /**
+     * API definition for action still active.
+     */
+    public static final String ACTION_PENDING = "pending";
+
+    @JsonProperty("id")
+    private Long actionId;
+
+    @JsonProperty
+    private String type;
+
+    @JsonProperty
+    private String status;
+
+    @JsonProperty
+    private Long forceTime;
+
+    @JsonProperty
+    private MgmtActionType forceType;
+
+    @JsonProperty
+    private MgmtMaintenanceWindow maintenanceWindow;
+
+    public MgmtMaintenanceWindow getMaintenanceWindow() {
+        return maintenanceWindow;
+    }
+
+    public void setMaintenanceWindow(final MgmtMaintenanceWindow maintenanceWindow) {
+        this.maintenanceWindow = maintenanceWindow;
+    }
+
+    public Long getForceTime() {
+        return forceTime;
+    }
+
+    public void setForceTime(final Long forceTime) {
+        this.forceTime = forceTime;
+    }
+
+    public MgmtActionType getForceType() {
+        return forceType;
+    }
+
+    public void setForceType(final MgmtActionType forceType) {
+        this.forceType = forceType;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(final String status) {
+        this.status = status;
+    }
+
+    public Long getActionId() {
+        return actionId;
+    }
+
+    public void setActionId(final Long actionId) {
+        this.actionId = actionId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(final String type) {
+        this.type = type;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionRequestBodyPut.java

@@ -0,0 +1,32 @@
+/**
+ * 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.mgmt.json.model.action;
+
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A json annotated model for Action updates in RESTful API representation.
+ *
+ */
+public class MgmtActionRequestBodyPut {
+
+    @JsonProperty
+    private MgmtActionType forceType;
+
+    public MgmtActionType getForceType() {
+        return forceType;
+    }
+
+    public void setForceType(final MgmtActionType forceType) {
+        this.forceType = forceType;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionStatus.java

@@ -0,0 +1,98 @@
+/**
+ * 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.mgmt.json.model.action;
+
+import java.util.List;
+
+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;
+
+/**
+ * A json annotated rest model for ActionStatus to RESTful API representation.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtActionStatus {
+
+    @JsonProperty("id")
+    private Long statusId;
+
+    @JsonProperty
+    private String type;
+
+    @JsonProperty
+    private List<String> messages;
+
+    @JsonProperty
+    private Long reportedAt;
+
+    /**
+     * @return the statusId
+     */
+    public Long getStatusId() {
+        return statusId;
+    }
+
+    /**
+     * @param statusId
+     *            the statusId to set
+     */
+    public void setStatusId(final Long statusId) {
+        this.statusId = statusId;
+    }
+
+    /**
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @param type
+     *            the type to set
+     */
+    public void setType(final String type) {
+        this.type = type;
+    }
+
+    /**
+     * @return the messages
+     */
+    public List<String> getMessages() {
+        return messages;
+    }
+
+    /**
+     * @param messages
+     *            the messages to set
+     */
+    public void setMessages(final List<String> messages) {
+        this.messages = messages;
+    }
+
+    /**
+     * @return the reportedAt
+     */
+    public Long getReportedAt() {
+        return reportedAt;
+    }
+
+    /**
+     * @param reportedAt
+     *            the reportedAt to set
+     */
+    public void setReportedAt(final Long reportedAt) {
+        this.reportedAt = reportedAt;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifact.java

@@ -0,0 +1,106 @@
+/**
+ * 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.mgmt.json.model.artifact;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtBaseEntity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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;
+
+/**
+ * A json annotated rest model for Artifact to RESTful API representation.
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtArtifact extends MgmtBaseEntity {
+
+    @JsonProperty("id")
+    private Long artifactId;
+
+    @JsonProperty
+    private MgmtArtifactHash hashes;
+
+    @JsonProperty
+    private String providedFilename;
+
+    @JsonProperty
+    private Long size;
+
+    public MgmtArtifact() {
+        // need for json encoder
+    }
+
+    /**
+     * @param hashes
+     *            the hashes to set
+     */
+    @JsonIgnore
+    public void setHashes(final MgmtArtifactHash hashes) {
+        this.hashes = hashes;
+    }
+
+    /**
+     * @param artifactId
+     *            the artifactId to set
+     */
+    @JsonIgnore
+    public void setArtifactId(final Long artifactId) {
+        this.artifactId = artifactId;
+    }
+
+    /**
+     * @return the artifactId
+     */
+    public Long getArtifactId() {
+        return artifactId;
+    }
+
+    /**
+     * @return the hashes
+     */
+    public MgmtArtifactHash getHashes() {
+        return hashes;
+    }
+
+    /**
+     * @return the providedFilename
+     */
+    public String getProvidedFilename() {
+        return providedFilename;
+    }
+
+    /**
+     * @param providedFilename
+     *            the providedFilename to set
+     */
+    @JsonIgnore
+    public void setProvidedFilename(final String providedFilename) {
+        this.providedFilename = providedFilename;
+    }
+
+    /**
+     * @return the size
+     */
+    public Long getSize() {
+        return size;
+    }
+
+    /**
+     * @param size
+     *            the size to set
+     */
+    @JsonIgnore
+    public void setSize(final Long size) {
+        this.size = size;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifactHash.java

@@ -0,0 +1,49 @@
+/**
+ * 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.mgmt.json.model.artifact;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Hashes for given Artifact.
+ *
+ *
+ */
+public class MgmtArtifactHash {
+
+    @JsonProperty
+    private String sha1;
+
+    @JsonProperty
+    private String md5;
+
+    /**
+     * Default constructor.
+     */
+    public MgmtArtifactHash() {
+        // used for jackson to instantiate
+    }
+
+    /**
+     * Public constructor.
+     */
+    public MgmtArtifactHash(final String sha1, final String md5) {
+        this.sha1 = sha1;
+        this.md5 = md5;
+    }
+
+    public String getSha1() {
+        return sha1;
+    }
+
+    public String getMd5() {
+        return md5;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtActionType.java

@@ -0,0 +1,44 @@
+/**
+ * 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.mgmt.json.model.distributionset;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Definition of the Action type for the REST management API.
+ *
+ */
+public enum MgmtActionType {
+    /**
+     * The soft action type.
+     */
+    SOFT("soft"),
+
+    /**
+     * The forced action type.
+     */
+    FORCED("forced"),
+
+    /**
+     * The time forced action type.
+     */
+    TIMEFORCED("timeforced");
+
+    private final String name;
+
+    private MgmtActionType(final String name) {
+        this.name = name;
+    }
+
+    @JsonValue
+    public String getName() {
+        return name;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSet.java

@@ -0,0 +1,113 @@
+/**
+ * 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.mgmt.json.model.distributionset;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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;
+
+/**
+ * A json annotated rest model for DistributionSet to RESTful API
+ * representation.
+ *
+ *
+ *
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtDistributionSet extends MgmtNamedEntity {
+
+    @JsonProperty(value = "id", required = true)
+    private Long dsId;
+
+    @JsonProperty
+    private String version;
+
+    @JsonProperty
+    private List<MgmtSoftwareModule> modules = new ArrayList<>();
+
+    @JsonProperty
+    private boolean requiredMigrationStep;
+
+    @JsonProperty
+    private String type;
+
+    @JsonProperty
+    private Boolean complete;
+
+    @JsonProperty
+    private boolean deleted;
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(final boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public Long getDsId() {
+        return dsId;
+    }
+
+    @JsonIgnore
+    public void setDsId(final Long id) {
+        dsId = id;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(final String version) {
+        this.version = version;
+    }
+
+    public boolean isRequiredMigrationStep() {
+        return requiredMigrationStep;
+    }
+
+    public void setRequiredMigrationStep(final boolean requiredMigrationStep) {
+        this.requiredMigrationStep = requiredMigrationStep;
+    }
+
+    public List<MgmtSoftwareModule> getModules() {
+        return modules;
+    }
+
+    public void setModules(final List<MgmtSoftwareModule> modules) {
+        this.modules = modules;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(final String type) {
+        this.type = type;
+    }
+
+    public Boolean getComplete() {
+        return complete;
+    }
+
+    public void setComplete(final Boolean complete) {
+        this.complete = complete;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPost.java

@@ -0,0 +1,140 @@
+/**
+ * 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.mgmt.json.model.distributionset;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleAssigment;
+
+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;
+
+/**
+ * A json annotated rest model for DistributionSet for POST.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtDistributionSetRequestBodyPost extends MgmtDistributionSetRequestBodyPut {
+
+    // deprecated format from the time where os, application and runtime where
+    // statically defined
+    @JsonProperty
+    private MgmtSoftwareModuleAssigment os;
+
+    @JsonProperty
+    private MgmtSoftwareModuleAssigment runtime;
+
+    @JsonProperty
+    private MgmtSoftwareModuleAssigment application;
+    // deprecated format - END
+
+    @JsonProperty
+    private List<MgmtSoftwareModuleAssigment> modules;
+
+    @JsonProperty
+    private String type;
+
+    /**
+     * @return the os
+     */
+    public MgmtSoftwareModuleAssigment getOs() {
+        return os;
+    }
+
+    /**
+     * @param os
+     *            the os to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetRequestBodyPost setOs(final MgmtSoftwareModuleAssigment os) {
+        this.os = os;
+        return this;
+    }
+
+    /**
+     * @return the runtime
+     */
+    public MgmtSoftwareModuleAssigment getRuntime() {
+        return runtime;
+    }
+
+    /**
+     * @param runtime
+     *            the runtime to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetRequestBodyPost setRuntime(final MgmtSoftwareModuleAssigment runtime) {
+        this.runtime = runtime;
+
+        return this;
+    }
+
+    /**
+     * @return the application
+     */
+    public MgmtSoftwareModuleAssigment getApplication() {
+        return application;
+    }
+
+    /**
+     * @param application
+     *            the application to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetRequestBodyPost setApplication(final MgmtSoftwareModuleAssigment application) {
+        this.application = application;
+
+        return this;
+    }
+
+    /**
+     * @return the modules
+     */
+    public List<MgmtSoftwareModuleAssigment> getModules() {
+        return modules;
+    }
+
+    /**
+     * @param modules
+     *            the modules to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetRequestBodyPost setModules(final List<MgmtSoftwareModuleAssigment> modules) {
+        this.modules = modules;
+
+        return this;
+    }
+
+    /**
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @param type
+     *            the type to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetRequestBodyPost setType(final String type) {
+        this.type = type;
+
+        return this;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPut.java

@@ -0,0 +1,110 @@
+/**
+ * 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.mgmt.json.model.distributionset;
+
+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;
+
+/**
+ * A json annotated rest model for DistributionSet for PUT/POST.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtDistributionSetRequestBodyPut {
+
+    @JsonProperty
+    private String name;
+
+    @JsonProperty
+    private String description;
+
+    @JsonProperty
+    private String version;
+
+    @JsonProperty
+    private Boolean requiredMigrationStep;
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     *            the name to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetRequestBodyPut setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @return the requiredMigrationStep
+     */
+    public Boolean isRequiredMigrationStep() {
+        return requiredMigrationStep;
+    }
+
+    /**
+     * @param requiredMigrationStep
+     *            the requiredMigrationStep to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetRequestBodyPut setRequiredMigrationStep(final Boolean requiredMigrationStep) {
+        this.requiredMigrationStep = requiredMigrationStep;
+
+        return this;
+    }
+
+    /**
+     * @return the description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @param description
+     *            the description to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetRequestBodyPut setDescription(final String description) {
+        this.description = description;
+
+        return this;
+    }
+
+    /**
+     * @return the version
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * @param version
+     *            the version to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetRequestBodyPut setVersion(final String version) {
+        this.version = version;
+
+        return this;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentRequestBody.java

@@ -0,0 +1,68 @@
+/**
+ * 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.mgmt.json.model.distributionset;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtMaintenanceWindowRequestBody;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request Body of Target for assignment operations (ID only).
+ *
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtTargetAssignmentRequestBody {
+
+    @JsonProperty
+    private String id;
+
+    private long forcetime;
+
+    private MgmtActionType type;
+
+    /**
+     * {@link MgmtMaintenanceWindowRequestBody} object containing schedule,
+     * duration and timezone.
+     */
+    private MgmtMaintenanceWindowRequestBody maintenanceWindow;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    public MgmtActionType getType() {
+        return type;
+    }
+
+    public void setType(final MgmtActionType type) {
+        this.type = type;
+    }
+
+    public long getForcetime() {
+        return forcetime;
+    }
+
+    public void setForcetime(final long forcetime) {
+        this.forcetime = forcetime;
+    }
+
+    public MgmtMaintenanceWindowRequestBody getMaintenanceWindow() {
+        return maintenanceWindow;
+    }
+
+    public void setMaintenanceWindow(final MgmtMaintenanceWindowRequestBody maintenanceWindow) {
+        this.maintenanceWindow = maintenanceWindow;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBody.java

@@ -0,0 +1,73 @@
+/**
+ * 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.mgmt.json.model.distributionset;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+/**
+ * Response Body of Target for assignment operations.
+ *
+ *
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtTargetAssignmentResponseBody {
+
+    private int assigned;
+    private int alreadyAssigned;
+    private int total;
+
+    /**
+     * @return the assigned
+     */
+    public int getAssigned() {
+        return assigned;
+    }
+
+    /**
+     * @param assigned
+     *            the assigned to set
+     */
+    public void setAssigned(final int assigned) {
+        this.assigned = assigned;
+    }
+
+    /**
+     * @return the alreadyAssigned
+     */
+    public int getAlreadyAssigned() {
+        return alreadyAssigned;
+    }
+
+    /**
+     * @param alreadyAssigned
+     *            the alreadyAssigned to set
+     */
+    public void setAlreadyAssigned(final int alreadyAssigned) {
+        this.alreadyAssigned = alreadyAssigned;
+    }
+
+    /**
+     * @return the total
+     */
+    public int getTotal() {
+        return total;
+    }
+
+    /**
+     * @param total
+     *            the total to set
+     */
+    public void setTotal(final int total) {
+        this.total = total;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetType.java

@@ -0,0 +1,77 @@
+/**
+ * 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.mgmt.json.model.distributionsettype;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
+
+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;
+
+/**
+ * A json annotated rest model for SoftwareModuleType to RESTful API
+ * representation.
+ *
+ *
+ *
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtDistributionSetType extends MgmtNamedEntity {
+
+    @JsonProperty(value = "id", required = true)
+    private Long moduleId;
+
+    @JsonProperty
+    private String key;
+
+    @JsonProperty
+    private boolean deleted;
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(final boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    /**
+     * @return the moduleId
+     */
+    public Long getModuleId() {
+        return moduleId;
+    }
+
+    /**
+     * @param moduleId
+     *            the moduleId to set
+     */
+    public void setModuleId(final Long moduleId) {
+        this.moduleId = moduleId;
+    }
+
+    /**
+     * @return the key
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * @param key
+     *            the key to set
+     */
+    public void setKey(final String key) {
+        this.key = key;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPost.java

@@ -0,0 +1,121 @@
+/**
+ * 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.mgmt.json.model.distributionsettype;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleTypeAssigment;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request Body for DistributionSetType POST.
+ *
+ */
+public class MgmtDistributionSetTypeRequestBodyPost extends MgmtDistributionSetTypeRequestBodyPut {
+
+    @JsonProperty(required = true)
+    private String name;
+
+    @JsonProperty
+    private String key;
+
+    @JsonProperty
+    private List<MgmtSoftwareModuleTypeAssigment> mandatorymodules;
+
+    @JsonProperty
+    private List<MgmtSoftwareModuleTypeAssigment> optionalmodules;
+
+    @Override
+    public MgmtDistributionSetTypeRequestBodyPost setDescription(final String description) {
+        super.setDescription(description);
+        return this;
+    }
+
+    @Override
+    public MgmtDistributionSetTypeRequestBodyPost setColour(final String colour) {
+        super.setColour(colour);
+        return this;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     *            the name to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetTypeRequestBodyPost setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @return the key
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * @param key
+     *            the key to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetTypeRequestBodyPost setKey(final String key) {
+        this.key = key;
+        return this;
+    }
+
+    /**
+     * @return the mandatory modules
+     */
+    public List<MgmtSoftwareModuleTypeAssigment> getMandatorymodules() {
+        return mandatorymodules;
+    }
+
+    /**
+     * @param mandatorymodules
+     *            the mandatory modules to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetTypeRequestBodyPost setMandatorymodules(
+            final List<MgmtSoftwareModuleTypeAssigment> mandatorymodules) {
+        this.mandatorymodules = mandatorymodules;
+        return this;
+    }
+
+    /**
+     * @return the optional modules
+     */
+    public List<MgmtSoftwareModuleTypeAssigment> getOptionalmodules() {
+        return optionalmodules;
+    }
+
+    /**
+     * @param optionalmodules
+     *            the optional modules to set
+     *
+     * @return updated body
+     */
+    public MgmtDistributionSetTypeRequestBodyPost setOptionalmodules(
+            final List<MgmtSoftwareModuleTypeAssigment> optionalmodules) {
+        this.optionalmodules = optionalmodules;
+        return this;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPut.java

@@ -0,0 +1,43 @@
+/**
+ * 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.mgmt.json.model.distributionsettype;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request Body for DistributionSetType PUT, i.e. update.
+ *
+ */
+public class MgmtDistributionSetTypeRequestBodyPut {
+
+    @JsonProperty
+    private String description;
+
+    @JsonProperty
+    private String colour;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public MgmtDistributionSetTypeRequestBodyPut setDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    public String getColour() {
+        return colour;
+    }
+
+    public MgmtDistributionSetTypeRequestBodyPut setColour(final String colour) {
+        this.colour = colour;
+        return this;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/AbstractMgmtRolloutConditionsEntity.java

@@ -0,0 +1,60 @@
+/**
+ * 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.mgmt.json.model.rollout;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * Model for defining Conditions and Actions
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public abstract class AbstractMgmtRolloutConditionsEntity extends MgmtNamedEntity {
+
+    private MgmtRolloutCondition successCondition;
+    private MgmtRolloutSuccessAction successAction;
+    private MgmtRolloutCondition errorCondition;
+    private MgmtRolloutErrorAction errorAction;
+
+    public MgmtRolloutCondition getSuccessCondition() {
+        return successCondition;
+    }
+
+    public void setSuccessCondition(final MgmtRolloutCondition successCondition) {
+        this.successCondition = successCondition;
+    }
+
+    public MgmtRolloutSuccessAction getSuccessAction() {
+        return successAction;
+    }
+
+    public void setSuccessAction(final MgmtRolloutSuccessAction successAction) {
+        this.successAction = successAction;
+    }
+
+    public MgmtRolloutCondition getErrorCondition() {
+        return errorCondition;
+    }
+
+    public void setErrorCondition(final MgmtRolloutCondition errorCondition) {
+        this.errorCondition = errorCondition;
+    }
+
+    public MgmtRolloutErrorAction getErrorAction() {
+        return errorAction;
+    }
+
+    public void setErrorAction(final MgmtRolloutErrorAction errorAction) {
+        this.errorAction = errorAction;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutCondition.java

@@ -0,0 +1,70 @@
+/**
+ * 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.mgmt.json.model.rollout;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+/**
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtRolloutCondition {
+
+    private Condition condition = Condition.THRESHOLD;
+    private String expression = "100";
+
+    /**
+     * 
+     */
+    public MgmtRolloutCondition() {
+        // needed for jackson json creator.
+    }
+
+    public MgmtRolloutCondition(final Condition condition, final String expression) {
+        this.condition = condition;
+        this.expression = expression;
+    }
+
+    /**
+     * @return the condition
+     */
+    public Condition getCondition() {
+        return condition;
+    }
+
+    /**
+     * @param condition
+     *            the condition to set
+     */
+    public void setCondition(final Condition condition) {
+        this.condition = condition;
+    }
+
+    /**
+     * @return the expession
+     */
+    public String getExpression() {
+        return expression;
+    }
+
+    /**
+     * @param expession
+     *            the expession to set
+     */
+    public void setExpression(final String expession) {
+        this.expression = expession;
+    }
+
+    public enum Condition {
+        THRESHOLD;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutErrorAction.java

@@ -0,0 +1,81 @@
+/**
+ * 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.mgmt.json.model.rollout;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+/**
+ * An action that runs when the error condition is met
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtRolloutErrorAction {
+
+    private ErrorAction action = ErrorAction.PAUSE;
+    private String expression;
+
+    /**
+     * Creates a rollout error action
+     * 
+     * @param action
+     *            the action to run when th error condition is met
+     * @param expression
+     *            the expression for the action
+     */
+    public MgmtRolloutErrorAction(ErrorAction action, String expression) {
+        this.action = action;
+        this.expression = expression;
+    }
+
+    /**
+     * Default constructor
+     */
+    public MgmtRolloutErrorAction() {
+        // Instantiate default error action
+    }
+
+    /**
+     * @return the action
+     */
+    public ErrorAction getAction() {
+        return action;
+    }
+
+    /**
+     * @param action
+     *            the action to set
+     */
+    public void setAction(final ErrorAction action) {
+        this.action = action;
+    }
+
+    /**
+     * @return the expression
+     */
+    public String getExpression() {
+        return expression;
+    }
+
+    /**
+     * @param expression
+     *            the expression to set
+     */
+    public void setExpression(final String expression) {
+        this.expression = expression;
+    }
+
+    /**
+     * Possible actions
+     */
+    public enum ErrorAction {
+        PAUSE;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java

@@ -0,0 +1,105 @@
+/**
+ * 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.mgmt.json.model.rollout;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
+
+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;
+
+/**
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtRolloutResponseBody extends MgmtNamedEntity {
+
+    private String targetFilterQuery;
+    private Long distributionSetId;
+
+    @JsonProperty(value = "id", required = true)
+    private Long rolloutId;
+
+    @JsonProperty(required = true)
+    private String status;
+
+    @JsonProperty(required = true)
+    private Long totalTargets;
+
+    @JsonProperty
+    private Map<String, Long> totalTargetsPerStatus;
+
+    @JsonProperty
+    private boolean deleted;
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(final boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(final String status) {
+        this.status = status;
+    }
+
+    public Long getRolloutId() {
+        return rolloutId;
+    }
+
+    public void setRolloutId(final Long rolloutId) {
+        this.rolloutId = rolloutId;
+    }
+
+    public String getTargetFilterQuery() {
+        return targetFilterQuery;
+    }
+
+    public void setTargetFilterQuery(final String targetFilterQuery) {
+        this.targetFilterQuery = targetFilterQuery;
+    }
+
+    public Long getDistributionSetId() {
+        return distributionSetId;
+    }
+
+    public void setDistributionSetId(final Long distributionSetId) {
+        this.distributionSetId = distributionSetId;
+    }
+
+    public void setTotalTargets(final Long totalTargets) {
+        this.totalTargets = totalTargets;
+    }
+
+    public Long getTotalTargets() {
+        return totalTargets;
+    }
+
+    public Map<String, Long> getTotalTargetsPerStatus() {
+        return totalTargetsPerStatus;
+    }
+
+    public void addTotalTargetsPerStatus(final String status, final Long totalTargetCountByStatus) {
+        if (totalTargetsPerStatus == null) {
+            totalTargetsPerStatus = new HashMap<>();
+        }
+
+        totalTargetsPerStatus.put(status, totalTargetCountByStatus);
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutRestRequestBody.java

@@ -0,0 +1,144 @@
+/**
+ * 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.mgmt.json.model.rollout;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType;
+import org.eclipse.hawkbit.mgmt.json.model.rolloutgroup.MgmtRolloutGroup;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+/**
+ * Model for request containing a rollout body e.g. in a POST request of
+ * creating a rollout via REST API.
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtRolloutRestRequestBody extends AbstractMgmtRolloutConditionsEntity {
+
+    private String targetFilterQuery;
+    private long distributionSetId;
+
+    private Integer amountGroups;
+
+    private Long forcetime;
+
+    private Long startAt;
+
+    private MgmtActionType type;
+
+    private List<MgmtRolloutGroup> groups;
+
+    /**
+     * @return the targetFilterQuery
+     */
+    public String getTargetFilterQuery() {
+        return targetFilterQuery;
+    }
+
+    /**
+     * @param targetFilterQuery
+     *            the targetFilterQuery to set
+     */
+    public void setTargetFilterQuery(final String targetFilterQuery) {
+        this.targetFilterQuery = targetFilterQuery;
+    }
+
+    /**
+     * @return the distributionSetId
+     */
+    public long getDistributionSetId() {
+        return distributionSetId;
+    }
+
+    /**
+     * @param distributionSetId
+     *            the distributionSetId to set
+     */
+    public void setDistributionSetId(final long distributionSetId) {
+        this.distributionSetId = distributionSetId;
+    }
+
+    /**
+     * @return the groupSize
+     */
+    public Integer getAmountGroups() {
+        return amountGroups;
+    }
+
+    /**
+     * @param groupSize
+     *            the groupSize to set
+     */
+    public void setAmountGroups(final Integer groupSize) {
+        this.amountGroups = groupSize;
+    }
+
+    /**
+     * @return the forcetime
+     */
+    public Long getForcetime() {
+        return forcetime;
+    }
+
+    /**
+     * @param forcetime
+     *            the forcetime to set
+     */
+    public void setForcetime(final Long forcetime) {
+        this.forcetime = forcetime;
+    }
+
+    /**
+     * @return the type
+     */
+    public MgmtActionType getType() {
+        return type;
+    }
+
+    /**
+     * @param type
+     *            the type to set
+     */
+    public void setType(final MgmtActionType type) {
+        this.type = type;
+    }
+
+    /**
+     * @return the List of defined Groups
+     */
+    public List<MgmtRolloutGroup> getGroups() {
+        return groups;
+    }
+
+    /**
+     * @param groups List of {@link MgmtRolloutGroup}
+     */
+    public void setGroups(List<MgmtRolloutGroup> groups) {
+        this.groups = groups;
+    }
+
+    /**
+     * @return the start at timestamp in millis or null
+     */
+    public Long getStartAt() {
+        return startAt;
+    }
+
+    /**
+     * @param startAt
+     *            the start at timestamp in millis or null
+     */
+    public void setStartAt(Long startAt) {
+        this.startAt = startAt;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutSuccessAction.java

@@ -0,0 +1,70 @@
+/**
+ * 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.mgmt.json.model.rollout;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+/**
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtRolloutSuccessAction {
+
+    private SuccessAction action = SuccessAction.NEXTGROUP;
+    private String expression = null;
+
+    /**
+     * 
+     */
+    public MgmtRolloutSuccessAction() {
+        // needed for json creator
+    }
+
+    public MgmtRolloutSuccessAction(final SuccessAction action, final String expression) {
+        this.action = action;
+        this.expression = expression;
+    }
+
+    /**
+     * @return the action
+     */
+    public SuccessAction getAction() {
+        return action;
+    }
+
+    /**
+     * @param action
+     *            the action to set
+     */
+    public void setAction(final SuccessAction action) {
+        this.action = action;
+    }
+
+    /**
+     * @return the expession
+     */
+    public String getExpression() {
+        return expression;
+    }
+
+    /**
+     * @param expession
+     *            the expession to set
+     */
+    public void setExpression(final String expession) {
+        this.expression = expession;
+    }
+
+    public enum SuccessAction {
+        NEXTGROUP;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroup.java

@@ -0,0 +1,41 @@
+/**
+ * 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.mgmt.json.model.rolloutgroup;
+
+import org.eclipse.hawkbit.mgmt.json.model.rollout.AbstractMgmtRolloutConditionsEntity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * Model for defining the Attributes of a Rollout Group
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtRolloutGroup extends AbstractMgmtRolloutConditionsEntity {
+
+    private String targetFilterQuery;
+    private Float targetPercentage;
+
+    public String getTargetFilterQuery() {
+        return targetFilterQuery;
+    }
+
+    public void setTargetFilterQuery(final String targetFilterQuery) {
+        this.targetFilterQuery = targetFilterQuery;
+    }
+
+    public Float getTargetPercentage() {
+        return targetPercentage;
+    }
+
+    public void setTargetPercentage(Float targetPercentage) {
+        this.targetPercentage = targetPercentage;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroupResponseBody.java

@@ -0,0 +1,73 @@
+/**
+ * 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.mgmt.json.model.rolloutgroup;
+
+import java.util.HashMap;
+import java.util.Map;
+
+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;
+
+/**
+ * Model for the rollout group annotated with json-annotations for easier
+ * serialization and de-serialization.
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtRolloutGroupResponseBody extends MgmtRolloutGroup {
+
+    @JsonProperty(value = "id", required = true)
+    private Long rolloutGroupId;
+
+    @JsonProperty(required = true)
+    private String status;
+
+    private int totalTargets;
+
+    private Map<String, Long> totalTargetsPerStatus;
+
+    public Long getRolloutGroupId() {
+        return rolloutGroupId;
+    }
+
+    public void setRolloutGroupId(final Long rolloutGroupId) {
+        this.rolloutGroupId = rolloutGroupId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(final String status) {
+        this.status = status;
+    }
+
+    public int getTotalTargets() {
+        return totalTargets;
+    }
+
+    public void setTotalTargets(final int totalTargets) {
+        this.totalTargets = totalTargets;
+    }
+
+    public Map<String, Long> getTotalTargetsPerStatus() {
+        return totalTargetsPerStatus;
+    }
+
+    public void addTotalTargetsPerStatus(final String status, final Long totalTargetCountByStatus) {
+        if (totalTargetsPerStatus == null) {
+            totalTargetsPerStatus = new HashMap<>();
+        }
+
+        totalTargetsPerStatus.put(status, totalTargetCountByStatus);
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModule.java

@@ -0,0 +1,82 @@
+/**
+ * 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.mgmt.json.model.softwaremodule;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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;
+
+/**
+ * A json annotated rest model for SoftwareModule to RESTful API representation.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSoftwareModule extends MgmtNamedEntity {
+    @JsonProperty(value = "id", required = true)
+    private Long moduleId;
+
+    @JsonProperty(required = true)
+    private String version;
+
+    @JsonProperty(required = true)
+    private String type;
+
+    @JsonProperty
+    private String vendor;
+
+    @JsonProperty
+    private boolean deleted;
+
+    public void setDeleted(final boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public Long getModuleId() {
+        return moduleId;
+    }
+
+    @JsonIgnore
+    public void setModuleId(final Long moduleId) {
+        this.moduleId = moduleId;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(final String version) {
+        this.version = version;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(final String type) {
+        this.type = type;
+    }
+
+    public String getVendor() {
+        return vendor;
+    }
+
+    public void setVendor(final String vendor) {
+        this.vendor = vendor;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleAssigment.java

@@ -0,0 +1,22 @@
+/**
+ * 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.mgmt.json.model.softwaremodule;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtId;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Request Body of SoftwareModule for assignment operations (ID only).
+ *
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSoftwareModuleAssigment extends MgmtId {
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadata.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.mgmt.json.model.softwaremodule;
+
+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;
+
+/**
+ * The representation of SoftwareModuleMetadata in the REST API for POST/Create.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSoftwareModuleMetadata {
+
+    @JsonProperty(required = true)
+    private String key;
+    @JsonProperty
+    private String value;
+    @JsonProperty
+    private boolean targetVisible;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(final String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    public boolean isTargetVisible() {
+        return targetVisible;
+    }
+
+    public void setTargetVisible(final boolean targetVisible) {
+        this.targetVisible = targetVisible;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadataBodyPut.java

@@ -0,0 +1,44 @@
+/**
+ * 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.mgmt.json.model.softwaremodule;
+
+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;
+
+/**
+ * The representation of an meta data in the REST API for PUT/Update.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSoftwareModuleMetadataBodyPut {
+
+    @JsonProperty
+    private String value;
+    @JsonProperty
+    private Boolean targetVisible;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    public Boolean isTargetVisible() {
+        return targetVisible;
+    }
+
+    public void setTargetVisible(final Boolean targetVisible) {
+        this.targetVisible = targetVisible;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPost.java

@@ -0,0 +1,124 @@
+/**
+ * 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.mgmt.json.model.softwaremodule;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request Body for SoftwareModule POST.
+ *
+ */
+public class MgmtSoftwareModuleRequestBodyPost {
+
+    @JsonProperty(required = true)
+    private String name;
+
+    @JsonProperty(required = true)
+    private String version;
+
+    @JsonProperty(required = true)
+    private String type;
+
+    @JsonProperty
+    private String description;
+
+    @JsonProperty
+    private String vendor;
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     *            the name to set
+     *
+     * @return updated body
+     */
+    public MgmtSoftwareModuleRequestBodyPost setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @return the version
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * @param version
+     *            the version to set
+     *
+     * @return updated body
+     */
+    public MgmtSoftwareModuleRequestBodyPost setVersion(final String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @param type
+     *            the type to set
+     *
+     * @return updated body
+     */
+    public MgmtSoftwareModuleRequestBodyPost setType(final String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * @return the description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @param description
+     *            the description to set
+     *
+     * @return updated body
+     */
+    public MgmtSoftwareModuleRequestBodyPost setDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * @return the vendor
+     */
+    public String getVendor() {
+        return vendor;
+    }
+
+    /**
+     * @param vendor
+     *            the vendor to set
+     *
+     * @return updated body
+     */
+    public MgmtSoftwareModuleRequestBodyPost setVendor(final String vendor) {
+        this.vendor = vendor;
+        return this;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPut.java

@@ -0,0 +1,61 @@
+/**
+ * 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.mgmt.json.model.softwaremodule;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request Body for SoftwareModule PUT.
+ *
+ */
+public class MgmtSoftwareModuleRequestBodyPut {
+
+    @JsonProperty
+    private String description;
+
+    @JsonProperty
+    private String vendor;
+
+    /**
+     * @return the description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @param description
+     *            the description to set
+     *
+     * @return updated body
+     */
+    public MgmtSoftwareModuleRequestBodyPut setDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * @return the vendor
+     */
+    public String getVendor() {
+        return vendor;
+    }
+
+    /**
+     * @param vendor
+     *            the vendor to set
+     *
+     * @return updated body
+     */
+    public MgmtSoftwareModuleRequestBodyPut setVendor(final String vendor) {
+        this.vendor = vendor;
+        return this;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleType.java

@@ -0,0 +1,71 @@
+/**
+ * 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.mgmt.json.model.softwaremoduletype;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
+
+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;
+
+/**
+ * A json annotated rest model for SoftwareModuleType to RESTful API
+ * representation.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSoftwareModuleType extends MgmtNamedEntity {
+
+    @JsonProperty(value = "id", required = true)
+    private Long moduleId;
+
+    @JsonProperty
+    private String key;
+
+    @JsonProperty
+    private int maxAssignments;
+
+    @JsonProperty
+    private boolean deleted;
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(final boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public Long getModuleId() {
+        return moduleId;
+    }
+
+    public void setModuleId(final Long moduleId) {
+        this.moduleId = moduleId;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(final String key) {
+        this.key = key;
+    }
+
+    public int getMaxAssignments() {
+        return maxAssignments;
+    }
+
+    public void setMaxAssignments(final int maxAssignments) {
+        this.maxAssignments = maxAssignments;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeAssigment.java

@@ -0,0 +1,22 @@
+/**
+ * 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.mgmt.json.model.softwaremoduletype;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtId;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Request Body of SoftwareModuleType for assignment operations (ID only).
+ *
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSoftwareModuleTypeAssigment extends MgmtId {
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPost.java

@@ -0,0 +1,93 @@
+/**
+ * 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.mgmt.json.model.softwaremoduletype;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request Body for SoftwareModuleType POST.
+ *
+ */
+public class MgmtSoftwareModuleTypeRequestBodyPost extends MgmtSoftwareModuleTypeRequestBodyPut {
+
+    @JsonProperty(required = true)
+    private String name;
+
+    @JsonProperty
+    private String key;
+
+    @JsonProperty
+    private int maxAssignments;
+
+    @Override
+    public MgmtSoftwareModuleTypeRequestBodyPost setDescription(final String description) {
+        super.setDescription(description);
+        return this;
+    }
+
+    @Override
+    public MgmtSoftwareModuleTypeRequestBodyPost setColour(final String colour) {
+        super.setColour(colour);
+        return this;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     *            the name to set
+     *
+     * @return updated body
+     */
+    public MgmtSoftwareModuleTypeRequestBodyPost setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @return the key
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * @param key
+     *            the key to set
+     * @return updated body
+     */
+    public MgmtSoftwareModuleTypeRequestBodyPost setKey(final String key) {
+        this.key = key;
+        return this;
+    }
+
+    /**
+     * @return the maxAssignments
+     */
+    public int getMaxAssignments() {
+        return maxAssignments;
+    }
+
+    /**
+     * @param maxAssignments
+     *            the maxAssignments to set
+     *
+     * @return updated body
+     */
+    public MgmtSoftwareModuleTypeRequestBodyPost setMaxAssignments(final int maxAssignments) {
+        this.maxAssignments = maxAssignments;
+        return this;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPut.java

@@ -0,0 +1,43 @@
+/**
+ * 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.mgmt.json.model.softwaremoduletype;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request Body for SoftwareModuleType PUT.
+ *
+ */
+public class MgmtSoftwareModuleTypeRequestBodyPut {
+
+    @JsonProperty
+    private String description;
+
+    @JsonProperty
+    private String colour;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public MgmtSoftwareModuleTypeRequestBodyPut setDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    public String getColour() {
+        return colour;
+    }
+
+    public MgmtSoftwareModuleTypeRequestBodyPut setColour(final String colour) {
+        this.colour = colour;
+        return this;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValue.java

@@ -0,0 +1,86 @@
+/**
+ * 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.mgmt.json.model.system;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+/**
+ * A json annotated rest model for a tenant configuration value to RESTful API
+ * representation.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSystemTenantConfigurationValue extends ResourceSupport {
+
+    @JsonInclude(Include.ALWAYS)
+    private Object value;
+
+    @JsonInclude(Include.ALWAYS)
+    private boolean isGlobal = true;
+
+    private Long lastModifiedAt;
+    private String lastModifiedBy;
+    private Long createdAt;
+    private String createdBy;
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(final Object value) {
+        this.value = value;
+    }
+
+    public boolean isGlobal() {
+        return isGlobal;
+    }
+
+    public void setGlobal(final boolean isGlobal) {
+        this.isGlobal = isGlobal;
+    }
+
+    public Long getLastModifiedAt() {
+        return lastModifiedAt;
+    }
+
+    public void setLastModifiedAt(final Long lastModifiedAt) {
+        this.lastModifiedAt = lastModifiedAt;
+    }
+
+    public String getLastModifiedBy() {
+        return lastModifiedBy;
+    }
+
+    public void setLastModifiedBy(final String lastModifiedBy) {
+        this.lastModifiedBy = lastModifiedBy;
+    }
+
+    public Long getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(final Long createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(final String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValueRequest.java

@@ -0,0 +1,48 @@
+/**
+ * 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.mgmt.json.model.system;
+
+import java.io.Serializable;
+
+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;
+
+/**
+ * A json annotated rest model for System Configuration for PUT.
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSystemTenantConfigurationValueRequest {
+
+    @JsonProperty(required = true)
+    private Serializable value;
+
+    /**
+     * 
+     * @return the value of the MgmtSystemTenantConfigurationValueRequest
+     */
+    public Serializable getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the MgmtSystemTenantConfigurationValueRequest
+     * 
+     * @param value
+     */
+    public void setValue(final Object value) {
+        if (!(value instanceof Serializable)) {
+            throw new IllegalArgumentException("The value muste be a instance of " + Serializable.class.getName());
+        }
+        this.value = (Serializable) value;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemCache.java

@@ -0,0 +1,62 @@
+/**
+ * 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.mgmt.json.model.systemmanagement;
+
+import java.util.Collection;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+/**
+ * Model representation of an Cache entry as json.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSystemCache {
+
+    private final String name;
+    private final Collection<String> keys;
+
+    /**
+     * @param name
+     *            the name of the cache
+     * @param cacheKeys
+     *            the keys which contains in the cache
+     */
+    public MgmtSystemCache(final String name, final Collection<String> cacheKeys) {
+        this.name = name;
+        this.keys = cacheKeys;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return the keys
+     */
+    public Collection<String> getKeys() {
+        return keys;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "MgmtSystemCache [name=" + name + ", keys=" + keys + "]";
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemStatisticsRest.java

@@ -0,0 +1,97 @@
+/**
+ * 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.mgmt.json.model.systemmanagement;
+
+import java.util.List;
+
+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;
+
+/**
+ * Body for system statistics.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSystemStatisticsRest {
+
+    @JsonProperty
+    private long overallTargets;
+
+    @JsonProperty
+    private long overallArtifacts;
+
+    @JsonProperty
+    private long overallArtifactVolumeInBytes;
+
+    @JsonProperty
+    private long overallActions;
+
+    @JsonProperty
+    private long overallTenants;
+
+    @JsonProperty
+    private List<MgmtSystemTenantServiceUsage> tenantStats;
+
+    public long getOverallTargets() {
+        return overallTargets;
+    }
+
+    public MgmtSystemStatisticsRest setOverallTargets(final long overallTargets) {
+        this.overallTargets = overallTargets;
+        return this;
+    }
+
+    public long getOverallArtifacts() {
+        return overallArtifacts;
+    }
+
+    public MgmtSystemStatisticsRest setOverallArtifacts(final long overallArtifacts) {
+        this.overallArtifacts = overallArtifacts;
+        return this;
+    }
+
+    public long getOverallArtifactVolumeInBytes() {
+        return overallArtifactVolumeInBytes;
+    }
+
+    public MgmtSystemStatisticsRest setOverallArtifactVolumeInBytes(final long overallArtifactVolumeInBytes) {
+        this.overallArtifactVolumeInBytes = overallArtifactVolumeInBytes;
+        return this;
+    }
+
+    public long getOverallActions() {
+        return overallActions;
+    }
+
+    public MgmtSystemStatisticsRest setOverallActions(final long overallActions) {
+        this.overallActions = overallActions;
+        return this;
+    }
+
+    public long getOverallTenants() {
+        return overallTenants;
+    }
+
+    public MgmtSystemStatisticsRest setOverallTenants(final long overallTenants) {
+        this.overallTenants = overallTenants;
+        return this;
+    }
+
+    public void setTenantStats(final List<MgmtSystemTenantServiceUsage> tenantStats) {
+        this.tenantStats = tenantStats;
+    }
+
+    public List<MgmtSystemTenantServiceUsage> getTenantStats() {
+        return tenantStats;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemTenantServiceUsage.java

@@ -0,0 +1,92 @@
+/**
+ * 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.mgmt.json.model.systemmanagement;
+
+import java.util.Map;
+
+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;
+
+/**
+ * Response body for system usage report.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtSystemTenantServiceUsage {
+
+    @JsonProperty
+    private String tenantName;
+
+    @JsonProperty
+    private long targets;
+
+    @JsonProperty
+    private long artifacts;
+
+    @JsonProperty
+    private long actions;
+
+    @JsonProperty
+    private long overallArtifactVolumeInBytes;
+
+    @JsonProperty
+    private Map<String, String> usageData;
+
+    public void setTenantName(final String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public long getTargets() {
+        return targets;
+    }
+
+    public void setTargets(final long targets) {
+        this.targets = targets;
+    }
+
+    public long getArtifacts() {
+        return artifacts;
+    }
+
+    public void setArtifacts(final long artifacts) {
+        this.artifacts = artifacts;
+    }
+
+    public long getActions() {
+        return actions;
+    }
+
+    public void setActions(final long actions) {
+        this.actions = actions;
+    }
+
+    public long getOverallArtifactVolumeInBytes() {
+        return overallArtifactVolumeInBytes;
+    }
+
+    public void setOverallArtifactVolumeInBytes(final long overallArtifactVolumeInBytes) {
+        this.overallArtifactVolumeInBytes = overallArtifactVolumeInBytes;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public Map<String, String> getUsageData() {
+        return usageData;
+    }
+
+    public void setUsageData(final Map<String, String> usageData) {
+        this.usageData = usageData;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedDistributionSetRequestBody.java

@@ -0,0 +1,36 @@
+/**
+ * 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.mgmt.json.model.tag;
+
+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;
+
+/**
+ * Request Body for PUT.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtAssignedDistributionSetRequestBody {
+
+    @JsonProperty(value = "id", required = true)
+    private Long distributionSetId;
+
+    public Long getDistributionSetId() {
+        return distributionSetId;
+    }
+
+    public MgmtAssignedDistributionSetRequestBody setDistributionSetId(final Long distributionSetId) {
+        this.distributionSetId = distributionSetId;
+        return this;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java

@@ -0,0 +1,36 @@
+/**
+ * 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.mgmt.json.model.tag;
+
+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;
+
+/**
+ * Request Body for PUT.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtAssignedTargetRequestBody {
+
+    @JsonProperty(required = true)
+    private String controllerId;
+
+    public String getControllerId() {
+        return controllerId;
+    }
+
+    public MgmtAssignedTargetRequestBody setControllerId(final String controllerId) {
+        this.controllerId = controllerId;
+        return this;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtDistributionSetTagAssigmentResult.java

@@ -0,0 +1,51 @@
+/**
+ * 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.mgmt.json.model.tag;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet;
+
+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;
+
+/**
+ * * A json annotated rest model for DSAssigmentResult to RESTful API
+ * representation.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtDistributionSetTagAssigmentResult {
+
+    @JsonProperty
+    private List<MgmtDistributionSet> assignedDistributionSets;
+
+    @JsonProperty
+    private List<MgmtDistributionSet> unassignedDistributionSets;
+
+    public List<MgmtDistributionSet> getAssignedDistributionSets() {
+        return assignedDistributionSets;
+    }
+
+    public List<MgmtDistributionSet> getUnassignedDistributionSets() {
+        return unassignedDistributionSets;
+    }
+
+    public void setAssignedDistributionSets(final List<MgmtDistributionSet> assignedDistributionSets) {
+        this.assignedDistributionSets = assignedDistributionSets;
+    }
+
+    public void setUnassignedDistributionSets(final List<MgmtDistributionSet> unassignedDistributionSets) {
+        this.unassignedDistributionSets = unassignedDistributionSets;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTag.java

@@ -0,0 +1,49 @@
+/**
+ * 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.mgmt.json.model.tag;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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;
+
+/**
+ * A json annotated rest model for Tag to RESTful API representation.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtTag extends MgmtNamedEntity {
+
+    @JsonProperty(value = "id", required = true)
+    private Long tagId;
+
+    @JsonProperty
+    private String colour;
+
+    @JsonIgnore
+    public void setTagId(final Long tagId) {
+        this.tagId = tagId;
+    }
+
+    public Long getTagId() {
+        return tagId;
+    }
+
+    public void setColour(final String colour) {
+        this.colour = colour;
+    }
+
+    public String getColour() {
+        return colour;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTagRequestBodyPut.java

@@ -0,0 +1,59 @@
+/**
+ * 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.mgmt.json.model.tag;
+
+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;
+
+/**
+ * Request Body for PUT/POST.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtTagRequestBodyPut {
+
+    @JsonProperty
+    private String colour;
+
+    @JsonProperty
+    private String name;
+
+    @JsonProperty
+    private String description;
+
+    public String getName() {
+        return name;
+    }
+
+    public MgmtTagRequestBodyPut setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public MgmtTagRequestBodyPut setDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    public MgmtTagRequestBodyPut setColour(final String colour) {
+        this.colour = colour;
+        return this;
+    }
+
+    public String getColour() {
+        return colour;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java

@@ -0,0 +1,51 @@
+/**
+ * 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.mgmt.json.model.tag;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget;
+
+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;
+
+/**
+ * * A json annotated rest model for TargetTagAssigmentResult to RESTful API
+ * representation.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtTargetTagAssigmentResult {
+
+    @JsonProperty
+    private List<MgmtTarget> assignedTargets;
+
+    @JsonProperty
+    private List<MgmtTarget> unassignedTargets;
+
+    public void setAssignedTargets(final List<MgmtTarget> assignedTargets) {
+        this.assignedTargets = assignedTargets;
+    }
+
+    public List<MgmtTarget> getAssignedTargets() {
+        return assignedTargets;
+    }
+
+    public void setUnassignedTargets(final List<MgmtTarget> unassignedTargets) {
+        this.unassignedTargets = unassignedTargets;
+    }
+
+    public List<MgmtTarget> getUnassignedTargets() {
+        return unassignedTargets;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignment.java

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2011-2015 Bosch Software Innovations GmbH, Germany. All rights reserved.
+ */
+package org.eclipse.hawkbit.mgmt.json.model.target;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtId;
+import org.eclipse.hawkbit.mgmt.json.model.MgmtMaintenanceWindowRequestBody;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType;
+
+/**
+ * Request Body of DistributionSet for assignment operations (ID only).
+ *
+ */
+public class MgmtDistributionSetAssignment extends MgmtId {
+    private long forcetime;
+    private MgmtActionType type;
+
+    /**
+     * {@link MgmtMaintenanceWindowRequestBody} object defining a schedule,
+     * duration and timezone.
+     */
+    private MgmtMaintenanceWindowRequestBody maintenanceWindow;
+
+    public MgmtActionType getType() {
+        return type;
+    }
+
+    public void setType(final MgmtActionType type) {
+        this.type = type;
+    }
+
+    public long getForcetime() {
+        return forcetime;
+    }
+
+    public void setForcetime(final long forcetime) {
+        this.forcetime = forcetime;
+    }
+
+    /**
+     * Returns {@link MgmtMaintenanceWindowRequestBody} for distribution set
+     * assignment.
+     *
+     * @return {@link MgmtMaintenanceWindowRequestBody}.
+     */
+    public MgmtMaintenanceWindowRequestBody getMaintenanceWindow() {
+        return maintenanceWindow;
+    }
+
+    /**
+     * Sets {@link MgmtMaintenanceWindowRequestBody} for distribution set
+     * assignment.
+     *
+     * @param maintenanceWindow
+     *            as {@link MgmtMaintenanceWindowRequestBody}.
+     */
+    public void setMaintenanceWindow(final MgmtMaintenanceWindowRequestBody maintenanceWindow) {
+        this.maintenanceWindow = maintenanceWindow;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTarget.java

@@ -0,0 +1,170 @@
+/**
+ * Copyright (c) 2011-2015 Bosch Software Innovations GmbH, Germany. All rights reserved.
+ */
+package org.eclipse.hawkbit.mgmt.json.model.target;
+
+import java.net.URI;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
+import org.eclipse.hawkbit.mgmt.json.model.MgmtPollStatus;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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;
+
+/**
+ * A json annotated rest model for Target to RESTful API representation.
+ *
+ */
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtTarget extends MgmtNamedEntity {
+
+    @JsonProperty(required = true)
+    private String controllerId;
+
+    @JsonProperty
+    private String updateStatus;
+
+    @JsonProperty
+    private Long lastControllerRequestAt;
+
+    @JsonProperty
+    private Long installedAt;
+
+    @JsonProperty
+    private String ipAddress;
+
+    @JsonProperty
+    private String address;
+
+    @JsonProperty
+    private MgmtPollStatus pollStatus;
+
+    @JsonProperty
+    private String securityToken;
+
+    /**
+     * @return the controllerId
+     */
+    public String getControllerId() {
+        return controllerId;
+    }
+
+    /**
+     * @param controllerId
+     *            the controllerId to set
+     */
+    public void setControllerId(final String controllerId) {
+        this.controllerId = controllerId;
+    }
+
+    /**
+     * @return the updateStatus
+     */
+    public String getUpdateStatus() {
+        return updateStatus;
+    }
+
+    /**
+     * @param updateStatus
+     *            the updateStatus to set
+     */
+    public void setUpdateStatus(final String updateStatus) {
+        this.updateStatus = updateStatus;
+    }
+
+    /**
+     * @return the lastControllerRequestAt
+     */
+    public Long getLastControllerRequestAt() {
+        return lastControllerRequestAt;
+    }
+
+    /**
+     * @param lastControllerRequestAt
+     *            the lastControllerRequestAt to set
+     */
+    @JsonIgnore
+    public void setLastControllerRequestAt(final Long lastControllerRequestAt) {
+        this.lastControllerRequestAt = lastControllerRequestAt;
+    }
+
+    /**
+     * @return the installedAt
+     */
+    public Long getInstalledAt() {
+        return installedAt;
+    }
+
+    /**
+     * @param installedAt
+     *            the installedAt to set
+     */
+    @JsonIgnore
+    public void setInstalledAt(final Long installedAt) {
+        this.installedAt = installedAt;
+    }
+
+    /**
+     * @return the pollStatus
+     */
+    public MgmtPollStatus getPollStatus() {
+        return pollStatus;
+    }
+
+    /**
+     * @param pollStatus
+     *            the pollStatus to set
+     */
+    @JsonIgnore
+    public void setPollStatus(final MgmtPollStatus pollStatus) {
+        this.pollStatus = pollStatus;
+    }
+
+    /**
+     * @return the ipAddress
+     */
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    /**
+     * @param ipAddress
+     *            the ipAddress to set
+     */
+    @JsonIgnore
+    public void setIpAddress(final String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    /**
+     * @return the securityToken
+     */
+    public String getSecurityToken() {
+        return securityToken;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    @JsonIgnore
+    public void setAddress(final String address) {
+        if (address != null) {
+            URI.create(address);
+        }
+        this.address = address;
+    }
+
+    /**
+     * @param securityToken
+     *            the securityToken to set
+     */
+    @JsonIgnore
+    public void setSecurityToken(final String securityToken) {
+        this.securityToken = securityToken;
+    }
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetAttributes.java

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2011-2015 Bosch Software Innovations GmbH, Germany. All rights reserved.
+ */
+package org.eclipse.hawkbit.mgmt.json.model.target;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * {@link Map} with attributes of SP Target.
+ */
+public class MgmtTargetAttributes extends HashMap<String, String> {
+
+    private static final long serialVersionUID = 1L;
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetRequestBody.java

@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) 2011-2015 Bosch Software Innovations GmbH, Germany. All rights reserved.
+ */
+package org.eclipse.hawkbit.mgmt.json.model.target;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request body for target PUT/POST commands.
+ *
+ */
+public class MgmtTargetRequestBody {
+    @JsonProperty(required = true)
+    private String name;
+
+    private String description;
+
+    @JsonProperty(required = true)
+    private String controllerId;
+
+    @JsonProperty
+    private String address;
+
+    @JsonProperty
+    private String securityToken;
+
+    public String getSecurityToken() {
+        return securityToken;
+    }
+
+    public void setSecurityToken(final String securityToken) {
+        this.securityToken = securityToken;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return the description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @return the controllerId
+     */
+    public String getControllerId() {
+        return controllerId;
+    }
+
+    /**
+     * @param name
+     *            the name to set
+     */
+    public MgmtTargetRequestBody setName(final String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @param description
+     *            the description to set
+     */
+    public MgmtTargetRequestBody setDescription(final String description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * @param controllerId
+     *            the controllerId to set
+     */
+    public MgmtTargetRequestBody setControllerId(final String controllerId) {
+        this.controllerId = controllerId;
+        return this;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(final String address) {
+        this.address = address;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQuery.java

@@ -0,0 +1,71 @@
+/**
+ * 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.mgmt.json.model.targetfilter;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtBaseEntity;
+
+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;
+
+/**
+ * A json annotated rest model for Target Filter Queries to RESTful API
+ * representation.
+ *
+ */
+@JsonInclude(Include.ALWAYS)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MgmtTargetFilterQuery extends MgmtBaseEntity {
+
+    @JsonProperty(value = "id", required = true)
+    private Long filterId;
+
+    @JsonProperty
+    private String name;
+
+    @JsonProperty
+    private String query;
+
+    @JsonProperty
+    private Long autoAssignDistributionSet;
+
+    public Long getFilterId() {
+        return filterId;
+    }
+
+    public void setFilterId(final Long filterId) {
+        this.filterId = filterId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(final String query) {
+        this.query = query;
+    }
+
+    public Long getAutoAssignDistributionSet() {
+        return autoAssignDistributionSet;
+    }
+
+    public void setAutoAssignDistributionSet(final Long autoAssignDistributionSet) {
+        this.autoAssignDistributionSet = autoAssignDistributionSet;
+    }
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQueryRequestBody.java

@@ -0,0 +1,40 @@
+/**
+ * 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.mgmt.json.model.targetfilter;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request body for target PUT/POST commands.
+ *
+ */
+public class MgmtTargetFilterQueryRequestBody {
+    @JsonProperty(required = true)
+    private String name;
+
+    @JsonProperty(required = true)
+    private String query;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(String query) {
+        this.query = query;
+    }
+
+}

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

@@ -0,0 +1,384 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtMetadata;
+import org.eclipse.hawkbit.mgmt.json.model.MgmtMetadataBodyPut;
+import org.eclipse.hawkbit.mgmt.json.model.PagedList;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSetRequestBodyPost;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSetRequestBodyPut;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtTargetAssignmentRequestBody;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtTargetAssignmentResponseBody;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleAssigment;
+import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget;
+import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * REST Resource handling for DistributionSet CRUD operations.
+ */
+@RequestMapping(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING)
+public interface MgmtDistributionSetRestApi {
+
+    /**
+     * Handles the GET request of retrieving all DistributionSets .
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of sets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return a list of all set for a defined or default page request with
+     *         status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtDistributionSet>> getDistributionSets(
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving a single DistributionSet .
+     *
+     * @param distributionSetId
+     *            the ID of the set to retrieve
+     *
+     * @return a single DistributionSet with status OK.
+     *
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetId}", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtDistributionSet> getDistributionSet(@PathVariable("distributionSetId") Long distributionSetId);
+
+    /**
+     * Handles the POST request of creating new distribution sets . The request
+     * body must always be a list of sets.
+     *
+     * @param sets
+     *            the DistributionSets to be created.
+     * @return In case all sets could successful created the ResponseEntity with
+     *         status code 201 - Created but without ResponseBody. In any
+     *         failure the JsonResponseExceptionHandler is handling the
+     *         response.
+     */
+    @RequestMapping(method = RequestMethod.POST, consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtDistributionSet>> createDistributionSets(List<MgmtDistributionSetRequestBodyPost> sets);
+
+    /**
+     * Handles the DELETE request for a single DistributionSet .
+     *
+     * @param distributionSetId
+     *            the ID of the DistributionSet to delete
+     * @return status OK if delete as successful.
+     *
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{distributionSetId}")
+    ResponseEntity<Void> deleteDistributionSet(@PathVariable("distributionSetId") Long distributionSetId);
+
+    /**
+     * Handles the UPDATE request for a single DistributionSet .
+     *
+     * @param distributionSetId
+     *            the ID of the DistributionSet to delete
+     * @param toUpdate
+     *            with the data that needs updating
+     *
+     * @return status OK if update as successful with updated content.
+     *
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{distributionSetId}", consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaType.APPLICATION_JSON_VALUE,
+                    MediaTypes.HAL_JSON_VALUE })
+    ResponseEntity<MgmtDistributionSet> updateDistributionSet(@PathVariable("distributionSetId") Long distributionSetId,
+            MgmtDistributionSetRequestBodyPut toUpdate);
+
+    /**
+     * Handles the GET request of retrieving assigned targets to a specific
+     * distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set to retrieve the assigned
+     *            targets
+     * @param pagingOffsetParam
+     *            the offset of list of targets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return status OK if get request is successful with the paged list of
+     *         targets
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetId}/assignedTargets", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtTarget>> getAssignedTargets(@PathVariable("distributionSetId") Long distributionSetId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving installed targets to a specific
+     * distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set to retrieve the assigned
+     *            targets
+     * @param pagingOffsetParam
+     *            the offset of list of targets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return status OK if get request is successful with the paged list of
+     *         targets
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetId}/installedTargets", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtTarget>> getInstalledTargets(@PathVariable("distributionSetId") Long distributionSetId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request to retrieve target filter queries that have the
+     * given distribution set as auto assign DS.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set to retrieve the assigned
+     *            targets
+     * @param pagingOffsetParam
+     *            the offset of list of targets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search name parameter in the request URL, syntax
+     *            {@code q=myFilter}
+     * @return status OK if get request is successful with the paged list of
+     *         targets
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetId}/autoAssignTargetFilters", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtTargetFilterQuery>> getAutoAssignTargetFilterQueries(
+            @PathVariable("distributionSetId") Long distributionSetId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the POST request of assigning multiple targets to a single
+     * distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set within the URL path parameter
+     * @param targetIds
+     *            the IDs of the target which should get assigned to the
+     *            distribution set given in the response body
+     * @param offline
+     *            to <code>true</code> if update was executed offline, i.e. not
+     *            managed by hawkBit.
+     * @return status OK if the assignment of the targets was successful and a
+     *         complex return body which contains information about the assigned
+     *         targets and the already assigned targets counters
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{distributionSetId}/assignedTargets", consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTargetAssignmentResponseBody> createAssignedTarget(
+            @PathVariable("distributionSetId") Long distributionSetId,
+            final List<MgmtTargetAssignmentRequestBody> targetIds,
+            @RequestParam(value = "offline", required = false) boolean offline);
+
+    /**
+     * Gets a paged list of meta data for a distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set for the meta data
+     * @param pagingOffsetParam
+     *            the offset of list of targets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=key==abc}
+     * @return status OK if get request is successful with the paged list of
+     *         meta data
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetId}/metadata", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtMetadata>> getMetadata(
+            @PathVariable("distributionSetId") Long distributionSetId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Gets a single meta data value for a specific key of a distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set to get the meta data from
+     * @param metadataKey
+     *            the key of the meta data entry to retrieve the value from
+     * @return status OK if get request is successful with the value of the meta
+     *         data
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetId}/metadata/{metadataKey}", produces = {
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtMetadata> getMetadataValue(@PathVariable("distributionSetId") Long distributionSetId,
+            @PathVariable("metadataKey") String metadataKey);
+
+    /**
+     * Updates a single meta data value of a distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set to update the meta data entry
+     * @param metadataKey
+     *            the key of the meta data to update the value
+     * @param metadata
+     *            update body
+     * @return status OK if the update request is successful and the updated
+     *         meta data result
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{distributionSetId}/metadata/{metadataKey}", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtMetadata> updateMetadata(@PathVariable("distributionSetId") Long distributionSetId,
+            @PathVariable("metadataKey") String metadataKey, MgmtMetadataBodyPut metadata);
+
+    /**
+     * Deletes a single meta data entry from the distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set to delete the meta data entry
+     * @param metadataKey
+     *            the key of the meta data to delete
+     * @return status OK if the delete request is successful
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{distributionSetId}/metadata/{metadataKey}")
+    ResponseEntity<Void> deleteMetadata(@PathVariable("distributionSetId") Long distributionSetId,
+            @PathVariable("metadataKey") String metadataKey);
+
+    /**
+     * Creates a list of meta data for a specific distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set to create meta data for
+     * @param metadataRest
+     *            the list of meta data entries to create
+     * @return status created if post request is successful with the value of
+     *         the created meta data
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{distributionSetId}/metadata", consumes = {
+            MediaType.APPLICATION_JSON_VALUE,
+            MediaTypes.HAL_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtMetadata>> createMetadata(@PathVariable("distributionSetId") Long distributionSetId,
+            List<MgmtMetadata> metadataRest);
+
+    /**
+     * Assigns a list of software modules to a distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set to assign software modules for
+     * @param softwareModuleIDs
+     *            the list of software modules ids to assign
+     * @return http status
+     *
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{distributionSetId}/assignedSM", consumes = {
+            MediaType.APPLICATION_JSON_VALUE,
+            MediaTypes.HAL_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Void> assignSoftwareModules(@PathVariable("distributionSetId") Long distributionSetId,
+            List<MgmtSoftwareModuleAssigment> softwareModuleIDs);
+
+    /**
+     * Deletes the assignment of the software module form the distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution set to reject the software module
+     *            for
+     * @param softwareModuleId
+     *            the software module id to get rejected form the distribution
+     *            set
+     * @return status OK if rejection was successful.
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{distributionSetId}/assignedSM/{softwareModuleId}")
+    ResponseEntity<Void> deleteAssignSoftwareModules(@PathVariable("distributionSetId") Long distributionSetId,
+            @PathVariable("softwareModuleId") Long softwareModuleId);
+
+    /**
+     * Handles the GET request for retrieving the assigned software modules of a
+     * specific distribution set.
+     *
+     * @param distributionSetId
+     *            the ID of the distribution to retrieve
+     * @param pagingOffsetParam
+     *            the offset of list of sets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @return a list of the assigned software modules of a distribution set
+     *         with status OK, if none is assigned than {@code null}
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetId}/assignedSM", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtSoftwareModule>> getAssignedSoftwareModules(
+            @PathVariable("distributionSetId") Long distributionSetId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam);
+}

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

@@ -0,0 +1,277 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.PagedList;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet;
+import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtAssignedDistributionSetRequestBody;
+import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtDistributionSetTagAssigmentResult;
+import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTag;
+import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTagRequestBodyPut;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * REST Resource handling for DistributionSetTag CRUD operations.
+ *
+ */
+@RequestMapping(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING)
+public interface MgmtDistributionSetTagRestApi {
+    /**
+     * Handles the GET request of retrieving all DistributionSet tags.
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of DistributionSet tags for pagination,
+     *            might not be present in the rest request then default value
+     *            will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return a list of all target tags for a defined or default page request
+     *         with status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtTag>> getDistributionSetTags(
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving a single distribution set tag.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag to retrieve
+     *
+     * @return a single distribution set tag with status OK.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionsetTagId}", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTag> getDistributionSetTag(@PathVariable("distributionsetTagId") Long distributionsetTagId);
+
+    /**
+     * Handles the POST request of creating new distribution set tag. The
+     * request body must always be a list of tags.
+     *
+     * @param tags
+     *            the distribution set tags to be created.
+     * @return In case all modules could successful created the ResponseEntity
+     *         with status code 201 - Created. The Response Body are the created
+     *         distribution set tags but without ResponseBody.
+     */
+    @RequestMapping(method = RequestMethod.POST, consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtTag>> createDistributionSetTags(List<MgmtTagRequestBodyPut> tags);
+
+    /**
+     *
+     * Handles the PUT request of updating a single distribution set tag.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag
+     * @param restDSTagRest
+     *            the the request body to be updated
+     * @return status OK if update is successful and the updated distribution
+     *         set tag.
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{distributionsetTagId}", consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTag> updateDistributionSetTag(@PathVariable("distributionsetTagId") Long distributionsetTagId,
+            MgmtTagRequestBodyPut restDSTagRest);
+
+    /**
+     * Handles the DELETE request for a single distribution set tag.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag
+     * @return status OK if delete as successfully.
+     *
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{distributionsetTagId}")
+    ResponseEntity<Void> deleteDistributionSetTag(@PathVariable("distributionsetTagId") Long distributionsetTagId);
+
+    /**
+     * Handles the GET request of retrieving all assigned distribution sets by
+     * the given tag id.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag
+     * @param pagingOffsetParam
+     *            the offset of list of target tags for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     *
+     * @return the list of assigned distribution sets.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING, produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtDistributionSet>> getAssignedDistributionSets(
+            @PathVariable("distributionsetTagId") Long distributionsetTagId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving all assigned distribution sets by
+     * the given tag id.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag
+     *
+     * @return the list of assigned distribution sets.
+     * 
+     * @deprecated please use
+     *             {@link #getAssignedDistributionSets(Long, int, int, String, String)}
+     *             instead as this variant does not include paging and as result
+     *             returns only a limited list of distributionsets
+     */
+    @Deprecated
+    @RequestMapping(method = RequestMethod.GET, value = MgmtRestConstants.DEPRECATED_DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING, produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtDistributionSet>> getAssignedDistributionSets(
+            @PathVariable("distributionsetTagId") Long distributionsetTagId);
+
+    /**
+     * Handles the POST request to toggle the assignment of distribution sets by
+     * the given tag id.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag to retrieve
+     * @param assignedDSRequestBodies
+     *            list of distribution set ids to be toggled
+     *
+     * @return the list of assigned distribution sets and unassigned
+     *         distribution sets.
+     */
+    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING
+            + "/toggleTagAssignment")
+    ResponseEntity<MgmtDistributionSetTagAssigmentResult> toggleTagAssignment(
+            @PathVariable("distributionsetTagId") Long distributionsetTagId,
+            List<MgmtAssignedDistributionSetRequestBody> assignedDSRequestBodies);
+
+    /**
+     * Handles the POST request to toggle the assignment of distribution sets by
+     * the given tag id.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag to retrieve
+     * @param assignedDSRequestBodies
+     *            list of distribution set ids to be toggled
+     *
+     * @return the list of assigned distribution sets and unassigned
+     *         distribution sets.
+     * 
+     * @deprecated please use
+     *             {@link MgmtDistributionSetTagRestApi#toggleTagAssignment}
+     */
+    @Deprecated
+    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.DEPRECATED_DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING
+            + "/toggleTagAssignment")
+    ResponseEntity<MgmtDistributionSetTagAssigmentResult> toggleTagAssignmentUnpaged(
+            @PathVariable("distributionsetTagId") Long distributionsetTagId,
+            List<MgmtAssignedDistributionSetRequestBody> assignedDSRequestBodies);
+
+    /**
+     * Handles the POST request to assign distribution sets to the given tag id.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag to retrieve
+     * @param assignedDSRequestBodies
+     *            list of distribution sets ids to be assigned
+     *
+     * @return the list of assigned distribution set.
+     */
+    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING, consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtDistributionSet>> assignDistributionSets(
+            @PathVariable("distributionsetTagId") Long distributionsetTagId,
+            List<MgmtAssignedDistributionSetRequestBody> assignedDSRequestBodies);
+
+    /**
+     * Handles the POST request to assign distribution sets to the given tag id.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag to retrieve
+     * @param assignedDSRequestBodies
+     *            list of distribution sets ids to be assigned
+     *
+     * @return the list of assigned distribution set.
+     * 
+     * @deprecated please use
+     *             {@link MgmtDistributionSetTagRestApi#assignDistributionSets}
+     */
+    @Deprecated
+    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.DEPRECATED_DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING, consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtDistributionSet>> assignDistributionSetsUnpaged(
+            @PathVariable("distributionsetTagId") Long distributionsetTagId,
+            List<MgmtAssignedDistributionSetRequestBody> assignedDSRequestBodies);
+
+    /**
+     * Handles the DELETE request to unassign one distribution set from the
+     * given tag id.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag
+     * @param distributionsetId
+     *            the ID of the distribution set to unassign
+     * @return http status code
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING
+            + "/{distributionsetId}")
+    ResponseEntity<Void> unassignDistributionSet(@PathVariable("distributionsetTagId") Long distributionsetTagId,
+            @PathVariable("distributionsetId") Long distributionsetId);
+
+    /**
+     * Handles the DELETE request to unassign one distribution set from the
+     * given tag id.
+     *
+     * @param distributionsetTagId
+     *            the ID of the distribution set tag
+     * @param distributionsetId
+     *            the ID of the distribution set to unassign
+     * @return http status code
+     * 
+     * @deprecated please use
+     *             {@link MgmtDistributionSetTagRestApi#unassignDistributionSet}
+     */
+    @Deprecated
+    @RequestMapping(method = RequestMethod.DELETE, value = MgmtRestConstants.DEPRECATED_DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING
+            + "/{distributionsetId}")
+    ResponseEntity<Void> unassignDistributionSetUnpaged(@PathVariable("distributionsetTagId") Long distributionsetTagId,
+            @PathVariable("distributionsetId") Long distributionsetId);
+}

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

@@ -0,0 +1,250 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtId;
+import org.eclipse.hawkbit.mgmt.json.model.PagedList;
+import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionSetType;
+import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionSetTypeRequestBodyPost;
+import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionSetTypeRequestBodyPut;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleType;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * REST Resource handling for SoftwareModule and related Artifact CRUD
+ * operations.
+ *
+ */
+@RequestMapping(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING)
+public interface MgmtDistributionSetTypeRestApi {
+
+    /**
+     * Handles the GET request of retrieving all DistributionSetTypes.
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of modules for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     *
+     * @return a list of all DistributionSetType for a defined or default page
+     *         request with status OK. The response is always paged. In any
+     *         failure the JsonResponseExceptionHandler is handling the
+     *         response.
+     */
+    @RequestMapping(method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtDistributionSetType>> getDistributionSetTypes(
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving a single DistributionSetType
+     * within.
+     *
+     * @param distributionSetTypeId
+     *            the ID of the module type to retrieve
+     *
+     * @return a single softwareModule with status OK.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetTypeId}", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtDistributionSetType> getDistributionSetType(
+            @PathVariable("distributionSetTypeId") Long distributionSetTypeId);
+
+    /**
+     * Handles the DELETE request for a single Distribution Set Type.
+     *
+     * @param distributionSetTypeId
+     *            the ID of the module to retrieve
+     * @return status OK if delete as sucessfull.
+     *
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{distributionSetTypeId}")
+    ResponseEntity<Void> deleteDistributionSetType(@PathVariable("distributionSetTypeId") Long distributionSetTypeId);
+
+    /**
+     * Handles the PUT request of updating a Distribution Set Type.
+     *
+     * @param distributionSetTypeId
+     *            the ID of the software module in the URL
+     * @param restDistributionSetType
+     *            the module type to be updated.
+     * @return status OK if update is successful
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{distributionSetTypeId}", consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtDistributionSetType> updateDistributionSetType(
+            @PathVariable("distributionSetTypeId") Long distributionSetTypeId,
+            MgmtDistributionSetTypeRequestBodyPut restDistributionSetType);
+
+    /**
+     * Handles the POST request of creating new DistributionSetTypes. The
+     * request body must always be a list of types.
+     *
+     * @param distributionSetTypes
+     *            the modules to be created.
+     * @return In case all modules could successful created the ResponseEntity
+     *         with status code 201 - Created but without ResponseBody. In any
+     *         failure the JsonResponseExceptionHandler is handling the
+     *         response.
+     */
+    @RequestMapping(method = RequestMethod.POST, consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtDistributionSetType>> createDistributionSetTypes(
+            List<MgmtDistributionSetTypeRequestBodyPost> distributionSetTypes);
+
+    /**
+     * Handles the GET request of retrieving the list of mandatory software
+     * module types in that distribution set type.
+     *
+     * @param distributionSetTypeId
+     *            of the DistributionSetType.
+     * @return Unpaged list of module types and OK in case of success.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetTypeId}/"
+            + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULE_TYPES, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtSoftwareModuleType>> getMandatoryModules(
+            @PathVariable("distributionSetTypeId") Long distributionSetTypeId);
+
+    /**
+     * Handles the GET request of retrieving the single mandatory software
+     * module type in that distribution set type.
+     *
+     * @param distributionSetTypeId
+     *            of the DistributionSetType.
+     * @param softwareModuleTypeId
+     *            of SoftwareModuleType.
+     * @return Unpaged list of module types and OK in case of success.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetTypeId}/"
+            + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULE_TYPES
+            + "/{softwareModuleTypeId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSoftwareModuleType> getMandatoryModule(
+            @PathVariable("distributionSetTypeId") Long distributionSetTypeId,
+            @PathVariable("softwareModuleTypeId") Long softwareModuleTypeId);
+
+    /**
+     * Handles the GET request of retrieving the single optional software module
+     * type in that distribution set type.
+     *
+     * @param distributionSetTypeId
+     *            of the DistributionSetType.
+     * @param softwareModuleTypeId
+     *            of SoftwareModuleType.
+     * @return Unpaged list of module types and OK in case of success.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetTypeId}/"
+            + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULE_TYPES
+            + "/{softwareModuleTypeId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSoftwareModuleType> getOptionalModule(
+            @PathVariable("distributionSetTypeId") Long distributionSetTypeId,
+            @PathVariable("softwareModuleTypeId") Long softwareModuleTypeId);
+
+    /**
+     * Handles the GET request of retrieving the list of optional software
+     * module types in that distribution set type.
+     *
+     * @param distributionSetTypeId
+     *            of the DistributionSetType.
+     * @return Unpaged list of module types and OK in case of success.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{distributionSetTypeId}/"
+            + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULE_TYPES, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtSoftwareModuleType>> getOptionalModules(
+            @PathVariable("distributionSetTypeId") Long distributionSetTypeId);
+
+    /**
+     * Handles DELETE request for removing a mandatory module from the
+     * DistributionSetType.
+     *
+     * @param distributionSetTypeId
+     *            of the DistributionSetType.
+     * @param softwareModuleTypeId
+     *            of the SoftwareModuleType to remove
+     *
+     * @return OK if the request was successful
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{distributionSetTypeId}/"
+            + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULE_TYPES + "/{softwareModuleTypeId}")
+    ResponseEntity<Void> removeMandatoryModule(@PathVariable("distributionSetTypeId") Long distributionSetTypeId,
+            @PathVariable("softwareModuleTypeId") Long softwareModuleTypeId);
+
+    /**
+     * Handles DELETE request for removing an optional module from the
+     * DistributionSetType.
+     *
+     * @param distributionSetTypeId
+     *            of the DistributionSetType.
+     * @param softwareModuleTypeId
+     *            of the SoftwareModuleType to remove
+     *
+     * @return OK if the request was successful
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{distributionSetTypeId}/"
+            + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULE_TYPES + "/{softwareModuleTypeId}")
+    ResponseEntity<Void> removeOptionalModule(@PathVariable("distributionSetTypeId") Long distributionSetTypeId,
+            @PathVariable("softwareModuleTypeId") Long softwareModuleTypeId);
+
+    /**
+     * Handles the POST request for adding a mandatory software module type to a
+     * distribution set type.
+     *
+     * @param distributionSetTypeId
+     *            of the DistributionSetType.
+     * @param smtId
+     *            of the SoftwareModuleType to add
+     *
+     * @return OK if the request was successful
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{distributionSetTypeId}/"
+            + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULE_TYPES, consumes = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Void> addMandatoryModule(@PathVariable("distributionSetTypeId") Long distributionSetTypeId,
+            MgmtId smtId);
+
+    /**
+     * Handles the POST request for adding an optional software module type to a
+     * distribution set type.
+     *
+     * @param distributionSetTypeId
+     *            of the DistributionSetType.
+     * @param smtId
+     *            of the SoftwareModuleType to add
+     *
+     * @return OK if the request was successful
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{distributionSetTypeId}/"
+            + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULE_TYPES, consumes = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Void> addOptionalModule(@PathVariable("distributionSetTypeId") Long distributionSetTypeId,
+            MgmtId smtId);
+
+}

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

@@ -0,0 +1,45 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.io.InputStream;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ *
+ */
+@RequestMapping(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING)
+@FunctionalInterface
+public interface MgmtDownloadArtifactRestApi {
+
+    /**
+     * Handles the GET request for downloading an artifact.
+     *
+     * @param softwareModuleId
+     *            of the parent SoftwareModule
+     * @param artifactId
+     *            of the related LocalArtifact
+     * @param servletResponse
+     *            of the servlet
+     * @param request
+     *            of the client
+     *
+     * @return responseEntity with status ok if successful
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{softwareModuleId}/artifacts/{artifactId}/download")
+    @ResponseBody
+    ResponseEntity<InputStream> downloadArtifact(@PathVariable("softwareModuleId") Long softwareModuleId,
+            @PathVariable("artifactId") Long artifactId);
+
+}

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

@@ -0,0 +1,45 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.io.InputStream;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * A resource for download artifacts.
+ *
+ */
+@RequestMapping(MgmtRestConstants.DOWNLOAD_ID_V1_REQUEST_MAPPING_BASE)
+@FunctionalInterface
+public interface MgmtDownloadRestApi {
+
+    /**
+     * Handles the GET request for downloading an artifact.
+     * 
+     * @param tenant
+     *            the download belongs to
+     * @param downloadId
+     *            the generated download id
+     * @param response
+     *            of the servlet
+     * @return {@link ResponseEntity} with status {@link HttpStatus#OK} if
+     *         successful
+     */
+    @RequestMapping(method = RequestMethod.GET, value = MgmtRestConstants.DOWNLOAD_ID_V1_REQUEST_MAPPING)
+    @ResponseBody
+    ResponseEntity<InputStream> downloadArtifactByDownloadId(@PathVariable("tenant") String tenant,
+            @PathVariable("downloadId") String downloadId);
+
+}

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

@@ -0,0 +1,236 @@
+/**
+ * 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.mgmt.rest.api;
+
+/**
+ * Constants for RESTful API.
+ *
+ */
+public final class MgmtRestConstants {
+
+    /**
+     * API version definition. We are using only major versions.
+     */
+    public static final String API_VERSION = "v1";
+
+    /**
+     * The base URL mapping of the SP rest resources.
+     */
+    public static final String BASE_V1_REQUEST_MAPPING = "/rest/v1";
+
+    /**
+     * String representation of
+     * {@link #REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT_VALUE}.
+     */
+    public static final String REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT = "50";
+
+    /**
+     * The default limit parameter in case the limit parameter is not present in
+     * the request.
+     *
+     * @see #REQUEST_PARAMETER_PAGING_LIMIT
+     */
+    public static final int REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT_VALUE = Integer
+            .parseInt(REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT);
+
+    /**
+     * The software module URL mapping rest resource.
+     */
+    public static final String SOFTWAREMODULE_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING + "/softwaremodules";
+
+    public static final String DOWNLOAD_ID_V1_REQUEST_MAPPING_BASE = "/api/" + API_VERSION + "/downloadserver/";
+
+    public static final String DOWNLOAD_ID_V1_REQUEST_MAPPING = "/downloadId/{tenant}/{downloadId}";
+
+    /**
+     * The base URL mapping for the spring acuator management context path.
+     */
+    public static final String BASE_SYSTEM_MAPPING = "/system";
+
+    /**
+     * URL mapping for system admin operations.
+     */
+    public static final String SYSTEM_ADMIN_MAPPING = BASE_SYSTEM_MAPPING + "/admin";
+
+    public static final String SYSTEM_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING + BASE_SYSTEM_MAPPING;
+
+    /**
+     * The target URL mapping, href link for assigned distribution set.
+     */
+    public static final String TARGET_V1_ASSIGNED_DISTRIBUTION_SET = "assignedDS";
+    /**
+     * The target URL mapping, href link for installed distribution set.
+     */
+    public static final String TARGET_V1_INSTALLED_DISTRIBUTION_SET = "installedDS";
+    /**
+     * The target URL mapping, href link for target attributes.
+     */
+    public static final String TARGET_V1_ATTRIBUTES = "attributes";
+    /**
+     * The target URL mapping, href link for target actions.
+     */
+    public static final String TARGET_V1_ACTIONS = "actions";
+    /**
+     * The target URL mapping, href link for canceled actions.
+     */
+    public static final String TARGET_V1_CANCELED_ACTION = "canceledaction";
+    /**
+     * The target URL mapping, href link for canceled actions.
+     */
+    public static final String TARGET_V1_ACTION_STATUS = "status";
+
+    /**
+     * The target URL mapping rest resource.
+     */
+    public static final String TARGET_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING + "/targets";
+
+    /**
+     * The tag URL mapping rest resource.
+     */
+    public static final String TARGET_TAG_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING + "/targettags";
+
+    /**
+     * The tag URL mapping rest resource.
+     * 
+     * @deprecated {@link #TARGET_TAG_TARGETS_REQUEST_MAPPING} is preferred as
+     *             this resource on GET supports paging
+     */
+    @Deprecated
+    public static final String DEPRECATAED_TARGET_TAG_TARGETS_REQUEST_MAPPING = "/{targetTagId}/targets";
+
+    /**
+     * The tag URL mapping rest resource.
+     */
+    public static final String TARGET_TAG_TARGETS_REQUEST_MAPPING = "/{targetTagId}/assigned";
+
+    /**
+     * The tag URL mapping rest resource.
+     */
+    public static final String DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING
+            + "/distributionsettags";
+
+    /**
+     * The target URL mapping rest resource.
+     */
+    public static final String TARGET_FILTER_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING + "/targetfilters";
+
+    /**
+     * The deprecated tag URL mapping rest resource.
+     * 
+     * @deprecated {@link #DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING}
+     *             is preferred as this resource on GET supports paging
+     */
+    @Deprecated
+    public static final String DEPRECATED_DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING = "/{distributionsetTagId}/distributionsets";
+
+    /**
+     * The tag URL mapping rest resource.
+     */
+    public static final String DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING = "/{distributionsetTagId}/assigned";
+
+    /**
+     * The default offset parameter in case the offset parameter is not present
+     * in the request.
+     *
+     * @see #REQUEST_PARAMETER_PAGING_OFFSET
+     */
+    public static final String REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET = "0";
+
+    /**
+     * The default offset parameter in case the offset parameter is not present
+     * in the request.
+     *
+     * @see #REQUEST_PARAMETER_PAGING_OFFSET
+     */
+    public static final int REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET_VALUE = Integer
+            .parseInt(REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET);
+
+    /**
+     * Limit http parameter for the limitation of returned values for a paged
+     * request.
+     */
+    public static final String REQUEST_PARAMETER_PAGING_LIMIT = "limit";
+    /**
+     * The maximum limit of entities returned by rest resources.
+     */
+    public static final int REQUEST_PARAMETER_PAGING_MAX_LIMIT = 500;
+
+    /**
+     * Paging http parameter for the offset for a paged request.
+     */
+    public static final String REQUEST_PARAMETER_PAGING_OFFSET = "offset";
+
+    /**
+     * The request parameter for sorting. The value of the sort parameter must
+     * be in the following pattern. Example:
+     * http://www.bosch.com/iap/sp/rest/targets?sort=field_1:ASC,field_2:DESC,
+     * field_3:ASC
+     */
+    public static final String REQUEST_PARAMETER_SORTING = "sort";
+
+    /**
+     * The request parameter for searching. The value of the search parameter
+     * must be in the FIQL syntax.
+     */
+    public static final String REQUEST_PARAMETER_SEARCH = "q";
+
+    /**
+     * The software module type URL mapping rest resource.
+     */
+    public static final String SOFTWAREMODULETYPE_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING + "/softwaremoduletypes";
+
+    /**
+     * The distributon set base resource.
+     */
+    public static final String DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING
+            + "/distributionsettypes";
+
+    /**
+     * The software module URL mapping rest resource.
+     */
+    public static final String DISTRIBUTIONSET_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING + "/distributionsets";
+
+    /**
+     * The rollout URL mapping rest resource.
+     */
+    public static final String ROLLOUT_V1_REQUEST_MAPPING = BASE_V1_REQUEST_MAPPING + "/rollouts";
+
+    /**
+     * Request parameter for async
+     */
+    public static final String REQUEST_PARAMETER_ASYNC = "async";
+
+    /**
+     * The target URL mapping, href link for artifact download.
+     */
+    public static final String SOFTWAREMODULE_V1_ARTIFACT = "artifacts";
+
+    /**
+     * The target URL mapping, href link for software module access.
+     */
+    public static final String DISTRIBUTIONSET_V1_MODULE = "modules";
+
+    /**
+     * The target URL mapping, href link for type information.
+     */
+    public static final String SOFTWAREMODULE_V1_TYPE = "type";
+
+    public static final String DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULES = "optionalmodules";
+
+    public static final String DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULES = "mandatorymodules";
+
+    public static final String DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULE_TYPES = "optionalmoduletypes";
+
+    public static final String DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULE_TYPES = "mandatorymoduletypes";
+
+    // constant class, private constructor.
+    private MgmtRestConstants() {
+
+    }
+}

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

@@ -0,0 +1,207 @@
+/**
+ * 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.mgmt.rest.api;
+
+import org.eclipse.hawkbit.mgmt.json.model.PagedList;
+import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutResponseBody;
+import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutRestRequestBody;
+import org.eclipse.hawkbit.mgmt.json.model.rolloutgroup.MgmtRolloutGroupResponseBody;
+import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * REST Resource handling rollout CRUD operations.
+ *
+ */
+@RequestMapping(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING)
+public interface MgmtRolloutRestApi {
+
+    /**
+     * Handles the GET request of retrieving all rollouts.
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of rollouts for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return a list of all rollouts for a defined or default page request with
+     *         status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtRolloutResponseBody>> getRollouts(
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving a single rollout.
+     *
+     * @param rolloutId
+     *            the ID of the rollout to retrieve
+     * @return a single rollout with status OK.
+     */
+    @RequestMapping(value = "/{rolloutId}", method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtRolloutResponseBody> getRollout(@PathVariable("rolloutId") Long rolloutId);
+
+    /**
+     * Handles the POST request for creating rollout.
+     *
+     * @param rolloutRequestBody
+     *            the rollout body to be created.
+     * @return In case rollout could successful created the ResponseEntity with
+     *         status code 201 with the successfully created rollout. In any
+     *         failure the JsonResponseExceptionHandler is handling the
+     *         response.
+     */
+    @RequestMapping(method = RequestMethod.POST, consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtRolloutResponseBody> create(MgmtRolloutRestRequestBody rolloutRequestBody);
+
+    /**
+     * Handles the POST request for starting a rollout.
+     *
+     * @param rolloutId
+     *            the ID of the rollout to be started.
+     * @return OK response (200) if rollout could be started. In case of any
+     *         exception the corresponding errors occur.
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{rolloutId}/start", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Void> start(@PathVariable("rolloutId") Long rolloutId);
+
+    /**
+     * Handles the POST request for pausing a rollout.
+     *
+     * @param rolloutId
+     *            the ID of the rollout to be paused.
+     * @return OK response (200) if rollout could be paused. In case of any
+     *         exception the corresponding errors occur.
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{rolloutId}/pause", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Void> pause(@PathVariable("rolloutId") Long rolloutId);
+
+    /**
+     * Handles the DELETE request for deleting a rollout.
+     *
+     * @param rolloutId
+     *            the ID of the rollout to be deleted.
+     * @return OK response (200) if rollout could be deleted. In case of any
+     *         exception the corresponding errors occur.
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{rolloutId}", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Void> delete(@PathVariable("rolloutId") Long rolloutId);
+
+    /**
+     * Handles the POST request for resuming a rollout.
+     *
+     * @param rolloutId
+     *            the ID of the rollout to be resumed.
+     * @return OK response (200) if rollout could be resumed. In case of any
+     *         exception the corresponding errors occur.
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{rolloutId}/resume", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Void> resume(@PathVariable("rolloutId") Long rolloutId);
+
+    /**
+     * Handles the GET request of retrieving all rollout groups referred to a
+     * rollout.
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of rollout groups for pagination, might not
+     *            be present in the rest request then default value will be
+     *            applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return a list of all rollout groups referred to a rollout for a defined
+     *         or default page request with status OK. The response is always
+     *         paged. In any failure the JsonResponseExceptionHandler is
+     *         handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{rolloutId}/deploygroups", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtRolloutGroupResponseBody>> getRolloutGroups(@PathVariable("rolloutId") Long rolloutId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request for retrieving a single rollout group.
+     *
+     * @param rolloutId
+     *            the rolloutId to retrieve the group from
+     * @param groupId
+     *            the groupId to retrieve the rollout group
+     * @return the OK response containing the MgmtRolloutGroupResponseBody
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{rolloutId}/deploygroups/{groupId}", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtRolloutGroupResponseBody> getRolloutGroup(@PathVariable("rolloutId") Long rolloutId,
+            @PathVariable("groupId") Long groupId);
+
+    /**
+     * Retrieves all targets related to a specific rollout group.
+     *
+     * @param rolloutId
+     *            the ID of the rollout
+     * @param groupId
+     *            the ID of the rollout group
+     * @param pagingOffsetParam
+     *            the offset of list of rollout groups for pagination, might not
+     *            be present in the rest request then default value will be
+     *            applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return a paged list of targets related to a specific rollout and rollout
+     *         group.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{rolloutId}/deploygroups/{groupId}/targets", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtTarget>> getRolloutGroupTargets(@PathVariable("rolloutId") Long rolloutId,
+            @PathVariable("groupId") Long groupId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+}

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

@@ -0,0 +1,289 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.PagedList;
+import org.eclipse.hawkbit.mgmt.json.model.artifact.MgmtArtifact;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleMetadata;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleMetadataBodyPut;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleRequestBodyPost;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleRequestBodyPut;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * REST Resource handling for SoftwareModule and related Artifact CRUD
+ * operations.
+ *
+ */
+@RequestMapping(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING)
+public interface MgmtSoftwareModuleRestApi {
+
+    /**
+     * Handles POST request for artifact upload.
+     *
+     * @param softwareModuleId
+     *            of the parent SoftwareModule
+     * @param file
+     *            that has to be uploaded
+     * @param optionalFileName
+     *            to override {@link MultipartFile#getOriginalFilename()}
+     * @param md5Sum
+     *            checksum for uploaded content check
+     * @param sha1Sum
+     *            checksum for uploaded content check
+     * 
+     * @return In case all sets could successful be created the ResponseEntity
+     *         with status code 201 - Created but without ResponseBody. In any
+     *         failure the JsonResponseExceptionHandler is handling the
+     *         response.
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{softwareModuleId}/artifacts", produces = {
+            MediaTypes.HAL_JSON_VALUE, 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,
+            @RequestParam(value = "md5sum", required = false) final String md5Sum,
+            @RequestParam(value = "sha1sum", required = false) final String sha1Sum);
+
+    /**
+     * Handles the GET request of retrieving all meta data of artifacts assigned
+     * to a software module.
+     *
+     * @param softwareModuleId
+     *            of the parent SoftwareModule
+     *
+     * @return a list of all artifacts for a defined or default page request
+     *         with status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{softwareModuleId}/artifacts", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtArtifact>> getArtifacts(@PathVariable("softwareModuleId") final Long softwareModuleId);
+
+    /**
+     * Handles the GET request of retrieving a single Artifact meta data
+     * request.
+     *
+     * @param softwareModuleId
+     *            of the parent SoftwareModule
+     * @param artifactId
+     *            of the related LocalArtifact
+     *
+     * @return responseEntity with status ok if successful
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{softwareModuleId}/artifacts/{artifactId}", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    @ResponseBody
+    ResponseEntity<MgmtArtifact> getArtifact(@PathVariable("softwareModuleId") final Long softwareModuleId,
+            @PathVariable("artifactId") final Long artifactId);
+
+    /**
+     * Handles the DELETE request for a single SoftwareModule.
+     *
+     * @param softwareModuleId
+     *            the ID of the module that has the artifact
+     * @param artifactId
+     *            of the artifact to be deleted
+     *
+     * @return status OK if delete as successful.
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{softwareModuleId}/artifacts/{artifactId}")
+    @ResponseBody
+    ResponseEntity<Void> deleteArtifact(@PathVariable("softwareModuleId") final Long softwareModuleId,
+            @PathVariable("artifactId") final Long artifactId);
+
+    /**
+     * Handles the GET request of retrieving all softwaremodules.
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of modules for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     *
+     * @return a list of all modules for a defined or default page request with
+     *         status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtSoftwareModule>> getSoftwareModules(
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) final int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) final int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) final String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) final String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving a single software module.
+     *
+     * @param softwareModuleId
+     *            the ID of the module to retrieve
+     *
+     * @return a single softwareModule with status OK.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{softwareModuleId}", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSoftwareModule> getSoftwareModule(@PathVariable("softwareModuleId") final Long softwareModuleId);
+
+    /**
+     * Handles the POST request of creating new softwaremodules. The request
+     * body must always be a list of modules.
+     *
+     * @param softwareModules
+     *            the modules to be created.
+     * @return In case all modules could successful created the ResponseEntity
+     *         with status code 201 - Created but without ResponseBody. In any
+     *         failure the JsonResponseExceptionHandler is handling the
+     *         response.
+     */
+    @RequestMapping(method = RequestMethod.POST, consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtSoftwareModule>> createSoftwareModules(
+            final List<MgmtSoftwareModuleRequestBodyPost> softwareModules);
+
+    /**
+     * Handles the PUT request of updating a software module.
+     *
+     * @param softwareModuleId
+     *            the ID of the software module in the URL
+     * @param restSoftwareModule
+     *            the modules to be updated.
+     * @return status OK if update was successful
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{softwareModuleId}", consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSoftwareModule> updateSoftwareModule(
+            @PathVariable("softwareModuleId") final Long softwareModuleId,
+            final MgmtSoftwareModuleRequestBodyPut restSoftwareModule);
+
+    /**
+     * Handles the DELETE request for a single software module.
+     *
+     * @param softwareModuleId
+     *            the ID of the module to retrieve
+     * @return status OK if delete was successful.
+     *
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{softwareModuleId}")
+    ResponseEntity<Void> deleteSoftwareModule(@PathVariable("softwareModuleId") final Long softwareModuleId);
+
+    /**
+     * Gets a paged list of meta data for a software module.
+     *
+     * @param softwareModuleId
+     *            the ID of the software module for the meta data
+     * @param pagingOffsetParam
+     *            the offset of list of meta data for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=key==abc}
+     * @return status OK if get request is successful with the paged list of
+     *         meta data
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{softwareModuleId}/metadata", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtSoftwareModuleMetadata>> getMetadata(
+            @PathVariable("softwareModuleId") final Long softwareModuleId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) final int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) final int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) final String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) final String rsqlParam);
+
+    /**
+     * Gets a single meta data value for a specific key of a software module.
+     *
+     * @param softwareModuleId
+     *            the ID of the software module to get the meta data from
+     * @param metadataKey
+     *            the key of the meta data entry to retrieve the value from
+     * @return status OK if get request is successful with the value of the meta
+     *         data
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{softwareModuleId}/metadata/{metadataKey}", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSoftwareModuleMetadata> getMetadataValue(
+            @PathVariable("softwareModuleId") final Long softwareModuleId,
+            @PathVariable("metadataKey") final String metadataKey);
+
+    /**
+     * Updates a single meta data value of a software module.
+     *
+     * @param softwareModuleId
+     *            the ID of the software module to update the meta data entry
+     * @param metadataKey
+     *            the key of the meta data to update the value
+     * @param metadata
+     *            body to update
+     * @return status OK if the update request is successful and the updated
+     *         meta data result
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{softwareModuleId}/metadata/{metadataKey}", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSoftwareModuleMetadata> updateMetadata(
+            @PathVariable("softwareModuleId") final Long softwareModuleId,
+            @PathVariable("metadataKey") final String metadataKey, final MgmtSoftwareModuleMetadataBodyPut metadata);
+
+    /**
+     * Deletes a single meta data entry from the software module.
+     *
+     * @param softwareModuleId
+     *            the ID of the software module to delete the meta data entry
+     * @param metadataKey
+     *            the key of the meta data to delete
+     * @return status OK if the delete request is successful
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{softwareModuleId}/metadata/{metadataKey}")
+    ResponseEntity<Void> deleteMetadata(@PathVariable("softwareModuleId") final Long softwareModuleId,
+            @PathVariable("metadataKey") final String metadataKey);
+
+    /**
+     * Creates a list of meta data for a specific software module.
+     *
+     * @param softwareModuleId
+     *            the ID of the distribution set to create meta data for
+     * @param metadataRest
+     *            the list of meta data entries to create
+     * @return status created if post request is successful with the value of
+     *         the created meta data
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{softwareModuleId}/metadata", consumes = {
+            MediaType.APPLICATION_JSON_VALUE,
+            MediaTypes.HAL_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtSoftwareModuleMetadata>> createMetadata(
+            @PathVariable("softwareModuleId") final Long softwareModuleId,
+            final List<MgmtSoftwareModuleMetadata> metadataRest);
+
+}

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

@@ -0,0 +1,117 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.PagedList;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleType;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleTypeRequestBodyPost;
+import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleTypeRequestBodyPut;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * REST Resource handling for SoftwareModule and related Artifact CRUD
+ * operations.
+ *
+ */
+@RequestMapping(MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING)
+public interface MgmtSoftwareModuleTypeRestApi {
+    /**
+     * Handles the GET request of retrieving all SoftwareModuleTypes .
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of modules for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     *
+     * @return a list of all module type for a defined or default page request
+     *         with status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtSoftwareModuleType>> getTypes(
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving a single software module type .
+     *
+     * @param softwareModuleTypeId
+     *            the ID of the module type to retrieve
+     *
+     * @return a single softwareModule with status OK.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{softwareModuleTypeId}", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSoftwareModuleType> getSoftwareModuleType(
+            @PathVariable("softwareModuleTypeId") Long softwareModuleTypeId);
+
+    /**
+     * Handles the DELETE request for a single software module type .
+     *
+     * @param softwareModuleTypeId
+     *            the ID of the module to retrieve
+     * @return status OK if delete as successfully.
+     *
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{softwareModuleTypeId}")
+    ResponseEntity<Void> deleteSoftwareModuleType(@PathVariable("softwareModuleTypeId") Long softwareModuleTypeId);
+
+    /**
+     * Handles the PUT request of updating a software module type .
+     *
+     * @param softwareModuleTypeId
+     *            the ID of the software module in the URL
+     * @param restSoftwareModuleType
+     *            the module type to be updated.
+     * @return status OK if update is successful
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{softwareModuleTypeId}", consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSoftwareModuleType> updateSoftwareModuleType(
+            @PathVariable("softwareModuleTypeId") Long softwareModuleTypeId,
+            MgmtSoftwareModuleTypeRequestBodyPut restSoftwareModuleType);
+
+    /**
+     * Handles the POST request of creating new SoftwareModuleTypes. The request
+     * body must always be a list of types.
+     *
+     * @param softwareModuleTypes
+     *            the modules to be created.
+     * @return In case all modules could successful created the ResponseEntity
+     *         with status code 201 - Created but without ResponseBody. In any
+     *         failure the JsonResponseExceptionHandler is handling the
+     *         response.
+     */
+    @RequestMapping(method = RequestMethod.POST, consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtSoftwareModuleType>> createSoftwareModuleTypes(
+            List<MgmtSoftwareModuleTypeRequestBodyPost> softwareModuleTypes);
+
+}

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

@@ -0,0 +1,66 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.util.Collection;
+
+import org.eclipse.hawkbit.mgmt.json.model.systemmanagement.MgmtSystemCache;
+import org.eclipse.hawkbit.mgmt.json.model.systemmanagement.MgmtSystemStatisticsRest;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * System management capabilities by REST.
+ *
+ */
+@RequestMapping(MgmtRestConstants.SYSTEM_ADMIN_MAPPING)
+public interface MgmtSystemManagementRestApi {
+
+    /**
+     * Deletes the tenant data of a given tenant. USE WITH CARE!
+     *
+     * @param tenant
+     *            to delete
+     * @return HttpStatus.OK
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/tenants/{tenant}")
+    ResponseEntity<Void> deleteTenant(@PathVariable("tenant") String tenant);
+
+    /**
+     * Collects and returns system usage statistics. It provides a system wide
+     * overview and tenant based stats.
+     *
+     * @return system usage statistics
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/usage", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSystemStatisticsRest> getSystemUsageStats();
+
+    /**
+     * Returns a list of all caches.
+     *
+     * @return a list of caches for all tenants
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/caches", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Collection<MgmtSystemCache>> getCaches();
+
+    /**
+     * Invalidates all caches for all tenants.
+     *
+     * @return a list of cache names which has been invalidated
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/caches")
+    ResponseEntity<Collection<String>> invalidateCaches();
+
+}

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

@@ -0,0 +1,160 @@
+/**
+ * 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.mgmt.rest.api;
+
+import org.eclipse.hawkbit.mgmt.json.model.MgmtId;
+import org.eclipse.hawkbit.mgmt.json.model.PagedList;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet;
+import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery;
+import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQueryRequestBody;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * Api for handling target operations.
+ */
+@RequestMapping(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING)
+public interface MgmtTargetFilterQueryRestApi {
+
+    /**
+     * Handles the GET request of retrieving a single target filter.
+     *
+     * @param filterId
+     *            the ID of the target filter to retrieve
+     * @return a single target with status OK.
+     */
+
+    @RequestMapping(method = RequestMethod.GET, value = "/{filterId}", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTargetFilterQuery> getFilter(@PathVariable("filterId") Long filterId);
+
+    /**
+     * Handles the GET request of retrieving all filters.
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of targets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return a list of all targets for a defined or default page request with
+     *         status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+
+    @RequestMapping(method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtTargetFilterQuery>> getFilters(
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the POST request of creating new target filters. The request body
+     * must always be a list of target filters.
+     *
+     * @param filter
+     *            the filters to be created.
+     * @return In case all filters were successfully created the ResponseEntity
+     *         with status code 201 with a list of successfully created entities
+     *         is returned. In any failure the JsonResponseExceptionHandler is
+     *         handling the response.
+     */
+    @RequestMapping(method = RequestMethod.POST, consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTargetFilterQuery> createFilter(@RequestBody MgmtTargetFilterQueryRequestBody filter);
+
+    /**
+     * Handles the PUT request of updating a target filter. The ID is within the
+     * URL path of the request. A given ID in the request body is ignored. It's
+     * not possible to set fields to {@code null} values.
+     *
+     * @param filterId
+     *            the path parameter which contains the ID of the target filter
+     * @param targetFilterRest
+     *            the request body which contains the fields which should be
+     *            updated, fields which are not given are ignored for the
+     *            update.
+     * @return the updated target filter response which contains all fields
+     *         including fields which have not been updated
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{filterId}", consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTargetFilterQuery> updateFilter(@PathVariable("filterId") Long filterId,
+            @RequestBody MgmtTargetFilterQueryRequestBody targetFilterRest);
+
+    /**
+     * Handles the DELETE request of deleting a target filter.
+     *
+     * @param filterId
+     *            the ID of the target filter to be deleted
+     * @return If the given controllerId could exists and could be deleted Http
+     *         OK. In any failure the JsonResponseExceptionHandler is handling
+     *         the response.
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{filterId}", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Void> deleteFilter(@PathVariable("filterId") Long filterId);
+
+    /**
+     * Handles the GET request of retrieving the distribution set for auto
+     * assignment of an specific target filter.
+     *
+     * @param filterId
+     *            the ID of the target to retrieve the assigned distribution
+     * @return the assigned distribution set with status OK, if none is assigned
+     *         than {@code null} content (e.g. "{}")
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{filterId}/autoAssignDS", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtDistributionSet> getAssignedDistributionSet(@PathVariable("filterId") Long filterId);
+
+    /**
+     * Handles the POST request for changing distribution set for auto
+     * assignment of a target filter.
+     *
+     * @param filterId
+     *            of the target to change
+     * @param dsId
+     *            of the Id of the auto assign distribution set
+     * @return http status
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{filterId}/autoAssignDS", consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTargetFilterQuery> postAssignedDistributionSet(@PathVariable("filterId") Long filterId,
+            @RequestBody MgmtId dsId);
+
+    /**
+     * Handles the DELETE request for removing the distribution set for auto
+     * assignment of a target filter.
+     *
+     * @param filterId
+     *            of the target to change
+     * @return http status
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{filterId}/autoAssignDS")
+    ResponseEntity<Void> deleteAssignedDistributionSet(@PathVariable("filterId") Long filterId);
+
+}

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

@@ -0,0 +1,292 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.PagedList;
+import org.eclipse.hawkbit.mgmt.json.model.action.MgmtAction;
+import org.eclipse.hawkbit.mgmt.json.model.action.MgmtActionRequestBodyPut;
+import org.eclipse.hawkbit.mgmt.json.model.action.MgmtActionStatus;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet;
+import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtTargetAssignmentResponseBody;
+import org.eclipse.hawkbit.mgmt.json.model.target.MgmtDistributionSetAssignment;
+import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget;
+import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetAttributes;
+import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetRequestBody;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * Api for handling target operations.
+ */
+@RequestMapping(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING)
+public interface MgmtTargetRestApi {
+
+    /**
+     * Handles the GET request of retrieving a single target.
+     *
+     * @param controllerId
+     *            the ID of the target to retrieve
+     * @return a single target with status OK.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{controllerId}", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTarget> getTarget(@PathVariable("controllerId") String controllerId);
+
+    /**
+     * Handles the GET request of retrieving all targets.
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of targets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return a list of all targets for a defined or default page request with
+     *         status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+
+    @RequestMapping(method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtTarget>> getTargets(
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the POST request of creating new targets. The request body must
+     * always be a list of targets.
+     *
+     * @param targets
+     *            the targets to be created.
+     * @return In case all targets could successful created the ResponseEntity
+     *         with status code 201 with a list of successfully created
+     *         entities. In any failure the JsonResponseExceptionHandler is
+     *         handling the response.
+     */
+    @RequestMapping(method = RequestMethod.POST, consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtTarget>> createTargets(List<MgmtTargetRequestBody> targets);
+
+    /**
+     * Handles the PUT request of updating a target. The ID is within the URL
+     * path of the request. A given ID in the request body is ignored. It's not
+     * possible to set fields to {@code null} values.
+     *
+     * @param controllerId
+     *            the path parameter which contains the ID of the target
+     * @param targetRest
+     *            the request body which contains the fields which should be
+     *            updated, fields which are not given are ignored for the
+     *            udpate.
+     * @return the updated target response which contains all fields also fields
+     *         which have not updated
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{controllerId}", consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTarget> updateTarget(@PathVariable("controllerId") String controllerId,
+            MgmtTargetRequestBody targetRest);
+
+    /**
+     * Handles the DELETE request of deleting a target.
+     *
+     * @param controllerId
+     *            the ID of the target to be deleted
+     * @return If the given controllerId could exists and could be deleted Http
+     *         OK. In any failure the JsonResponseExceptionHandler is handling
+     *         the response.
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{controllerId}")
+    ResponseEntity<Void> deleteTarget(@PathVariable("controllerId") String controllerId);
+
+    /**
+     * Handles the GET request of retrieving the attributes of a specific
+     * target.
+     *
+     * @param controllerId
+     *            the ID of the target to retrieve the attributes.
+     * @return the target attributes as map response with status OK
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{controllerId}/attributes", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTargetAttributes> getAttributes(@PathVariable("controllerId") String controllerId);
+
+    /**
+     * Handles the GET request of retrieving the Actions of a specific target.
+     *
+     * @param controllerId
+     *            to load actions for
+     * @param pagingOffsetParam
+     *            the offset of list of targets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=status==pending}
+     * @return a list of all Actions for a defined or default page request with
+     *         status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{controllerId}/actions", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtAction>> getActionHistory(@PathVariable("controllerId") String controllerId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving a specific Actions of a specific
+     * Target.
+     *
+     * @param controllerId
+     *            to load the action for
+     * @param actionId
+     *            to load
+     * @return the action
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{controllerId}/actions/{actionId}", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtAction> getAction(@PathVariable("controllerId") String controllerId,
+            @PathVariable("actionId") Long actionId);
+
+    /**
+     * Handles the DELETE request of canceling an specific Actions of a specific
+     * Target.
+     *
+     * @param controllerId
+     *            the ID of the target in the URL path parameter
+     * @param actionId
+     *            the ID of the action in the URL path parameter
+     * @param force
+     *            optional parameter, which indicates a force cancel
+     * @return status no content in case cancellation was successful
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{controllerId}/actions/{actionId}")
+    ResponseEntity<Void> cancelAction(@PathVariable("controllerId") String controllerId,
+            @PathVariable("actionId") Long actionId,
+            @RequestParam(value = "force", required = false, defaultValue = "false") boolean force);
+
+    /**
+     * Handles the PUT update request to switch an action from soft to forced.
+     *
+     * @param controllerId
+     *            the ID of the target in the URL path parameter
+     * @param actionId
+     *            the ID of the action in the URL path parameter
+     * @param actionUpdate
+     *            to update the action
+     * @return status no content in case cancellation was successful
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{controllerId}/actions/{actionId}", consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtAction> updateAction(@PathVariable("controllerId") String controllerId,
+            @PathVariable("actionId") Long actionId, MgmtActionRequestBodyPut actionUpdate);
+
+    /**
+     * Handles the GET request of retrieving the ActionStatus of a specific
+     * target and action.
+     *
+     * @param controllerId
+     *            of the the action
+     * @param actionId
+     *            of the status we are intend to load
+     * @param pagingOffsetParam
+     *            the offset of list of targets for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @return a list of all ActionStatus for a defined or default page request
+     *         with status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{controllerId}/actions/{actionId}/status", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtActionStatus>> getActionStatusList(@PathVariable("controllerId") String controllerId,
+            @PathVariable("actionId") Long actionId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam);
+
+    /**
+     * Handles the GET request of retrieving the assigned distribution set of an
+     * specific target.
+     *
+     * @param controllerId
+     *            the ID of the target to retrieve the assigned distribution
+     * 
+     * @return the assigned distribution set with status OK, if none is assigned
+     *         than {@code null} content (e.g. "{}")
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{controllerId}/assignedDS", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtDistributionSet> getAssignedDistributionSet(@PathVariable("controllerId") String controllerId);
+
+    /**
+     * Changes the assigned distribution set of a target.
+     *
+     * @param controllerId
+     *            of the target to change
+     * @param dsId
+     *            of the distributionset that is to be assigned
+     * @param offline
+     *            to <code>true</code> if update was executed offline, i.e. not
+     *            managed by hawkBit.
+     * 
+     * @return status OK if the assignment of the targets was successful and a
+     *         complex return body which contains information about the assigned
+     *         targets and the already assigned targets counters
+     */
+    @RequestMapping(method = RequestMethod.POST, value = "/{controllerId}/assignedDS", consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTargetAssignmentResponseBody> postAssignedDistributionSet(
+            @PathVariable("controllerId") String controllerId, MgmtDistributionSetAssignment dsId,
+            @RequestParam(value = "offline", required = false) boolean offline);
+
+    /**
+     * Handles the GET request of retrieving the installed distribution set of
+     * an specific target.
+     *
+     * @param controllerId
+     *            the ID of the target to retrieve
+     * @return the assigned installed set with status OK, if none is installed
+     *         than {@code null} content (e.g. "{}")
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{controllerId}/installedDS", produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtDistributionSet> getInstalledDistributionSet(@PathVariable("controllerId") String controllerId);
+
+}

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

@@ -0,0 +1,267 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.util.List;
+
+import org.eclipse.hawkbit.mgmt.json.model.PagedList;
+import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtAssignedTargetRequestBody;
+import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTag;
+import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTagRequestBodyPut;
+import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTargetTagAssigmentResult;
+import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * REST Resource handling for TargetTag CRUD operations.
+ *
+ */
+@RequestMapping(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING)
+public interface MgmtTargetTagRestApi {
+
+    /**
+     * Handles the GET request of retrieving all target tags.
+     *
+     * @param pagingOffsetParam
+     *            the offset of list of target tags for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     * @return a list of all target tags for a defined or default page request
+     *         with status OK. The response is always paged. In any failure the
+     *         JsonResponseExceptionHandler is handling the response.
+     */
+    @RequestMapping(method = RequestMethod.GET, produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtTag>> getTargetTags(
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the GET request of retrieving a single target tag.
+     *
+     * @param targetTagId
+     *            the ID of the target tag to retrieve
+     *
+     * @return a single target tag with status OK.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/{targetTagId}", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTag> getTargetTag(@PathVariable("targetTagId") Long targetTagId);
+
+    /**
+     * Handles the POST request of creating new target tag. The request body
+     * must always be a list of tags.
+     *
+     * @param tags
+     *            the target tags to be created.
+     * @return In case all modules could successful created the ResponseEntity
+     *         with status code 201 - Created. The Response Body are the created
+     *         target tags but without ResponseBody.
+     */
+    @RequestMapping(method = RequestMethod.POST, consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtTag>> createTargetTags(List<MgmtTagRequestBodyPut> tags);
+
+    /**
+     *
+     * Handles the PUT request of updating a single targetr tag.
+     *
+     * @param targetTagId
+     *            the ID of the target tag
+     * @param restTargetTagRest
+     *            the the request body to be updated
+     * @return status OK if update is successful and the updated target tag.
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/{targetTagId}", consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTag> updateTargetTag(@PathVariable("targetTagId") Long targetTagId,
+            MgmtTagRequestBodyPut restTargetTagRest);
+
+    /**
+     * Handles the DELETE request for a single target tag.
+     *
+     * @param targetTagId
+     *            the ID of the target tag
+     * @return status OK if delete as successfully.
+     *
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{targetTagId}")
+    ResponseEntity<Void> deleteTargetTag(@PathVariable("targetTagId") Long targetTagId);
+
+    /**
+     * Handles the GET request of retrieving all assigned targets by the given
+     * tag id.
+     *
+     * @param targetTagId
+     *            the ID of the target tag to retrieve
+     *
+     * @return the list of assigned targets.
+     * 
+     * @deprecated please use
+     *             {@link #getAssignedTargets(Long, int, int, String, String)}
+     *             instead as this variant does not include paging and as result
+     *             returns only a limited list of targets
+     */
+    @Deprecated
+    @RequestMapping(method = RequestMethod.GET, value = MgmtRestConstants.DEPRECATAED_TARGET_TAG_TARGETS_REQUEST_MAPPING, produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtTarget>> getAssignedTargets(@PathVariable("targetTagId") Long targetTagId);
+
+    /**
+     * Handles the GET request of retrieving all assigned targets by the given
+     * tag id.
+     *
+     * @param targetTagId
+     *            the ID of the target tag to retrieve
+     * @param pagingOffsetParam
+     *            the offset of list of target tags for pagination, might not be
+     *            present in the rest request then default value will be applied
+     * @param pagingLimitParam
+     *            the limit of the paged request, might not be present in the
+     *            rest request then default value will be applied
+     * @param sortParam
+     *            the sorting parameter in the request URL, syntax
+     *            {@code field:direction, field:direction}
+     * @param rsqlParam
+     *            the search parameter in the request URL, syntax
+     *            {@code q=name==abc}
+     *
+     * @return the list of assigned targets.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING, produces = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<PagedList<MgmtTarget>> getAssignedTargets(@PathVariable("targetTagId") Long targetTagId,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam,
+            @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam);
+
+    /**
+     * Handles the POST request to toggle the assignment of targets by the given
+     * tag id.
+     *
+     * @param targetTagId
+     *            the ID of the target tag to retrieve
+     * @param assignedTargetRequestBodies
+     *            list of controller ids to be toggled
+     *
+     * @return the list of assigned targets and unassigned targets.
+     */
+    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING
+            + "/toggleTagAssignment", consumes = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTargetTagAssigmentResult> toggleTagAssignment(@PathVariable("targetTagId") Long targetTagId,
+            List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies);
+
+    /**
+     * Handles the POST request to toggle the assignment of targets by the given
+     * tag id.
+     *
+     * @param targetTagId
+     *            the ID of the target tag to retrieve
+     * @param assignedTargetRequestBodies
+     *            list of controller ids to be toggled
+     *
+     * @return the list of assigned targets and unassigned targets.
+     * @deprecated please use {@link MgmtTargetTagRestApi#toggleTagAssignment}
+     */
+    @Deprecated
+    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.DEPRECATAED_TARGET_TAG_TARGETS_REQUEST_MAPPING
+            + "/toggleTagAssignment", consumes = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtTargetTagAssigmentResult> toggleTagAssignmentUnpaged(
+            @PathVariable("targetTagId") Long targetTagId,
+            List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies);
+
+    /**
+     * Handles the POST request to assign targets to the given tag id.
+     *
+     * @param targetTagId
+     *            the ID of the target tag to retrieve
+     * @param assignedTargetRequestBodies
+     *            list of controller ids to be assigned
+     *
+     * @return the list of assigned targets.
+     */
+    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING, consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtTarget>> assignTargets(@PathVariable("targetTagId") Long targetTagId,
+            List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies);
+
+    /**
+     * Handles the POST request to assign targets to the given tag id.
+     *
+     * @param targetTagId
+     *            the ID of the target tag to retrieve
+     * @param assignedTargetRequestBodies
+     *            list of controller ids to be assigned
+     *
+     * @return the list of assigned targets.
+     * 
+     * @deprecated please use {@link MgmtTargetTagRestApi#assignTargets}
+     */
+    @Deprecated
+    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.DEPRECATAED_TARGET_TAG_TARGETS_REQUEST_MAPPING, consumes = {
+            MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<List<MgmtTarget>> assignTargetsUnpaged(@PathVariable("targetTagId") Long targetTagId,
+            List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies);
+
+    /**
+     * Handles the DELETE request to unassign one target from the given tag id.
+     *
+     * @param targetTagId
+     *            the ID of the target tag
+     * @param controllerId
+     *            the ID of the target to unassign
+     * @return http status code
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING
+            + "/{controllerId}")
+    ResponseEntity<Void> unassignTarget(@PathVariable("targetTagId") Long targetTagId,
+            @PathVariable("controllerId") String controllerId);
+
+    /**
+     * Handles the DELETE request to unassign one target from the given tag id.
+     *
+     * @param targetTagId
+     *            the ID of the target tag
+     * @param controllerId
+     *            the ID of the target to unassign
+     * @return http status code
+     * 
+     * @deprecated please use {@link MgmtTargetTagRestApi#unassignTarget}
+     */
+    @Deprecated
+    @RequestMapping(method = RequestMethod.DELETE, value = MgmtRestConstants.DEPRECATAED_TARGET_TAG_TARGETS_REQUEST_MAPPING
+            + "/{controllerId}")
+    ResponseEntity<Void> unassignTargetUnpaged(@PathVariable("targetTagId") Long targetTagId,
+            @PathVariable("controllerId") String controllerId);
+}

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

@@ -0,0 +1,86 @@
+/**
+ * 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.mgmt.rest.api;
+
+import java.util.Map;
+
+import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValue;
+import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValueRequest;
+import org.springframework.hateoas.MediaTypes;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * REST Resource for handling tenant specific configuration operations.
+ *
+ */
+@RequestMapping(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING)
+public interface MgmtTenantManagementRestApi {
+
+    /**
+     * Handles the GET request for receiving all tenant specific configuration
+     * values.
+     * 
+     * @return a map of all configuration values.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/configs", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Map<String, MgmtSystemTenantConfigurationValue>> getTenantConfiguration();
+
+    /**
+     * Handles the DELETE request of deleting a tenant specific configuration
+     * value.
+     *
+     * @param keyName
+     *            the Name of the configuration key
+     * @return if the given configuration value exists and could be deleted HTTP
+     *         OK. In any failure the JsonResponseExceptionHandler is handling
+     *         the response.
+     */
+    @RequestMapping(method = RequestMethod.DELETE, value = "/configs/{keyName}", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<Void> deleteTenantConfigurationValue(@PathVariable("keyName") String keyName);
+
+    /**
+     * Handles the GET request of receiving a tenant specific configuration
+     * value.
+     *
+     * @param keyName
+     *            the name of the configuration key
+     * @return if the given configuration value exists and could be get HTTP OK.
+     *         In any failure the JsonResponseExceptionHandler is handling the
+     *         response.
+     */
+    @RequestMapping(method = RequestMethod.GET, value = "/configs/{keyName}", produces = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSystemTenantConfigurationValue> getTenantConfigurationValue(
+            @PathVariable("keyName") String keyName);
+
+    /**
+     * Handles the PUT request for updating a tenant specific configuration
+     * value.
+     *
+     * @param keyName
+     *            the name of the configuration key
+     * @param configurationValueRest
+     *            the new value for the configuration
+     * @return if the given configuration value exists and could be get HTTP OK.
+     *         In any failure the JsonResponseExceptionHandler is handling the
+     *         response.
+     */
+    @RequestMapping(method = RequestMethod.PUT, value = "/configs/{keyName}", consumes = { MediaTypes.HAL_JSON_VALUE,
+            MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE,
+                    MediaType.APPLICATION_JSON_VALUE })
+    ResponseEntity<MgmtSystemTenantConfigurationValue> updateTenantConfigurationValue(
+            @PathVariable("keyName") String keyName, MgmtSystemTenantConfigurationValueRequest configurationValueRest);
+
+}

hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java

@@ -0,0 +1,65 @@
+/**
+ * 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.mgmt.json.model;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+import ru.yandex.qatools.allure.annotations.Description;
+import ru.yandex.qatools.allure.annotations.Features;
+import ru.yandex.qatools.allure.annotations.Stories;
+
+@Features("Unit Tests - Management API")
+@Stories("Paged List Handling")
+public class PagedListTest {
+
+    @Test
+    @Description("Ensures that a null payload entitiy throws an exception.")
+    public void createListWithNullContentThrowsException() {
+        try {
+            new PagedList<>(null, 0);
+            fail("as content is null");
+        } catch (final NullPointerException e) {
+        }
+    }
+
+    @Test
+    @Description("Create list with payload and verify content.")
+    public void createListWithContent() {
+        final long knownTotal = 2;
+        final List<String> knownContentList = new ArrayList<>();
+        knownContentList.add("content1");
+        knownContentList.add("content2");
+
+        assertListSize(knownTotal, knownContentList);
+    }
+
+    private void assertListSize(final long knownTotal, final List<String> knownContentList) {
+        final PagedList<String> pagedList = new PagedList<>(knownContentList, knownTotal);
+        assertThat(pagedList.getTotal()).as("total size is wrong").isEqualTo(knownTotal);
+        assertThat(pagedList.getSize()).as("list size is wrong").isEqualTo(knownContentList.size());
+    }
+
+    @Test
+    @Description("Create list with payload and verify size values.")
+    public void createListWithSmallerTotalThanContentSizeIsOk() {
+        final long knownTotal = 0;
+        final List<String> knownContentList = new ArrayList<>();
+        knownContentList.add("content1");
+        knownContentList.add("content2");
+
+        assertListSize(knownTotal, knownContentList);
+
+    }
+}