Skip to content

Commit 578f155

Browse files
committed
Polishing
1 parent 444e06f commit 578f155

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private String getName() {
153153
nonGeneratedParent = nonGeneratedParent.getParent();
154154
}
155155
if (nonGeneratedParent != null) {
156-
return StringUtils.uncapitalize(getSimpleBeanName(nonGeneratedParent.getBeanName()) + "InnerBean");
156+
return getSimpleBeanName(nonGeneratedParent.getBeanName()) + "InnerBean";
157157
}
158158
return "innerBean";
159159
}
@@ -163,7 +163,7 @@ private String getSimpleBeanName(String beanName) {
163163
beanName = (lastDot != -1) ? beanName.substring(lastDot + 1) : beanName;
164164
int lastDollar = beanName.lastIndexOf('$');
165165
beanName = (lastDollar != -1) ? beanName.substring(lastDollar + 1) : beanName;
166-
return beanName;
166+
return StringUtils.uncapitalize(beanName);
167167
}
168168

169169
}

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,25 @@ private GeneratedMethods(Function<MethodName, String> methodNameGenerator,
6969
*/
7070
public GeneratedMethod add(String suggestedName, Consumer<Builder> method) {
7171
Assert.notNull(suggestedName, "'suggestedName' must not be null");
72+
return add(new String[] { suggestedName }, method);
73+
}
74+
75+
/**
76+
* Add a new {@link GeneratedMethod}.
77+
* @param suggestedNameParts the suggested name parts for the method
78+
* @param method a {@link Consumer} used to build method
79+
* @return the newly added {@link GeneratedMethod}
80+
*/
81+
public GeneratedMethod add(String[] suggestedNameParts, Consumer<Builder> method) {
82+
Assert.notNull(suggestedNameParts, "'suggestedNameParts' must not be null");
7283
Assert.notNull(method, "'method' must not be null");
73-
String generatedName = this.methodNameGenerator.apply(this.prefix.and(suggestedName));
84+
String generatedName = this.methodNameGenerator.apply(this.prefix.and(suggestedNameParts));
7485
GeneratedMethod generatedMethod = new GeneratedMethod(generatedName, method);
7586
this.generatedMethods.add(generatedMethod);
7687
return generatedMethod;
7788
}
7889

90+
7991
public GeneratedMethods withPrefix(String prefix) {
8092
Assert.notNull(prefix, "'prefix' must not be null");
8193
return new GeneratedMethods(this.methodNameGenerator, this.prefix.and(prefix), this.generatedMethods);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,8 +825,8 @@ private CodeBlock generateResourceToInjectCode(GeneratedMethods generatedMethods
825825
EntityManagerFactoryUtils.class, ListableBeanFactory.class,
826826
REGISTERED_BEAN_PARAMETER, unitName);
827827
}
828-
String methodName = "get" + StringUtils.capitalize(unitName) + "EntityManager";
829-
GeneratedMethod generatedMethod = generatedMethods.add(methodName, method ->
828+
String[] methodNameParts = { "get" , unitName, "EntityManager" };
829+
GeneratedMethod generatedMethod = generatedMethods.add(methodNameParts, method ->
830830
generateGetEntityManagerMethod(method, injectedElement));
831831
return CodeBlock.of("$L($L)", generatedMethod.getName(), REGISTERED_BEAN_PARAMETER);
832832
}

0 commit comments

Comments
 (0)