Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adhere to new Checkstyle rule

Browse Source
This commit is contained in:
Sam Brannen
2025-03-19 16:29:03 +01:00
parent 8db1340263
commit 92ee20c896
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
View File

@@ -875,8 +875,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
for (String name : this.beanFactory.getBeanDefinitionNames()) { for (String name : this.beanFactory.getBeanDefinitionNames()) {
BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition(name); BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition(name);
if (beanDefinition.getSource() instanceof Class<?> sourceClass if (beanDefinition.getSource() instanceof Class<?> sourceClass &&
&& BeanRegistrar.class.isAssignableFrom(sourceClass)) { BeanRegistrar.class.isAssignableFrom(sourceClass)) {
for (BeanRegistrationAotProcessor aotProcessor : this.aotProcessors) { for (BeanRegistrationAotProcessor aotProcessor : this.aotProcessors) {
BeanRegistrationAotContribution contribution = BeanRegistrationAotContribution contribution =
@@ -918,8 +918,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
throw new UnsupportedOperationException("AOT post processing of qualifiers is not supported yet with BeanRegistrar"); throw new UnsupportedOperationException("AOT post processing of qualifiers is not supported yet with BeanRegistrar");
} }
for (String attributeName : beanDefinition.attributeNames()) { for (String attributeName : beanDefinition.attributeNames()) {
if (!attributeName.equals(AbstractBeanDefinition.ORDER_ATTRIBUTE) if (!attributeName.equals(AbstractBeanDefinition.ORDER_ATTRIBUTE) &&
&& !attributeName.equals("aotProcessingIgnoreRegistration")) { !attributeName.equals("aotProcessingIgnoreRegistration")) {
throw new UnsupportedOperationException("AOT post processing of attribute " + attributeName + throw new UnsupportedOperationException("AOT post processing of attribute " + attributeName +
" is not supported yet with BeanRegistrar"); " is not supported yet with BeanRegistrar");
} }

8
spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java
View File

@@ -494,12 +494,12 @@ public class ReflectionHintsPredicates {
@SuppressWarnings("removal") @SuppressWarnings("removal")
private boolean memberCategoryMatch(TypeHint typeHint) { private boolean memberCategoryMatch(TypeHint typeHint) {
if (Modifier.isPublic(this.field.getModifiers())) { if (Modifier.isPublic(this.field.getModifiers())) {
return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_PUBLIC_FIELDS) return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_PUBLIC_FIELDS) ||
|| typeHint.getMemberCategories().contains(MemberCategory.PUBLIC_FIELDS); typeHint.getMemberCategories().contains(MemberCategory.PUBLIC_FIELDS);
} }
else { else {
return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_DECLARED_FIELDS) return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_DECLARED_FIELDS) ||
|| typeHint.getMemberCategories().contains(MemberCategory.DECLARED_FIELDS); typeHint.getMemberCategories().contains(MemberCategory.DECLARED_FIELDS);
} }
} }

12
spring-core/src/main/java/org/springframework/aot/nativex/NativeConfigurationWriter.java
View File

@@ -44,12 +44,12 @@ public abstract class NativeConfigurationWriter {
} }
private boolean hasAnyHint(RuntimeHints hints) { private boolean hasAnyHint(RuntimeHints hints) {
return (hints.serialization().javaSerializationHints().findAny().isPresent() return (hints.serialization().javaSerializationHints().findAny().isPresent() ||
|| hints.proxies().jdkProxyHints().findAny().isPresent() hints.proxies().jdkProxyHints().findAny().isPresent() ||
|| hints.reflection().typeHints().findAny().isPresent() hints.reflection().typeHints().findAny().isPresent() ||
|| hints.resources().resourcePatternHints().findAny().isPresent() hints.resources().resourcePatternHints().findAny().isPresent() ||
|| hints.resources().resourceBundleHints().findAny().isPresent() hints.resources().resourceBundleHints().findAny().isPresent() ||
|| hints.jni().typeHints().findAny().isPresent()); hints.jni().typeHints().findAny().isPresent());
} }
/** /**