Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
#	spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
#	spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
This commit is contained in:
Juergen Hoeller
2025-03-25 17:13:02 +01:00
parent fb423d66e3 84430a8db2
commit 3872c1a762
6 changed files with 113 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -56,6 +56,8 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
private @Nullable Integer sessionAcknowledgeMode;
private @Nullable Boolean acknowledgeAfterListener;
private @Nullable Boolean pubSubDomain;
private @Nullable Boolean replyPubSubDomain;
@@ -125,6 +127,14 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
this.sessionAcknowledgeMode = sessionAcknowledgeMode;
}
/**
* @since 6.2.6
* @see AbstractMessageListenerContainer#setAcknowledgeAfterListener(boolean)
*/
public void setAcknowledgeAfterListener(Boolean acknowledgeAfterListener) {
this.acknowledgeAfterListener = acknowledgeAfterListener;
}
/**
* @see AbstractMessageListenerContainer#setPubSubDomain(boolean)
*/
@@ -193,6 +203,7 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
this.observationRegistry = observationRegistry;
}
@Override
public C createListenerContainer(JmsListenerEndpoint endpoint) {
C instance = createContainerInstance();
@@ -218,6 +229,9 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
if (this.sessionAcknowledgeMode != null) {
instance.setSessionAcknowledgeMode(this.sessionAcknowledgeMode);
}
if (this.acknowledgeAfterListener != null) {
instance.setAcknowledgeAfterListener(this.acknowledgeAfterListener);
}
if (this.pubSubDomain != null) {
instance.setPubSubDomain(this.pubSubDomain);
}

51
spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -152,7 +152,8 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
implements MessageListenerContainer {
private static final boolean micrometerJakartaPresent = ClassUtils.isPresent(
"io.micrometer.jakarta9.instrument.jms.JmsInstrumentation", AbstractMessageListenerContainer.class.getClassLoader());
"io.micrometer.jakarta9.instrument.jms.JmsInstrumentation",
AbstractMessageListenerContainer.class.getClassLoader());
private volatile @Nullable Object destination;
@@ -166,12 +167,12 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
private @Nullable String subscriptionName;
private boolean pubSubNoLocal = false;
private @Nullable Boolean replyPubSubDomain;
private @Nullable QosSettings replyQosSettings;
private boolean pubSubNoLocal = false;
private @Nullable MessageConverter messageConverter;
private @Nullable ExceptionListener exceptionListener;
@@ -180,6 +181,8 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
private @Nullable ObservationRegistry observationRegistry;
private boolean acknowledgeAfterListener = true;
private boolean exposeListenerSession = true;
private boolean acceptMessagesWhileStopping = false;
@@ -484,12 +487,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
*/
@Override
public boolean isReplyPubSubDomain() {
if (this.replyPubSubDomain != null) {
return this.replyPubSubDomain;
}
else {
return isPubSubDomain();
}
return (this.replyPubSubDomain != null ? this.replyPubSubDomain : isPubSubDomain());
}
/**
@@ -575,6 +573,37 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
return this.observationRegistry;
}
/**
* Specify whether the listener container should automatically acknowledge
* each JMS Message after the message listener returned. This applies in
* case of client acknowledge modes, including vendor-specific modes but
* not in case of auto-acknowledge or a transacted JMS Session.
* <p>As of 6.2, the default is {@code true}: The listener container will
* acknowledge each JMS Message even in case of a vendor-specific mode,
* assuming client-acknowledge style processing for custom vendor modes.
* <p>If the provided listener prefers to manually acknowledge each message in
* the listener itself, in combination with an "individual acknowledge" mode,
* switch this flag to {code false} along with the vendor-specific mode.
* @since 6.2.6
* @see #setSessionAcknowledgeMode
* @see #setMessageListener
* @see Message#acknowledge()
*/
public void setAcknowledgeAfterListener(boolean acknowledgeAfterListener) {
this.acknowledgeAfterListener = acknowledgeAfterListener;
}
/**
* Determine whether the listener container should automatically acknowledge
* each JMS Message after the message listener returned.
* @since 6.2.6
* @see #setAcknowledgeAfterListener
* @see #isClientAcknowledge(Session)
*/
public boolean isAcknowledgeAfterListener() {
return this.acknowledgeAfterListener;
}
/**
* Set whether to expose the listener JMS Session to a registered
* {@link SessionAwareMessageListener} as well as to
@@ -812,7 +841,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
JmsUtils.commitIfNecessary(session);
}
}
else if (message != null && isClientAcknowledge(session)) {
else if (message != null && isAcknowledgeAfterListener() && isClientAcknowledge(session)) {
message.acknowledge();
}
}