Remove unlimited collections from the repository API (#496)

* Started to get rid of unlimited collections Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Align API usage. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * fix compile issues. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fix tests. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Remove comments Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Performance optimizations. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Remove dead code. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Allign method names Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Wait until the action update event is processed Conflicts: hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java Signed-off-by: SirWayne <dennis.melzer@bosch-si.com> * Started new tag APIs Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Quotas into central interface. Tag tests added. Event names fixed. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Simplified consumer run for every tenant. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * remove unused fields. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Alligned beans. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Deprecated client methods for old resources. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fix new foreach method. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fix transaction for foreach. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Extended DS creating to handle larger volumes. Fix on Readme. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fixed simulator bug and cleaned up tests. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fix in sorting. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Remove configuration processor. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fix wrong usage of sanitize. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Missing brackets. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fix README API compatability. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fix misinterpretation of pessimistic locking exceptions. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fix stability sentence. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Code cleanup. Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com> * Fixed page calculation Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2017-05-09 16:40:49 +02:00
parent aca87464bd
commit c18e9f515e
199 changed files with 3502 additions and 1607 deletions
--- a/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutRestRequestBody.java
+++ b/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutRestRequestBody.java
@@ -8,14 +8,14 @@
 */
 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;
-import org.eclipse.hawkbit.mgmt.json.model.rolloutgroup.MgmtRolloutGroup;
-
-import java.util.List;

 /**
 * Model for request containing a rollout body e.g. in a POST request of
--- a/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroup.java
+++ b/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroup.java
@@ -8,9 +8,10 @@
 */
 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;
-import org.eclipse.hawkbit.mgmt.json.model.rollout.AbstractMgmtRolloutConditionsEntity;

 /**
 * Model for defining the Attributes of a Rollout Group
--- a/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java
+++ b/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java
@@ -122,10 +122,46 @@ public interface MgmtDistributionSetTagRestApi {
     *
     * @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_REQUEST_MAPPING, produces = {
+    @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") final Long distributionsetTagId,
+            @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 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") final Long distributionsetTagId);
@@ -142,12 +178,34 @@ public interface MgmtDistributionSetTagRestApi {
     * @return the list of assigned distribution sets and unassigned
     *         distribution sets.
     */
-    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.DISTRIBUTIONSET_REQUEST_MAPPING
+    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING
            + "/toggleTagAssignment")
    ResponseEntity<MgmtDistributionSetTagAssigmentResult> toggleTagAssignment(
            @PathVariable("distributionsetTagId") final Long distributionsetTagId,
            final 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") final Long distributionsetTagId,
+            final List<MgmtAssignedDistributionSetRequestBody> assignedDSRequestBodies);
+
    /**
     * Handles the POST request to assign distribution sets to the given tag id.
     *
@@ -158,7 +216,7 @@ public interface MgmtDistributionSetTagRestApi {
     *
     * @return the list of assigned distribution set.
     */
