Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 38c9e7f

Browse files
jhoellerjhoeller
committedAug 10, 2022
Polishing
1 parent b31a158 commit 38c9e7f

File tree

12 files changed

+47
-66
lines changed

12 files changed

+47
-66
lines changed
 

‎spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessor.java

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,21 @@
4646
* @author Phillip Webb
4747
* @since 6.0
4848
*/
49-
class ScopedProxyBeanRegistrationAotProcessor
50-
implements BeanRegistrationAotProcessor {
49+
class ScopedProxyBeanRegistrationAotProcessor implements BeanRegistrationAotProcessor {
5150

52-
private static final Log logger = LogFactory
53-
.getLog(ScopedProxyBeanRegistrationAotProcessor.class);
51+
private static final Log logger = LogFactory.getLog(ScopedProxyBeanRegistrationAotProcessor.class);
5452

5553

5654
@Override
5755
public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
5856
Class<?> beanType = registeredBean.getBeanType().toClass();
5957
if (beanType.equals(ScopedProxyFactoryBean.class)) {
60-
String targetBeanName = getTargetBeanName(
61-
registeredBean.getMergedBeanDefinition());
62-
BeanDefinition targetBeanDefinition = getTargetBeanDefinition(
63-
registeredBean.getBeanFactory(), targetBeanName);
58+
String targetBeanName = getTargetBeanName(registeredBean.getMergedBeanDefinition());
59+
BeanDefinition targetBeanDefinition =
60+
getTargetBeanDefinition(registeredBean.getBeanFactory(), targetBeanName);
6461
if (targetBeanDefinition == null) {
65-
logger.warn("Could not handle " + ScopedProxyFactoryBean.class.getSimpleName()
66-
+ ": no target bean definition found with name " + targetBeanName);
62+
logger.warn("Could not handle " + ScopedProxyFactoryBean.class.getSimpleName() +
63+
": no target bean definition found with name " + targetBeanName);
6764
return null;
6865
}
6966
return BeanRegistrationAotContribution.ofBeanRegistrationCodeFragmentsCustomizer(codeFragments ->
@@ -76,7 +73,7 @@ public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registe
7673
@Nullable
7774
private String getTargetBeanName(BeanDefinition beanDefinition) {
7875
Object value = beanDefinition.getPropertyValues().get("targetBeanName");
79-
return (value instanceof String) ? (String) value : null;
76+
return (value instanceof String ? (String) value : null);
8077
}
8178

8279
@Nullable
@@ -90,41 +87,33 @@ private BeanDefinition getTargetBeanDefinition(ConfigurableBeanFactory beanFacto
9087
}
9188

9289

93-
private static class ScopedProxyBeanRegistrationCodeFragments
94-
extends BeanRegistrationCodeFragments {
90+
private static class ScopedProxyBeanRegistrationCodeFragments extends BeanRegistrationCodeFragments {
9591

9692
private static final String REGISTERED_BEAN_PARAMETER_NAME = "registeredBean";
9793

98-
9994
private final RegisteredBean registeredBean;
10095

10196
private final String targetBeanName;
10297

10398
private final BeanDefinition targetBeanDefinition;
10499

105-
106-
ScopedProxyBeanRegistrationCodeFragments(
107-
BeanRegistrationCodeFragments codeGenerator,
108-
RegisteredBean registeredBean, String targetBeanName,
109-
BeanDefinition targetBeanDefinition) {
100+
ScopedProxyBeanRegistrationCodeFragments(BeanRegistrationCodeFragments codeGenerator,
101+
RegisteredBean registeredBean, String targetBeanName, BeanDefinition targetBeanDefinition) {
110102

111103
super(codeGenerator);
112104
this.registeredBean = registeredBean;
113105
this.targetBeanName = targetBeanName;
114106
this.targetBeanDefinition = targetBeanDefinition;
115107
}
116108

117-
118109
@Override
119-
public Class<?> getTarget(RegisteredBean registeredBean,
120-
Executable constructorOrFactoryMethod) {
110+
public Class<?> getTarget(RegisteredBean registeredBean, Executable constructorOrFactoryMethod) {
121111
return this.targetBeanDefinition.getResolvableType().toClass();
122112
}
123113

124114
@Override
125-
public CodeBlock generateNewBeanDefinitionCode(
126-
GenerationContext generationContext, ResolvableType beanType,
127-
BeanRegistrationCode beanRegistrationCode) {
115+
public CodeBlock generateNewBeanDefinitionCode(GenerationContext generationContext,
116+
ResolvableType beanType, BeanRegistrationCode beanRegistrationCode) {
128117

129118
return super.generateNewBeanDefinitionCode(generationContext,
130119
this.targetBeanDefinition.getResolvableType(), beanRegistrationCode);

‎spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ private LifecycleMetadata findInjectionMetadata(RootBeanDefinition beanDefinitio
180180

181181
private String[] safeMerge(@Nullable String[] existingNames, Collection<LifecycleElement> detectedElements) {
182182
Stream<String> detectedNames = detectedElements.stream().map(LifecycleElement::getIdentifier);
183-
Stream<String> mergedNames = (existingNames != null
184-
? Stream.concat(Stream.of(existingNames), detectedNames) : detectedNames);
183+
Stream<String> mergedNames = (existingNames != null ?
184+
Stream.concat(Stream.of(existingNames), detectedNames) : detectedNames);
185185
return mergedNames.distinct().toArray(String[]::new);
186186
}
187187

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public interface BeanFactoryInitializationAotProcessor {
5555
* @return a {@link BeanFactoryInitializationAotContribution} or {@code null}
5656
*/
5757
@Nullable
58-
BeanFactoryInitializationAotContribution processAheadOfTime(
59-
ConfigurableListableBeanFactory beanFactory);
58+
BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory);
6059

6160
}

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,8 @@ public CodeBlock generateNewBeanDefinitionCode(GenerationContext generationConte
103103
* @return the generated code
104104
*/
105105
public CodeBlock generateSetBeanDefinitionPropertiesCode(
106-
GenerationContext generationContext,
107-
BeanRegistrationCode beanRegistrationCode, RootBeanDefinition beanDefinition,
108-
Predicate<String> attributeFilter) {
106+
GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode,
107+
RootBeanDefinition beanDefinition, Predicate<String> attributeFilter) {
109108

110109
return this.codeFragments.generateSetBeanDefinitionPropertiesCode(
111110
generationContext, beanRegistrationCode, beanDefinition, attributeFilter);
@@ -122,9 +121,8 @@ public CodeBlock generateSetBeanDefinitionPropertiesCode(
122121
* @see #generateInstanceSupplierCode
123122
*/
124123
public CodeBlock generateSetBeanInstanceSupplierCode(
125-
GenerationContext generationContext,
126-
BeanRegistrationCode beanRegistrationCode, CodeBlock instanceSupplierCode,
127-
List<MethodReference> postProcessors) {
124+
GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode,
125+
CodeBlock instanceSupplierCode, List<MethodReference> postProcessors) {
128126

129127
return this.codeFragments.generateSetBeanInstanceSupplierCode(generationContext,
130128
beanRegistrationCode, instanceSupplierCode, postProcessors);
@@ -140,13 +138,12 @@ public CodeBlock generateSetBeanInstanceSupplierCode(
140138
* than always needing an {@link InstanceSupplier}
141139
* @return the generated code
142140
*/
143-
public CodeBlock generateInstanceSupplierCode(GenerationContext generationContext,
144-
BeanRegistrationCode beanRegistrationCode,
141+
public CodeBlock generateInstanceSupplierCode(
142+
GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode,
145143
Executable constructorOrFactoryMethod, boolean allowDirectSupplierShortcut) {
146144

147145
return this.codeFragments.generateInstanceSupplierCode(generationContext,
148-
beanRegistrationCode, constructorOrFactoryMethod,
149-
allowDirectSupplierShortcut);
146+
beanRegistrationCode, constructorOrFactoryMethod, allowDirectSupplierShortcut);
150147
}
151148

152149
/**
@@ -155,11 +152,10 @@ public CodeBlock generateInstanceSupplierCode(GenerationContext generationContex
155152
* @param beanRegistrationCode the bean registration code
156153
* @return the generated code
157154
*/
158-
public CodeBlock generateReturnCode(GenerationContext generationContext,
159-
BeanRegistrationCode beanRegistrationCode) {
155+
public CodeBlock generateReturnCode(
156+
GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode) {
160157

161-
return this.codeFragments.generateReturnCode(generationContext,
162-
beanRegistrationCode);
158+
return this.codeFragments.generateReturnCode(generationContext, beanRegistrationCode);
163159
}
164160

165161
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
class BeanRegistrationsAotProcessor implements BeanFactoryInitializationAotProcessor {
3333

3434
@Override
35-
public BeanRegistrationsAotContribution processAheadOfTime(
36-
ConfigurableListableBeanFactory beanFactory) {
37-
35+
public BeanRegistrationsAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {
3836
BeanDefinitionMethodGeneratorFactory beanDefinitionMethodGeneratorFactory =
3937
new BeanDefinitionMethodGeneratorFactory(beanFactory);
4038
Map<String, BeanDefinitionMethodGenerator> registrations = new LinkedHashMap<>();

‎spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -815,13 +815,13 @@ else if (containsSingleton(beanName)) {
815815
}
816816

817817
BeanFactory parent = getParentBeanFactory();
818-
if (parent instanceof DefaultListableBeanFactory dlfb) {
818+
if (parent instanceof DefaultListableBeanFactory dlbf) {
819819
// No bean definition found in this factory -> delegate to parent.
820-
return dlfb.isAutowireCandidate(beanName, descriptor, resolver);
820+
return dlbf.isAutowireCandidate(beanName, descriptor, resolver);
821821
}
822-
else if (parent instanceof ConfigurableListableBeanFactory clfb) {
822+
else if (parent instanceof ConfigurableListableBeanFactory clbf) {
823823
// If no DefaultListableBeanFactory, can't pass the resolver along.
824-
return clfb.isAutowireCandidate(beanName, descriptor);
824+
return clbf.isAutowireCandidate(beanName, descriptor);
825825
}
826826
else {
827827
return true;

‎spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public AnnotatedElement getQualifiedElement() {
320320
* Specify a generics-containing target type of this bean definition, if known in advance.
321321
* @since 4.3.3
322322
*/
323-
public void setTargetType(ResolvableType targetType) {
323+
public void setTargetType(@Nullable ResolvableType targetType) {
324324
this.targetType = targetType;
325325
}
326326

@@ -432,8 +432,8 @@ public Method getResolvedFactoryMethod() {
432432
@Override
433433
public void setInstanceSupplier(@Nullable Supplier<?> instanceSupplier) {
434434
super.setInstanceSupplier(instanceSupplier);
435-
Method factoryMethod = (instanceSupplier instanceof InstanceSupplier<?>)
436-
? ((InstanceSupplier<?>) instanceSupplier).getFactoryMethod() : null;
435+
Method factoryMethod = (instanceSupplier instanceof InstanceSupplier<?> ?
436+
((InstanceSupplier<?>) instanceSupplier).getFactoryMethod() : null);
437437
if (factoryMethod != null) {
438438
setResolvedFactoryMethod(factoryMethod);
439439
}

‎spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ private RegisteredBean registerTestBean(DefaultListableBeanFactory beanFactory)
166166
return RegisteredBean.of(beanFactory, "test");
167167
}
168168

169+
169170
static class MockBeanRegistrationExcludeFilter implements
170171
BeanRegistrationAotProcessor, BeanRegistrationExcludeFilter, Ordered {
171172

@@ -182,8 +183,7 @@ static class MockBeanRegistrationExcludeFilter implements
182183
}
183184

184185
@Override
185-
public BeanRegistrationAotContribution processAheadOfTime(
186-
RegisteredBean registeredBean) {
186+
public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
187187
return null;
188188
}
189189

‎spring-context/src/main/java/org/springframework/context/aot/RuntimeHintsBeanFactoryInitializationAotProcessor.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,13 @@
4646
*
4747
* @author Brian Clozel
4848
*/
49-
class RuntimeHintsBeanFactoryInitializationAotProcessor
50-
implements BeanFactoryInitializationAotProcessor {
49+
class RuntimeHintsBeanFactoryInitializationAotProcessor implements BeanFactoryInitializationAotProcessor {
5150

52-
private static final Log logger = LogFactory
53-
.getLog(RuntimeHintsBeanFactoryInitializationAotProcessor.class);
51+
private static final Log logger = LogFactory.getLog(RuntimeHintsBeanFactoryInitializationAotProcessor.class);
5452

5553

5654
@Override
57-
public BeanFactoryInitializationAotContribution processAheadOfTime(
58-
ConfigurableListableBeanFactory beanFactory) {
55+
public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {
5956
Map<Class<? extends RuntimeHintsRegistrar>, RuntimeHintsRegistrar> registrars = AotServices
6057
.factories(beanFactory.getBeanClassLoader()).load(RuntimeHintsRegistrar.class).stream()
6158
.collect(LinkedHashMap::new, (map, item) -> map.put(item.getClass(), item), Map::putAll);

‎spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ public void testNoTarget() {
8787
AdvisedSupport pc = new AdvisedSupport(ITestBean.class);
8888
pc.addAdvice(new NopInterceptor());
8989
AopProxy aop = createAopProxy(pc);
90-
assertThatExceptionOfType(AopConfigException.class).isThrownBy(
91-
aop::getProxy);
90+
assertThatExceptionOfType(AopConfigException.class).isThrownBy(aop::getProxy);
9291
}
9392

9493
@Test

‎spring-test/src/main/java/org/springframework/test/context/aot/TestClassScanner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ Stream<Class<?>> scan(String... packageNames) {
129129
if (logger.isInfoEnabled()) {
130130
if (packageNames.length > 0) {
131131
logger.info("Scanning for Spring test classes in packages %s in classpath roots %s"
132-
.formatted(Arrays.toString(packageNames), this.classpathRoots));
132+
.formatted(Arrays.toString(packageNames), this.classpathRoots));
133133
}
134134
else {
135135
logger.info("Scanning for Spring test classes in all packages in classpath roots %s"
136-
.formatted(this.classpathRoots));
136+
.formatted(this.classpathRoots));
137137
}
138138
}
139139

‎spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessor.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class TransactionBeanRegistrationAotProcessor implements BeanRegistrationAotProc
4545

4646
private final static String JAKARTA_TRANSACTIONAL_CLASS_NAME = "jakarta.transaction.Transactional";
4747

48+
4849
@Override
4950
public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
5051
Class<?> beanClass = registeredBean.getBeanClass();
@@ -68,6 +69,7 @@ private boolean isTransactional(Class<?> beanClass) {
6869
});
6970
}
7071

72+
7173
private static class TransactionBeanRegistrationAotContribution implements BeanRegistrationAotContribution {
7274

7375
private final Class<?> beanClass;
@@ -84,7 +86,8 @@ public void applyTo(GenerationContext generationContext, BeanRegistrationCode be
8486
return;
8587
}
8688
for (Class<?> proxyInterface : proxyInterfaces) {
87-
runtimeHints.reflection().registerType(proxyInterface, builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_METHODS));
89+
runtimeHints.reflection().registerType(proxyInterface,
90+
builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_METHODS));
8891
}
8992
runtimeHints.proxies().registerJdkProxy(AopProxyUtils.completeJdkProxyInterfaces(proxyInterfaces));
9093
}

0 commit comments

Comments
 (0)
Please sign in to comment.