Fix problem a repeatable where DS assignment leads to 500. (#501)

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

hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java

@@ -12,7 +12,6 @@ import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
 import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -282,17 +281,10 @@ public class MgmtTargetResource implements MgmtTargetRestApi {
         findTargetWithExceptionIfNotFound(controllerId);
         final ActionType type = (dsId.getType() != null) ? MgmtRestModelMapper.convertActionType(dsId.getType())
                 : ActionType.FORCED;
-        final Iterator<Target> changed = this.deploymentManagement
+        this.deploymentManagement.assignDistributionSet(dsId.getId(), type, dsId.getForcetime(),
-                .assignDistributionSet(dsId.getId(), type, dsId.getForcetime(), Lists.newArrayList(controllerId))
+                Lists.newArrayList(controllerId));
-                .getAssignedEntity().iterator();
-        if (changed.hasNext()) {
-            return new ResponseEntity<>(HttpStatus.OK);
-        }
-
-        LOG.error("Target update (ds {} assigment to target {}) failed! Returnd target list is empty.", dsId.getId(),
-                controllerId);
-        return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
 
+        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @Override

hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java

@@ -1080,16 +1080,27 @@ public class MgmtTargetResourceTest extends AbstractManagementApiIntegrationTest
     }
 
     @Test
+    @Description("Verfies that a DS to target assignment is reflected by the repository and that repeating "
+            + "the assignment does not change the target.")
     public void assignDistributionSetToTarget() throws Exception {
 
-        testdataFactory.createTarget("fsdfsd");
+        Target target = testdataFactory.createTarget();
         final DistributionSet set = testdataFactory.createDistributionSet("one");
 
-        mvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/fsdfsd/assignedDS")
+        mvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/" + target.getControllerId() + "/assignedDS")
                 .content("{\"id\":" + set.getId() + "}").contentType(MediaType.APPLICATION_JSON))
                 .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());
 
-        assertThat(deploymentManagement.getAssignedDistributionSet("fsdfsd").get()).isEqualTo(set);
+        assertThat(deploymentManagement.getAssignedDistributionSet(target.getControllerId()).get()).isEqualTo(set);
+        target = targetManagement.findTargetByControllerID(target.getControllerId()).get();
+
+        // repeating DS assignment leads again to OK
+        mvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/" + target.getControllerId() + "/assignedDS")
+                .content("{\"id\":" + set.getId() + "}").contentType(MediaType.APPLICATION_JSON))
+                .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());
+
+        // ...but does not change the target
+        assertThat(targetManagement.findTargetByControllerID(target.getControllerId()).get()).isEqualTo(target);
     }
 
     @Test