From 9573fc96ecedfe703af4a001b0ea66e5f74be3bb Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 25 Jul 2022 13:45:46 +0200
Subject: [PATCH] Polish

---
 .../org/springframework/aot/generate/AccessVisibility.java    | 2 --
 .../org/springframework/aot/generate/GeneratedMethod.java     | 2 +-
 .../org/springframework/aot/generate/GeneratedMethods.java    | 4 ++--
 .../java/org/springframework/aot/generate/MethodName.java     | 3 ++-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/aot/generate/AccessVisibility.java b/spring-core/src/main/java/org/springframework/aot/generate/AccessVisibility.java
index 1233a949c3..a042945f17 100644
--- a/spring-core/src/main/java/org/springframework/aot/generate/AccessVisibility.java
+++ b/spring-core/src/main/java/org/springframework/aot/generate/AccessVisibility.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import java.util.function.IntFunction;
 
 import org.springframework.core.ResolvableType;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -111,7 +110,6 @@ public enum AccessVisibility {
 		return forResolvableType(resolvableType, new HashSet<>());
 	}
 
-	@Nullable
 	private static AccessVisibility forResolvableType(ResolvableType resolvableType,
 			Set<ResolvableType> seen) {
 		if (!seen.add(resolvableType)) {
diff --git a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethod.java b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethod.java
index 6848bde904..4d351241d0 100644
--- a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethod.java
+++ b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethod.java
@@ -72,7 +72,7 @@ public final class GeneratedMethod {
 
 	@Override
 	public String toString() {
-		return this.name.toString();
+		return this.name;
 	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethods.java b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethods.java
index 8ddedb2c09..e16779ab77 100644
--- a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethods.java
+++ b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedMethods.java
@@ -42,8 +42,8 @@ public class GeneratedMethods {
 	private final List<GeneratedMethod> generatedMethods;
 
 	/**
-	 * Create a new {@link GeneratedMethods} instance backed by the given
-	 * {@link MethodNameGenerator}.
+	 * Create a new {@link GeneratedMethods} using the specified method name
+	 * generator.
 	 * @param methodNameGenerator the method name generator
 	 */
 	GeneratedMethods(Function<MethodName, String> methodNameGenerator) {
diff --git a/spring-core/src/main/java/org/springframework/aot/generate/MethodName.java b/spring-core/src/main/java/org/springframework/aot/generate/MethodName.java
index 180c3f083b..e992b4b0c8 100644
--- a/spring-core/src/main/java/org/springframework/aot/generate/MethodName.java
+++ b/spring-core/src/main/java/org/springframework/aot/generate/MethodName.java
@@ -19,6 +19,7 @@ package org.springframework.aot.generate;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -115,7 +116,7 @@ final class MethodName {
 				.map(StringUtils::capitalize).collect(Collectors.joining()));
 	}
 
-	private static String clean(String part) {
+	private static String clean(@Nullable String part) {
 		char[] chars = (part != null) ? part.toCharArray() : new char[0];
 		StringBuilder name = new StringBuilder(chars.length);
 		boolean uppercase = false;