From 6712c044b12be0a28649fd8bb80e70a4a016a43d Mon Sep 17 00:00:00 2001 From: 70825 Date: Sat, 19 Aug 2023 15:35:33 +0900 Subject: [PATCH 1/2] Wrap ternary operator within parentheses See gh-31076 --- .../org/springframework/core/codec/ResourceDecoder.java | 2 +- .../web/servlet/handler/AbstractHandlerMapping.java | 6 +++--- .../web/servlet/resource/ResourceHttpRequestHandler.java | 2 +- .../web/servlet/view/ContentNegotiatingViewResolver.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java b/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java index 87f7ac478a..23e5f5f6e6 100644 --- a/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java +++ b/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java @@ -76,7 +76,7 @@ public class ResourceDecoder extends AbstractDataBufferDecoder { } Class clazz = elementType.toClass(); - String filename = hints != null ? (String) hints.get(FILENAME_HINT) : null; + String filename = (hints != null ? (String) hints.get(FILENAME_HINT) : null); if (clazz == InputStreamResource.class) { return new InputStreamResource(new ByteArrayInputStream(bytes)) { @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java index e0a56b82a7..8910d46670 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java @@ -399,7 +399,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport } protected String formatMappingName() { - return this.beanName != null ? "'" + this.beanName + "'" : getClass().getName(); + return (this.beanName != null ? "'" + this.beanName + "'" : getClass().getName()); } @@ -589,9 +589,9 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport private RequestPath getRequestPath(HttpServletRequest request) { // Expect pre-parsed path with DispatcherServlet, // but otherwise parse per handler lookup + cache for handling - return request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE) != null ? + return (request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE) != null ? ServletRequestPathUtils.getParsedRequestPath(request) : - ServletRequestPathUtils.parseAndCache(request); + ServletRequestPathUtils.parseAndCache(request)); } /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java index 1435c8b8be..aa1598666c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java @@ -676,7 +676,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator prev = curr; } } - return sb != null ? sb.toString() : path; + return (sb != null ? sb.toString() : path); } private String cleanLeadingSlash(String path) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java index 9f1c2d3b20..f56bf0cd5a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java @@ -233,8 +233,8 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport } } - String mediaTypeInfo = logger.isDebugEnabled() && requestedMediaTypes != null ? - " given " + requestedMediaTypes.toString() : ""; + String mediaTypeInfo = (logger.isDebugEnabled() && requestedMediaTypes != null ? + " given " + requestedMediaTypes.toString() : ""); if (this.useNotAcceptableStatusCode) { if (logger.isDebugEnabled()) { From 2b76c4d847b066759b02a78a66a148b407e8bda3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Aug 2023 15:36:30 +0200 Subject: [PATCH 2/2] Polish "Wrap ternary operator within parentheses" See gh-31076 --- .../CustomServerRequestObservationConvention.java | 4 ++-- .../AspectJBeanFactoryInitializationAotProcessor.java | 2 +- .../java/org/springframework/aop/config/AspectEntry.java | 5 +++-- .../interceptor/ConcurrencyThrottleInterceptorTests.java | 4 ++-- .../transaction/aspectj/TransactionAspectTests.java | 6 +++--- .../annotation/AutowiredAnnotationBeanPostProcessor.java | 6 +++--- .../factory/aot/BeanDefinitionPropertiesCodeGenerator.java | 2 +- .../beans/factory/groovy/GroovyBeanDefinitionReader.java | 4 ++-- .../beans/factory/support/AbstractBeanFactory.java | 2 +- .../beans/factory/support/AutowireUtils.java | 2 +- .../springframework/beans/factory/support/Spr8954Tests.java | 2 +- .../springframework/cache/caffeine/CaffeineCacheTests.java | 4 ++-- .../springframework/cache/jcache/JCacheEhCacheApiTests.java | 4 ++-- .../jcache/interceptor/AbstractCacheOperationTests.java | 2 +- .../context/support/DelegatingMessageSource.java | 4 ++-- .../java/org/springframework/scheduling/TriggerContext.java | 6 +++--- .../scheduling/support/SimpleTriggerContext.java | 4 ++-- .../validation/beanvalidation/MethodValidationAdapter.java | 4 ++-- .../factory/xml/support/CustomNamespaceHandlerTests.java | 2 +- .../cache/concurrent/ConcurrentMapCacheTests.java | 4 ++-- .../springframework/context/annotation/Spr8954Tests.java | 2 +- .../context/event/ApplicationContextEventTests.java | 2 +- .../context/support/ResourceBundleMessageSourceTests.java | 2 +- .../datetime/standard/DateTimeFormatterFactoryTests.java | 2 +- .../jmx/export/NotificationListenerTests.java | 4 ++-- .../test/tools/CompileWithForkedClassLoaderClassLoader.java | 2 +- .../springframework/core/test/tools/DynamicClassLoader.java | 2 +- .../org/springframework/core/test/tools/TestCompiler.java | 6 +++--- .../java/org/springframework/util/StringUtilsBenchmark.java | 4 ++-- .../org/springframework/aot/generate/GeneratedClass.java | 4 ++-- .../aot/generate/InMemoryGeneratedFiles.java | 4 ++-- .../java/org/springframework/aot/generate/MethodName.java | 2 +- .../java/org/springframework/aot/hint/ResourceHints.java | 4 ++-- .../org/springframework/aot/hint/SimpleTypeReference.java | 6 +++--- .../aot/hint/support/FilePatternResourceHintsRegistrar.java | 2 +- .../web/servlet/view/ContentNegotiatingViewResolver.java | 2 +- 36 files changed, 62 insertions(+), 61 deletions(-) diff --git a/framework-docs/src/main/java/org/springframework/docs/integration/observability/config/conventions/CustomServerRequestObservationConvention.java b/framework-docs/src/main/java/org/springframework/docs/integration/observability/config/conventions/CustomServerRequestObservationConvention.java index dc76cbc839..44000cd41b 100644 --- a/framework-docs/src/main/java/org/springframework/docs/integration/observability/config/conventions/CustomServerRequestObservationConvention.java +++ b/framework-docs/src/main/java/org/springframework/docs/integration/observability/config/conventions/CustomServerRequestObservationConvention.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ public class CustomServerRequestObservationConvention implements ServerRequestOb } private KeyValue exception(ServerRequestObservationContext context) { - String exception = (context.getError() != null) ? context.getError().getClass().getSimpleName() : KeyValue.NONE_VALUE; + String exception = (context.getError() != null ? context.getError().getClass().getSimpleName() : KeyValue.NONE_VALUE); return KeyValue.of(ServerHttpObservationDocumentation.LowCardinalityKeyNames.EXCEPTION, exception); } diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJBeanFactoryInitializationAotProcessor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJBeanFactoryInitializationAotProcessor.java index 5fe8c5c35b..a851fb27b6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJBeanFactoryInitializationAotProcessor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJBeanFactoryInitializationAotProcessor.java @@ -61,7 +61,7 @@ class AspectJBeanFactoryInitializationAotProcessor implements BeanFactoryInitial private static AspectContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) { BeanFactoryAspectJAdvisorsBuilder builder = new BeanFactoryAspectJAdvisorsBuilder(beanFactory); List advisors = builder.buildAspectJAdvisors(); - return advisors.isEmpty() ? null : new AspectContribution(advisors); + return (advisors.isEmpty() ? null : new AspectContribution(advisors)); } } diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AspectEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectEntry.java index 2d4360048c..93540fe11d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AspectEntry.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AspectEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,8 @@ public class AspectEntry implements ParseState.Entry { @Override public String toString() { - return "Aspect: " + (StringUtils.hasLength(this.id) ? "id='" + this.id + "'" : "ref='" + this.ref + "'"); + return "Aspect: " + (StringUtils.hasLength(this.id) ? "id='" + this.id + "'" + : "ref='" + this.ref + "'"); } } diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java index d135689dec..347581ceba 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,7 +95,7 @@ public class ConcurrencyThrottleInterceptorTests { ex.printStackTrace(); } threads[i] = new ConcurrencyThread(proxy, - i % 2 == 0 ? new OutOfMemoryError() : new IllegalStateException()); + (i % 2 == 0 ? new OutOfMemoryError() : new IllegalStateException())); threads[i].start(); } for (int i = 0; i < NR_OF_THREADS; i++) { diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java index 2d92b8a59b..8c790bf2dc 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -157,9 +157,9 @@ public class TransactionAspectTests { } finally { assertThat(txManager.begun).isEqualTo(1); - long expected1 = rollback ? 0 : 1; + long expected1 = (rollback ? 0 : 1); assertThat(txManager.commits).isEqualTo(expected1); - long expected = rollback ? 1 : 0; + long expected = (rollback ? 1 : 0); assertThat(txManager.rollbacks).isEqualTo(expected); } } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index a26094cd25..c5d9e11624 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -1007,7 +1007,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA hints.reflection().registerField(field); CodeBlock resolver = CodeBlock.of("$T.$L($S)", AutowiredFieldValueResolver.class, - (!required) ? "forField" : "forRequiredField", field.getName()); + (!required ? "forField" : "forRequiredField"), field.getName()); AccessControl accessControl = AccessControl.forMember(field); if (!accessControl.isAccessibleFrom(targetClassName)) { return CodeBlock.of("$L.resolveAndSet($L, $L)", resolver, @@ -1022,7 +1022,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA CodeBlock.Builder code = CodeBlock.builder(); code.add("$T.$L", AutowiredMethodArgumentsResolver.class, - (!required) ? "forMethod" : "forRequiredMethod"); + (!required ? "forMethod" : "forRequiredMethod")); code.add("($S", method.getName()); if (method.getParameterCount() > 0) { code.add(", $L", generateParameterTypesCode(method.getParameterTypes())); @@ -1047,7 +1047,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA private CodeBlock generateParameterTypesCode(Class[] parameterTypes) { CodeBlock.Builder code = CodeBlock.builder(); for (int i = 0; i < parameterTypes.length; i++) { - code.add(i != 0 ? ", " : ""); + code.add((i != 0 ? ", " : "")); code.add("$T.class", parameterTypes[i]); } return code.build(); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java index c4efb48dcd..cd812f3da3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java @@ -316,7 +316,7 @@ class BeanDefinitionPropertiesCodeGenerator { private static final ThreadLocal> threadLocal = ThreadLocal.withInitial(ArrayDeque::new); static void push(@Nullable String name) { - String valueToSet = (name != null) ? name : ""; + String valueToSet = (name != null ? name : ""); threadLocal.get().push(valueToSet); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java index a01b8ed036..d529ca3966 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java @@ -489,7 +489,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp // named constructor arguments if (args.length > 1 && args[1] instanceof Class clazz) { List constructorArgs = - resolveConstructorArguments(args, 2, hasClosureArgument ? args.length - 1 : args.length); + resolveConstructorArguments(args, 2, (hasClosureArgument ? args.length - 1 : args.length)); this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName, clazz, constructorArgs); for (Map.Entry entity : namedArgs.entrySet()) { String propName = (String) entity.getKey(); @@ -525,7 +525,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp } else { List constructorArgs = - resolveConstructorArguments(args, 0, hasClosureArgument ? args.length - 1 : args.length); + resolveConstructorArguments(args, 0, (hasClosureArgument ? args.length - 1 : args.length)); this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName, null, constructorArgs); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java index d26d182537..1e283092c5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java @@ -734,7 +734,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp aliases.add(fullBeanName); } String[] retrievedAliases = super.getAliases(beanName); - String prefix = factoryPrefix ? FACTORY_BEAN_PREFIX : ""; + String prefix = (factoryPrefix ? FACTORY_BEAN_PREFIX : ""); for (String retrievedAlias : retrievedAliases) { String alias = prefix + retrievedAlias; if (!alias.equals(name)) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java index b085f760c0..6baa1fd138 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java @@ -53,7 +53,7 @@ abstract class AutowireUtils { public static final Comparator EXECUTABLE_COMPARATOR = (e1, e2) -> { int result = Boolean.compare(Modifier.isPublic(e2.getModifiers()), Modifier.isPublic(e1.getModifiers())); - return result != 0 ? result : Integer.compare(e2.getParameterCount(), e1.getParameterCount()); + return (result != 0 ? result : Integer.compare(e2.getParameterCount(), e1.getParameterCount())); }; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java index 19dfaa5974..e86c9f561b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java @@ -129,7 +129,7 @@ public class Spr8954Tests { @Override public Class predictBeanType(Class beanClass, String beanName) { - return FactoryBean.class.isAssignableFrom(beanClass) ? PredictedType.class : null; + return (FactoryBean.class.isAssignableFrom(beanClass) ? PredictedType.class : null); } } diff --git a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java index 7f760354d8..0afc36b44a 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ class CaffeineCacheTests extends AbstractValueAdaptingCacheTests @Override protected CaffeineCache getCache(boolean allowNull) { - return allowNull ? this.cache : this.cacheNoNull; + return (allowNull ? this.cache : this.cacheNoNull); } @Override diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java index 3f56f2e06c..7a802b020d 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public class JCacheEhCacheApiTests extends AbstractValueAdaptingCacheTests> private static String getCacheName(Annotation annotation) { Object cacheName = AnnotationUtils.getValue(annotation, "cacheName"); - return cacheName != null ? cacheName.toString() : "test"; + return (cacheName != null ? cacheName.toString() : "test"); } } diff --git a/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java index f592996fee..afe4db3e89 100644 --- a/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,7 +95,7 @@ public class DelegatingMessageSource extends MessageSourceSupport implements Hie @Override public String toString() { - return this.parentMessageSource != null ? this.parentMessageSource.toString() : "Empty MessageSource"; + return (this.parentMessageSource != null ? this.parentMessageSource.toString() : "Empty MessageSource"); } } diff --git a/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java b/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java index d70159b14f..d2fc96d677 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java +++ b/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java @@ -52,7 +52,7 @@ public interface TriggerContext { @Deprecated(since = "6.0") default Date lastScheduledExecutionTime() { Instant instant = lastScheduledExecution(); - return instant != null ? Date.from(instant) : null; + return (instant != null ? Date.from(instant) : null); } /** @@ -73,7 +73,7 @@ public interface TriggerContext { @Deprecated(since = "6.0") default Date lastActualExecutionTime() { Instant instant = lastActualExecution(); - return instant != null ? Date.from(instant) : null; + return (instant != null ? Date.from(instant) : null); } /** @@ -94,7 +94,7 @@ public interface TriggerContext { @Nullable default Date lastCompletionTime() { Instant instant = lastCompletion(); - return instant != null ? Date.from(instant) : null; + return (instant != null ? Date.from(instant) : null); } /** diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java b/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java index 740f905c0a..52088fb41d 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,7 +68,7 @@ public class SimpleTriggerContext implements TriggerContext { @Nullable private static Instant toInstant(@Nullable Date date) { - return date != null ? date.toInstant() : null; + return (date != null ? date.toInstant() : null); } /** diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java index 053f581a6f..bfba255d1f 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java @@ -225,7 +225,7 @@ public class MethodValidationAdapter implements MethodValidator { } return adaptViolations(target, method, violations, - i -> parameters != null ? parameters[i] : initMethodParameter(method, i), + i -> (parameters != null ? parameters[i] : initMethodParameter(method, i)), i -> arguments[i]); } @@ -263,7 +263,7 @@ public class MethodValidationAdapter implements MethodValidator { } return adaptViolations(target, method, violations, - i -> returnType != null ? returnType : initMethodParameter(method, -1), + i -> (returnType != null ? returnType : initMethodParameter(method, -1)), i -> returnValue); } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java index f6336a5f51..4f45ad9115 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java @@ -260,7 +260,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { Element element = (Element) node; BeanDefinition def = definition.getBeanDefinition(); - MutablePropertyValues mpvs = (def.getPropertyValues() == null) ? new MutablePropertyValues() : def.getPropertyValues(); + MutablePropertyValues mpvs = (def.getPropertyValues() == null ? new MutablePropertyValues() : def.getPropertyValues()); mpvs.add("name", element.getAttribute("name")); mpvs.add("age", element.getAttribute("age")); diff --git a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java index ac7d52b59e..484494091c 100644 --- a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java +++ b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ public class ConcurrentMapCacheTests extends AbstractValueAdaptingCacheTests predictBeanType(Class beanClass, String beanName) { - return FactoryBean.class.isAssignableFrom(beanClass) ? PredictedType.class : null; + return (FactoryBean.class.isAssignableFrom(beanClass) ? PredictedType.class : null); } @Override diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 0c38415663..bb5c052690 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -131,7 +131,7 @@ public class ApplicationContextEventTests extends AbstractApplicationEventListen else { smc.multicastEvent(event); } - int invocation = match ? 1 : 0; + int invocation = (match ? 1 : 0); verify(listener, times(invocation)).onApplicationEvent(event); } diff --git a/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java index 063a43aea7..3ac67704c6 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java @@ -132,7 +132,7 @@ class ResourceBundleMessageSourceTests { Locale.setDefault(expectGermanFallback ? Locale.GERMAN : Locale.CANADA); assertThat(ac.getMessage("code1", null, Locale.ENGLISH)).isEqualTo("message1"); - Object expected = fallbackToSystemLocale && expectGermanFallback ? "nachricht2" : "message2"; + Object expected = (fallbackToSystemLocale && expectGermanFallback ? "nachricht2" : "message2"); assertThat(ac.getMessage("code2", null, Locale.ENGLISH)).isEqualTo(expected); assertThat(ac.getMessage("code2", null, Locale.GERMAN)).isEqualTo("nachricht2"); diff --git a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java index 081aa02dff..4e98db21a5 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java @@ -41,7 +41,7 @@ public class DateTimeFormatterFactoryTests { private static final TimeZone NEW_YORK = TimeZone.getTimeZone("America/New_York"); // Ensure that we are testing against a timezone other than the default. - private static final TimeZone TEST_TIMEZONE = ZURICH.equals(TimeZone.getDefault()) ? NEW_YORK : ZURICH; + private static final TimeZone TEST_TIMEZONE = (ZURICH.equals(TimeZone.getDefault()) ? NEW_YORK : ZURICH); private DateTimeFormatterFactory factory = new DateTimeFormatterFactory(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java index f774744dec..96284312a7 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -468,7 +468,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests { public int getCount(String attribute) { Integer count = (Integer) this.attributeCounts.get(attribute); - return (count == null) ? 0 : count; + return (count == null ? 0 : count); } public Object getLastHandback(String attributeName) { diff --git a/spring-core-test/src/main/java/org/springframework/core/test/tools/CompileWithForkedClassLoaderClassLoader.java b/spring-core-test/src/main/java/org/springframework/core/test/tools/CompileWithForkedClassLoaderClassLoader.java index 723a34bc0f..fe728b22ac 100644 --- a/spring-core-test/src/main/java/org/springframework/core/test/tools/CompileWithForkedClassLoaderClassLoader.java +++ b/spring-core-test/src/main/java/org/springframework/core/test/tools/CompileWithForkedClassLoaderClassLoader.java @@ -70,7 +70,7 @@ final class CompileWithForkedClassLoaderClassLoader extends ClassLoader { @Override protected Class findClass(String name) throws ClassNotFoundException { byte[] bytes = findClassBytes(name); - return (bytes != null) ? defineClass(name, bytes, 0, bytes.length, null) : super.findClass(name); + return (bytes != null ? defineClass(name, bytes, 0, bytes.length, null) : super.findClass(name)); } @Nullable diff --git a/spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicClassLoader.java b/spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicClassLoader.java index 42db68069a..73b88758a0 100644 --- a/spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicClassLoader.java +++ b/spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicClassLoader.java @@ -139,7 +139,7 @@ public class DynamicClassLoader extends ClassLoader { return classFile.getContent(); } DynamicClassFileObject dynamicClassFile = this.dynamicClassFiles.get(name); - return (dynamicClassFile != null) ? dynamicClassFile.getBytes() : null; + return (dynamicClassFile != null ? dynamicClassFile.getBytes() : null); } @SuppressWarnings("deprecation") // on JDK 20 diff --git a/spring-core-test/src/main/java/org/springframework/core/test/tools/TestCompiler.java b/spring-core-test/src/main/java/org/springframework/core/test/tools/TestCompiler.java index 308118002d..cc468f2ef5 100644 --- a/spring-core-test/src/main/java/org/springframework/core/test/tools/TestCompiler.java +++ b/spring-core-test/src/main/java/org/springframework/core/test/tools/TestCompiler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -265,8 +265,8 @@ public final class TestCompiler { } private DynamicClassLoader compile() { - ClassLoader classLoaderToUse = (this.classLoader != null) ? this.classLoader - : Thread.currentThread().getContextClassLoader(); + ClassLoader classLoaderToUse = (this.classLoader != null ? this.classLoader + : Thread.currentThread().getContextClassLoader()); List compilationUnits = this.sourceFiles.stream().map( DynamicJavaFileObject::new).toList(); StandardJavaFileManager standardFileManager = this.compiler.getStandardFileManager( diff --git a/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java b/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java index 1fc7753b22..6fa0a2a4fa 100644 --- a/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java +++ b/spring-core/src/jmh/java/org/springframework/util/StringUtilsBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -100,7 +100,7 @@ public class StringUtilsBenchmark { } private String createSamplePath(Random random) { - String separator = random.nextBoolean() ? "/" : "\\"; + String separator = (random.nextBoolean() ? "/" : "\\"); StringBuilder sb = new StringBuilder(); sb.append("jar:file:///c:"); for (int i = 0; i < this.segmentCount; i++) { diff --git a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClass.java b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClass.java index 6917e5051e..0cf0507e4b 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClass.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/GeneratedClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public final class GeneratedClass { private String generateSequencedMethodName(MethodName name) { int sequence = this.methodNameSequenceGenerator .computeIfAbsent(name, key -> new AtomicInteger()).getAndIncrement(); - return (sequence > 0) ? name.toString() + sequence : name.toString(); + return (sequence > 0 ? name.toString() + sequence : name.toString()); } /** diff --git a/spring-core/src/main/java/org/springframework/aot/generate/InMemoryGeneratedFiles.java b/spring-core/src/main/java/org/springframework/aot/generate/InMemoryGeneratedFiles.java index 00f1fe2d7b..f3936c21be 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/InMemoryGeneratedFiles.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/InMemoryGeneratedFiles.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -86,7 +86,7 @@ public class InMemoryGeneratedFiles implements GeneratedFiles { Assert.notNull(kind, "'kind' must not be null"); Assert.hasLength(path, "'path' must not be empty"); Map paths = this.files.get(kind); - return (paths != null) ? paths.get(path) : null; + return (paths != null ? paths.get(path) : null); } } diff --git a/spring-core/src/main/java/org/springframework/aot/generate/MethodName.java b/spring-core/src/main/java/org/springframework/aot/generate/MethodName.java index f9ea24c9fe..6a4ff72f6f 100644 --- a/spring-core/src/main/java/org/springframework/aot/generate/MethodName.java +++ b/spring-core/src/main/java/org/springframework/aot/generate/MethodName.java @@ -116,7 +116,7 @@ final class MethodName { StringBuilder name = new StringBuilder(chars.length); boolean uppercase = false; for (char ch : chars) { - char outputChar = (!uppercase) ? ch : Character.toUpperCase(ch); + char outputChar = (!uppercase ? ch : Character.toUpperCase(ch)); name.append((!Character.isLetter(ch)) ? "" : outputChar); uppercase = (ch == '.'); } diff --git a/spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java b/spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java index 483db7d9e0..490dd257f4 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,7 +80,7 @@ public class ResourceHints { */ public ResourceHints registerPatternIfPresent(@Nullable ClassLoader classLoader, String location, Consumer resourceHint) { - ClassLoader classLoaderToUse = (classLoader != null) ? classLoader : getClass().getClassLoader(); + ClassLoader classLoaderToUse = (classLoader != null ? classLoader : getClass().getClassLoader()); if (classLoaderToUse.getResource(location) != null) { registerPattern(resourceHint); } diff --git a/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java b/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java index b21df02e82..62a3ff9978 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -73,7 +73,7 @@ final class SimpleTypeReference extends AbstractTypeReference { return new SimpleTypeReference(className.substring(0, i), className.substring(i + 1), null); } else { - String packageName = isPrimitive(className) ? "java.lang" : ""; + String packageName = (isPrimitive(className) ? "java.lang" : ""); return new SimpleTypeReference(packageName, className, null); } } @@ -101,7 +101,7 @@ final class SimpleTypeReference extends AbstractTypeReference { if (type == null) { return; } - String typeName = (type.getEnclosingType() != null) ? "." + type.getSimpleName() : type.getSimpleName(); + String typeName = (type.getEnclosingType() != null ? "." + type.getSimpleName() : type.getSimpleName()); sb.insert(0, typeName); buildName(type.getEnclosingType(), sb); } diff --git a/spring-core/src/main/java/org/springframework/aot/hint/support/FilePatternResourceHintsRegistrar.java b/spring-core/src/main/java/org/springframework/aot/hint/support/FilePatternResourceHintsRegistrar.java index 1bcb8c0933..41523a877c 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/support/FilePatternResourceHintsRegistrar.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/support/FilePatternResourceHintsRegistrar.java @@ -73,7 +73,7 @@ public class FilePatternResourceHintsRegistrar { @Deprecated(since = "6.0.12", forRemoval = true) public void registerHints(ResourceHints hints, @Nullable ClassLoader classLoader) { - ClassLoader classLoaderToUse = (classLoader != null) ? classLoader : getClass().getClassLoader(); + ClassLoader classLoaderToUse = (classLoader != null ? classLoader : getClass().getClassLoader()); List includes = new ArrayList<>(); for (String location : this.locations) { if (classLoaderToUse.getResource(location) != null) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java index f56bf0cd5a..bd3b215287 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.