Perform NullAway build-time checks in spring-jms

See spring-projectsgh-32475
sdeleuze · Mar 25, 2024 · 2fc78df · 2fc78df
1 parent e52ee01
commit 2fc78df
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle
@@ -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")

diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
@@ -285,6 +285,7 @@ public static Session doGetTransactionalSession(
 	 * @throws JMSException in case of JMS failure
 	 */
 	@Nullable
+	@SuppressWarnings("NullAway")
 	public static Session doGetTransactionalSession(
 			ConnectionFactory connectionFactory, ResourceFactory resourceFactory, boolean startConnection)
 			throws JMSException {

diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
@@ -332,6 +332,7 @@ private ConnectionFactory obtainTargetConnectionFactory() {
 	 * @throws jakarta.jms.JMSException if thrown by JMS API methods
 	 * @see #initConnection()
 	 */
+	@SuppressWarnings("NullAway")
 	protected Connection getConnection() throws JMSException {
 		this.connectionLock.lock();
 		try {

diff --git a/...g-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java b/...g-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer.java
@@ -1440,6 +1440,7 @@ private void decreaseActiveInvokerCount() {
 			}
 		}
 
+		@SuppressWarnings("NullAway")
 		private void initResourcesIfNecessary() throws JMSException {
 			if (getCacheLevel() <= CACHE_CONNECTION) {
 				updateRecoveryMarker();

diff --git a/...ng-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java b/...ng-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java
@@ -315,6 +315,7 @@ protected void initializeConsumers() throws JMSException {
 	 * @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) {