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 1233a949c31..a042945f17d 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 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 6848bde9040..4d351241d0d 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 8ddedb2c097..e16779ab779 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 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 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 180c3f083ba..e992b4b0c84 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;