ack immediately last msg of non-txn batch

SolaceDev · Jun 7, 2024 · 4153483 · 4153483
1 parent e7d9da1
commit 4153483
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/...main/java/com/solace/spring/cloud/stream/binder/outbound/JCSMPOutboundMessageHandler.java b/...main/java/com/solace/spring/cloud/stream/binder/outbound/JCSMPOutboundMessageHandler.java
@@ -116,6 +116,10 @@ public void handleMessage(Message<?> message) throws MessagingException {
 			smfMessages.forEach(smfMessage -> smfMessage.setCorrelationKey(
 					Objects.requireNonNullElse(batchProxyCorrelationKey, correlationKey)));
 
+			if (transactedSession == null) {
+				smfMessages.get(smfMessages.size() - 1).setAckImmediately(true);
+			}
+
 			// after successfully running xmlMessageMapper.mapBatchMessage(),
 			// SolaceBinderHeaders.BATCHED_HEADERS is verified to be well-formed
 

diff --git a/.../java/com/solace/spring/cloud/stream/binder/outbound/JCSMPOutboundMessageHandlerTest.java b/.../java/com/solace/spring/cloud/stream/binder/outbound/JCSMPOutboundMessageHandlerTest.java
@@ -181,7 +181,21 @@ public void test_responseReceived_withInTimeout(
 		}
 
 		getCorrelationKeys().forEach(pubEventHandlerCaptor.getValue()::responseReceivedEx);
-		assertThat(xmlMessageCaptor.getAllValues()).hasSize(batched ? batchingConfig.getNumberOfMessages() : 1);
+		assertThat(xmlMessageCaptor.getAllValues())
+				.hasSize(batched ? batchingConfig.getNumberOfMessages() : 1)
+				.satisfies(msgs -> {
+					boolean lastMsgIsAckImmediately = batched && !transacted;
+					assertThat(lastMsgIsAckImmediately ? msgs.subList(0, msgs.size() - 1) : msgs)
+							.extracting(XMLMessage::isAckImmediately)
+							.containsOnly(false);
+
+					if (lastMsgIsAckImmediately) {
+						assertThat(msgs)
+								.last()
+								.extracting(XMLMessage::isAckImmediately)
+								.isEqualTo(true);
+					}
+				});
 
 		assertThat(correlationData.getFuture()).succeedsWithin(100, TimeUnit.MILLISECONDS);
 		assertThat(timesSuccessResolved).hasValue(1);