Make MethodName package-private

Closes gh-28832

Author: philwebb

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

@@ -25,12 +25,12 @@
 import org.springframework.aot.generate.GeneratedMethod;
 import org.springframework.aot.generate.GeneratedMethods;
 import org.springframework.aot.generate.GenerationContext;
-import org.springframework.aot.generate.MethodName;
 import org.springframework.aot.generate.MethodReference;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.javapoet.ClassName;
 import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
 
 /**
  * Generates a method that returns a {@link BeanDefinition} to be registered.
@@ -153,7 +153,7 @@ private String getName() {
 			nonGeneratedParent = nonGeneratedParent.getParent();
 		}
 		if (nonGeneratedParent != null) {
-			return MethodName.of(getSimpleBeanName(nonGeneratedParent.getBeanName()), "innerBean").toString();
+			return StringUtils.uncapitalize(getSimpleBeanName(nonGeneratedParent.getBeanName()) + "InnerBean");
 		}
 		return "innerBean";
 	}

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

@@ -68,17 +68,6 @@ private GeneratedMethods(Function<MethodName, String> methodNameGenerator,
 	 * @return the newly added {@link GeneratedMethod}
 	 */
 	public GeneratedMethod add(String suggestedName, Consumer<Builder> method) {
-		Assert.notNull(suggestedName, "'suggestedName' must not be null");
-		return add(MethodName.of(suggestedName), method);
-	}
-
-	/**
-	 * Add a new {@link GeneratedMethod}.
-	 * @param suggestedName the suggested name for the method
-	 * @param method a {@link Consumer} used to build the method
-	 * @return the newly added {@link GeneratedMethod}
-	 */
-	public GeneratedMethod add(MethodName suggestedName, Consumer<Builder> method) {
 		Assert.notNull(suggestedName, "'suggestedName' must not be null");
 		Assert.notNull(method, "'method' must not be null");
 		String generatedName = this.methodNameGenerator.apply(this.prefix.and(suggestedName));

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

@@ -28,7 +28,7 @@
  * @author Phillip Webb
  * @since 6.0
  */
-public final class MethodName {
+final class MethodName {
 
 	private static final String[] PREFIXES = { "get", "set", "is" };
 
@@ -51,7 +51,7 @@ private MethodName(String value) {
 	 * @param parts the parts the form the name
 	 * @return a method name instance
 	 */
-	public static MethodName of(String... parts) {
+	static MethodName of(String... parts) {
 		Assert.notNull(parts, "'parts' must not be null");
 		return new MethodName(join(parts));
 	}
@@ -61,7 +61,7 @@ public static MethodName of(String... parts) {
 	 * @param name the name to concatenate
 	 * @return a new method name instance
 	 */
-	public MethodName and(MethodName name) {
+	MethodName and(MethodName name) {
 		Assert.notNull(name, "'name' must not be null");
 		return and(name.value);
 	}
@@ -71,7 +71,7 @@ public MethodName and(MethodName name) {
 	 * @param parts the parts to concatenate
 	 * @return a new method name instance
 	 */
-	public MethodName and(String... parts) {
+	MethodName and(String... parts) {
 		Assert.notNull(parts, "'parts' must not be null");
 		String joined = join(parts);
 		String prefix = getPrefix(joined);

spring-core/src/test/java/org/springframework/aot/generate/GeneratedMethodsTests.java

@@ -52,20 +52,6 @@ void createWithExistingGeneratorUsesGenerator() {
 		assertThat(methods.add("test", methodSpecCustomizer).getName()).hasToString("__test");
 	}
 
-	@Test
-	void addWithMethodNameWhenSuggestedMethodIsNullThrowsException() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				this.methods.add((MethodName) null, methodSpecCustomizer))
-			.withMessage("'suggestedName' must not be null");
-	}
-
-	@Test
-	void addWithMethodNameWhenMethodIsNullThrowsException() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				this.methods.add(MethodName.of("test"), null))
-		.withMessage("'method' must not be null");
-	}
-
 	@Test
 	void addWithStringNameWhenSuggestedMethodIsNullThrowsException() {
 		assertThatIllegalArgumentException().isThrownBy(() ->

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

@@ -43,7 +43,6 @@
 import org.springframework.aot.generate.GeneratedMethod;
 import org.springframework.aot.generate.GeneratedMethods;
 import org.springframework.aot.generate.GenerationContext;
-import org.springframework.aot.generate.MethodName;
 import org.springframework.aot.generate.MethodReference;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.beans.BeanUtils;
@@ -826,8 +825,8 @@ private CodeBlock generateResourceToInjectCode(GeneratedMethods generatedMethods
 						EntityManagerFactoryUtils.class, ListableBeanFactory.class,
 						REGISTERED_BEAN_PARAMETER, unitName);
 			}
-			GeneratedMethod generatedMethod = generatedMethods
-					.add(MethodName.of("get", unitName, "EntityManager"), method ->
+			String methodName = "get" + StringUtils.capitalize(unitName) + "EntityManager";
+			GeneratedMethod generatedMethod = generatedMethods.add(methodName, method ->
 							generateGetEntityManagerMethod(method, injectedElement));
 			return CodeBlock.of("$L($L)", generatedMethod.getName(), REGISTERED_BEAN_PARAMETER);
 		}