From 92ee20c896e4db940dcf4050b0886d28e5e25f4b Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Wed, 19 Mar 2025 16:29:03 +0100 Subject: [PATCH] Adhere to new Checkstyle rule --- .../annotation/ConfigurationClassPostProcessor.java | 8 ++++---- .../hint/predicate/ReflectionHintsPredicates.java | 8 ++++---- .../aot/nativex/NativeConfigurationWriter.java | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java index 5596c1d166d..78d6e5b39ee 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java @@ -875,8 +875,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo for (String name : this.beanFactory.getBeanDefinitionNames()) { BeanDefinition beanDefinition = this.beanFactory.getMergedBeanDefinition(name); - if (beanDefinition.getSource() instanceof Class sourceClass - && BeanRegistrar.class.isAssignableFrom(sourceClass)) { + if (beanDefinition.getSource() instanceof Class sourceClass && + BeanRegistrar.class.isAssignableFrom(sourceClass)) { for (BeanRegistrationAotProcessor aotProcessor : this.aotProcessors) { 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"); } for (String attributeName : beanDefinition.attributeNames()) { - if (!attributeName.equals(AbstractBeanDefinition.ORDER_ATTRIBUTE) - && !attributeName.equals("aotProcessingIgnoreRegistration")) { + if (!attributeName.equals(AbstractBeanDefinition.ORDER_ATTRIBUTE) && + !attributeName.equals("aotProcessingIgnoreRegistration")) { throw new UnsupportedOperationException("AOT post processing of attribute " + attributeName + " is not supported yet with BeanRegistrar"); } diff --git a/spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java b/spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java index 4a4425fd796..406d46d5b39 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java @@ -494,12 +494,12 @@ public class ReflectionHintsPredicates { @SuppressWarnings("removal") private boolean memberCategoryMatch(TypeHint typeHint) { if (Modifier.isPublic(this.field.getModifiers())) { - return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_PUBLIC_FIELDS) - || typeHint.getMemberCategories().contains(MemberCategory.PUBLIC_FIELDS); + return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_PUBLIC_FIELDS) || + typeHint.getMemberCategories().contains(MemberCategory.PUBLIC_FIELDS); } else { - return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_DECLARED_FIELDS) - || typeHint.getMemberCategories().contains(MemberCategory.DECLARED_FIELDS); + return typeHint.getMemberCategories().contains(MemberCategory.ACCESS_DECLARED_FIELDS) || + typeHint.getMemberCategories().contains(MemberCategory.DECLARED_FIELDS); } } diff --git a/spring-core/src/main/java/org/springframework/aot/nativex/NativeConfigurationWriter.java b/spring-core/src/main/java/org/springframework/aot/nativex/NativeConfigurationWriter.java index d0886760c47..56d51b30efc 100644 --- a/spring-core/src/main/java/org/springframework/aot/nativex/NativeConfigurationWriter.java +++ b/spring-core/src/main/java/org/springframework/aot/nativex/NativeConfigurationWriter.java @@ -44,12 +44,12 @@ public abstract class NativeConfigurationWriter { } private boolean hasAnyHint(RuntimeHints hints) { - return (hints.serialization().javaSerializationHints().findAny().isPresent() - || hints.proxies().jdkProxyHints().findAny().isPresent() - || hints.reflection().typeHints().findAny().isPresent() - || hints.resources().resourcePatternHints().findAny().isPresent() - || hints.resources().resourceBundleHints().findAny().isPresent() - || hints.jni().typeHints().findAny().isPresent()); + return (hints.serialization().javaSerializationHints().findAny().isPresent() || + hints.proxies().jdkProxyHints().findAny().isPresent() || + hints.reflection().typeHints().findAny().isPresent() || + hints.resources().resourcePatternHints().findAny().isPresent() || + hints.resources().resourceBundleHints().findAny().isPresent() || + hints.jni().typeHints().findAny().isPresent()); } /**