HHH-16515 - Add o.h.exception to nullness checking

HHH-16515 - Add o.h.integrator to nullness checking

HHH-16515 - Add o.h.service to nullness checking

HHH-16515 - Add o.h.engine.jndi to nullness checking

HHH-16515 - Add o.h.engine.config to nullness checking

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

gradle/java-module.gradle

@@ -544,7 +544,7 @@ checkerFramework {
 	extraJavacArgs = [
             '-AsuppressWarnings=initialization',
             // stubs is passed directly through options.compilerArgumentProviders
-            '-AonlyDefs=^org\\.hibernate\\.(jpamodelgen|spi|pretty|stat|engine\\.(profile|transaction)|(action|context|bytecode)\\.spi)\\.'
+            '-AonlyDefs=^org\\.hibernate\\.(exception|integrator|jpamodelgen|service|spi|pretty|stat|engine\\.(config|jndi|profile|transaction)|(action|context|bytecode)\\.spi)\\.'
 	]
 }
 

hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java

@@ -659,10 +659,6 @@ public MetadataBuildingOptionsImpl(StandardServiceRegistry serviceRegistry) {
 			this.sharedCacheMode = configService.getSetting(
 					AvailableSettings.JAKARTA_SHARED_CACHE_MODE,
 					value -> {
-						if ( value == null ) {
-							return null;
-						}
-
 						if ( value instanceof SharedCacheMode ) {
 							return (SharedCacheMode) value;
 						}

hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java

@@ -187,7 +187,7 @@ public BootstrapServiceRegistry build() {
 			classLoaderService = providedClassLoaderService;
 		}
 
-		final IntegratorServiceImpl integratorService = new IntegratorServiceImpl(
+		final IntegratorServiceImpl integratorService = IntegratorServiceImpl.create(
 				providedIntegrators,
 				classLoaderService
 		);

hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java

@@ -365,7 +365,7 @@ public StandardServiceRegistry build() {
 		settingsCopy.put( LOADED_CONFIG_KEY, aggregatedCfgXml );
 		ConfigurationHelper.resolvePlaceHolders( settingsCopy );
 
-		return new StandardServiceRegistryImpl(
+		return StandardServiceRegistryImpl.create(
 				autoCloseRegistry,
 				bootstrapServiceRegistry,
 				initiators,

hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java

@@ -29,6 +29,8 @@
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.service.spi.Stoppable;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 /**
  * {@link ServiceRegistry} implementation containing specialized "bootstrap" services, specifically:<ul>
  *     <li>{@link ClassLoaderService}</li>
@@ -117,7 +119,7 @@ public BootstrapServiceRegistryImpl(
 		this.integratorServiceBinding = new ServiceBinding<>(
 				this,
 				IntegratorService.class,
-				new IntegratorServiceImpl( providedIntegrators, classLoaderService )
+				IntegratorServiceImpl.create( providedIntegrators, classLoaderService )
 		);
 	}
 
@@ -185,7 +187,7 @@ public BootstrapServiceRegistryImpl(
 
 
 	@Override
-	public <R extends Service> R getService(Class<R> serviceRole) {
+	public <R extends Service> @Nullable R getService(Class<R> serviceRole) {
 		final ServiceBinding<R> binding = locateServiceBinding( serviceRole );
 		return binding == null ? null : binding.getService();
 	}
@@ -235,7 +237,7 @@ public boolean isActive() {
 	}
 
 	@Override
-	public ServiceRegistry getParentServiceRegistry() {
+	public @Nullable ServiceRegistry getParentServiceRegistry() {
 		return null;
 	}
 

hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java

@@ -30,6 +30,14 @@ public class StandardServiceRegistryImpl extends AbstractServiceRegistryImpl imp
 	//Access to this field requires synchronization on -this-
 	private Map<String,Object> configurationValues;
 
+	protected StandardServiceRegistryImpl(
+			boolean autoCloseRegistry,
+			BootstrapServiceRegistry bootstrapServiceRegistry,
+			Map<String,Object> configurationValues) {
+		super( bootstrapServiceRegistry, autoCloseRegistry );
+		this.configurationValues = configurationValues;
+	}
+
 	/**
 	 * Constructs a StandardServiceRegistryImpl.  Should not be instantiated directly; use
 	 * {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder} instead
@@ -41,12 +49,13 @@ public class StandardServiceRegistryImpl extends AbstractServiceRegistryImpl imp
 	 *
 	 * @see org.hibernate.boot.registry.StandardServiceRegistryBuilder
 	 */
-	public StandardServiceRegistryImpl(
+	public static StandardServiceRegistryImpl create(
 			BootstrapServiceRegistry bootstrapServiceRegistry,
 			List<StandardServiceInitiator<?>> serviceInitiators,
 			List<ProvidedService<?>> providedServices,
 			Map<String,Object> configurationValues) {
-		this( true, bootstrapServiceRegistry, serviceInitiators, providedServices, configurationValues );
+
+		return create( true, bootstrapServiceRegistry, serviceInitiators, providedServices, configurationValues );
 	}
 
 	/**
@@ -62,20 +71,21 @@ public StandardServiceRegistryImpl(
 	 *
 	 * @see org.hibernate.boot.registry.StandardServiceRegistryBuilder
 	 */
-	public StandardServiceRegistryImpl(
+	public static StandardServiceRegistryImpl create(
 			boolean autoCloseRegistry,
 			BootstrapServiceRegistry bootstrapServiceRegistry,
 			List<StandardServiceInitiator<?>> serviceInitiators,
 			List<ProvidedService<?>> providedServices,
 			Map<String,Object> configurationValues) {
-		super( bootstrapServiceRegistry, autoCloseRegistry );
 
-		this.configurationValues = configurationValues;
+		StandardServiceRegistryImpl instance = new StandardServiceRegistryImpl( autoCloseRegistry, bootstrapServiceRegistry, configurationValues );
+		instance.initialize();
+		instance.applyServiceRegistrations( serviceInitiators, providedServices );
 
-		applyServiceRegistrations( serviceInitiators, providedServices );
+		return instance;
 	}
 
-	private void applyServiceRegistrations(List<StandardServiceInitiator<?>> serviceInitiators, List<ProvidedService<?>> providedServices) {
+	protected void applyServiceRegistrations(List<StandardServiceInitiator<?>> serviceInitiators, List<ProvidedService<?>> providedServices) {
 		try {
 			// process initiators
 			for ( ServiceInitiator<?> initiator : serviceInitiators ) {

hibernate-core/src/main/java/org/hibernate/cache/spi/access/AccessType.java

@@ -8,6 +8,8 @@
 
 import java.util.Locale;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 /**
  * Enumerates the policies for managing concurrent access to the shared
  * second-level cache.
@@ -70,7 +72,7 @@ public String toString() {
 	 *
 	 * @see #getExternalName()
 	 */
-	public static AccessType fromExternalName(String externalName) {
+	public static AccessType fromExternalName(@Nullable String externalName) {
 		if ( externalName == null ) {
 			return null;
 		}

hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java

@@ -13,11 +13,15 @@
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.internal.CoreMessageLogger;
+import org.hibernate.internal.util.NullnessUtil;
 import org.hibernate.service.spi.ServiceRegistryAwareService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 import org.jboss.logging.Logger;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.checker.nullness.qual.PolyNull;
+
 /**
  * The standard {@link ConfigurationService} implementation.
  *
@@ -52,12 +56,12 @@ public void injectServices(ServiceRegistryImplementor serviceRegistry) {
 	}
 
 	@Override
-	public <T> T getSetting(String name, Converter<T> converter) {
+	public <T> @Nullable T getSetting(String name, Converter<T> converter) {
 		return getSetting( name, converter, null );
 	}
 
 	@Override
-	public <T> T getSetting(String name, Converter<T> converter, T defaultValue) {
+	public <T> @PolyNull T getSetting(String name, Converter<T> converter, @PolyNull T defaultValue) {
 		final Object value = settings.get( name );
 		if ( value == null ) {
 			return defaultValue;
@@ -67,14 +71,14 @@ public <T> T getSetting(String name, Converter<T> converter, T defaultValue) {
 	}
 
 	@Override
-	public <T> T getSetting(String name, Class<T> expected, T defaultValue) {
+	public <T> @PolyNull T getSetting(String name, Class<T> expected, @PolyNull T defaultValue) {
 		final Object value = settings.get( name );
 		final T target = cast( expected, value );
 		return target !=null ? target : defaultValue;
 	}
 
 	@SuppressWarnings("unchecked")
-	public <T> T cast(Class<T> expected, Object candidate){
+	public <T> @Nullable T cast(Class<T> expected, @Nullable Object candidate){
 		if (candidate == null) {
 			return null;
 		}
@@ -89,7 +93,7 @@ public <T> T cast(Class<T> expected, Object candidate){
 		}
 		else {
 			try {
-				target = serviceRegistry.getService( ClassLoaderService.class ).classForName( candidate.toString() );
+				target = NullnessUtil.castNonNull( serviceRegistry.getService( ClassLoaderService.class ) ).classForName( candidate.toString() );
 			}
 			catch ( ClassLoadingException e ) {
 				LOG.debugf( "Unable to locate %s implementation class %s", expected.getName(), candidate.toString() );

hibernate-core/src/main/java/org/hibernate/engine/config/spi/ConfigurationService.java

@@ -10,6 +10,10 @@
 
 import org.hibernate.service.Service;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.checker.nullness.qual.PolyNull;
+
 /**
  * Provides access to the initial user-provided configuration values.  Generally speaking
  * these values come from:<ul>
@@ -38,7 +42,7 @@ public interface ConfigurationService extends Service {
 	 *
 	 * @return The converted (typed) setting.  May return {@code null} (see {@link #getSetting(String, Class, Object)})
 	 */
-	<T> T getSetting(String name, Converter<T> converter);
+	<T> @Nullable T getSetting(String name, Converter<T> converter);
 
 	/**
 	 * Get the named setting, using the specified converter and default value.
@@ -50,7 +54,7 @@ public interface ConfigurationService extends Service {
 	 *
 	 * @return The converted (typed) setting.  Will be the defaultValue if no such setting was defined.
 	 */
-	<T> T getSetting(String name, Converter<T> converter, T defaultValue);
+	<T> @PolyNull T getSetting(String name, Converter<T> converter, @PolyNull T defaultValue);
 
 	/**
 	 * Get the named setting.  Differs from the form taking a Converter in that here we expect to have a simple
@@ -63,7 +67,7 @@ public interface ConfigurationService extends Service {
 	 *
 	 * @return The converted (typed) setting.  Will be the defaultValue if no such setting was defined.
 	 */
-	<T> T getSetting(String name, Class<T> expected, T defaultValue);
+	<T> @PolyNull T getSetting(String name, Class<T> expected, @PolyNull T defaultValue);
 
 	/**
 	 * Simple conversion contract for converting an untyped object to a specified type.
@@ -78,6 +82,6 @@ interface Converter<T> {
 		 *
 		 * @return The converted (typed) value.
 		 */
-		T convert(Object value);
+		@NonNull T convert(Object value);
 	}
 }

hibernate-core/src/main/java/org/hibernate/engine/config/spi/StandardConverters.java

@@ -7,6 +7,8 @@
 package org.hibernate.engine.config.spi;
 
 
+import org.checkerframework.checker.nullness.qual.PolyNull;
+
 import static org.hibernate.engine.config.spi.ConfigurationService.Converter;
 
 /**
@@ -18,10 +20,6 @@ public class StandardConverters {
 	public static final Converter<Boolean> BOOLEAN = StandardConverters::asBoolean;
 
 	public static Boolean asBoolean(Object value) {
-		if ( value == null ) {
-			throw new IllegalArgumentException( "Null value passed to convert" );
-		}
-
 		return value instanceof Boolean
 				? (Boolean) value
 				: Boolean.parseBoolean( value.toString() );
@@ -30,20 +28,12 @@ public static Boolean asBoolean(Object value) {
 	public static final Converter<String> STRING = StandardConverters::asString;
 
 	public static String asString(Object value) {
-		if ( value == null ) {
-			throw new IllegalArgumentException( "Null value passed to convert" );
-		}
-
 		return value.toString();
 	}
 
 	public static final Converter<Integer> INTEGER = StandardConverters::asInteger;
 
 	public static Integer asInteger(Object value) {
-		if ( value == null ) {
-			throw new IllegalArgumentException( "Null value passed to convert" );
-		}
-
 		if ( value instanceof Number ) {
 			return ( (Number) value ).intValue();
 		}