Consider target ack to be requested if target ack is live-response

and signal is a live signal requiring a response Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Oct 2, 2020 · a40c288 · a40c288
1 parent a842b37
commit a40c288
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/...g/src/main/java/org/eclipse/ditto/services/connectivity/messaging/BasePublisherActor.java b/...g/src/main/java/org/eclipse/ditto/services/connectivity/messaging/BasePublisherActor.java
@@ -63,6 +63,7 @@
 import org.eclipse.ditto.model.placeholders.ExpressionResolver;
 import org.eclipse.ditto.model.placeholders.PlaceholderFilter;
 import org.eclipse.ditto.model.things.ThingId;
+import org.eclipse.ditto.protocoladapter.ProtocolAdapter;
 import org.eclipse.ditto.services.connectivity.messaging.config.ConnectionConfig;
 import org.eclipse.ditto.services.connectivity.messaging.config.ConnectivityConfig;
 import org.eclipse.ditto.services.connectivity.messaging.config.DittoConnectivityConfig;
@@ -88,6 +89,8 @@
 import org.eclipse.ditto.signals.acks.base.Acknowledgements;
 import org.eclipse.ditto.signals.base.Signal;
 import org.eclipse.ditto.signals.commands.base.CommandResponse;
+import org.eclipse.ditto.signals.commands.messages.MessageCommand;
+import org.eclipse.ditto.signals.commands.things.ThingCommand;
 import org.eclipse.ditto.signals.events.thingsearch.SubscriptionEvent;
 
 import akka.actor.AbstractActor;
@@ -546,13 +549,26 @@ private static Charset determineCharset(final CharSequence contentType) {
     }
 
     private static boolean isTargetAckRequested(final OutboundSignal.Mapped mapped, final Target target) {
-        final Set<AcknowledgementLabel> requestedAcks = mapped.getSource()
-                .getDittoHeaders()
+        final Signal<?> originatingSignal = mapped.getSource();
+        final DittoHeaders dittoHeaders = originatingSignal.getDittoHeaders();
+        final Set<AcknowledgementLabel> requestedAcks = dittoHeaders
                 .getAcknowledgementRequests()
                 .stream()
                 .map(AcknowledgementRequest::getLabel)
                 .collect(Collectors.toSet());
-        return target.getIssuedAcknowledgementLabel().filter(requestedAcks::contains).isPresent();
+
+        if (target.getIssuedAcknowledgementLabel()
+                .filter(DittoAcknowledgementLabel.LIVE_RESPONSE::equals)
+                .isPresent()) {
+            return dittoHeaders.isResponseRequired() && isLiveSignal(originatingSignal);
+        } else {
+            return target.getIssuedAcknowledgementLabel().filter(requestedAcks::contains).isPresent();
+        }
+    }
+
+    private static boolean isLiveSignal(final Signal<?> signal) {
+        return signal instanceof MessageCommand ||
+                (signal instanceof ThingCommand && ProtocolAdapter.isLiveSignal(signal));
     }
 
     private SendingContext sendingContextForReplyTarget(final OutboundSignal.Mapped outboundSignal,