moved action filtering to the database query level (#12)

* simplified method * Use @ExpectedEvents instead of EventHandlerStubs * removed @param from 'existsByTargetControllerIdAndStatusAndActiveIsTrue' * reverted metadata initialization Signed-off-by: Ahmed Sayed <[email protected]>
bosch-io · Jun 21, 2019 · 2bb0f3d · 2bb0f3d
1 parent 7acf2c8
commit 2bb0f3d
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 186 deletions.
diff --git a/...est/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java b/...est/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java
@@ -135,21 +135,21 @@ public void sendDownloadAndInstallStatusMessageDuringMaintenanceWindow() {
     @Test
     @Description("Verify that a distribution assignment multiple times send cancel and assign events with right softwaremodules")
     @ExpectEvents({ @Expect(type = TargetCreatedEvent.class, count = 1),
-            @Expect(type = TargetAssignDistributionSetEvent.class, count = 1),
+            @Expect(type = TargetAssignDistributionSetEvent.class, count = 2),
             @Expect(type = CancelTargetAssignmentEvent.class, count = 1),
             @Expect(type = ActionCreatedEvent.class, count = 2), @Expect(type = ActionUpdatedEvent.class, count = 1),
             @Expect(type = SoftwareModuleCreatedEvent.class, count = 6),
-            @Expect(type = SoftwareModuleUpdatedEvent.class, count = 6),
+            @Expect(type = SoftwareModuleUpdatedEvent.class, count = 12),
             @Expect(type = DistributionSetCreatedEvent.class, count = 2),
-            @Expect(type = TargetUpdatedEvent.class, count = 2), @Expect(type = TargetPollEvent.class, count = 3) })
+            @Expect(type = TargetUpdatedEvent.class, count = 2), @Expect(type = TargetPollEvent.class, count = 2) })
     public void assignDistributionSetMultipleTimes() {
         final String controllerId = TARGET_PREFIX + "assignDistributionSetMultipleTimes";
 
         final DistributionSetAssignmentResult assignmentResult = registerTargetAndAssignDistributionSet(controllerId);
-
         final DistributionSet distributionSet2 = testdataFactory.createDistributionSet(UUID.randomUUID().toString());
-        registerTargetAndAssignDistributionSet(distributionSet2.getId(), TargetUpdateStatus.PENDING,
-                getDistributionSet().getModules(), controllerId);
+        testdataFactory.addSoftwareModuleMetadata(distributionSet2);
+        assignDistributionSet(distributionSet2.getId(), controllerId);
+        assertDownloadAndInstallMessage(distributionSet2.getModules(), controllerId);
         assertCancelActionMessage(assignmentResult.getActionIds().get(0), controllerId);
 
         createAndSendThingCreated(controllerId, TENANT_EXIST);

diff --git a/...hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/matcher/SoftwareModuleJsonMatcher.java b/...hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/matcher/SoftwareModuleJsonMatcher.java
@@ -57,50 +57,27 @@ public SoftwareModulesMatcher(final List<DmfSoftwareModule> expectedModules) {
             this.expectedModules = expectedModules;
         }
 
-        static boolean containsExactly(final Object actual, final List<DmfSoftwareModule> expected) {
+        boolean containsExactly(final Object actual) {
             if (actual == null) {
-                return expected == null;
+                return expectedModules == null;
             }
 
             @SuppressWarnings("unchecked")
             final Collection<SoftwareModule> modules = (Collection<SoftwareModule>) actual;
 
-            if (modules.size() != expected.size()) {
-                return false;
-            }
-
-            for (final SoftwareModule repoSoftwareModule : modules) {
-                boolean containsElement = false;
-
-                for (final DmfSoftwareModule jsonSoftwareModule : expected) {
-                    if (!jsonSoftwareModule.getModuleId().equals(repoSoftwareModule.getId())) {
-                        continue;
-                    }
-                    containsElement = true;
-
-                    if (!jsonSoftwareModule.getModuleType().equals(repoSoftwareModule.getType().getKey())) {
-                        return false;
-                    }
-                    if (!jsonSoftwareModule.getModuleVersion().equals(repoSoftwareModule.getVersion())) {
-                        return false;
-                    }
-                    if (jsonSoftwareModule.getArtifacts().size() != repoSoftwareModule.getArtifacts().size()) {
-                        return false;
-                    }
-                }
-
-                if (!containsElement) {
-                    return false;
-                }
-
-            }
+            return expectedModules.stream().allMatch(e -> existsIn(e, modules));
+        }
 
-            return true;
+        private static boolean existsIn(final DmfSoftwareModule module, final Collection<SoftwareModule> actual) {
+            return actual.stream()
+                    .anyMatch(e -> module.getModuleType().equals(e.getType().getKey())
+                            && module.getModuleVersion().equals(e.getVersion())
+                            && module.getArtifacts().size() == e.getArtifacts().size());
         }
 
         @Override
         public boolean matches(final Object actualValue) {
-            return containsExactly(actualValue, expectedModules);
+            return containsExactly(actualValue);
         }
 
         @Override

diff --git a/...bit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfMetadata.java b/...bit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfMetadata.java
@@ -79,4 +79,8 @@ public boolean equals(final Object obj) {
         return true;
     }
 
+    @Override
+    public String toString() {
+        return String.format("DmfMetadata [key='%s', value='%s']", key, value);
+    }
 }
diff --git a/...f/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfSoftwareModule.java b/...f/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfSoftwareModule.java
@@ -83,4 +83,11 @@ public void setMetadata(final List<DmfMetadata> metadata) {
         }
     }
 
+    @Override
+    public String toString() {
+        return String.format(
+                "DmfSoftwareModule [moduleId=%d, moduleType='%s', moduleVersion='%s', artifacts=%s, metadata=%s]",
+                moduleId, moduleType, moduleVersion, artifacts, metadata);
+    }
+
 }
diff --git a/...bit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/ActionRepository.java b/...bit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/ActionRepository.java
@@ -127,6 +127,20 @@ public interface ActionRepository extends BaseEntityRepository<JpaAction, Long>,
     @Query("SELECT CASE WHEN COUNT(a)>0 THEN 'true' ELSE 'false' END FROM JpaAction a JOIN a.target t WHERE t.controllerId=:controllerId AND a.active=1")
     boolean activeActionExistsForControllerId(@Param("controllerId") String controllerId);
 
+    /**
+     * Check if any active actions with given action status and given controller
+     * ID exist.
+     *
+     * @param controllerId
+     *            of the target to check for actions
+     * @param currentStatus
+     *            of the active action to look for
+     *
+     * @return <code>true</code> if one or more active actions for the given
+     *         controllerId and action status are found
+     */
+    boolean existsByTargetControllerIdAndStatusAndActiveIsTrue(String controllerId, Action.Status currentStatus);
+
     /**
      * Retrieves latest {@link Action} for given target and
      * {@link SoftwareModule}.

diff --git a/...tory-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OnlineDsAssignmentStrategy.java b/...tory-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OnlineDsAssignmentStrategy.java
@@ -196,8 +196,8 @@ private void sendTargetAssignDistributionSetEvent(final String tenant, final lon
     }
 
     private boolean hasPendingCancellations(final Target target) {
-        return actionRepository.findByActiveAndTarget(ACTION_PAGE_REQUEST, target.getControllerId(), true).getContent()
-                .stream().anyMatch(action -> action.getStatus() == Status.CANCELING);
+        return actionRepository.existsByTargetControllerIdAndStatusAndActiveIsTrue(target.getControllerId(),
+                Status.CANCELING);
     }
 
     /**