-    @RequestMapping(method = RequestMethod.POST, value = MgmtRestConstants.DISTRIBUTIONSET_REQUEST_MAPPING, consumes = {
+    @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(
@@ -166,16 +224,25 @@ public interface MgmtDistributionSetTagRestApi {
            final List<MgmtAssignedDistributionSetRequestBody> assignedDSRequestBodies);

    /**
-     * Handles the DELETE request to unassign all distribution set from the
-     * given tag id.
+     * Handles the POST request to assign distribution sets to the given tag id.
     *
     * @param distributionsetTagId
     *            the ID of the distribution set tag to retrieve
-     * @return http status code
+     * @param assignedDSRequestBodies
+     *            list of distribution sets ids to be assigned
+     *
+     * @return the list of assigned distribution set.
+     * 
+     * @deprecated please use
+     *             {@link MgmtDistributionSetTagRestApi#assignDistributionSets}
     */
-    @RequestMapping(method = RequestMethod.DELETE, value = MgmtRestConstants.DISTRIBUTIONSET_REQUEST_MAPPING)
-    ResponseEntity<Void> unassignDistributionSets(
-            @PathVariable("distributionsetTagId") final Long distributionsetTagId);
+    @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") final Long distributionsetTagId,
+            final List<MgmtAssignedDistributionSetRequestBody> assignedDSRequestBodies);

    /**
     * Handles the DELETE request to unassign one distribution set from the
@@ -187,8 +254,28 @@ public interface MgmtDistributionSetTagRestApi {
     *            the ID of the distribution set to unassign
     * @return http status code
     */
-    @RequestMapping(method = RequestMethod.DELETE, value = MgmtRestConstants.DISTRIBUTIONSET_REQUEST_MAPPING
+    @RequestMapping(method = RequestMethod.DELETE, value = MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING
            + "/{distributionsetId}")
    ResponseEntity<Void> unassignDistributionSet(@PathVariable("distributionsetTagId") final Long distributionsetTagId,
            @PathVariable("distributionsetId") final 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") final Long distributionsetTagId,
+            @PathVariable("distributionsetId") final Long distributionsetId);
 }
--- a/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java
+++ b/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java
@@ -24,19 +24,20 @@ public final class MgmtRestConstants {
     */
    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 = 50;
-
-    /**
-     * String representation of
-     * {@link #REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT_VALUE}.
-     */
-    public static final String REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT = "50";
+    public static final int REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT_VALUE = Integer
+            .parseInt(REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT);

    /**
     * The software module URL mapping rest resource.
@@ -93,10 +94,20 @@ public final class MgmtRestConstants {
     * 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}/targets";
+    public static final String TARGET_TAG_TARGETS_REQUEST_MAPPING = "/{targetTagId}/assigned";

    /**
     * The tag URL mapping rest resource.
@@ -109,10 +120,19 @@ public final class MgmtRestConstants {
     */
    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_REQUEST_MAPPING = "/{distributionsetTagId}/distributionsets";
+    public static final String DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING = "/{distributionsetTagId}/assigned";

    /**
     * The default offset parameter in case the offset parameter is not present
@@ -122,6 +142,15 @@ public final class MgmtRestConstants {
     */
    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.
--- a/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java
+++ b/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java
@@ -98,7 +98,7 @@ public interface MgmtTargetTagRestApi {
    @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> updateTagretTag(@PathVariable("targetTagId") final Long targetTagId,
+    ResponseEntity<MgmtTag> updateTargetTag(@PathVariable("targetTagId") final Long targetTagId,
            final MgmtTagRequestBodyPut restTargetTagRest);

    /**
@@ -120,10 +120,45 @@ public interface MgmtTargetTagRestApi {
     *            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") final 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<List<MgmtTarget>> getAssignedTargets(@PathVariable("targetTagId") final Long targetTagId);
+    ResponseEntity<PagedList<MgmtTarget>> getAssignedTargets(@PathVariable("targetTagId") final Long targetTagId,
+            @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 POST request to toggle the assignment of targets by the given
@@ -144,6 +179,27 @@ public interface MgmtTargetTagRestApi {
            @PathVariable("targetTagId") final Long targetTagId,
            final 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") final Long targetTagId,
+            final List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies);
+
    /**
     * Handles the POST request to assign targets to the given tag id.
     *
@@ -161,14 +217,23 @@ public interface MgmtTargetTagRestApi {
            final List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies);

    /**
-     * Handles the DELETE request to unassign all targets from the given tag id.
+     * Handles the POST request to assign targets to the given tag id.
     *
     * @param targetTagId
     *            the ID of the target tag to retrieve
-     * @return http status code
+     * @param assignedTargetRequestBodies
+     *            list of controller ids to be assigned
+     *
+     * @return the list of assigned targets.
+     * 
+     * @deprecated please use {@link MgmtTargetTagRestApi#assignTargets}
     */
-    @RequestMapping(method = RequestMethod.DELETE, value = MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING)
-    ResponseEntity<Void> unassignTargets(@PathVariable("targetTagId") final Long targetTagId);
+    @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") final Long targetTagId,
+            final List<MgmtAssignedTargetRequestBody> assignedTargetRequestBodies);

    /**
     * Handles the DELETE request to unassign one target from the given tag id.
@@ -183,4 +248,21 @@ public interface MgmtTargetTagRestApi {
            + "/{controllerId}")
    ResponseEntity<Void> unassignTarget(@PathVariable("targetTagId") final Long targetTagId,
            @PathVariable("controllerId") final 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") final Long targetTagId,
+            @PathVariable("controllerId") final String controllerId);
 }