Polishing

Author: jhoeller

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

@@ -32,6 +32,7 @@ public class AotBeanProcessingException extends AotProcessingException {
 
 	private final RootBeanDefinition beanDefinition;
 
+
 	/**
 	 * Create an instance with the {@link RegisteredBean} that fails to be
 	 * processed, a detail message, and an optional root cause.
@@ -65,6 +66,7 @@ private static String createErrorMessage(RegisteredBean registeredBean, String m
 		return sb.toString();
 	}
 
+
 	/**
 	 * Return the bean definition of the bean that failed to be processed.
 	 */

spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java

@@ -783,16 +783,13 @@ public void applyTo(GenerationContext generationContext, BeanRegistrationCode be
 					});
 			GeneratedMethod generateMethod = generatedClass.getMethods().add("apply", method -> {
 				method.addJavadoc("Apply resource autowiring.");
-				method.addModifiers(javax.lang.model.element.Modifier.PUBLIC,
-						javax.lang.model.element.Modifier.STATIC);
+				method.addModifiers(javax.lang.model.element.Modifier.PUBLIC, javax.lang.model.element.Modifier.STATIC);
 				method.addParameter(RegisteredBean.class, REGISTERED_BEAN_PARAMETER);
 				method.addParameter(this.target, INSTANCE_PARAMETER);
 				method.returns(this.target);
-				method.addCode(generateMethodCode(generatedClass.getName(),
-						generationContext.getRuntimeHints()));
+				method.addCode(generateMethodCode(generatedClass.getName(), generationContext.getRuntimeHints()));
 			});
 			beanRegistrationCode.addInstancePostProcessor(generateMethod.toMethodReference());
-
 			registerHints(generationContext.getRuntimeHints());
 		}
 

spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java

@@ -846,12 +846,11 @@ private CodeBlock generateResourceToInjectCode(
 			return CodeBlock.of("$L($L)", generatedMethod.getName(), REGISTERED_BEAN_PARAMETER);
 		}
 
-		@SuppressWarnings("NullAway") // Dataflow analysis limitation
 		private void generateGetEntityManagerMethod(MethodSpec.Builder method, PersistenceElement injectedElement) {
 			String unitName = injectedElement.unitName;
 			Properties properties = injectedElement.properties;
 			method.addJavadoc("Get the '$L' {@link $T}.",
-					(StringUtils.hasLength(unitName)) ? unitName : "default",
+					(StringUtils.hasLength(unitName) ? unitName : "default"),
 					EntityManager.class);
 			method.addModifiers(javax.lang.model.element.Modifier.PUBLIC,
 					javax.lang.model.element.Modifier.STATIC);
@@ -861,18 +860,16 @@ private void generateGetEntityManagerMethod(MethodSpec.Builder method, Persisten
 					"$T entityManagerFactory = $T.findEntityManagerFactory(($T) $L.getBeanFactory(), $S)",
 					EntityManagerFactory.class, EntityManagerFactoryUtils.class,
 					ListableBeanFactory.class, REGISTERED_BEAN_PARAMETER, unitName);
-			boolean hasProperties = !CollectionUtils.isEmpty(properties);
-			if (hasProperties) {
-				method.addStatement("$T properties = new Properties()",
-						Properties.class);
+			if (properties != null) {
+				method.addStatement("$T properties = new Properties()", Properties.class);
 				for (String propertyName : new TreeSet<>(properties.stringPropertyNames())) {
 					method.addStatement("properties.put($S, $S)", propertyName, properties.getProperty(propertyName));
 				}
 			}
 			method.addStatement(
 					"return $T.createSharedEntityManager(entityManagerFactory, $L, $L)",
 					SharedEntityManagerCreator.class,
-					(hasProperties) ? "properties" : null,
+					(properties != null ? "properties" : null),
 					injectedElement.synchronizedWithTransaction);
 		}
 	}