Skip to content

Commit 92ee20c

Browse files
committed
Adhere to new Checkstyle rule
1 parent 8db1340 commit 92ee20c

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Diff for: spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -875,8 +875,8 @@ private void generateApplyBeanRegistrarsMethod(MethodSpec.Builder method, Genera
875875

876876
for (String name : this.beanFactory.getBeanDefinitionNames()) {
877877
BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition(name);
878-
if (beanDefinition.getSource() instanceof Class<?> sourceClass
879-
&& BeanRegistrar.class.isAssignableFrom(sourceClass)) {
878+
if (beanDefinition.getSource() instanceof Class<?> sourceClass &&
879+
BeanRegistrar.class.isAssignableFrom(sourceClass)) {
880880

881881
for (BeanRegistrationAotProcessor aotProcessor : this.aotProcessors) {
882882
BeanRegistrationAotContribution contribution =
@@ -918,8 +918,8 @@ private void checkUnsupportedFeatures(AbstractBeanDefinition beanDefinition) {
918918
throw new UnsupportedOperationException("AOT post processing of qualifiers is not supported yet with BeanRegistrar");
919919
}
920920
for (String attributeName : beanDefinition.attributeNames()) {
921-
if (!attributeName.equals(AbstractBeanDefinition.ORDER_ATTRIBUTE)
922-
&& !attributeName.equals("aotProcessingIgnoreRegistration")) {
921+
if (!attributeName.equals(AbstractBeanDefinition.ORDER_ATTRIBUTE) &&
922+
!attributeName.equals("aotProcessingIgnoreRegistration")) {
923923
throw new UnsupportedOperationException("AOT post processing of attribute " + attributeName +
924924
" is not supported yet with BeanRegistrar");
925925
}

Diff for: spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -494,12 +494,12 @@ public boolean test(RuntimeHints runtimeHints) {
494494
@SuppressWarnings("removal")
495495
private boolean memberCategoryMatch(TypeHint typeHint) {
496496
if (Modifier.isPublic(this.field.getModifiers())) {
497-
return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_PUBLIC_FIELDS)
498-
|| typeHint.getMemberCategories().contains(MemberCategory.PUBLIC_FIELDS);
497+
return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_PUBLIC_FIELDS) ||
498+
typeHint.getMemberCategories().contains(MemberCategory.PUBLIC_FIELDS);
499499
}
500500
else {
501-
return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_DECLARED_FIELDS)
502-
|| typeHint.getMemberCategories().contains(MemberCategory.DECLARED_FIELDS);
501+
return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_DECLARED_FIELDS) ||
502+
typeHint.getMemberCategories().contains(MemberCategory.DECLARED_FIELDS);
503503
}
504504
}
505505

Diff for: spring-core/src/main/java/org/springframework/aot/nativex/NativeConfigurationWriter.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ public void write(RuntimeHints hints) {
4444
}
4545

4646
private boolean hasAnyHint(RuntimeHints hints) {
47-
return (hints.serialization().javaSerializationHints().findAny().isPresent()
48-
|| hints.proxies().jdkProxyHints().findAny().isPresent()
49-
|| hints.reflection().typeHints().findAny().isPresent()
50-
|| hints.resources().resourcePatternHints().findAny().isPresent()
51-
|| hints.resources().resourceBundleHints().findAny().isPresent()
52-
|| hints.jni().typeHints().findAny().isPresent());
47+
return (hints.serialization().javaSerializationHints().findAny().isPresent() ||
48+
hints.proxies().jdkProxyHints().findAny().isPresent() ||
49+
hints.reflection().typeHints().findAny().isPresent() ||
50+
hints.resources().resourcePatternHints().findAny().isPresent() ||
51+
hints.resources().resourceBundleHints().findAny().isPresent() ||
52+
hints.jni().typeHints().findAny().isPresent());
5353
}
5454

5555
/**

0 commit comments

Comments
 (0)