Merge branch 'master' into Download_server_supports_download_through_HTTP_and_HTTPs

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetAssignmentResult.java

@@ -8,6 +8,7 @@
  */
 package org.eclipse.hawkbit.repository;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.hawkbit.repository.model.AssignmentResult;
@@ -19,7 +20,7 @@ import org.eclipse.hawkbit.repository.model.Target;
  * how much of the assignments had already been existed.
  *
  */
-public class DistributionSetAssignmentResult extends AssignmentResult {
+public class DistributionSetAssignmentResult extends AssignmentResult<Target> {
 
     private final List<String> assignedTargets;
     private final List<Long> actions;
@@ -45,16 +46,14 @@ public class DistributionSetAssignmentResult extends AssignmentResult {
      */
     public DistributionSetAssignmentResult(final List<String> assignedTargets, final int assigned,
             final int alreadyAssigned, final List<Long> actions, final TargetManagement targetManagement) {
-        super(assigned, alreadyAssigned);
+        super(assigned, alreadyAssigned, 0, Collections.emptyList(), Collections.emptyList());
         this.assignedTargets = assignedTargets;
         this.actions = actions;
         this.targetManagement = targetManagement;
     }
-
-    /**
-     * @return the assignedTargets
-     */
-    public List<Target> getAssignedTargets() {
+    
+    @Override
+    public List<Target> getAssignedEntity() {
         return targetManagement.findTargetByControllerID(assignedTargets);
     }
 

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/AssignmentResult.java

@@ -8,15 +8,21 @@
  */
 package org.eclipse.hawkbit.repository.model;
 
+import java.util.List;
+
 /**
  * Generic assignment result bean.
  *
  */
-public class AssignmentResult {
+public class AssignmentResult<T extends BaseEntity> {
 
     private final int total;
     private final int assigned;
     private final int alreadyAssigned;
+    
+    private final int unassigned;
+    private final List<T> assignedEntity;
+    private final List<T> unassignedEntity;
 
     /**
      * Constructor.
@@ -24,25 +30,47 @@ public class AssignmentResult {
      * @param assigned
      *            is the number of newly assigned elements.
      * @param alreadyAssigned
-     *            is the number of already assigned elements.
+     *            number of already assigned/ignored elements
+     * @param unassigned
+     *            number of newly assigned elements
+     * @param assignedEntity
+     *            {@link List} of assigned entity.
+     * @param unassignedEntity
+     *            {@link List} of unassigned entity.
      */
-    public AssignmentResult(final int assigned, final int alreadyAssigned) {
-        super();
+    public AssignmentResult(final int assigned, final int alreadyAssigned, final int unassigned,
+            final List<T> assignedEntity, final List<T> unassignedEntity) {
         this.assigned = assigned;
         this.alreadyAssigned = alreadyAssigned;
         total = assigned + alreadyAssigned;
+        this.unassigned = unassigned;
+        this.assignedEntity = assignedEntity;
+        this.unassignedEntity = unassignedEntity;
     }
-
+    
     public int getAssigned() {
         return assigned;
     }
-
+    
     public int getTotal() {
         return total;
     }
-
+    
     public int getAlreadyAssigned() {
         return alreadyAssigned;
     }
+    
+
+    public int getUnassigned() {
+        return unassigned;
+    }
+
+    public List<T> getAssignedEntity() {
+        return assignedEntity;
+    }
+    
+    public List<T> getUnassignedEntity() {
+        return unassignedEntity;
+    }
 
 }

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java

@@ -14,11 +14,8 @@ import java.util.List;
  * Result object for {@link DistributionSetTag} assignments.
  *
  */
-public class DistributionSetTagAssignmentResult extends AssignmentResult {
+public class DistributionSetTagAssignmentResult extends AssignmentResult<DistributionSet> {
 
-    private final int unassigned;
-    private final List<DistributionSet> assignedDs;
-    private final List<DistributionSet> unassignedDs;
     private final DistributionSetTag distributionSetTag;
 
     /**
@@ -40,27 +37,13 @@ public class DistributionSetTagAssignmentResult extends AssignmentResult {
     public DistributionSetTagAssignmentResult(final int alreadyAssigned, final int assigned, final int unassigned,
             final List<DistributionSet> assignedDs, final List<DistributionSet> unassignedDs,
             final DistributionSetTag distributionSetTag) {
-        super(assigned, alreadyAssigned);
-        this.unassigned = unassigned;
-        this.assignedDs = assignedDs;
-        this.unassignedDs = unassignedDs;
+        super(assigned, alreadyAssigned,unassigned, assignedDs, unassignedDs);
         this.distributionSetTag = distributionSetTag;
     }
 
-    public int getUnassigned() {
-        return unassigned;
-    }
-
     public DistributionSetTag getDistributionSetTag() {
         return distributionSetTag;
     }
 
-    public List<DistributionSet> getAssignedDs() {
-        return assignedDs;
-    }
-
-    public List<DistributionSet> getUnassignedDs() {
-        return unassignedDs;
-    }
 
 }

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java

@@ -14,11 +14,8 @@ import java.util.List;
  * Result object for {@link TargetTag} assignments.
  *
  */
-public class TargetTagAssignmentResult extends AssignmentResult {
+public class TargetTagAssignmentResult extends AssignmentResult<Target> {
 
-    private final int unassigned;
-    private final List<Target> assignedTargets;
-    private final List<Target> unassignedTargets;
     private final TargetTag targetTag;
 
     /**
@@ -39,25 +36,10 @@ public class TargetTagAssignmentResult extends AssignmentResult {
      */
     public TargetTagAssignmentResult(final int alreadyAssigned, final int assigned, final int unassigned,
             final List<Target> assignedTargets, final List<Target> unassignedTargets, final TargetTag targetTag) {
-        super(assigned, alreadyAssigned);
-        this.unassigned = unassigned;
-        this.assignedTargets = assignedTargets;
-        this.unassignedTargets = unassignedTargets;
+        super(assigned, alreadyAssigned, unassigned, assignedTargets, unassignedTargets);
         this.targetTag = targetTag;
     }
 
-    public int getUnassigned() {
-        return unassigned;
-    }
-
-    public List<Target> getAssignedTargets() {
-        return assignedTargets;
-    }
-
-    public List<Target> getUnassignedTargets() {
-        return unassignedTargets;
-    }
-
     public TargetTag getTargetTag() {
         return targetTag;
     }