Add nullability annotations to module/spring-boot-jooq

See gh-46587

Author: mhalbritter

module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/DefaultExceptionTranslatorExecuteListener.java

@@ -23,6 +23,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jooq.ExecuteContext;
 import org.jooq.SQLDialect;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
@@ -117,7 +118,7 @@ private SQLExceptionTranslator apply(SQLDialect dialect) {
 					: new SQLExceptionSubclassTranslator();
 		}
 
-		private String getSpringDbName(SQLDialect dialect) {
+		private @Nullable String getSpringDbName(@Nullable SQLDialect dialect) {
 			return (dialect != null && dialect.thirdParty() != null) ? dialect.thirdParty().springDbName() : null;
 		}
 

module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/JooqAutoConfiguration.java

@@ -133,6 +133,7 @@ Settings settings(JooqProperties properties) throws IOException {
 			throw new JaxbNotAvailableException();
 		}
 		Resource resource = properties.getConfig();
+		Assert.state(resource != null, "'resource' must not be null");
 		Assert.state(resource.exists(),
 				() -> "Resource %s set in spring.jooq.config does not exist".formatted(resource));
 		try (InputStream stream = resource.getInputStream()) {

module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/JooqProperties.java

@@ -19,6 +19,7 @@
 import javax.sql.DataSource;
 
 import org.jooq.SQLDialect;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.core.io.Resource;
@@ -37,26 +38,26 @@ public class JooqProperties {
 	/**
 	 * SQL dialect to use. Auto-detected by default.
 	 */
-	private SQLDialect sqlDialect;
+	private @Nullable SQLDialect sqlDialect;
 
 	/**
 	 * Location of the jOOQ config file.
 	 */
-	private Resource config;
+	private @Nullable Resource config;
 
-	public SQLDialect getSqlDialect() {
+	public @Nullable SQLDialect getSqlDialect() {
 		return this.sqlDialect;
 	}
 
-	public void setSqlDialect(SQLDialect sqlDialect) {
+	public void setSqlDialect(@Nullable SQLDialect sqlDialect) {
 		this.sqlDialect = sqlDialect;
 	}
 
-	public Resource getConfig() {
+	public @Nullable Resource getConfig() {
 		return this.config;
 	}
 
-	public void setConfig(Resource config) {
+	public void setConfig(@Nullable Resource config) {
 		this.config = config;
 	}
 

module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/NoDslContextBeanFailureAnalyzer.java

@@ -17,6 +17,7 @@
 package org.springframework.boot.jooq.autoconfigure;
 
 import org.jooq.DSLContext;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -35,7 +36,7 @@ class NoDslContextBeanFailureAnalyzer extends AbstractFailureAnalyzer<NoSuchBean
 	}
 
 	@Override
-	protected FailureAnalysis analyze(Throwable rootFailure, NoSuchBeanDefinitionException cause) {
+	protected @Nullable FailureAnalysis analyze(Throwable rootFailure, NoSuchBeanDefinitionException cause) {
 		if (DSLContext.class.equals(cause.getBeanType()) && hasR2dbcAutoConfiguration()) {
 			return new FailureAnalysis(
 					"jOOQ has not been auto-configured as R2DBC has been auto-configured in favor of JDBC and jOOQ "

module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/SpringTransactionProvider.java

@@ -23,6 +23,7 @@
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
+import org.springframework.util.Assert;
 
 /**
  * Allows Spring Transaction to be used with jOOQ.
@@ -61,6 +62,7 @@ public void rollback(TransactionContext ctx) {
 
 	private TransactionStatus getTransactionStatus(TransactionContext ctx) {
 		SpringTransaction transaction = (SpringTransaction) ctx.transaction();
+		Assert.state(transaction != null, "'transaction' must not be null");
 		return transaction.getTxStatus();
 	}
 

module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/SqlDialectLookup.java

@@ -25,6 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jooq.SQLDialect;
 import org.jooq.tools.jdbc.JDBCUtils;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Utility to lookup well known {@link SQLDialect SQLDialects} from a {@link DataSource}.
@@ -45,7 +46,7 @@ private SqlDialectLookup() {
 	 * @param dataSource the source {@link DataSource}
 	 * @return the most suitable {@link SQLDialect}
 	 */
-	static SQLDialect getDialect(DataSource dataSource) {
+	static SQLDialect getDialect(@Nullable DataSource dataSource) {
 		try (Connection connection = (dataSource != null) ? dataSource.getConnection() : null) {
 			return JDBCUtils.dialect(connection);
 		}

module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/autoconfigure/package-info.java

@@ -17,4 +17,7 @@
 /**
  * Auto-configuration for jOOQ.
  */
+@NullMarked
 package org.springframework.boot.jooq.autoconfigure;
+
+import org.jspecify.annotations.NullMarked;

module/spring-boot-jooq/src/main/java/org/springframework/boot/jooq/package-info.java

@@ -19,4 +19,7 @@
  *
  * @see org.springframework.boot.json.JsonParser
  */
+@NullMarked
 package org.springframework.boot.jooq;
+
+import org.jspecify.annotations.NullMarked;