Polishing

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,21 +60,18 @@ public CodeBlock generateCode(Class<?>[] parameterTypes, int startIndex) {
 		return generateCode(parameterTypes, startIndex, "args");
 	}
 
-	public CodeBlock generateCode(Class<?>[] parameterTypes, int startIndex,
-			String variableName) {
-
+	public CodeBlock generateCode(Class<?>[] parameterTypes, int startIndex, String variableName) {
 		Assert.notNull(parameterTypes, "'parameterTypes' must not be null");
 		Assert.notNull(variableName, "'variableName' must not be null");
 		boolean ambiguous = isAmbiguous();
 		CodeBlock.Builder code = CodeBlock.builder();
 		for (int i = startIndex; i < parameterTypes.length; i++) {
-			code.add((i != startIndex) ? ", " : "");
+			code.add(i > startIndex ? ", " : "");
 			if (!ambiguous) {
 				code.add("$L.get($L)", variableName, i - startIndex);
 			}
 			else {
-				code.add("$L.get($L, $T.class)", variableName, i - startIndex,
-						parameterTypes[i]);
+				code.add("$L.get($L, $T.class)", variableName, i - startIndex, parameterTypes[i]);
 			}
 		}
 		return code.build();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,16 +58,14 @@ public final class AutowiredFieldValueResolver extends AutowiredElementResolver
 	private final boolean required;
 
 	@Nullable
-	private final String shortcut;
+	private final String shortcutBeanName;
 
 
-	private AutowiredFieldValueResolver(String fieldName, boolean required,
-			@Nullable String shortcut) {
-
+	private AutowiredFieldValueResolver(String fieldName, boolean required, @Nullable String shortcut) {
 		Assert.hasText(fieldName, "'fieldName' must not be empty");
 		this.fieldName = fieldName;
 		this.required = required;
-		this.shortcut = shortcut;
+		this.shortcutBeanName = shortcut;
 	}
 
 
@@ -97,7 +95,7 @@ public static AutowiredFieldValueResolver forRequiredField(String fieldName) {
 	 * direct bean name injection shortcut.
 	 * @param beanName the bean name to use as a shortcut
 	 * @return a new {@link AutowiredFieldValueResolver} instance that uses the
-	 * shortcuts
+	 * given shortcut bean name
 	 */
 	public AutowiredFieldValueResolver withShortcut(String beanName) {
 		return new AutowiredFieldValueResolver(this.fieldName, this.required, beanName);
@@ -178,8 +176,8 @@ private Object resolveValue(RegisteredBean registeredBean, Field field) {
 		ConfigurableBeanFactory beanFactory = registeredBean.getBeanFactory();
 		DependencyDescriptor descriptor = new DependencyDescriptor(field, this.required);
 		descriptor.setContainingClass(beanClass);
-		if (this.shortcut != null) {
-			descriptor = new ShortcutDependencyDescriptor(descriptor, this.shortcut);
+		if (this.shortcutBeanName != null) {
+			descriptor = new ShortcutDependencyDescriptor(descriptor, this.shortcutBeanName);
 		}
 		Set<String> autowiredBeanNames = new LinkedHashSet<>(1);
 		TypeConverter typeConverter = beanFactory.getTypeConverter();

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

@@ -63,17 +63,17 @@ public final class AutowiredMethodArgumentsResolver extends AutowiredElementReso
 	private final boolean required;
 
 	@Nullable
-	private final String[] shortcuts;
+	private final String[] shortcutBeanNames;
 
 
 	private AutowiredMethodArgumentsResolver(String methodName, Class<?>[] parameterTypes,
-			boolean required, @Nullable String[] shortcuts) {
+			boolean required, @Nullable String[] shortcutBeanNames) {
 
 		Assert.hasText(methodName, "'methodName' must not be empty");
 		this.methodName = methodName;
 		this.parameterTypes = parameterTypes;
 		this.required = required;
-		this.shortcuts = shortcuts;
+		this.shortcutBeanNames = shortcutBeanNames;
 	}
 
 
@@ -105,7 +105,7 @@ public static AutowiredMethodArgumentsResolver forRequiredMethod(String methodNa
 	 * @param beanNames the bean names to use as shortcuts (aligned with the
 	 * method parameters)
 	 * @return a new {@link AutowiredMethodArgumentsResolver} instance that uses
-	 * the shortcuts
+	 * the given shortcut bean names
 	 */
 	public AutowiredMethodArgumentsResolver withShortcut(String... beanNames) {
 		return new AutowiredMethodArgumentsResolver(this.methodName, this.parameterTypes, this.required, beanNames);
@@ -171,7 +171,7 @@ private AutowiredArguments resolveArguments(RegisteredBean registeredBean,
 			MethodParameter parameter = new MethodParameter(method, i);
 			DependencyDescriptor descriptor = new DependencyDescriptor(parameter, this.required);
 			descriptor.setContainingClass(beanClass);
-			String shortcut = (this.shortcuts != null ? this.shortcuts[i] : null);
+			String shortcut = (this.shortcutBeanNames != null ? this.shortcutBeanNames[i] : null);
 			if (shortcut != null) {
 				descriptor = new ShortcutDependencyDescriptor(descriptor, shortcut);
 			}

spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java

@@ -644,25 +644,29 @@ private static TestGenerationContext processAheadOfTime(GenericApplicationContex
 
 	private static void testCompiledResult(GenericApplicationContext applicationContext,
 			BiConsumer<ApplicationContextInitializer<GenericApplicationContext>, Compiled> result) {
+
 		testCompiledResult(processAheadOfTime(applicationContext), result);
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings("unchecked")
 	private static void testCompiledResult(TestGenerationContext generationContext,
 			BiConsumer<ApplicationContextInitializer<GenericApplicationContext>, Compiled> result) {
+
 		TestCompiler.forSystem().with(generationContext).compile(compiled ->
 				result.accept(compiled.getInstance(ApplicationContextInitializer.class), compiled));
 	}
 
 	private static GenericApplicationContext toFreshApplicationContext(
 			ApplicationContextInitializer<GenericApplicationContext> initializer) {
+
 		GenericApplicationContext freshApplicationContext = createFreshApplicationContext(initializer);
 		freshApplicationContext.refresh();
 		return freshApplicationContext;
 	}
 
 	private static GenericApplicationContext createFreshApplicationContext(
 			ApplicationContextInitializer<GenericApplicationContext> initializer) {
+
 		GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
 		initializer.initialize(freshApplicationContext);
 		return freshApplicationContext;

spring-core/src/main/java/org/springframework/aot/generate/ValueCodeGenerationException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ public class ValueCodeGenerationException extends RuntimeException {
 	@Nullable
 	private final Object value;
 
+
 	protected ValueCodeGenerationException(String message, @Nullable Object value, @Nullable Throwable cause) {
 		super(message, cause);
 		this.value = value;
@@ -49,9 +50,9 @@ private static String buildErrorMessage(@Nullable Object value) {
 		return message.toString();
 	}
 
+
 	/**
 	 * Return the value that failed to be generated.
-	 * @return the value
 	 */
 	@Nullable
 	public Object getValue() {

spring-core/src/main/java/org/springframework/aot/generate/ValueCodeGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,20 +33,24 @@
  */
 public final class ValueCodeGenerator {
 
-	private static final ValueCodeGenerator INSTANCE = new ValueCodeGenerator(ValueCodeGeneratorDelegates.INSTANCES, null);
+	private static final ValueCodeGenerator INSTANCE =
+			new ValueCodeGenerator(ValueCodeGeneratorDelegates.INSTANCES, null);
 
 	private static final CodeBlock NULL_VALUE_CODE_BLOCK = CodeBlock.of("null");
 
+
 	private final List<Delegate> delegates;
 
 	@Nullable
 	private final GeneratedMethods generatedMethods;
 
+
 	private ValueCodeGenerator(List<Delegate> delegates, @Nullable GeneratedMethods generatedMethods) {
 		this.delegates = delegates;
 		this.generatedMethods = generatedMethods;
 	}
 
+
 	/**
 	 * Return an instance that provides support for {@linkplain
 	 * ValueCodeGeneratorDelegates#INSTANCES common value types}.
@@ -75,6 +79,7 @@ public static ValueCodeGenerator with(List<Delegate> delegates) {
 		return new ValueCodeGenerator(new ArrayList<>(delegates), null);
 	}
 
+
 	public ValueCodeGenerator add(List<Delegate> additionalDelegates) {
 		Assert.notEmpty(additionalDelegates, "AdditionalDelegates must not be empty");
 		List<Delegate> allDelegates = new ArrayList<>(this.delegates);
@@ -117,7 +122,6 @@ public CodeBlock generateCode(@Nullable Object value) {
 		}
 	}
 
-
 	/**
 	 * Return the {@link GeneratedMethods} that represents the scope
 	 * in which code generated by this instance will be added, or
@@ -129,6 +133,7 @@ public GeneratedMethods getGeneratedMethods() {
 		return this.generatedMethods;
 	}
 
+
 	/**
 	 * Strategy interface that can be used to implement code generation for a
 	 * particular value type.
@@ -146,7 +151,6 @@ public interface Delegate {
 		 */
 		@Nullable
 		CodeBlock generateCode(ValueCodeGenerator valueCodeGenerator, Object value);
-
 	}
 
 }