Browse Source

Perform NullAway build-time checks in spring-jms

See gh-32475
pull/31257/merge
Sébastien Deleuze 2 years ago
parent
commit
2fc78dfb69
  1. 2
      gradle/spring-module.gradle
  2. 1
      spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
  3. 1
      spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
  4. 1
      spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
  5. 1
      spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java

2
gradle/spring-module.gradle

@ -118,7 +118,7 @@ tasks.withType(JavaCompile).configureEach { @@ -118,7 +118,7 @@ tasks.withType(JavaCompile).configureEach {
disableAllChecks = true
option("NullAway:CustomContractAnnotations", "org.springframework.lang.Contract")
option("NullAway:AnnotatedPackages", "org.springframework.core,org.springframework.expression," +
"org.springframework.web")
"org.springframework.web,org.springframework.jms")
option("NullAway:UnannotatedSubPackages", "org.springframework.instrument,org.springframework.context.index," +
"org.springframework.asm,org.springframework.cglib,org.springframework.objenesis," +
"org.springframework.javapoet,org.springframework.aot.nativex.substitution")

1
spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java

@ -285,6 +285,7 @@ public abstract class ConnectionFactoryUtils { @@ -285,6 +285,7 @@ public abstract class ConnectionFactoryUtils {
* @throws JMSException in case of JMS failure
*/
@Nullable
@SuppressWarnings("NullAway")
public static Session doGetTransactionalSession(
ConnectionFactory connectionFactory, ResourceFactory resourceFactory, boolean startConnection)
throws JMSException {

1
spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java

@ -332,6 +332,7 @@ public class SingleConnectionFactory implements ConnectionFactory, QueueConnecti @@ -332,6 +332,7 @@ public class SingleConnectionFactory implements ConnectionFactory, QueueConnecti
* @throws jakarta.jms.JMSException if thrown by JMS API methods
* @see #initConnection()
*/
@SuppressWarnings("NullAway")
protected Connection getConnection() throws JMSException {
this.connectionLock.lock();
try {

1
spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java

@ -1440,6 +1440,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe @@ -1440,6 +1440,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
}
}
@SuppressWarnings("NullAway")
private void initResourcesIfNecessary() throws JMSException {
if (getCacheLevel() <= CACHE_CONNECTION) {
updateRecoveryMarker();

1
spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java

@ -315,6 +315,7 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta @@ -315,6 +315,7 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta
* @throws JMSException if thrown by JMS methods
* @see #executeListener
*/
@SuppressWarnings("NullAway")
protected MessageConsumer createListenerConsumer(final Session session) throws JMSException {
Destination destination = getDestination();
if (destination == null) {

Loading…
Cancel
Save