[#1228] also start AcknowledgementAggregatorActor for "smart channel …

…commands" + validate command responses also for those Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Dec 22, 2021 · d5f95d6 · d5f95d6
1 parent dca1a03
commit d5f95d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.../src/main/java/org/eclipse/ditto/internal/models/acks/AcknowledgementAggregatorActor.java b/.../src/main/java/org/eclipse/ditto/internal/models/acks/AcknowledgementAggregatorActor.java
@@ -220,7 +220,8 @@ private void handleThingCommandResponse(final ThingCommandResponse<?> thingComma
 
     private MatchingValidationResult validateResponse(final CommandResponse<?> commandResponse) {
         final MatchingValidationResult result;
-        if (SignalInformationPoint.isLiveCommand(originatingSignal)) {
+        if (SignalInformationPoint.isLiveCommand(originatingSignal) ||
+                SignalInformationPoint.isChannelSmart(originatingSignal)) {
             result = tryToValidateLiveResponse((Command<?>) originatingSignal, commandResponse);
         } else {
 

diff --git a/...in/java/org/eclipse/ditto/internal/models/acks/AcknowledgementAggregatorActorStarter.java b/...in/java/org/eclipse/ditto/internal/models/acks/AcknowledgementAggregatorActorStarter.java
@@ -280,6 +280,7 @@ private static boolean shouldStartForIncoming(final Signal<?> signal) {
         final boolean result;
 
         final var isLiveSignal = SignalInformationPoint.isChannelLive(signal);
+        final var isChannelSmart = SignalInformationPoint.isChannelSmart(signal);
         final Collection<AcknowledgementRequest> ackRequests = signal.getDittoHeaders().getAcknowledgementRequests();
         if (signal instanceof ThingModifyCommand && !isLiveSignal) {
             result = ackRequests.stream().anyMatch(AcknowledgementForwarderActorStarter::isNotLiveResponse);
@@ -288,7 +289,7 @@ private static boolean shouldStartForIncoming(final Signal<?> signal) {
 
             result = ackRequests.stream().anyMatch(AcknowledgementForwarderActorStarter::isNotTwinPersisted);
         } else {
-            result = false;
+            result = isChannelSmart;
         }
 
         return result;