Merge pull request #283 from bsinno/fix_dmf_cancel

Fixed DMF sending out wrong message if action on CANCELING

hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java

@@ -11,6 +11,7 @@ package org.eclipse.hawkbit.repository;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.validation.constraints.NotNull;
 
@@ -111,7 +112,18 @@ public interface ControllerManagement {
      * @return a list of actions assigned to given target which are active
      */
     @PreAuthorize(SpringEvalExpressions.IS_CONTROLLER)
-    List<Action> findActionByTargetAndActive(@NotNull Target target);
+    List<Action> findActiveActionByTarget(@NotNull Target target);
+
+    /**
+     * Retrieves oldest {@link Action} that is active and assigned to a
+     * {@link Target}.
+     *
+     * @param target
+     *            the target to retrieve the actions from
+     * @return a list of actions assigned to given target which are active
+     */
+    @PreAuthorize(SpringEvalExpressions.IS_CONTROLLER)
+    Optional<Action> findOldestActiveActionByTarget(@NotNull Target target);
 
     /**
      * Get the {@link Action} entity for given actionId with all lazy

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/ActionRepository.java

@@ -10,6 +10,7 @@ package org.eclipse.hawkbit.repository.jpa;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
 import org.eclipse.hawkbit.repository.jpa.model.JpaAction;
 import org.eclipse.hawkbit.repository.jpa.model.JpaDistributionSet;
@@ -79,21 +80,31 @@ public interface ActionRepository extends BaseEntityRepository<JpaAction, Long>,
     Slice<Action> findByTarget(Pageable pageable, JpaTarget target);
 
     /**
-     * Retrieves all {@link Action}s which are active and referring the given
-     * {@link Target} in a specified order. Loads also the lazy
-     * {@link Action#getDistributionSet()} field.
+     * Retrieves all {@link Action}s which are active and referring to the given
+     * {@link Target} order by ID ascending.
      *
-     * @param pageable
-     *            page parameters
      * @param target
      *            the target to find assigned actions
      * @param active
      *            the action active flag
      * @return the found {@link Action}s
      */
-    @EntityGraph(value = "Action.ds", type = EntityGraphType.LOAD)
     List<Action> findByTargetAndActiveOrderByIdAsc(final JpaTarget target, boolean active);
 
+    /**
+     * Retrieves the oldest {@link Action} that is active and referring to the
+     * given {@link Target}.
+     *
+     * @param target
+     *            the target to find assigned actions
+     * @param active
+     *            the action active flag
+     * 
+     * @return the found {@link Action}
+     */
+    @EntityGraph(value = "Action.ds", type = EntityGraphType.LOAD)
+    Optional<Action> findFirstByTargetAndActiveOrderByIdAsc(final JpaTarget target, boolean active);
+
     /**
      * Retrieves latest {@link UpdateAction} for given target and
      * {@link SoftwareModule}.

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java

@@ -12,6 +12,7 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -156,10 +157,15 @@ public class JpaControllerManagement implements ControllerManagement {
     }
 
     @Override
-    public List<Action> findActionByTargetAndActive(final Target target) {
+    public List<Action> findActiveActionByTarget(final Target target) {
         return actionRepository.findByTargetAndActiveOrderByIdAsc((JpaTarget) target, true);
     }
 
+    @Override
+    public Optional<Action> findOldestActiveActionByTarget(final Target target) {
+        return actionRepository.findFirstByTargetAndActiveOrderByIdAsc((JpaTarget) target, true);
+    }
+
     @Override
     public List<SoftwareModule> findSoftwareModulesByDistributionSet(final DistributionSet distributionSet) {
         return new ArrayList<>(softwareModuleRepository.findByAssignedTo((JpaDistributionSet) distributionSet));