Polishing

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationAotContribution.java

@@ -40,8 +40,7 @@ public interface BeanRegistrationAotContribution {
 	 * default code generation isn't suitable.
 	 * @param generationContext the generation context
 	 * @param codeFragments the existing code fragments
-	 * @return the code fragments to use, may be the original instance or a
+	 * @return the code fragments to use, may be the original instance or a wrapper
-	 * wrapper
 	 */
 	default BeanRegistrationCodeFragments customizeBeanRegistrationCodeFragments(
 			GenerationContext generationContext, BeanRegistrationCodeFragments codeFragments) {
@@ -77,8 +76,7 @@ public interface BeanRegistrationAotContribution {
 				return defaultCodeFragments.apply(codeFragments);
 			}
 			@Override
-			public void applyTo(GenerationContext generationContext,
+			public void applyTo(GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode) {
-					BeanRegistrationCode beanRegistrationCode) {
 			}
 		};
 	}

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationCodeFragments.java

@@ -31,14 +31,15 @@ import org.springframework.javapoet.CodeBlock;
 
 /**
  * Generate the various fragments of code needed to register a bean.
- * <p>
+ *
- * A default implementation is provided that suits most needs and custom code
+ * <p>A default implementation is provided that suits most needs and custom code
  * fragments are only expected to be used by library authors having built custom
  * arrangement on top of the core container.
- * <p>
+ *
- * Users are not expected to implement this interface directly, but rather extends
+ * <p>Users are not expected to implement this interface directly, but rather
- * from {@link BeanRegistrationCodeFragmentsDecorator} and only override the
+ * extends from {@link BeanRegistrationCodeFragmentsDecorator} and only override
- * necessary method(s).
+ * the necessary method(s).
+ *
  * @author Phillip Webb
  * @author Stephane Nicoll
  * @since 6.0
@@ -48,12 +49,12 @@ import org.springframework.javapoet.CodeBlock;
 public interface BeanRegistrationCodeFragments {
 
 	/**
-	 * The variable name to used when creating the bean definition.
+	 * The variable name used when creating the bean definition.
 	 */
 	String BEAN_DEFINITION_VARIABLE = "beanDefinition";
 
 	/**
-	 * The variable name to used when creating the bean definition.
+	 * The variable name used when creating the bean definition.
 	 */
 	String INSTANCE_SUPPLIER_VARIABLE = "instanceSupplier";
 
@@ -69,8 +70,7 @@ public interface BeanRegistrationCodeFragments {
 
 	/**
 	 * Generate the code that defines the new bean definition instance.
-	 * <p>
+	 * <p>This should declare a variable named {@value BEAN_DEFINITION_VARIABLE}
-	 * This should declare a variable named {@value BEAN_DEFINITION_VARIABLE}
 	 * so that further fragments can refer to the variable to further tune
 	 * the bean definition.
 	 * @param generationContext the generation context
@@ -94,14 +94,13 @@ public interface BeanRegistrationCodeFragments {
 
 	/**
 	 * Generate the code that sets the instance supplier on the bean definition.
-	 * <p>
+	 * <p>The {@code postProcessors} represent methods to be exposed once the
-	 * The {@code postProcessors} represent methods to be exposed once the
 	 * instance has been created to further configure it. Each method should
 	 * accept two parameters, the {@link RegisteredBean} and the bean
 	 * instance, and should return the modified bean instance.
 	 * @param generationContext the generation context
 	 * @param beanRegistrationCode the bean registration code
-	 * @param instanceSupplierCode the instance supplier code supplier code
+	 * @param instanceSupplierCode the instance supplier code
 	 * @param postProcessors any instance post processors that should be applied
 	 * @return the generated code
 	 * @see #generateInstanceSupplierCode

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanRegistrationCodeGenerator.java

@@ -58,6 +58,7 @@ class BeanRegistrationCodeGenerator implements BeanRegistrationCode {
 		this.codeFragments = codeFragments;
 	}
 
+
 	@Override
 	public ClassName getClassName() {
 		return this.className;

spring-beans/src/main/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragments.java

@@ -246,7 +246,7 @@ class DefaultBeanRegistrationCodeFragments implements BeanRegistrationCodeFragme
 	}
 
 	private boolean hasInstanceSupplier() {
-		return this.registeredBean.getMergedBeanDefinition().getInstanceSupplier() != null;
+		return (this.registeredBean.getMergedBeanDefinition().getInstanceSupplier() != null);
 	}
 
 }

spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java

@@ -31,9 +31,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.lang.Nullable;
 
 /**
- * A collection of {@link BeanFactoryInitializationAotContribution AOT
+ * A collection of {@link BeanFactoryInitializationAotContribution AOT contributions}
- * contributions} obtained from {@link BeanFactoryInitializationAotProcessor AOT
+ * obtained from {@link BeanFactoryInitializationAotProcessor AOT processors}.
- * processors}.
  *
  * @author Phillip Webb
  * @since 6.0
@@ -47,14 +46,12 @@ class BeanFactoryInitializationAotContributions {
 		this(beanFactory, AotServices.factoriesAndBeans(beanFactory));
 	}
 
-	BeanFactoryInitializationAotContributions(DefaultListableBeanFactory beanFactory,
+	BeanFactoryInitializationAotContributions(DefaultListableBeanFactory beanFactory, AotServices.Loader loader) {
-			AotServices.Loader loader) {
 		this.contributions = getContributions(beanFactory, getProcessors(loader));
 	}
 
 
-	private static List<BeanFactoryInitializationAotProcessor> getProcessors(
+	private static List<BeanFactoryInitializationAotProcessor> getProcessors(AotServices.Loader loader) {
-			AotServices.Loader loader) {
 		List<BeanFactoryInitializationAotProcessor> processors = new ArrayList<>(
 				loader.load(BeanFactoryInitializationAotProcessor.class).asList());
 		processors.add(new RuntimeHintsBeanFactoryInitializationAotProcessor());
@@ -62,8 +59,8 @@ class BeanFactoryInitializationAotContributions {
 	}
 
 	private List<BeanFactoryInitializationAotContribution> getContributions(
-			DefaultListableBeanFactory beanFactory,
+			DefaultListableBeanFactory beanFactory, List<BeanFactoryInitializationAotProcessor> processors) {
-			List<BeanFactoryInitializationAotProcessor> processors) {
+
 		List<BeanFactoryInitializationAotContribution> contributions = new ArrayList<>();
 		for (BeanFactoryInitializationAotProcessor processor : processors) {
 			BeanFactoryInitializationAotContribution contribution = processAheadOfTime(processor, beanFactory);
@@ -75,8 +72,8 @@ class BeanFactoryInitializationAotContributions {
 	}
 
 	@Nullable
-	private BeanFactoryInitializationAotContribution processAheadOfTime(BeanFactoryInitializationAotProcessor processor,
+	private BeanFactoryInitializationAotContribution processAheadOfTime(
-			DefaultListableBeanFactory beanFactory) {
+			BeanFactoryInitializationAotProcessor processor, DefaultListableBeanFactory beanFactory) {
 
 		try {
 			return processor.processAheadOfTime(beanFactory);
@@ -92,6 +89,7 @@ class BeanFactoryInitializationAotContributions {
 
 	void applyTo(GenerationContext generationContext,
 			BeanFactoryInitializationCode beanFactoryInitializationCode) {
+
 		for (BeanFactoryInitializationAotContribution contribution : this.contributions) {
 			contribution.applyTo(generationContext, beanFactoryInitializationCode);
 		}

spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateQueryException.java

@@ -40,9 +40,9 @@ public class HibernateQueryException extends InvalidDataAccessResourceUsageExcep
 	 * Return the HQL query string that was invalid.
 	 */
 	@Nullable
-	@SuppressWarnings("NullAway")
 	public String getQueryString() {
-		return ((QueryException) getCause()).getQueryString();
+		QueryException cause = (QueryException) getCause();
+		return (cause != null ? cause.getQueryString() : null);
 	}
 
 }

spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java

@@ -120,7 +120,6 @@ public class LocalSessionFactoryBuilder extends Configuration {
 
 	private final ResourcePatternResolver resourcePatternResolver;
 
-	@Nullable
 	private TypeFilter[] entityTypeFilters = DEFAULT_ENTITY_TYPE_FILTERS;
 
 
@@ -379,11 +378,9 @@ public class LocalSessionFactoryBuilder extends Configuration {
 	 * the current class descriptor contained in the metadata reader.
 	 */
 	private boolean matchesEntityTypeFilter(MetadataReader reader, MetadataReaderFactory readerFactory) throws IOException {
-		if (this.entityTypeFilters != null) {
+		for (TypeFilter filter : this.entityTypeFilters) {
-			for (TypeFilter filter : this.entityTypeFilters) {
+			if (filter.match(reader, readerFactory)) {
-				if (filter.match(reader, readerFactory)) {
+				return true;
-					return true;
-				}
 			}
 		}
 		return false;