spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Polishing contribution

Browse Source 
Closes gh-35224
This commit is contained in:
rstoyanchev
2025-08-12 06:30:08 +01:00
parent b89dcb1a1a
commit fbe96a8112
3 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java
-1
View File
@@ -351,7 +351,6 @@ public class DefaultStompSession implements ConnectionHandlingStompSession {
if (headers == null){
headers = new StompHeaders();
}
String receiptId = checkOrAddReceipt(headers);
Receiptable receiptable = new ReceiptHandler(receiptId);
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompSession.java
+4 -2
View File
@@ -182,13 +182,15 @@ public interface StompSession {
/**
* Remove the subscription by sending an UNSUBSCRIBE frame.
* <p>As of 7.0, this method returns {@link Receiptable}.
*/
Receiptable unsubscribe();
/**
* Alternative to {@link #unsubscribe()} with additional custom headers
* to send to the server.
* <p><strong>Note:</strong> There is no need to set the subscription id.
* to send to the server. Note, however, there is no need to set the
* subscription id.
* <p>As of 7.0, this method returns {@link Receiptable}.
* @param headers the custom headers, if any
* @since 5.0
*/
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java
+10 -32
View File
@@ -664,7 +664,7 @@ public class DefaultStompSessionTests {
}
@Test
void unsubscribeWithReceipt() {
void unsubscribeWithoutReceipt() {
this.session.afterConnected(this.connection);
assertThat(this.session.isConnected()).isTrue();
Subscription subscription = this.session.subscribe("/topic/foo", mock());
@@ -672,62 +672,40 @@ public class DefaultStompSessionTests {
Receiptable receipt = subscription.unsubscribe();
assertThat(receipt).isNotNull();
assertThat(receipt.getReceiptId()).isNull();
Message<byte[]> message = this.messageCaptor.getValue();
StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
assertThat(accessor.getCommand()).isEqualTo(StompCommand.UNSUBSCRIBE);
StompHeaders stompHeaders = StompHeaders.readOnlyStompHeaders(accessor.getNativeHeaders());
assertThat(stompHeaders).hasSize(1);
assertThat(stompHeaders.getId()).isEqualTo(subscription.getSubscriptionId());
}
@Test
void unsubscribeWithCustomHeaderAndReceipt() {
void unsubscribeWithReceipt() {
this.session.afterConnected(this.connection);
this.session.setTaskScheduler(mock());
this.session.setAutoReceipt(true);
Subscription subscription = this.session.subscribe("/topic/foo", mock());
StompHeaders subHeaders = new StompHeaders();
subHeaders.setDestination("/topic/foo");
Subscription subscription = this.session.subscribe(subHeaders, mock());
StompHeaders custom = new StompHeaders();
custom.set("x-cust", "value");
Receiptable receipt = subscription.unsubscribe(custom);
Receiptable receipt = subscription.unsubscribe();
assertThat(receipt).isNotNull();
assertThat(receipt.getReceiptId()).isNotNull();
Message<byte[]> message = this.messageCaptor.getValue();
StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
assertThat(accessor.getCommand()).isEqualTo(StompCommand.UNSUBSCRIBE);
StompHeaders stompHeaders = StompHeaders.readOnlyStompHeaders(accessor.getNativeHeaders());
assertThat(stompHeaders.getId()).isEqualTo(subscription.getSubscriptionId());
assertThat(stompHeaders.get("x-cust")).containsExactly("value");
assertThat(stompHeaders.getReceipt()).isEqualTo(receipt.getReceiptId());
assertThat(accessor.getReceipt()).isEqualTo(receipt.getReceiptId());
}
@Test
void receiptReceivedOnUnsubscribe() {
this.session.afterConnected(this.connection);
TaskScheduler scheduler = mock();
this.session.setTaskScheduler(scheduler);
this.session.setTaskScheduler(mock());
this.session.setAutoReceipt(true);
Subscription subscription = this.session.subscribe("/topic/foo", mock());
Receiptable receipt = subscription.unsubscribe();
StompHeaderAccessor ack = StompHeaderAccessor.create(StompCommand.RECEIPT);
ack.setReceiptId(receipt.getReceiptId());
ack.setLeaveMutable(true);
Message<byte[]> receiptMessage = MessageBuilder.createMessage(new byte[0], ack.getMessageHeaders());
AtomicBoolean called = new AtomicBoolean(false);
receipt.addReceiptTask(() -> called.set(true));
this.session.handleMessage(receiptMessage);
StompHeaderAccessor ack = StompHeaderAccessor.create(StompCommand.RECEIPT);
ack.setReceiptId(receipt.getReceiptId());
ack.setLeaveMutable(true);
this.session.handleMessage(MessageBuilder.createMessage(new byte[0], ack.getMessageHeaders()));
assertThat(called.get()).isTrue();
}