Merge pull request #3623 from ebean-orm/feature/readOnly-DataSource-mark-nullable

Explicitly mark Database.readOnlyDataSource() as @nullable

Author: rbygrave

ebean-api/src/main/java/io/ebean/Database.java

@@ -137,6 +137,7 @@ static DatabaseBuilder builder() {
   /**
    * Return the associated read only DataSource for this Database instance (can be null).
    */
+  @Nullable
   DataSource readOnlyDataSource();
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -278,6 +278,7 @@ public DataSource dataSource() {
   }
 
   @Override
+  @Nullable
   public DataSource readOnlyDataSource() {
     return transactionManager.readOnlyDataSource();
   }

ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java

@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
+import org.jspecify.annotations.Nullable;
+
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -25,6 +27,7 @@ public interface DataSourceSupplier {
    * This can return null meaning that no read only DataSource (with autoCommit)
    * is available for use so normal transactions with explicit commit should be used.
    */
+  @Nullable
   DataSource readOnlyDataSource();
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java

@@ -10,6 +10,7 @@
 import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.datasource.DataSourcePool;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeSet;
@@ -30,6 +31,8 @@
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 
 import jakarta.persistence.PersistenceException;
+import org.jspecify.annotations.Nullable;
+
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -257,6 +260,7 @@ public final DataSource dataSource() {
   }
 
   @Override
+  @Nullable
   public final DataSource readOnlyDataSource() {
     return dataSourceSupplier.readOnlyDataSource();
   }