diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInterceptor.java b/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInterceptor.java index 8ac8f65ca3f..4915b0d3d6a 100644 --- a/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInterceptor.java +++ b/spring-aop/src/main/java/org/aopalliance/intercept/ConstructorInterceptor.java @@ -43,7 +43,7 @@ import javax.annotation.Nonnull; * * @author Rod Johnson */ -public interface ConstructorInterceptor extends Interceptor { +public interface ConstructorInterceptor extends Interceptor { /** * Implement this method to perform extra treatments before and diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java index a412214ccd6..bbe397880b1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AbstractAspectJAdvice.java @@ -307,7 +307,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence this.discoveredReturningType = ClassUtils.forName(name, getAspectClassLoader()); } catch (Throwable ex) { - throw new IllegalArgumentException("Returning name '" + name + + throw new IllegalArgumentException("Returning name '" + name + "' is neither a valid argument name nor the fully-qualified " + "name of a Java type on the classpath. Root cause: " + ex); } @@ -342,7 +342,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence this.discoveredThrowingType = ClassUtils.forName(name, getAspectClassLoader()); } catch (Throwable ex) { - throw new IllegalArgumentException("Throwing name '" + name + + throw new IllegalArgumentException("Throwing name '" + name + "' is neither a valid argument name nor the fully-qualified " + "name of a Java type on the classpath. Root cause: " + ex); } diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java index ffb270cdd9b..79d874e09b0 100644 --- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java @@ -45,8 +45,8 @@ class AopNamespaceHandlerEventTests { private static final Class CLASS = AopNamespaceHandlerEventTests.class; - private static final Resource CONTEXT = qualifiedResource(CLASS, "context.xml"); - private static final Resource POINTCUT_EVENTS_CONTEXT = qualifiedResource(CLASS, "pointcutEvents.xml"); + private static final Resource CONTEXT = qualifiedResource(CLASS, "context.xml"); + private static final Resource POINTCUT_EVENTS_CONTEXT = qualifiedResource(CLASS, "pointcutEvents.xml"); private static final Resource POINTCUT_REF_CONTEXT = qualifiedResource(CLASS, "pointcutRefEvents.xml"); private static final Resource DIRECT_POINTCUT_EVENTS_CONTEXT = qualifiedResource(CLASS, "directPointcutEvents.xml"); diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java index fa494c92128..c5bc6224b9d 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java +++ b/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java @@ -209,7 +209,7 @@ public class AnnotatedClassCacheableService implements CacheableService } @Override - @Caching(evict = { @CacheEvict("primary"), @CacheEvict(cacheNames = "secondary", key = "#a0"), @CacheEvict(cacheNames = "primary", key = "#p0 + 'A'") }) + @Caching(evict = { @CacheEvict("primary"), @CacheEvict(cacheNames = "secondary", key = "#a0"), @CacheEvict(cacheNames = "primary", key = "#p0 + 'A'") }) public Object multiEvict(Object arg1) { return this.counter.getAndIncrement(); } diff --git a/spring-aspects/src/test/java/org/springframework/context/annotation/aspectj/AnnotationBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/context/annotation/aspectj/AnnotationBeanConfigurerTests.java index ae781c8fa69..d840bdcd0f1 100644 --- a/spring-aspects/src/test/java/org/springframework/context/annotation/aspectj/AnnotationBeanConfigurerTests.java +++ b/spring-aspects/src/test/java/org/springframework/context/annotation/aspectj/AnnotationBeanConfigurerTests.java @@ -37,7 +37,7 @@ public class AnnotationBeanConfigurerTests { @Test public void injection() { - try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class)) { + try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class)) { ShouldBeConfiguredBySpring myObject = new ShouldBeConfiguredBySpring(); assertThat(myObject.getName()).isEqualTo("Rod"); } 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 d529ca39667..363ec528962 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 @@ -476,7 +476,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName, beanClass); } } - else { + else { this.currentBeanDefinition = new GroovyBeanDefinitionWrapper( beanName, beanClass, resolveConstructorArguments(args, 1, args.length)); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index 2153cbd3c85..67de5be9439 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -1161,7 +1161,7 @@ class DefaultListableBeanFactoryTests { assertThat(lbf.getBean("singletonObject")).isEqualTo(singletonObject); assertThat(test.getSpouse()).isEqualTo(singletonObject); - Map beansOfType = lbf.getBeansOfType(TestBean.class, false, true); + Map beansOfType = lbf.getBeansOfType(TestBean.class, false, true); assertThat(beansOfType).hasSize(2); assertThat(beansOfType.containsValue(test)).isTrue(); assertThat(beansOfType.containsValue(singletonObject)).isTrue(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java index 3c7410fc799..9af47fbd133 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/DefaultBeanRegistrationCodeFragmentsTests.java @@ -218,7 +218,7 @@ class DefaultBeanRegistrationCodeFragmentsTests { } private BeanRegistrationCodeFragments createCustomCodeFragments(RegisteredBean registeredBean, UnaryOperator customFragments) { - BeanRegistrationAotContribution aotContribution = BeanRegistrationAotContribution. + BeanRegistrationAotContribution aotContribution = BeanRegistrationAotContribution. withCustomCodeFragments(customFragments); BeanRegistrationCodeFragments defaultCodeFragments = createInstance(registeredBean); return aotContribution.customizeBeanRegistrationCodeFragments( diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java index 48dd45999e0..3c09f970f10 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/NullSourceExtractorTests.java @@ -28,7 +28,7 @@ public class NullSourceExtractorTests { @Test public void testPassThroughContract() throws Exception { - Object source = new Object(); + Object source = new Object(); Object extractedSource = new NullSourceExtractor().extractSource(source, null); assertThat(extractedSource).as("The contract of NullSourceExtractor states that the extraction *always* return null").isNull(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java index 2f6fe191d23..186bb404ed6 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java @@ -30,7 +30,7 @@ public class PassThroughSourceExtractorTests { @Test public void testPassThroughContract() throws Exception { - Object source = new Object(); + Object source = new Object(); Object extractedSource = new PassThroughSourceExtractor().extractSource(source, null); assertThat(extractedSource).as("The contract of PassThroughSourceExtractor states that the supplied " + "source object *must* be returned as-is").isSameAs(source); diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java index 33b23baf723..adc888dae95 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java @@ -490,7 +490,7 @@ public class JavaMailSenderImpl implements JavaMailSender { * @see #getProtocol() */ protected Transport getTransport(Session session) throws NoSuchProviderException { - String protocol = getProtocol(); + String protocol = getProtocol(); if (protocol == null) { protocol = session.getProperty("mail.transport.protocol"); if (protocol == null) { diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractCacheResolver.java b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractCacheResolver.java index 926a44a29f9..8d8aa90f84e 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractCacheResolver.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractCacheResolver.java @@ -73,7 +73,7 @@ public abstract class AbstractCacheResolver implements CacheResolver, Initializi } @Override - public void afterPropertiesSet() { + public void afterPropertiesSet() { Assert.notNull(this.cacheManager, "CacheManager is required"); } diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java index 50ea0e870ad..a0975f05aa1 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java @@ -84,7 +84,7 @@ public class CacheInterceptor extends CacheAspectSupport implements MethodInterc private static class KotlinDelegate { public static Publisher invokeSuspendingFunction(Method method, Object target, Object... args) { - Continuation continuation = (Continuation) args[args.length - 1]; + Continuation continuation = (Continuation) args[args.length - 1]; CoroutineContext coroutineContext = continuation.getContext().minusKey(Job.Key); return CoroutinesUtils.invokeSuspendingFunction(coroutineContext, method, target, args); } diff --git a/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java index a526f23d9be..dce0e23bb94 100644 --- a/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java +++ b/spring-context/src/main/java/org/springframework/format/datetime/DateTimeFormatAnnotationFormatterFactory.java @@ -37,7 +37,7 @@ import org.springframework.util.StringUtils; * @author Sam Brannen * @since 3.2 */ -public class DateTimeFormatAnnotationFormatterFactory extends EmbeddedValueResolutionSupport +public class DateTimeFormatAnnotationFormatterFactory extends EmbeddedValueResolutionSupport implements AnnotationFormatterFactory { private static final Set> FIELD_TYPES = Set.of(Date.class, Calendar.class, Long.class); diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java index 81674a8e39b..5486c2db611 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java @@ -158,7 +158,7 @@ public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { BlockingQueue queue = createQueue(this.queueCapacity); - ThreadPoolExecutor executor = createExecutor(this.corePoolSize, this.maxPoolSize, + ThreadPoolExecutor executor = createExecutor(this.corePoolSize, this.maxPoolSize, this.keepAliveSeconds, queue, threadFactory, rejectedExecutionHandler); if (this.allowCoreThreadTimeOut) { executor.allowCoreThreadTimeOut(true); diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java b/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java index ac877a72a46..d3394426347 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/BitsCronField.java @@ -247,7 +247,7 @@ final class BitsCronField extends CronField { } private void clearBit(int index) { - this.bits &= ~(1L << index); + this.bits &= ~(1L << index); } @Override diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java index f7ba88e0bfc..6df605d46b7 100644 --- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java +++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java @@ -949,7 +949,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter { if (value == null && !BeanUtils.isSimpleValueType(param.nestedIfOptional().getNestedParameterType())) { ResolvableType type = ResolvableType.forMethodParameter(param); - args[i] = createObject(type, paramPath + ".", valueResolver); + args[i] = createObject(type, paramPath + ".", valueResolver); } else { try { 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 161a7cda2ff..2863b0d3370 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 @@ -345,7 +345,7 @@ public class MethodValidationAdapter implements MethodValidator { } private MethodParameter initMethodParameter(Method method, int index) { - MethodParameter parameter = new MethodParameter(method, index); + MethodParameter parameter = new MethodParameter(method, index); parameter.initParameterNameDiscovery(this.parameterNameDiscoverer); return parameter; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java index cf71cca9344..924adb23550 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java @@ -39,7 +39,7 @@ class SPR3064Tests { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass()); - Service service = ctx.getBean(Service.class); + Service service = ctx.getBean(Service.class); assertThatRuntimeException() .isThrownBy(service::serveMe) .withMessage("advice invoked"); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java index e316ac4baec..c4e40482537 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java @@ -166,7 +166,7 @@ class BeanNameAutoProxyCreatorTests { } - private void jdkAssertions(ITestBean tb, int nopInterceptorCount) { + private void jdkAssertions(ITestBean tb, int nopInterceptorCount) { NopInterceptor nop = (NopInterceptor) beanFactory.getBean("nopInterceptor"); assertThat(nop.getCount()).isEqualTo(0); assertThat(AopUtils.isJdkDynamicProxy(tb)).isTrue(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java index 01c0f5413df..0a8066c0405 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java @@ -418,7 +418,7 @@ abstract class OverrideOneMethod extends MethodReplaceCandidate implements Overr @Override public String replaceMe(String someParam) { - return "replaceMe:" + someParam; + return "replaceMe:" + someParam; } } diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java index c6be614ff46..e86012dcd94 100644 --- a/spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java +++ b/spring-context/src/test/java/org/springframework/cache/interceptor/ExpressionEvaluatorTests.java @@ -121,7 +121,7 @@ public class ExpressionEvaluatorTests { EvaluationContext context = createEvaluationContext(CacheOperationExpressionEvaluator.RESULT_UNAVAILABLE); assertThatExceptionOfType(VariableNotAvailableException.class).isThrownBy(() -> new SpelExpressionParser().parseExpression("#result").getValue(context)) - .satisfies(ex -> assertThat(ex.getName()).isEqualTo("result")); + .satisfies(ex -> assertThat(ex.getName()).isEqualTo("result")); } @Test diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java index 279d520fa59..14fb583359f 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr10744Tests.java @@ -122,7 +122,7 @@ public class Spr10744Tests { static class MyTestConfiguration extends MyConfiguration { @Bean - @Scope(value = "myTestScope", proxyMode = ScopedProxyMode.TARGET_CLASS) + @Scope(value = "myTestScope", proxyMode = ScopedProxyMode.TARGET_CLASS) @Override public Foo foo() { return new Foo(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr12334/Spr12334Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr12334/Spr12334Tests.java index dcf9a59a59b..5b3210646eb 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr12334/Spr12334Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr12334/Spr12334Tests.java @@ -69,7 +69,7 @@ class Spr12334Tests { private static AtomicInteger scanned = new AtomicInteger(); @Override - public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { + public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { if (scanned.get() > 0) { throw new IllegalStateException("Already scanned"); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java b/spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java index 1e751e3471e..f446461453a 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java +++ b/spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java @@ -37,7 +37,7 @@ public class FactoryMethodComponent { private int i; - public static TestBean nullInstance() { + public static TestBean nullInstance() { return null; } diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java index 9397ba99747..0e78637c014 100644 --- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java @@ -677,7 +677,7 @@ class DefaultLifecycleProcessorTests { return new TestLifecycleBean(null, stoppedBeans); } - private TestLifecycleBean(CopyOnWriteArrayList startedBeans, CopyOnWriteArrayList stoppedBeans) { + private TestLifecycleBean(CopyOnWriteArrayList startedBeans, CopyOnWriteArrayList stoppedBeans) { this.startedBeans = startedBeans; this.stoppedBeans = stoppedBeans; } diff --git a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java index 6e28f2b08bd..63c6ae331ef 100644 --- a/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java @@ -652,7 +652,7 @@ class GenericApplicationContextTests { } } - static class BeanB implements ApplicationContextAware { + static class BeanB implements ApplicationContextAware { ApplicationContext applicationContext; diff --git a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java index c929150af1c..9bd39bcd53e 100644 --- a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java @@ -58,7 +58,7 @@ class JmxUtilsTests { } @Test - void isMBeanWithDynamicMBean() { + void isMBeanWithDynamicMBean() { DynamicMBean mbean = new TestDynamicMBean(); assertThat(JmxUtils.isMBean(mbean.getClass())).as("Dynamic MBean not detected correctly").isTrue(); } @@ -76,24 +76,24 @@ class JmxUtilsTests { } @Test - void notAnMBean() { + void notAnMBean() { assertThat(JmxUtils.isMBean(Object.class)).as("Object incorrectly identified as an MBean").isFalse(); } @Test - void simpleMBean() { + void simpleMBean() { Foo foo = new Foo(); assertThat(JmxUtils.isMBean(foo.getClass())).as("Simple MBean not detected correctly").isTrue(); } @Test - void simpleMXBean() { + void simpleMXBean() { FooX foo = new FooX(); assertThat(JmxUtils.isMBean(foo.getClass())).as("Simple MXBean not detected correctly").isTrue(); } @Test - void simpleMBeanThroughInheritance() { + void simpleMBeanThroughInheritance() { Bar bar = new Bar(); Abc abc = new Abc(); assertThat(JmxUtils.isMBean(bar.getClass())).as("Simple MBean (through inheritance) not detected correctly").isTrue(); diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java index 9f946b6cd16..4589c6256bd 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/support/CronExpressionTests.java @@ -1357,7 +1357,7 @@ class CronExpressionTests { @Test public void various() { CronExpression cronExpression = CronExpression.parse("3-57 13-28 17,18 1,15 3-12 6#1"); - LocalDateTime last = LocalDateTime.of(2022, 9, 15, 17, 44, 11); + LocalDateTime last = LocalDateTime.of(2022, 9, 15, 17, 44, 11); LocalDateTime expected = LocalDateTime.of(2022, 10, 1, 17, 13, 3); LocalDateTime actual = cronExpression.next(last); assertThat(actual).isNotNull(); diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java index e6168d77037..8597c392782 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractValueAdaptingCacheTests.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * @author Stephane Nicoll */ public abstract class AbstractValueAdaptingCacheTests - extends AbstractCacheTests { + extends AbstractCacheTests { protected static final String CACHE_NAME_NO_NULL = "testCacheNoNull"; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/AnnotatedClassCacheableService.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/AnnotatedClassCacheableService.java index 0f9c920112b..f31441f192f 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/AnnotatedClassCacheableService.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/beans/AnnotatedClassCacheableService.java @@ -205,7 +205,7 @@ public class AnnotatedClassCacheableService implements CacheableService } @Override - @Caching(evict = { @CacheEvict("primary"), @CacheEvict(cacheNames = "secondary", key = "#a0"), @CacheEvict(cacheNames = "primary", key = "#p0 + 'A'") }) + @Caching(evict = { @CacheEvict("primary"), @CacheEvict(cacheNames = "secondary", key = "#a0"), @CacheEvict(cacheNames = "primary", key = "#p0 + 'A'") }) public Object multiEvict(Object arg1) { return this.counter.getAndIncrement(); } diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedBridgeMethods.java b/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedBridgeMethods.java index bf3deedb368..35610a92220 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedBridgeMethods.java +++ b/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedBridgeMethods.java @@ -479,7 +479,7 @@ public abstract class InstrumentedBridgeMethods { return result; } - public static ResourceBundle resourcebundlegetBundle( String baseName, Locale targetLocale, ResourceBundle.Control control) { + public static ResourceBundle resourcebundlegetBundle(String baseName, Locale targetLocale, ResourceBundle.Control control) { RecordedInvocation.Builder builder = RecordedInvocation.of(InstrumentedMethod.RESOURCEBUNDLE_GETBUNDLE).withArguments(baseName, targetLocale, control); ResourceBundle result = null; try { diff --git a/spring-core/src/main/java/org/springframework/aot/hint/support/KotlinDetectorRuntimeHints.java b/spring-core/src/main/java/org/springframework/aot/hint/support/KotlinDetectorRuntimeHints.java index e3f6251a00b..5270f16b95f 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/support/KotlinDetectorRuntimeHints.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/support/KotlinDetectorRuntimeHints.java @@ -26,7 +26,7 @@ import org.springframework.aot.hint.TypeReference; * @author Brian Clozel * @since 6.1 */ -class KotlinDetectorRuntimeHints implements RuntimeHintsRegistrar { +class KotlinDetectorRuntimeHints implements RuntimeHintsRegistrar { @Override public void registerHints(RuntimeHints hints, ClassLoader classLoader) { diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java index 1cddc593066..3ac17cd27e5 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAwareOrderComparator.java @@ -92,7 +92,7 @@ public class AnnotationAwareOrderComparator extends OrderComparator { return OrderUtils.getPriority(clazz); } Integer priority = OrderUtils.getPriority(obj.getClass()); - if (priority == null && obj instanceof DecoratingProxy decoratingProxy) { + if (priority == null && obj instanceof DecoratingProxy decoratingProxy) { return getPriority(decoratingProxy.getDecoratedClass()); } return priority; diff --git a/spring-core/src/main/java/org/springframework/core/io/UrlResource.java b/spring-core/src/main/java/org/springframework/core/io/UrlResource.java index 57685795e26..ef426dc6819 100644 --- a/spring-core/src/main/java/org/springframework/core/io/UrlResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/UrlResource.java @@ -129,7 +129,7 @@ public class UrlResource extends AbstractFileResolvingResource { * @throws MalformedURLException if the given URL specification is not valid * @see java.net.URI#URI(String, String, String) */ - public UrlResource(String protocol, String location) throws MalformedURLException { + public UrlResource(String protocol, String location) throws MalformedURLException { this(protocol, location, null); } @@ -145,7 +145,7 @@ public class UrlResource extends AbstractFileResolvingResource { * @throws MalformedURLException if the given URL specification is not valid * @see java.net.URI#URI(String, String, String) */ - public UrlResource(String protocol, String location, @Nullable String fragment) throws MalformedURLException { + public UrlResource(String protocol, String location, @Nullable String fragment) throws MalformedURLException { try { this.uri = new URI(protocol, location, fragment); this.url = this.uri.toURL(); diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java index e05a77e6545..16cd5d5115a 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java @@ -1074,7 +1074,7 @@ public abstract class DataBufferUtils { DataBuffer.ByteBufferIterator iterator = dataBuffer.writableByteBuffers(); Assert.state(iterator.hasNext(), "No ByteBuffer available"); ByteBuffer byteBuffer = iterator.next(); - Attachment attachment = new Attachment(dataBuffer, iterator); + Attachment attachment = new Attachment(dataBuffer, iterator); this.channel.read(byteBuffer, this.position.get(), attachment, this); } diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java index 1f0fa8f17ae..fb2d3b2fdd3 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializingConverter.java @@ -56,7 +56,7 @@ public class SerializingConverter implements Converter { */ @Override public byte[] convert(Object source) { - try { + try { return this.serializer.serializeToByteArray(source); } catch (Throwable ex) { diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java index b895a4edb3a..fe442071c76 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java +++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java @@ -90,7 +90,7 @@ public class SimpleNamespaceContext implements NamespaceContext { } else { Set prefixes = this.namespaceUriToPrefixes.get(namespaceUri); - return (prefixes != null ? Collections.unmodifiableSet(prefixes) : Collections.emptySet()); + return (prefixes != null ? Collections.unmodifiableSet(prefixes) : Collections.emptySet()); } } diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java index 39f08e8b851..b28e69c0aaf 100644 --- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java @@ -252,7 +252,7 @@ class BridgeMethodResolverTests { Method bridgedMethod = MegaMessageProducerImpl.class.getDeclaredMethod("receive", MegaMessageEvent.class); assertThat(bridgedMethod.isBridge()).isFalse(); - Method bridgeMethod = MegaMessageProducerImpl.class.getDeclaredMethod("receive", MegaEvent.class); + Method bridgeMethod = MegaMessageProducerImpl.class.getDeclaredMethod("receive", MegaEvent.class); assertThat(bridgeMethod.isBridge()).isTrue(); assertThat(BridgeMethodResolver.findBridgedMethod(bridgeMethod)).isEqualTo(bridgedMethod); diff --git a/spring-core/src/test/java/org/springframework/core/codec/CharBufferDecoderTests.java b/spring-core/src/test/java/org/springframework/core/codec/CharBufferDecoderTests.java index 6f65b10f9ac..f1b7a4fe4ea 100644 --- a/spring-core/src/test/java/org/springframework/core/codec/CharBufferDecoderTests.java +++ b/spring-core/src/test/java/org/springframework/core/codec/CharBufferDecoderTests.java @@ -128,7 +128,7 @@ class CharBufferDecoderTests extends AbstractDecoderTests { } @Test - void decodeNewlinesAcrossBuffers() { + void decodeNewlinesAcrossBuffers() { Flux input = Flux.just( stringBuffer("\r"), stringBuffer("\n"), diff --git a/spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java b/spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java index df83b60f424..1aeb8a7df74 100644 --- a/spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java +++ b/spring-core/src/test/java/org/springframework/core/codec/StringDecoderTests.java @@ -139,7 +139,7 @@ class StringDecoderTests extends AbstractDecoderTests { } @Test - void decodeNewlinesAcrossBuffers() { + void decodeNewlinesAcrossBuffers() { Flux input = Flux.just( stringBuffer("\r"), stringBuffer("\n"), diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index 99b6ae3f6f8..e5065d23a96 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -633,7 +633,7 @@ class GenericConversionServiceTests { } - private static class MyStringToIntegerArrayConverter implements Converter { + private static class MyStringToIntegerArrayConverter implements Converter { @Override public Integer[] convert(String source) { diff --git a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java index b234739a270..6f80c7a394b 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java @@ -200,7 +200,7 @@ class PathMatchingResourcePatternResolverTests { } @Test - void usingFileProtocolWithoutWildcardInPatternAndEndingInSlashStarStar() { + void usingFileProtocolWithoutWildcardInPatternAndEndingInSlashStarStar() { Path testResourcesDir = Paths.get("src/test/resources").toAbsolutePath(); String pattern = String.format("file:%s/scanned-resources/**", testResourcesDir); String pathPrefix = ".+?resources/"; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java index d9735071d1f..a4193114e87 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java @@ -129,7 +129,7 @@ public enum SpelMessage { PROBLEM_LOCATING_METHOD(Kind.ERROR, 1031, "Problem locating method {0} on type {1}"), - SETVALUE_NOT_SUPPORTED( Kind.ERROR, 1032, + SETVALUE_NOT_SUPPORTED(Kind.ERROR, 1032, "setValue(ExpressionState, Object) not supported for ''{0}''"), MULTIPLE_POSSIBLE_METHODS(Kind.ERROR, 1033, diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java index 146f9976339..29c6e191e48 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineMap.java @@ -134,7 +134,7 @@ public class InlineMap extends SpelNodeImpl { key = keyChild.getValue(expressionState); } Object value = getChild(c).getValue(expressionState); - returnValue.put(key, value); + returnValue.put(key, value); } return new TypedValue(returnValue); } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java index 22924844941..c35641f2daa 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java @@ -74,7 +74,7 @@ public abstract class ReflectionHelper { match = null; } } - else if (!expectedArg.equals(suppliedArg)) { + else if (!expectedArg.equals(suppliedArg)) { if (suppliedArg.isAssignableTo(expectedArg)) { if (match != ArgumentsMatchKind.REQUIRES_CONVERSION) { match = ArgumentsMatchKind.CLOSE; diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java index d9e6dcb373b..87737e65c89 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java @@ -570,7 +570,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { private static boolean isKotlinProperty(Method method, String methodSuffix) { Class clazz = method.getDeclaringClass(); return KotlinDetector.isKotlinReflectPresent() && - KotlinDetector.isKotlinType(clazz) && + KotlinDetector.isKotlinType(clazz) && KotlinDelegate.isKotlinProperty(method, methodSuffix); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index 43d589116ac..eec812b221f 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -359,7 +359,7 @@ class EvaluationTests extends AbstractExpressionTests { // Add a new element to the list StandardEvaluationContext ctx = new StandardEvaluationContext(instance); ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); - Expression e = parser.parseExpression("listOfStrings[++index3]='def'"); + Expression e = parser.parseExpression("listOfStrings[++index3]='def'"); e.getValue(ctx); assertThat(instance.listOfStrings).hasSize(2); assertThat(instance.listOfStrings.get(1)).isEqualTo("def"); @@ -367,13 +367,13 @@ class EvaluationTests extends AbstractExpressionTests { // Check reference beyond end of collection ctx = new StandardEvaluationContext(instance); parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); - e = parser.parseExpression("listOfStrings[0]"); + e = parser.parseExpression("listOfStrings[0]"); String value = e.getValue(ctx, String.class); assertThat(value).isEqualTo("abc"); - e = parser.parseExpression("listOfStrings[1]"); + e = parser.parseExpression("listOfStrings[1]"); value = e.getValue(ctx, String.class); assertThat(value).isEqualTo("def"); - e = parser.parseExpression("listOfStrings[2]"); + e = parser.parseExpression("listOfStrings[2]"); value = e.getValue(ctx, String.class); assertThat(value).isEmpty(); @@ -858,7 +858,7 @@ class EvaluationTests extends AbstractExpressionTests { Integer i = 42; StandardEvaluationContext ctx = new StandardEvaluationContext(i); ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); - Expression e = parser.parseExpression("#this++"); + Expression e = parser.parseExpression("#this++"); assertThat(i).isEqualTo(42); assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() -> e.getValue(ctx, Integer.class)) @@ -993,11 +993,11 @@ class EvaluationTests extends AbstractExpressionTests { Integer i = 42; StandardEvaluationContext ctx = new StandardEvaluationContext(i); ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); - Expression e1 = parser.parseExpression("++1"); + Expression e1 = parser.parseExpression("++1"); assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() -> e1.getValue(ctx, Double.TYPE)) .satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.NOT_ASSIGNABLE)); - Expression e2 = parser.parseExpression("1++"); + Expression e2 = parser.parseExpression("1++"); assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() -> e2.getValue(ctx, Double.TYPE)) .satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.NOT_ASSIGNABLE)); @@ -1008,7 +1008,7 @@ class EvaluationTests extends AbstractExpressionTests { Integer i = 42; StandardEvaluationContext ctx = new StandardEvaluationContext(i); ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); - Expression e = parser.parseExpression("#this--"); + Expression e = parser.parseExpression("#this--"); assertThat(i).isEqualTo(42); assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() -> e.getValue(ctx, Integer.class)) @@ -1169,13 +1169,13 @@ class EvaluationTests extends AbstractExpressionTests { assertThat(helper.intArray[2]).isEqualTo(4); // index1 is 3 intArray[3] is 4 - e = parser.parseExpression("intArray[#root.index1++]--"); + e = parser.parseExpression("intArray[#root.index1++]--"); assertThat(e.getValue(ctx, Integer.class)).isEqualTo(4); assertThat(helper.index1).isEqualTo(4); assertThat(helper.intArray[3]).isEqualTo(3); // index1 is 4, intArray[3] is 3 - e = parser.parseExpression("intArray[--#root.index1]++"); + e = parser.parseExpression("intArray[--#root.index1]++"); assertThat(e.getValue(ctx, Integer.class)).isEqualTo(3); assertThat(helper.index1).isEqualTo(3); assertThat(helper.intArray[3]).isEqualTo(4); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java index d20cf8097ac..7341316cf0a 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java @@ -6372,7 +6372,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { private Float _valueF,_valueF2; public Reg(int v) { - this._value = v; + this._value = v; this._valueL = (long) v; this._valueD = (double) v; this._valueF = (float) v; @@ -6411,14 +6411,14 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } public void setValue(Integer value) { - _value = value; + _value = value; _valueL = value==null?null:Long.valueOf(value); _valueD = value==null?null:Double.valueOf(value); _valueF = value==null?null:Float.valueOf(value); } public void setValue2(Integer value) { - _value2 = value; + _value2 = value; _valueL2 = value==null?null:Long.valueOf(value); _valueD2 = value==null?null:Double.valueOf(value); _valueF2 = value==null?null:Float.valueOf(value); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java index 1ba488ccab0..5b71ec89155 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java @@ -130,7 +130,7 @@ class SpelDocumentationTests extends AbstractExpressionTests { String helloWorld = (String) parser.parseExpression("'Hello World'").getValue(); // evals to "Hello World" assertThat(helloWorld).isEqualTo("Hello World"); - double avogadrosNumber = (Double) parser.parseExpression("6.0221415E+23").getValue(); + double avogadrosNumber = (Double) parser.parseExpression("6.0221415E+23").getValue(); assertThat(avogadrosNumber).isCloseTo(6.0221415E+23, within((double) 0)); int maxValue = (Integer) parser.parseExpression("0x7FFFFFFF").getValue(); // evals to 2147483647 @@ -263,7 +263,7 @@ class SpelDocumentationTests extends AbstractExpressionTests { boolean falseValue = parser.parseExpression("true and false").getValue(Boolean.class); assertThat(falseValue).isFalse(); // evaluates to true - String expression = "isMember('Nikola Tesla') and isMember('Mihajlo Pupin')"; + String expression = "isMember('Nikola Tesla') and isMember('Mihajlo Pupin')"; boolean trueValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class); // -- OR -- @@ -273,7 +273,7 @@ class SpelDocumentationTests extends AbstractExpressionTests { assertThat(trueValue).isTrue(); // evaluates to true - expression = "isMember('Nikola Tesla') or isMember('Albert Einstien')"; + expression = "isMember('Nikola Tesla') or isMember('Albert Einstien')"; trueValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class); assertThat(trueValue).isTrue(); @@ -285,7 +285,7 @@ class SpelDocumentationTests extends AbstractExpressionTests { // -- AND and NOT -- - expression = "isMember('Nikola Tesla') and !isMember('Mihajlo Pupin')"; + expression = "isMember('Nikola Tesla') and !isMember('Mihajlo Pupin')"; falseValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class); assertThat(falseValue).isFalse(); } @@ -302,28 +302,28 @@ class SpelDocumentationTests extends AbstractExpressionTests { assertThat(testString).isEqualTo("test string"); // Subtraction - int four = parser.parseExpression("1 - -3").getValue(Integer.class); // 4 + int four = parser.parseExpression("1 - -3").getValue(Integer.class); // 4 assertThat(four).isEqualTo(4); double d = parser.parseExpression("1000.00 - 1e4").getValue(Double.class); // -9000 assertThat(d).isCloseTo(-9000.0d, within((double) 0)); // Multiplication - int six = parser.parseExpression("-2 * -3").getValue(Integer.class); // 6 + int six = parser.parseExpression("-2 * -3").getValue(Integer.class); // 6 assertThat(six).isEqualTo(6); double twentyFour = parser.parseExpression("2.0 * 3e0 * 4").getValue(Double.class); // 24.0 assertThat(twentyFour).isCloseTo(24.0d, within((double) 0)); // Division - int minusTwo = parser.parseExpression("6 / -3").getValue(Integer.class); // -2 + int minusTwo = parser.parseExpression("6 / -3").getValue(Integer.class); // -2 assertThat(minusTwo).isEqualTo(-2); double one = parser.parseExpression("8.0 / 4e0 / 2").getValue(Double.class); // 1.0 assertThat(one).isCloseTo(1.0d, within((double) 0)); // Modulus - int three = parser.parseExpression("7 % 4").getValue(Integer.class); // 3 + int three = parser.parseExpression("7 % 4").getValue(Integer.class); // 3 assertThat(three).isEqualTo(3); int oneInt = parser.parseExpression("8 / 5 % 2").getValue(Integer.class); // 1 diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java index 5e09ed74b7e..316297d74f7 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java @@ -370,7 +370,7 @@ public class BeanPropertyRowMapper implements RowMapper { * @throws SQLException if an SQLException is encountered * @since 5.3 */ - protected T constructMappedInstance(ResultSet rs, TypeConverter tc) throws SQLException { + protected T constructMappedInstance(ResultSet rs, TypeConverter tc) throws SQLException { Assert.state(this.mappedClass != null, "Mapped class was not specified"); return BeanUtils.instantiateClass(this.mappedClass); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/DataClassRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/DataClassRowMapper.java index c75eae3b118..a8ba50dae0a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/DataClassRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/DataClassRowMapper.java @@ -107,7 +107,7 @@ public class DataClassRowMapper extends BeanPropertyRowMapper { } @Override - protected T constructMappedInstance(ResultSet rs, TypeConverter tc) throws SQLException { + protected T constructMappedInstance(ResultSet rs, TypeConverter tc) throws SQLException { Assert.state(this.mappedConstructor != null, "Mapped constructor was not initialized"); Object[] args; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java index 79a075307f3..c8a15d79af1 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java @@ -1149,7 +1149,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { Assert.notNull(action, "Callback object must not be null"); if (logger.isDebugEnabled()) { String sql = getSql(csc); - logger.debug("Calling stored procedure" + (sql != null ? " [" + sql + "]" : "")); + logger.debug("Calling stored procedure" + (sql != null ? " [" + sql + "]" : "")); } Connection con = DataSourceUtils.getConnection(obtainDataSource()); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java index 2e496d463f6..b90859395fc 100755 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java @@ -554,7 +554,7 @@ public class CallMetaDataContext { Map callParameterNames = CollectionUtils.newHashMap(this.callParameters.size()); for (SqlParameter parameter : this.callParameters) { if (parameter.isInputValueProvided()) { - String parameterName = parameter.getName(); + String parameterName = parameter.getName(); String parameterNameToMatch = provider.parameterNameToUse(parameterName); if (parameterNameToMatch != null) { callParameterNames.put(parameterNameToMatch.toLowerCase(), parameterName); @@ -606,7 +606,7 @@ public class CallMetaDataContext { int i = 0; for (SqlParameter parameter : this.callParameters) { if (parameter.isInputValueProvided()) { - String parameterName = parameter.getName(); + String parameterName = parameter.getName(); matchedParameters.put(parameterName, parameterValues[i++]); } } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java index 9023b4f5942..9608eb21e72 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java @@ -114,7 +114,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider { @Nullable String schemaName, @Nullable String procedureName) throws SQLException { this.procedureColumnMetaDataUsed = true; - processProcedureColumns(databaseMetaData, catalogName, schemaName, procedureName); + processProcedureColumns(databaseMetaData, catalogName, schemaName, procedureName); } @Override diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java index 0121db51c0b..d09c7e9e6c7 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java @@ -404,7 +404,7 @@ public abstract class AbstractJdbcCall { logger.debug("The following parameters are used for call " + getCallString() + " with " + args); int i = 1; for (SqlParameter param : getCallParameters()) { - logger.debug(i + ": " + param.getName() + ", SQL type "+ param.getSqlType() + ", type name " + + logger.debug(i + ": " + param.getName() + ", SQL type " + param.getSqlType() + ", type name " + param.getTypeName() + ", parameter class [" + param.getClass().getName() + "]"); i++; } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java index 0b45a7af6eb..ebe98218afb 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java @@ -474,7 +474,7 @@ public abstract class AbstractJdbcInsert { if (getGeneratedKeyNames().length > 1) { throw new InvalidDataAccessApiUsageException( "Current database only supports retrieving the key for a single column. There are " + - getGeneratedKeyNames().length + " columns specified: " + Arrays.toString(getGeneratedKeyNames())); + getGeneratedKeyNames().length + " columns specified: " + Arrays.toString(getGeneratedKeyNames())); } Assert.state(getTableName() != null, "No table name set"); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java index ec9a3688e4c..9cfdab6c62d 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java @@ -41,7 +41,7 @@ public interface SqlValue { * @param paramIndex the index of the parameter for which we need to set the value * @throws SQLException if an SQLException is encountered while setting parameter values */ - void setValue(PreparedStatement ps, int paramIndex) throws SQLException; + void setValue(PreparedStatement ps, int paramIndex) throws SQLException; /** * Clean up resources held by this value object. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java index 2d45305597d..4ad06fc8a6f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java @@ -269,7 +269,7 @@ public interface SqlRowSet extends Serializable { * @see java.sql.ResultSet#getObject(int, Map) */ @Nullable - Object getObject(int columnIndex, Map> map) throws InvalidResultSetAccessException; + Object getObject(int columnIndex, Map> map) throws InvalidResultSetAccessException; /** * Retrieve the value of the indicated column in the current row as an Object. @@ -279,7 +279,7 @@ public interface SqlRowSet extends Serializable { * @see java.sql.ResultSet#getObject(String, Map) */ @Nullable - Object getObject(String columnLabel, Map> map) throws InvalidResultSetAccessException; + Object getObject(String columnLabel, Map> map) throws InvalidResultSetAccessException; /** * Retrieve the value of the indicated column in the current row as an Object. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java index 87d45d03d2c..f2fe1f98b20 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java @@ -60,7 +60,7 @@ import static org.mockito.Mockito.verify; */ @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) -class SqlLobValueTests { +class SqlLobValueTests { @Mock private PreparedStatement preparedStatement; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java index 2fdc9e06839..7a52e160059 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java @@ -181,32 +181,32 @@ public class DataSourceTransactionManagerTests { } @Test - public void testTransactionRollbackWithAutoCommitTrue() throws Exception { + public void testTransactionRollbackWithAutoCommitTrue() throws Exception { doTestTransactionRollbackRestoringAutoCommit(true, false, false); } @Test - public void testTransactionRollbackWithAutoCommitFalse() throws Exception { + public void testTransactionRollbackWithAutoCommitFalse() throws Exception { doTestTransactionRollbackRestoringAutoCommit(false, false, false); } @Test - public void testTransactionRollbackWithAutoCommitTrueAndLazyConnection() throws Exception { + public void testTransactionRollbackWithAutoCommitTrueAndLazyConnection() throws Exception { doTestTransactionRollbackRestoringAutoCommit(true, true, false); } @Test - public void testTransactionRollbackWithAutoCommitFalseAndLazyConnection() throws Exception { + public void testTransactionRollbackWithAutoCommitFalseAndLazyConnection() throws Exception { doTestTransactionRollbackRestoringAutoCommit(false, true, false); } @Test - public void testTransactionRollbackWithAutoCommitTrueAndLazyConnectionAndCreateStatement() throws Exception { + public void testTransactionRollbackWithAutoCommitTrueAndLazyConnectionAndCreateStatement() throws Exception { doTestTransactionRollbackRestoringAutoCommit(true, true, true); } @Test - public void testTransactionRollbackWithAutoCommitFalseAndLazyConnectionAndCreateStatement() throws Exception { + public void testTransactionRollbackWithAutoCommitFalseAndLazyConnectionAndCreateStatement() throws Exception { doTestTransactionRollbackRestoringAutoCommit(false, true, true); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java index 51443c46c2d..16e361e5734 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java @@ -54,7 +54,7 @@ import static org.mockito.Mockito.verify; * @author Thomas Risberg * @author Juergen Hoeller */ -public class SqlQueryTests { +public class SqlQueryTests { //FIXME inline? private static final String SELECT_ID = diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcTransactionManagerTests.java index 7ceb54b2883..a33e5df514a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcTransactionManagerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcTransactionManagerTests.java @@ -187,32 +187,32 @@ public class JdbcTransactionManagerTests { } @Test - public void testTransactionRollbackWithAutoCommitTrue() throws Exception { + public void testTransactionRollbackWithAutoCommitTrue() throws Exception { doTestTransactionRollbackRestoringAutoCommit(true, false, false); } @Test - public void testTransactionRollbackWithAutoCommitFalse() throws Exception { + public void testTransactionRollbackWithAutoCommitFalse() throws Exception { doTestTransactionRollbackRestoringAutoCommit(false, false, false); } @Test - public void testTransactionRollbackWithAutoCommitTrueAndLazyConnection() throws Exception { + public void testTransactionRollbackWithAutoCommitTrueAndLazyConnection() throws Exception { doTestTransactionRollbackRestoringAutoCommit(true, true, false); } @Test - public void testTransactionRollbackWithAutoCommitFalseAndLazyConnection() throws Exception { + public void testTransactionRollbackWithAutoCommitFalseAndLazyConnection() throws Exception { doTestTransactionRollbackRestoringAutoCommit(false, true, false); } @Test - public void testTransactionRollbackWithAutoCommitTrueAndLazyConnectionAndCreateStatement() throws Exception { + public void testTransactionRollbackWithAutoCommitTrueAndLazyConnectionAndCreateStatement() throws Exception { doTestTransactionRollbackRestoringAutoCommit(true, true, true); } @Test - public void testTransactionRollbackWithAutoCommitFalseAndLazyConnectionAndCreateStatement() throws Exception { + public void testTransactionRollbackWithAutoCommitFalseAndLazyConnectionAndCreateStatement() throws Exception { doTestTransactionRollbackRestoringAutoCommit(false, true, true); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java index 0e1228df782..88dfcb2041a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLExceptionCustomTranslatorTests.java @@ -56,7 +56,7 @@ public class SQLExceptionCustomTranslatorTests { @Test public void dataAccessResourceException() { - SQLException dataAccessResourceEx = new SQLDataException("", "", 2); + SQLException dataAccessResourceEx = new SQLDataException("", "", 2); DataAccessException dae = sext.translate("task", "SQL", dataAccessResourceEx); assertThat(dae.getCause()).isEqualTo(dataAccessResourceEx); assertThat(dae).isInstanceOf(TransientDataAccessResourceException.class); diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java index 45669be2a99..8bb8d92c5ca 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java @@ -243,7 +243,7 @@ public abstract class AbstractAdaptableMessageListener * as an argument * @throws MessageConversionException if the message could not be extracted */ - protected Object extractMessage(Message message) { + protected Object extractMessage(Message message) { try { MessageConverter converter = getMessageConverter(); if (converter != null) { diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java index 5151aaa3cb6..07c5a8d042c 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java @@ -47,7 +47,7 @@ import org.springframework.util.Assert; * @see #setTransactionManager * @see JmsMessageEndpointManager */ -public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory { +public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory { @Nullable private MessageListener messageListener; diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageContentsDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageContentsDelegate.java index 58d5f3a1ffc..ccd67d5b65e 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageContentsDelegate.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageContentsDelegate.java @@ -28,7 +28,7 @@ public interface MessageContentsDelegate { void handleMessage(CharSequence message); - void handleMessage(Map message); + void handleMessage(Map message); void handleMessage(byte[] message); diff --git a/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java b/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java index ebce89c7086..86782e3fc95 100644 --- a/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java +++ b/spring-messaging/src/jmh/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryBenchmark.java @@ -64,7 +64,7 @@ public class DefaultSubscriptionRegistryBenchmark { @Setup(Level.Trial) public void doSetup() { - this.findMessage = MessageBuilder.createMessage("", SimpMessageHeaderAccessor.create().getMessageHeaders()); + this.findMessage = MessageBuilder.createMessage("", SimpMessageHeaderAccessor.create().getMessageHeaders()); this.uniqueIdGenerator = new AtomicInteger(); this.registry = new DefaultSubscriptionRegistry(); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java index 05c4a6a941d..978ae01fa54 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketFrameTypeMessageCondition.java @@ -143,7 +143,7 @@ public class RSocketFrameTypeMessageCondition extends AbstractMessageCondition routeVariables, @Nullable MetadataHelper metadataHelper, + @Nullable String route, @Nullable List routeVariables, @Nullable MetadataHelper metadataHelper, @Nullable Object payloadValue, @Nullable Publisher payload, @Nullable ParameterizedTypeReference payloadElementType) { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java index 89315a714e3..90eee53b393 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java @@ -492,7 +492,7 @@ public class DefaultStompSession implements ConnectionHandlingStompSession { TcpConnection con = this.connection; Assert.state(con != null, "No TcpConnection available"); if (connect[0] > 0 && connected[1] > 0) { - long interval = Math.max(connect[0], connected[1]); + long interval = Math.max(connect[0], connected[1]); con.onWriteInactivity(new WriteInactivityTask(), interval); } if (connect[1] > 0 && connected[0] > 0) { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java index c4480b6fc2a..b9275963c9c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java @@ -43,7 +43,7 @@ import org.springframework.util.Assert; * @since 4.0 * @see StompDecoder */ -public class StompEncoder { +public class StompEncoder { private static final Byte LINE_FEED_BYTE = '\n'; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java index 4dad562b318..b3cda62e5f6 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java @@ -183,7 +183,7 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati @Override public String toString() { - return "local=[" + this.localRegistry + "], remote=" + this.remoteRegistries; + return "local=[" + this.localRegistry + "], remote=" + this.remoteRegistries; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java index 0331203200c..d452456acab 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java @@ -600,7 +600,7 @@ public class MessageHeaderAccessor { if (messageHeaders instanceof MutableMessageHeaders mutableHeaders) { MessageHeaderAccessor headerAccessor = mutableHeaders.getAccessor(); - if (requiredType == null || requiredType.isInstance(headerAccessor)) { + if (requiredType == null || requiredType.isInstance(headerAccessor)) { return (T) headerAccessor; } } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNetty2TcpClient.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNetty2TcpClient.java index fe7e4b4ed2e..624201cdcb2 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNetty2TcpClient.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNetty2TcpClient.java @@ -310,7 +310,7 @@ public class ReactorNetty2TcpClient

implements TcpOperations

{ } }); Sinks.Empty completionSink = Sinks.empty(); - TcpConnection

connection = new ReactorNetty2TcpConnection<>(inbound, outbound, codec, completionSink); + TcpConnection

connection = new ReactorNetty2TcpConnection<>(inbound, outbound, codec, completionSink); scheduler.schedule(() -> this.connectionHandler.afterConnected(connection)); inbound.withConnection(conn -> conn.addHandlerFirst(new StompMessageDecoder<>(codec))); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java index 56a1651b85e..35ff79fc781 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorNettyTcpClient.java @@ -308,7 +308,7 @@ public class ReactorNettyTcpClient

implements TcpOperations

{ } }); Sinks.Empty completionSink = Sinks.empty(); - TcpConnection

connection = new ReactorNettyTcpConnection<>(inbound, outbound, codec, completionSink); + TcpConnection

connection = new ReactorNettyTcpConnection<>(inbound, outbound, codec, completionSink); scheduler.schedule(() -> this.connectionHandler.afterConnected(connection)); inbound.withConnection(conn -> conn.addHandlerFirst(new StompMessageDecoder<>(codec))); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolverTests.java index b0210ffd998..5e7d5739bee 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolverTests.java @@ -134,7 +134,7 @@ public class AnnotationExceptionHandlerMethodResolverTests { static class InheritedController extends ExceptionController { @Override - public void handleIOException() { + public void handleIOException() { } } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/AbstractStompBrokerRelayIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/AbstractStompBrokerRelayIntegrationTests.java index ba7809a47c0..fe40e62fdd2 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/AbstractStompBrokerRelayIntegrationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/AbstractStompBrokerRelayIntegrationTests.java @@ -480,7 +480,7 @@ public abstract class AbstractStompBrokerRelayIntegrationTests { @Override public String toString() { - return "command=" + this.command + ", session=\"" + this.sessionId + "\""; + return "command=" + this.command + ", session=\"" + this.sessionId + "\""; } } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java index d5902283e5e..cf8bc8b450d 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java @@ -522,7 +522,7 @@ public class DefaultStompSessionTests { Subscription subscription = this.session.subscribe(subscribeHeaders, frameHandler); StompHeaders unsubscribeHeaders = new StompHeaders(); - unsubscribeHeaders.set(headerName, subscription.getSubscriptionHeaders().getFirst(headerName)); + unsubscribeHeaders.set(headerName, subscription.getSubscriptionHeaders().getFirst(headerName)); subscription.unsubscribe(unsubscribeHeaders); Message message = this.messageCaptor.getValue(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompEncoderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompEncoderTests.java index 67aa7cbc6b2..0f6f8a0475a 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompEncoderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompEncoderTests.java @@ -57,7 +57,7 @@ public class StompEncoderTests { @Test public void encodeFrameWithHeadersThatShouldBeEscaped() { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT); - headers.addNativeHeader("a:\r\n\\b", "alpha:bravo\r\n\\"); + headers.addNativeHeader("a:\r\n\\b", "alpha:bravo\r\n\\"); Message frame = MessageBuilder.createMessage(new byte[0], headers.getMessageHeaders()); assertThat(new String(encoder.encode(frame))).isEqualTo("DISCONNECT\na\\c\\r\\n\\\\b:alpha\\cbravo\\r\\n\\\\\n\n\0"); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java index 3d6f2d551e9..096df45de7f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java @@ -97,7 +97,7 @@ public class ExecutorSubscribableChannelTests { } @Test - public void subscribeTwice() { + public void subscribeTwice() { assertThat(this.channel.subscribe(this.handler)).isTrue(); assertThat(this.channel.subscribe(this.handler)).isFalse(); this.channel.send(this.message); @@ -105,7 +105,7 @@ public class ExecutorSubscribableChannelTests { } @Test - public void unsubscribeTwice() { + public void unsubscribeTwice() { this.channel.subscribe(this.handler); assertThat(this.channel.unsubscribe(this.handler)).isTrue(); assertThat(this.channel.unsubscribe(this.handler)).isFalse(); @@ -114,7 +114,7 @@ public class ExecutorSubscribableChannelTests { } @Test - public void failurePropagates() { + public void failurePropagates() { RuntimeException ex = new RuntimeException(); willThrow(ex).given(this.handler).handleMessage(this.message); MessageHandler secondHandler = mock(); @@ -130,7 +130,7 @@ public class ExecutorSubscribableChannelTests { } @Test - public void concurrentModification() { + public void concurrentModification() { this.channel.subscribe(message1 -> channel.unsubscribe(handler)); this.channel.subscribe(this.handler); this.channel.send(this.message); diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java index 275695dbd8c..9719081da3d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java @@ -202,7 +202,7 @@ public abstract class SessionFactoryUtils { return new PessimisticLockingFailureException(ex.getMessage() + "; SQL [" + hibJdbcEx.getSQL() + "]", ex); } if (ex instanceof ConstraintViolationException hibJdbcEx) { - return new DataIntegrityViolationException(ex.getMessage() + "; SQL [" + hibJdbcEx.getSQL() + + return new DataIntegrityViolationException(ex.getMessage() + "; SQL [" + hibJdbcEx.getSQL() + "]; constraint [" + hibJdbcEx.getConstraintName() + "]", ex); } if (ex instanceof DataException hibJdbcEx) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java index f3fcc74bd22..12a9d75c97b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java @@ -286,7 +286,7 @@ public class HibernateJpaDialect extends DefaultJpaDialect { return new PessimisticLockingFailureException(ex.getMessage() + "; SQL [" + hibEx.getSQL() + "]", ex); } if (ex instanceof ConstraintViolationException hibEx) { - return new DataIntegrityViolationException(ex.getMessage() + "; SQL [" + hibEx.getSQL() + + return new DataIntegrityViolationException(ex.getMessage() + "; SQL [" + hibEx.getSQL() + "]; constraint [" + hibEx.getConstraintName() + "]", ex); } if (ex instanceof DataException hibEx) { diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java index bdc89edd25f..2ba7c32aafb 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java @@ -877,7 +877,7 @@ public class XStreamMarshaller extends AbstractMarshaller implements BeanClassLo if (ex instanceof StreamException || ex instanceof CannotResolveClassException || ex instanceof ForbiddenClassException || ex instanceof ConversionException) { if (marshalling) { - return new MarshallingFailureException("XStream marshalling exception", ex); + return new MarshallingFailureException("XStream marshalling exception", ex); } else { return new UnmarshallingFailureException("XStream unmarshalling exception", ex); diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java index 8537aa4d8d1..93592d3ad1f 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java @@ -188,7 +188,7 @@ public class R2dbcTransactionManager extends AbstractReactiveTransactionManager ConnectionFactoryTransactionObject txObject = (ConnectionFactoryTransactionObject) transaction; if (definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_NESTED && - txObject.isTransactionActive()) { + txObject.isTransactionActive()) { return txObject.createSavepoint(); } diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/init/ScriptUtils.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/init/ScriptUtils.java index 18437ddca93..8bf20593e2e 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/init/ScriptUtils.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/init/ScriptUtils.java @@ -193,7 +193,7 @@ public abstract class ScriptUtils { return executeSqlScript(connection, resource, dataBufferFactory, continueOnError, ignoreFailedDrops, new String[] { commentPrefix }, separator, - blockCommentStartDelimiter, blockCommentEndDelimiter); + blockCommentStartDelimiter, blockCommentEndDelimiter); } /** diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java index 8973f553a2c..c8abd3083c2 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Mark Paluch * @author Christoph Strobl */ -abstract class AbstractTransactionalDatabaseClientIntegrationTests { +abstract class AbstractTransactionalDatabaseClientIntegrationTests { private ConnectionFactory connectionFactory; diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index 9acaa1346f4..f94b21cafcd 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -726,7 +726,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } else if (this.inputStream != null) { throw new IllegalStateException( - "Cannot call getReader() after getInputStream() has already been called for the current request") ; + "Cannot call getReader() after getInputStream() has already been called for the current request"); } if (this.content != null) { diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DynamicValuesPropertySource.java b/spring-test/src/main/java/org/springframework/test/context/support/DynamicValuesPropertySource.java index a8e623ea3f5..d8f795ffcfb 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DynamicValuesPropertySource.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DynamicValuesPropertySource.java @@ -30,7 +30,7 @@ import org.springframework.util.StringUtils; * @author Sam Brannen * @since 5.2.5 */ -class DynamicValuesPropertySource extends EnumerablePropertySource>> { +class DynamicValuesPropertySource extends EnumerablePropertySource>> { DynamicValuesPropertySource(String name, Map> valueSuppliers) { super(name, valueSuppliers); diff --git a/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java index 05ce3015358..4a00f1dbd57 100644 --- a/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java +++ b/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java @@ -51,7 +51,7 @@ public class XmlExpectationsHelper { assertThat("Body content", document, matcher); } - private Document parseXmlString(String xml) throws Exception { + private Document parseXmlString(String xml) throws Exception { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); DocumentBuilder documentBuilder = factory.newDocumentBuilder(); diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java index 66464087484..5ce9b8f2231 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java @@ -478,7 +478,7 @@ class DefaultWebTestClient implements WebTestClient { return new DefaultBodyContentSpec(entityResult); } - private EntityExchangeResult initEntityExchangeResult(@Nullable B body) { + private EntityExchangeResult initEntityExchangeResult(@Nullable B body) { EntityExchangeResult result = new EntityExchangeResult<>(this.exchangeResult, body); result.assertWithDiagnostics(() -> this.entityResultConsumer.accept(result)); return result; diff --git a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java index 63576647420..1c5d91caeab 100644 --- a/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java +++ b/spring-test/src/main/java/org/springframework/test/web/reactive/server/WiretapConnector.java @@ -73,7 +73,7 @@ class WiretapConnector implements ClientHttpConnector { requestRef.set(wrapped); return requestCallback.apply(wrapped); }) - .map(response -> { + .map(response -> { WiretapClientHttpRequest wrappedRequest = requestRef.get(); String header = WebTestClient.WEBTESTCLIENT_REQUEST_ID; String requestId = wrappedRequest.getHeaders().getFirst(header); diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/AotMergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/AotMergedContextConfigurationTests.java index 100c57f9146..1984fc19c53 100644 --- a/spring-test/src/test/java/org/springframework/test/context/cache/AotMergedContextConfigurationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/cache/AotMergedContextConfigurationTests.java @@ -54,7 +54,7 @@ class AotMergedContextConfigurationTests { @Test - void testEquals() { + void testEquals() { assertThat(aotMergedConfig1).isEqualTo(aotMergedConfig1); assertThat(aotMergedConfig1).isEqualTo(aotMergedConfig2); diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/BeforeTestClassSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/BeforeTestClassSqlScriptsTests.java index ae96e87dc2f..0f8ef4afe50 100644 --- a/spring-test/src/test/java/org/springframework/test/context/jdbc/BeforeTestClassSqlScriptsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/jdbc/BeforeTestClassSqlScriptsTests.java @@ -61,7 +61,7 @@ class BeforeTestClassSqlScriptsTests extends AbstractTransactionalTests { } @Nested - class NestedBeforeTestClassSqlScriptsTests { + class NestedBeforeTestClassSqlScriptsTests { @Test void classLevelScriptsHaveBeenRun() { diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/TransactionalInlinedStatementsSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/TransactionalInlinedStatementsSqlScriptsTests.java index 6e1628d84fc..0787af7a891 100644 --- a/spring-test/src/test/java/org/springframework/test/context/jdbc/TransactionalInlinedStatementsSqlScriptsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/jdbc/TransactionalInlinedStatementsSqlScriptsTests.java @@ -35,7 +35,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @SpringJUnitConfig(EmptyDatabaseConfig.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @Sql( - scripts = "schema.sql", + scripts = "schema.sql", statements = "INSERT INTO user VALUES('Dilbert')" ) @DirtiesContext diff --git a/spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java b/spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java index e602c034de9..913e95116ff 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/DefaultRequestExpectationTests.java @@ -80,7 +80,7 @@ class DefaultRequestExpectationTests { private ClientHttpRequest createRequest() { - return new MockClientHttpRequest(HttpMethod.GET, URI.create("/foo")); + return new MockClientHttpRequest(HttpMethod.GET, URI.create("/foo")); } } diff --git a/spring-test/src/test/java/org/springframework/test/web/client/UnorderedRequestExpectationManagerTests.java b/spring-test/src/test/java/org/springframework/test/web/client/UnorderedRequestExpectationManagerTests.java index 433183c6100..3a9cea269a4 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/UnorderedRequestExpectationManagerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/UnorderedRequestExpectationManagerTests.java @@ -120,7 +120,7 @@ class UnorderedRequestExpectationManagerTests { private ClientHttpRequest createRequest(HttpMethod method, String url) { - return new MockClientHttpRequest(method, URI.create(url)); + return new MockClientHttpRequest(method, URI.create(url)); } } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java index c32f9c384de..9c1370218f0 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java @@ -305,7 +305,7 @@ class JsonPathResultMatchersTests { MockHttpServletResponse response = new MockHttpServletResponse(); response.addHeader("Content-Type", "application/json"); response.getWriter().print(new String("test".getBytes(ISO_8859_1))); - StubMvcResult result = new StubMvcResult(null, null, null, null, null, null, response); + StubMvcResult result = new StubMvcResult(null, null, null, null, null, null, response); assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> new JsonPathResultMatchers("$.str").prefix("prefix").value("foo").match(result)); diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java index 762b5dae6fc..c350cdd297f 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java @@ -96,7 +96,7 @@ class StandaloneMockMvcBuilderTests { void applicationContextAttribute() { TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PlaceholderController()); builder.addPlaceholderValue("sys.login.ajax", "/foo"); - WebApplicationContext wac = builder.initWebAppContext(); + WebApplicationContext wac = builder.initWebAppContext(); assertThat(WebApplicationContextUtils.getRequiredWebApplicationContext(wac.getServletContext())).isEqualTo(wac); } diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java index 055b127e662..96a3944d29b 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java +++ b/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerBeanDefinitionParser.java @@ -30,7 +30,7 @@ import org.springframework.transaction.jta.JtaTransactionManager; * @author Christian Dupuis * @since 2.5 */ -public class JtaTransactionManagerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { +public class JtaTransactionManagerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { @Override protected Class getBeanClass(Element element) { diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java index 5b90510878f..4e102106b36 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java @@ -152,7 +152,7 @@ public class MethodMapTransactionAttributeSource public void addTransactionalMethod(Class clazz, String mappedName, TransactionAttribute attr) { Assert.notNull(clazz, "Class must not be null"); Assert.notNull(mappedName, "Mapped name must not be null"); - String name = clazz.getName() + '.' + mappedName; + String name = clazz.getName() + '.' + mappedName; Method[] methods = clazz.getDeclaredMethods(); List matchingMethods = new ArrayList<>(); diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java index 0b2cc33f115..4d9ecbd42fc 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java @@ -113,7 +113,7 @@ public class NameMatchTransactionAttributeSource } @Override - public void afterPropertiesSet() { + public void afterPropertiesSet() { for (TransactionAttribute attr : this.nameMap.values()) { if (attr instanceof DefaultTransactionAttribute dta) { dta.resolveAttributeStrings(this.embeddedValueResolver); diff --git a/spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java index 0134bb4b5bd..d29b380b0fb 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java @@ -355,7 +355,7 @@ public abstract class AbstractReactiveTransactionManager if (resourcesHolder != null) { Object suspendedResources = resourcesHolder.suspendedResources; if (suspendedResources != null) { - resume = doResume(synchronizationManager, transaction, suspendedResources); + resume = doResume(synchronizationManager, transaction, suspendedResources); } List suspendedSynchronizations = resourcesHolder.suspendedSynchronizations; if (suspendedSynchronizations != null) { diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java index d1706ce33aa..c8bc9a127c9 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java @@ -231,7 +231,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests TransactionInterceptor ti = transactionInterceptorWithTransactionManagerName( "fooTransactionManager", beanFactory); - PlatformTransactionManager txManager = associateTransactionManager(beanFactory, "fooTransactionManager"); + PlatformTransactionManager txManager = associateTransactionManager(beanFactory, "fooTransactionManager"); DefaultTransactionAttribute attribute = new DefaultTransactionAttribute(); TransactionManager actual = ti.determineTransactionManager(attribute); diff --git a/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java b/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java index fb8f89c3a31..d9372552c32 100644 --- a/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java +++ b/spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java @@ -364,7 +364,7 @@ public final class MultipartBodyBuilder { * @param

the publisher */ static final class PublisherEntity> extends HttpEntity

- implements ResolvableTypeProvider { + implements ResolvableTypeProvider { private final ResolvableType resolvableType; diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java index 61b810cf125..b057fea3448 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java +++ b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java @@ -166,7 +166,7 @@ public class FormHttpMessageReader extends LoggingCodecSupport result.add(URLDecoder.decode(pair, charset), null); } else { - String name = URLDecoder.decode(pair.substring(0, idx), charset); + String name = URLDecoder.decode(pair.substring(0, idx), charset); String value = URLDecoder.decode(pair.substring(idx + 1), charset); result.add(name, value); } diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java index 6771bf149af..eefdb10a347 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java +++ b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java @@ -252,7 +252,7 @@ public abstract class AbstractJackson2Decoder extends Jackson2CodecSupport imple @Nullable private Class getContextClass(@Nullable ResolvableType elementType) { - MethodParameter param = (elementType != null ? getParameter(elementType) : null); + MethodParameter param = (elementType != null ? getParameter(elementType) : null); return (param != null ? param.getContainingClass() : null); } diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java index 15b16f521e6..3336697ef9d 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java +++ b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java @@ -202,7 +202,7 @@ public abstract class AbstractJackson2Encoder extends Jackson2CodecSupport imple } return dataBufferFlux - .doOnNext(dataBuffer -> Hints.touchDataBuffer(dataBuffer, hintsToUse, logger)) + .doOnNext(dataBuffer -> Hints.touchDataBuffer(dataBuffer, hintsToUse, logger)) .doAfterTerminate(() -> { try { byteBuilder.release(); diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java index cdbafed4204..eeb1c590934 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java @@ -110,7 +110,7 @@ public class MultipartHttpMessageWriter extends MultipartWriterSupport * @param formWriter the fallback writer for form data, {@code null} by default */ public MultipartHttpMessageWriter(List> partWriters, - @Nullable HttpMessageWriter> formWriter) { + @Nullable HttpMessageWriter> formWriter) { this(() -> partWriters, formWriter); } @@ -125,7 +125,7 @@ public class MultipartHttpMessageWriter extends MultipartWriterSupport * @since 6.0.3 */ public MultipartHttpMessageWriter(Supplier>> partWritersSupplier, - @Nullable HttpMessageWriter> formWriter) { + @Nullable HttpMessageWriter> formWriter) { super(initMediaTypes(formWriter)); this.partWritersSupplier = partWritersSupplier; diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java index e17c5dfaf51..c241752667c 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java @@ -239,7 +239,7 @@ public abstract class AbstractListenerReadPublisher implements Publisher { private boolean handlePendingCompletionOrError() { State state = this.state.get(); - if (state == State.DEMAND || state == State.NO_DEMAND) { + if (state == State.DEMAND || state == State.NO_DEMAND) { if (this.completionPending) { rsReadLogger.trace(getLogPrefix() + "Processing pending completion"); this.state.get().onAllDataRead(this); diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java index ba63120383d..86e8bc5540a 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java @@ -42,7 +42,7 @@ import org.springframework.util.ClassUtils; * @see org.springframework.web.filter.RequestContextFilter * @see org.springframework.web.servlet.DispatcherServlet */ -public abstract class RequestContextHolder { +public abstract class RequestContextHolder { private static final boolean jsfPresent = ClassUtils.isPresent("jakarta.faces.context.FacesContext", RequestContextHolder.class.getClassLoader()); diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java index d3c087c1161..855892faeb6 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java @@ -59,7 +59,7 @@ class DeferredResultInterceptorChain { } @Nullable - public Object applyPostProcess(NativeWebRequest request, DeferredResult deferredResult, + public Object applyPostProcess(NativeWebRequest request, DeferredResult deferredResult, @Nullable Object concurrentResult) { try { diff --git a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java index 08a914f635d..1b09810ecd1 100644 --- a/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java @@ -429,7 +429,7 @@ public final class WebHttpHandlerBuilder { */ public HttpHandler build() { WebHandler decorated = new FilteringWebHandler(this.webHandler, this.filters); - decorated = new ExceptionHandlingWebHandler(decorated, this.exceptionHandlers); + decorated = new ExceptionHandlingWebHandler(decorated, this.exceptionHandlers); HttpWebHandlerAdapter adapted = new HttpWebHandlerAdapter(decorated); if (this.sessionManager != null) { diff --git a/spring-web/src/main/java/org/springframework/web/util/DisconnectedClientHelper.java b/spring-web/src/main/java/org/springframework/web/util/DisconnectedClientHelper.java index 286650e5624..2f443b133a1 100644 --- a/spring-web/src/main/java/org/springframework/web/util/DisconnectedClientHelper.java +++ b/spring-web/src/main/java/org/springframework/web/util/DisconnectedClientHelper.java @@ -60,7 +60,7 @@ public class DisconnectedClientHelper { *

  • IOException "Broken pipe" or "connection reset by peer" * */ - public boolean isClientDisconnectedException(Throwable ex) { + public boolean isClientDisconnectedException(Throwable ex) { String message = NestedExceptionUtils.getMostSpecificCause(ex).getMessage(); if (message != null) { String text = message.toLowerCase(); diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java index d3f0229b373..83a4bbc7f2f 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java +++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java @@ -751,7 +751,7 @@ final class HierarchicalUriComponents extends UriComponents { } - private static class UriTemplateEncoder implements BiFunction { + private static class UriTemplateEncoder implements BiFunction { private final Charset charset; diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java index 7368d6cf57f..cfd400f0afe 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java +++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java @@ -80,7 +80,7 @@ class HtmlCharacterEntityReferences { } catch (IOException ex) { throw new IllegalStateException( - "Failed to parse reference definition file [HtmlCharacterEntityReferences.properties]: " + ex.getMessage()); + "Failed to parse reference definition file [HtmlCharacterEntityReferences.properties]: " + ex.getMessage()); } // Parse reference definition properties diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java index ad9f9b9945a..397a0ed9c9f 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java @@ -506,7 +506,7 @@ public class HttpHeadersTests { @Test void contentLanguageSerialized() { - headers.set(HttpHeaders.CONTENT_LANGUAGE, "de, en_CA"); + headers.set(HttpHeaders.CONTENT_LANGUAGE, "de, en_CA"); assertThat(headers.getContentLanguage()).as("Expected one (first) locale").isEqualTo(Locale.GERMAN); } diff --git a/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java index ac83d40f882..d8bef7a793b 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java @@ -124,7 +124,7 @@ public class FormHttpMessageReaderTests extends AbstractLeakCheckingTests { private MockServerHttpRequest request(Publisher body) { return MockServerHttpRequest .method(HttpMethod.GET, "/") - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE) + .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE) .body(body); } diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java index 17f7c1d75d5..8ea3b4c3031 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java @@ -251,7 +251,7 @@ public class Jackson2JsonDecoderTests extends AbstractDecoderTests input = stringBuffer("{\"test\": 1}"); testDecode(input, TestObject.class, step -> step diff --git a/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java index 7dd36e0bbf9..64efd900a92 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java @@ -63,7 +63,7 @@ import static org.springframework.core.io.buffer.DataBufferUtils.release; /** * @author Arjen Poutsma */ -class DefaultPartHttpMessageReaderTests { +class DefaultPartHttpMessageReaderTests { private static final String LOREM_IPSUM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer iaculis metus id vestibulum nullam."; @@ -139,7 +139,7 @@ class DefaultPartHttpMessageReaderTests { } @ParameterizedDefaultPartHttpMessageReaderTest - void noEndHeader(DefaultPartHttpMessageReader reader) { + void noEndHeader(DefaultPartHttpMessageReader reader) { MockServerHttpRequest request = createRequest( new ClassPathResource("no-end-header.multipart", getClass()), "boundary"); Flux result = reader.read(forClass(Part.class), request, emptyMap()); diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java index 90fc14334cf..fc86500b410 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java @@ -302,7 +302,7 @@ class Jackson2ObjectMapperBuilderTests { javaTimeModule.addDeserializer(OffsetDateTime.class, new OffsetDateTimeDeserializer()); builder.modulesToInstall(javaTimeModule); builder.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); - ObjectMapper objectMapper = builder.build(); + ObjectMapper objectMapper = builder.build(); DemoPojo demoPojo = objectMapper.readValue(DATA, DemoPojo.class); assertThat(demoPojo.getOffsetDateTime()).isNotNull(); } diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java index 34ec83ba402..5e8226d694b 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java @@ -121,7 +121,7 @@ public class SpringHandlerInstantiatorTests { private Capitalizer capitalizer; @Override - public User deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { + public User deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { ObjectCodec oc = jsonParser.getCodec(); JsonNode node = oc.readTree(jsonParser); return new User(this.capitalizer.capitalize(node.get("username").asText())); diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java index 1dfb937c371..e817023264a 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java @@ -129,7 +129,7 @@ public class Jaxb2CollectionHttpMessageConverterTests { @SuppressWarnings("unchecked") public void readXmlRootElementExternalEntityDisabled() throws Exception { Resource external = new ClassPathResource("external.txt", getClass()); - String content = "\n" + " ]>" + " &ext;"; @@ -158,7 +158,7 @@ public class Jaxb2CollectionHttpMessageConverterTests { @SuppressWarnings("unchecked") public void readXmlRootElementExternalEntityEnabled() throws Exception { Resource external = new ClassPathResource("external.txt", getClass()); - String content = "\n" + " ]>" + " &ext;"; diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java index e3e58af5b25..04af0f70c30 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java @@ -124,7 +124,7 @@ public class Jaxb2RootElementHttpMessageConverterTests { @Test public void readXmlRootElementExternalEntityDisabled() throws Exception { Resource external = new ClassPathResource("external.txt", getClass()); - String content = "\n" + " ]>" + " &ext;"; @@ -138,7 +138,7 @@ public class Jaxb2RootElementHttpMessageConverterTests { @Test public void readXmlRootElementExternalEntityEnabled() throws Exception { Resource external = new ClassPathResource("external.txt", getClass()); - String content = "\n" + " ]>" + " &ext;"; diff --git a/spring-web/src/test/java/org/springframework/web/bind/annotation/ControllerMappingReflectiveProcessorTests.java b/spring-web/src/test/java/org/springframework/web/bind/annotation/ControllerMappingReflectiveProcessorTests.java index 74cb13cb24c..596fc6fcaaf 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/annotation/ControllerMappingReflectiveProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/annotation/ControllerMappingReflectiveProcessorTests.java @@ -235,12 +235,12 @@ public class ControllerMappingReflectiveProcessorTests { } @PostMapping - void postHttpEntity(HttpEntity entity) { + void postHttpEntity(HttpEntity entity) { } @PostMapping @SuppressWarnings({ "rawtypes", "unchecked" }) - void postRawHttpEntity(HttpEntity entity) { + void postRawHttpEntity(HttpEntity entity) { } @PostMapping diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java index dfbd8b3c4bc..5b1a764ebcf 100644 --- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java @@ -199,7 +199,7 @@ class HttpMessageConverterExtractorTests { responseHeaders.setContentType(contentType); given(response.getStatusCode()).willReturn(HttpStatus.OK); given(response.getHeaders()).willReturn(responseHeaders); - given(response.getBody()).willReturn(new ByteArrayInputStream("Foobar".getBytes()) { + given(response.getBody()).willReturn(new ByteArrayInputStream("Foobar".getBytes()) { @Override public boolean markSupported() { return false; diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java index 30fe752b58e..69cf75ab3fe 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java @@ -132,7 +132,7 @@ public class ExceptionHandlerMethodResolverTests { static class InheritedController extends ExceptionController { @Override - public void handleIOException() { + public void handleIOException() { } } diff --git a/spring-web/src/test/java/org/springframework/web/service/invoker/TestExchangeAdapter.java b/spring-web/src/test/java/org/springframework/web/service/invoker/TestExchangeAdapter.java index 776f1a61e43..b600d9d8700 100644 --- a/spring-web/src/test/java/org/springframework/web/service/invoker/TestExchangeAdapter.java +++ b/spring-web/src/test/java/org/springframework/web/service/invoker/TestExchangeAdapter.java @@ -97,7 +97,7 @@ public class TestExchangeAdapter implements HttpExchangeAdapter { return true; } - protected void saveInput( + protected void saveInput( String methodName, HttpRequestValues values, @Nullable ParameterizedTypeReference bodyType) { this.invokedMethodName = methodName; diff --git a/spring-web/src/test/java/org/springframework/web/service/invoker/TestReactorExchangeAdapter.java b/spring-web/src/test/java/org/springframework/web/service/invoker/TestReactorExchangeAdapter.java index 00c08860f7d..ed470daa40e 100644 --- a/spring-web/src/test/java/org/springframework/web/service/invoker/TestReactorExchangeAdapter.java +++ b/spring-web/src/test/java/org/springframework/web/service/invoker/TestReactorExchangeAdapter.java @@ -61,7 +61,7 @@ class TestReactorExchangeAdapter extends TestExchangeAdapter implements ReactorH @Override public Mono exchangeForBodyMono(HttpRequestValues requestValues, ParameterizedTypeReference bodyType) { saveInput("exchangeForBodyMono", requestValues, bodyType); - return bodyType.getType().getTypeName().contains("List") ? + return bodyType.getType().getTypeName().contains("List") ? (Mono) Mono.just(Collections.singletonList(getInvokedMethodName())) : (Mono) Mono.just(getInvokedMethodName()); } diff --git a/spring-web/src/test/java/org/springframework/web/util/ForwardedHeaderUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/ForwardedHeaderUtilsTests.java index 882bbb5ff33..17ff7144017 100644 --- a/spring-web/src/test/java/org/springframework/web/util/ForwardedHeaderUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/ForwardedHeaderUtilsTests.java @@ -373,7 +373,7 @@ class ForwardedHeaderUtilsTests { } @Test // SPR-11856 - void fromHttpRequestForwardedHeader() { + void fromHttpRequestForwardedHeader() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Forwarded", "proto=https; host=84.198.58.199"); request.setScheme("http"); @@ -389,7 +389,7 @@ class ForwardedHeaderUtilsTests { } @Test - void fromHttpRequestForwardedHeaderQuoted() { + void fromHttpRequestForwardedHeaderQuoted() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Forwarded", "proto=\"https\"; host=\"84.198.58.199\""); request.setScheme("http"); @@ -405,7 +405,7 @@ class ForwardedHeaderUtilsTests { } @Test - void fromHttpRequestMultipleForwardedHeader() { + void fromHttpRequestMultipleForwardedHeader() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Forwarded", "host=84.198.58.199;proto=https"); request.addHeader("Forwarded", "proto=ftp; host=1.2.3.4"); @@ -422,7 +422,7 @@ class ForwardedHeaderUtilsTests { } @Test - void fromHttpRequestMultipleForwardedHeaderComma() { + void fromHttpRequestMultipleForwardedHeaderComma() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Forwarded", "host=84.198.58.199 ;proto=https, proto=ftp; host=1.2.3.4"); request.setScheme("http"); @@ -438,7 +438,7 @@ class ForwardedHeaderUtilsTests { } @Test - void fromHttpRequestForwardedHeaderWithHostPortAndWithoutServerPort() { + void fromHttpRequestForwardedHeaderWithHostPortAndWithoutServerPort() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Forwarded", "proto=https; host=84.198.58.199:9090"); request.setScheme("http"); @@ -456,7 +456,7 @@ class ForwardedHeaderUtilsTests { } @Test - void fromHttpRequestForwardedHeaderWithHostPortAndServerPort() { + void fromHttpRequestForwardedHeaderWithHostPortAndServerPort() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Forwarded", "proto=https; host=84.198.58.199:9090"); request.setScheme("http"); @@ -475,7 +475,7 @@ class ForwardedHeaderUtilsTests { } @Test - void fromHttpRequestForwardedHeaderWithoutHostPortAndWithServerPort() { + void fromHttpRequestForwardedHeaderWithoutHostPortAndWithServerPort() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Forwarded", "proto=https; host=84.198.58.199"); request.setScheme("http"); @@ -494,7 +494,7 @@ class ForwardedHeaderUtilsTests { } @Test // SPR-16262 - void fromHttpRequestForwardedHeaderWithProtoAndServerPort() { + void fromHttpRequestForwardedHeaderWithProtoAndServerPort() { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("Forwarded", "proto=https"); request.setScheme("http"); diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java index 3198480eeab..317b1465e13 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java @@ -603,7 +603,7 @@ class UriComponentsBuilderTests { } @Test - void queryParamWithoutValueWithEquals() { + void queryParamWithoutValueWithEquals() { UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=").build(); assertThat(uriComponents.toUriString()).isEqualTo("https://example.com/foo?bar="); assertThat(uriComponents.getQueryParams().get("bar").get(0)).isEmpty(); diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java index 33bf23f2bdf..9dcd5aae083 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java @@ -726,7 +726,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } else if (this.inputStream != null) { throw new IllegalStateException( - "Cannot call getReader() after getInputStream() has already been called for the current request") ; + "Cannot call getReader() after getInputStream() has already been called for the current request"); } if (this.content != null) { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java index 9079e5da048..701854fe06a 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java @@ -245,7 +245,7 @@ class DefaultServerResponseBuilder implements ServerResponse.BodyBuilder { return initBuilder(producer, BodyInserters.fromProducer(producer, elementTypeRef)); } - private Mono initBuilder(T entity, BodyInserter inserter) { + private Mono initBuilder(T entity, BodyInserter inserter) { return new DefaultEntityResponseBuilder<>(entity, inserter) .status(this.statusCode) .headers(this.headers) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java index dd06c3844ef..e63ca971f57 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java @@ -1200,7 +1200,7 @@ public abstract class RequestPredicates { @Override public String toString() { - return method() + " " + path(); + return method() + " " + path(); } } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java index cf6a1eed034..c965e4a4b70 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java @@ -901,7 +901,7 @@ public abstract class RouterFunctions { * @return this builder */ Builder onError(Predicate predicate, - BiFunction> responseProvider); + BiFunction> responseProvider); /** * Filters all exceptions of the given type by applying the given response provider @@ -1199,7 +1199,7 @@ public abstract class RouterFunctions { } - private static class ResourcesRouterFunction extends AbstractRouterFunction { + private static class ResourcesRouterFunction extends AbstractRouterFunction { private final Function> lookupFunction; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java index 590d2af771d..ea4ae815e0e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java @@ -325,7 +325,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition getExpressionsToCompare() { - return (this.expressions.isEmpty() ? this.mediaTypeAllList : this.expressions); + return (this.expressions.isEmpty() ? this.mediaTypeAllList : this.expressions); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelInitializer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelInitializer.java index e718c00d890..033df46de47 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelInitializer.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelInitializer.java @@ -134,7 +134,7 @@ class ModelInitializer { } - private boolean isAsyncVoidType(ResolvableType type, MethodParameter typeSource, @Nullable ReactiveAdapter adapter) { + private boolean isAsyncVoidType(ResolvableType type, MethodParameter typeSource, @Nullable ReactiveAdapter adapter) { Method method = typeSource.getMethod(); return (adapter != null && (adapter.isNoValue() || type.resolveGeneric() == Void.class)) || (method != null && KotlinDetector.isSuspendingFunction(method) && typeSource.getParameterType() == void.class); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java index 5e88cd487e6..d08be90fa8c 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java @@ -247,7 +247,7 @@ public abstract class AbstractView implements View, BeanNameAware, ApplicationCo protected Mono resolveAsyncAttributes(Map model, ServerWebExchange exchange) { List> asyncAttributes = null; for (Map.Entry entry : model.entrySet()) { - Object value = entry.getValue(); + Object value = entry.getValue(); if (value == null) { continue; } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java index 50a556de640..2afeb1fafb6 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java @@ -204,7 +204,7 @@ public class FreeMarkerView extends AbstractUrlBasedView { } catch (ParseException ex) { throw new ApplicationContextException( - "Failed to parse FreeMarker template for URL [" + getUrl() + "]", ex); + "Failed to parse FreeMarker template for URL [" + getUrl() + "]", ex); } catch (IOException ex) { throw new ApplicationContextException( @@ -225,7 +225,7 @@ public class FreeMarkerView extends AbstractUrlBasedView { .switchIfEmpty(Mono.just(Boolean.FALSE)) .onErrorReturn(FileNotFoundException.class, Boolean.FALSE) .onErrorMap(ParseException.class, ex -> new ApplicationContextException( - "Failed to parse FreeMarker template for URL [" + getUrl() + "]", ex)) + "Failed to parse FreeMarker template for URL [" + getUrl() + "]", ex)) .onErrorMap(IOException.class, ex -> new ApplicationContextException( "Could not load FreeMarker template for URL [" + getUrl() + "]", ex)); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java index 2ca52cacb3f..7cbd5a4bbda 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java @@ -50,7 +50,7 @@ public final class CloseStatus { * "1002 indicates that an endpoint is terminating the connection due to a protocol * error." */ - public static final CloseStatus PROTOCOL_ERROR = new CloseStatus(1002); + public static final CloseStatus PROTOCOL_ERROR = new CloseStatus(1002); /** * "1003 indicates that an endpoint is terminating the connection because it has diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java index 77bbfef15bf..3ebdf1e9b7c 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java @@ -100,7 +100,7 @@ public class ViewResolverRegistryTests { List viewResolvers = this.registry.getViewResolvers(); assertThat(viewResolvers).hasSize(1); assertThat(viewResolvers.get(0).getClass()).isEqualTo(ScriptTemplateViewResolver.class); - DirectFieldAccessor accessor = new DirectFieldAccessor(viewResolvers.get(0)); + DirectFieldAccessor accessor = new DirectFieldAccessor(viewResolvers.get(0)); assertThat(accessor.getPropertyValue("prefix")).isEqualTo("/"); assertThat(accessor.getPropertyValue("suffix")).isEqualTo(".html"); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientDataBufferAllocatingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientDataBufferAllocatingTests.java index 7835707a89b..e64e9bce57a 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientDataBufferAllocatingTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientDataBufferAllocatingTests.java @@ -181,7 +181,7 @@ class WebClientDataBufferAllocatingTests extends AbstractDataBufferAllocatingTes .setHeader("Content-Type", "text/plain") .setBody("foo bar")); - Mono result = this.webClient.get() + Mono result = this.webClient.get() .exchangeToMono(ClientResponse::releaseBody); StepVerifier.create(result) @@ -198,7 +198,7 @@ class WebClientDataBufferAllocatingTests extends AbstractDataBufferAllocatingTes .setHeader("Foo", "bar") .setBody("foo bar")); - Mono> result = this.webClient.get() + Mono> result = this.webClient.get() .exchangeToMono(ClientResponse::toBodilessEntity); StepVerifier.create(result) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/AbstractRequestMappingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/AbstractRequestMappingIntegrationTests.java index ec34f70cebf..83ebbb28b84 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/AbstractRequestMappingIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/AbstractRequestMappingIntegrationTests.java @@ -92,11 +92,11 @@ public abstract class AbstractRequestMappingIntegrationTests extends AbstractHtt if (out != null) { headers.setAccept(Collections.singletonList(out)); } - return getRestTemplate().exchange(preparePost(url, headers, body), type); + return getRestTemplate().exchange(preparePost(url, headers, body), type); } ResponseEntity performPost(String url, HttpHeaders headers, Object body, Class type) { - return getRestTemplate().exchange(preparePost(url, headers, body), type); + return getRestTemplate().exchange(preparePost(url, headers, body), type); } ResponseEntity performPost(String url, MediaType in, Object body, MediaType out, ParameterizedTypeReference type) { diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolverTests.java index 59c41fd6890..728f0df2505 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolverTests.java @@ -83,7 +83,7 @@ public class ExpressionValueMethodArgumentResolverTests { System.setProperty("systemProperty", "22"); try { Mono mono = this.resolver.resolveArgument( - this.paramSystemProperty, new BindingContext(), this.exchange); + this.paramSystemProperty, new BindingContext(), this.exchange); Object value = mono.block(); assertThat(value).isEqualTo(22); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketServiceTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketServiceTests.java index b4a3fcdb61e..36dc67da86d 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketServiceTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketServiceTests.java @@ -87,7 +87,7 @@ class HandshakeWebSocketServiceTests { @Override public Mono upgrade(ServerWebExchange exchange, WebSocketHandler webSocketHandler, - @Nullable String subProtocol, Supplier handshakeInfoFactory) { + @Nullable String subProtocol, Supplier handshakeInfoFactory) { this.handshakeInfo = handshakeInfoFactory.get(); return Mono.empty(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java index a20154203f0..027bbf6b4ba 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java @@ -1116,7 +1116,7 @@ public abstract class RouterFunctions { } - private static class ResourcesRouterFunction extends AbstractRouterFunction { + private static class ResourcesRouterFunction extends AbstractRouterFunction { private final Function> lookupFunction; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java index aca0d81d822..031e5db38eb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractTemplateView.java @@ -190,7 +190,7 @@ public abstract class AbstractTemplateView extends AbstractUrlBasedView { * @param response current HTTP response * @see #setContentType */ - protected void applyContentType(HttpServletResponse response) { + protected void applyContentType(HttpServletResponse response) { if (response.getContentType() == null) { response.setContentType(getContentType()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java index af7d5560ffc..49bf4171d18 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java @@ -221,7 +221,7 @@ public class ResourceHandlerRegistryTests { } @Test - public void urlResourceWithCharset() { + public void urlResourceWithCharset() { this.registration.addResourceLocations("[charset=ISO-8859-1]file:///tmp"); this.registration.resourceChain(true); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java index 2853d626c65..37e14c56011 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistryTests.java @@ -205,7 +205,7 @@ public class ViewResolverRegistryTests { } private void checkPropertyValues(ViewResolver resolver, Object... nameValuePairs) { - DirectFieldAccessor accessor = new DirectFieldAccessor(resolver); + DirectFieldAccessor accessor = new DirectFieldAccessor(resolver); for (int i = 0; i < nameValuePairs.length ; i++, i++) { Object expected = nameValuePairs[i + 1]; Object actual = accessor.getPropertyValue((String) nameValuePairs[i]); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultAsyncServerResponseTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultAsyncServerResponseTests.java index 8f3cf3546d9..f0db9c153ee 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultAsyncServerResponseTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultAsyncServerResponseTests.java @@ -30,7 +30,7 @@ class DefaultAsyncServerResponseTests { @Test void block() { ServerResponse wrappee = ServerResponse.ok().build(); - CompletableFuture future = CompletableFuture.completedFuture(wrappee); + CompletableFuture future = CompletableFuture.completedFuture(wrappee); AsyncServerResponse response = AsyncServerResponse.create(future); assertThat(response.block()).isSameAs(wrappee); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java index 72c0bb09096..ca8f3a48b3a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java @@ -90,7 +90,7 @@ public class ModelAndViewMethodReturnValueHandlerTests { @Test public void handleRedirectAttributesWithViewReference() throws Exception { - RedirectAttributesModelMap redirectAttributes = new RedirectAttributesModelMap(); + RedirectAttributesModelMap redirectAttributes = new RedirectAttributesModelMap(); mavContainer.setRedirectModel(redirectAttributes); ModelAndView mav = new ModelAndView(new RedirectView(), "attrName", "attrValue"); @@ -103,7 +103,7 @@ public class ModelAndViewMethodReturnValueHandlerTests { @Test public void handleRedirectAttributesWithViewName() throws Exception { - RedirectAttributesModelMap redirectAttributes = new RedirectAttributesModelMap(); + RedirectAttributesModelMap redirectAttributes = new RedirectAttributesModelMap(); mavContainer.setRedirectModel(redirectAttributes); ModelAndView mav = new ModelAndView("redirect:viewName", "attrName", "attrValue"); @@ -117,7 +117,7 @@ public class ModelAndViewMethodReturnValueHandlerTests { @Test public void handleRedirectAttributesWithCustomPrefix() throws Exception { - RedirectAttributesModelMap redirectAttributes = new RedirectAttributesModelMap(); + RedirectAttributesModelMap redirectAttributes = new RedirectAttributesModelMap(); mavContainer.setRedirectModel(redirectAttributes); ModelAndView mav = new ModelAndView("myRedirect:viewName", "attrName", "attrValue"); @@ -132,7 +132,7 @@ public class ModelAndViewMethodReturnValueHandlerTests { @Test public void handleRedirectAttributesWithoutRedirect() throws Exception { - RedirectAttributesModelMap redirectAttributes = new RedirectAttributesModelMap(); + RedirectAttributesModelMap redirectAttributes = new RedirectAttributesModelMap(); mavContainer.setRedirectModel(redirectAttributes); ModelAndView mav = new ModelAndView(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 16eb838806a..42d4f8a0209 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -3772,7 +3772,7 @@ class ServletAnnotationControllerHandlerMethodTests extends AbstractServletHandl } @Controller - static class TrailingSlashController { + static class TrailingSlashController { @RequestMapping(value = "/", method = RequestMethod.GET) public void root(Writer writer) throws IOException { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CachingResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CachingResourceResolverTests.java index 486a43924bb..5136e2e7378 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CachingResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CachingResourceResolverTests.java @@ -127,7 +127,7 @@ public class CachingResourceResolverTests { // 2. Resolve with Accept-Encoding request = new MockHttpServletRequest("GET", file); - request.addHeader("Accept-Encoding", "gzip ; a=b , deflate , br ; c=d "); + request.addHeader("Accept-Encoding", "gzip ; a=b , deflate , br ; c=d "); expected = this.chain.resolveResource(request, file, this.locations); cacheKey = resourceKey(file + "+encoding=br,gzip"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java index 66b518a2e8e..e27ffe36f8b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/ServletUriComponentsBuilderTests.java @@ -96,7 +96,7 @@ public class ServletUriComponentsBuilderTests { request.addHeader("X-Forwarded-Port", "443"); HttpServletRequest requestToUse = adaptFromForwardedHeaders(request); - UriComponents result = ServletUriComponentsBuilder.fromRequest(requestToUse).build(); + UriComponents result = ServletUriComponentsBuilder.fromRequest(requestToUse).build(); assertThat(result.toString()).isEqualTo("https://84.198.58.199/mvc-showcase"); } @@ -116,7 +116,7 @@ public class ServletUriComponentsBuilderTests { this.request.setRequestURI("/mvc-showcase/bar"); HttpServletRequest requestToUse = adaptFromForwardedHeaders(this.request); - UriComponents result = ServletUriComponentsBuilder.fromRequest(requestToUse).build(); + UriComponents result = ServletUriComponentsBuilder.fromRequest(requestToUse).build(); assertThat(result.toUriString()).isEqualTo("http://localhost/prefix/bar"); } @@ -128,7 +128,7 @@ public class ServletUriComponentsBuilderTests { this.request.setRequestURI("/spring-mvc-showcase/bar"); HttpServletRequest requestToUse = adaptFromForwardedHeaders(this.request); - UriComponents result = ServletUriComponentsBuilder.fromRequest(requestToUse).build(); + UriComponents result = ServletUriComponentsBuilder.fromRequest(requestToUse).build(); assertThat(result.toUriString()).isEqualTo("http://localhost/foo/bar"); } @@ -140,7 +140,7 @@ public class ServletUriComponentsBuilderTests { this.request.setRequestURI("/mvc-showcase/bar"); HttpServletRequest requestToUse = adaptFromForwardedHeaders(this.request); - UriComponents result = ServletUriComponentsBuilder.fromRequest(requestToUse).build(); + UriComponents result = ServletUriComponentsBuilder.fromRequest(requestToUse).build(); assertThat(result.toUriString()).isEqualTo("http://localhost/bar"); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java b/spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java index 1c95288c398..1a5ea285757 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java @@ -54,7 +54,7 @@ public final class CloseStatus implements Serializable { * "1002 indicates that an endpoint is terminating the connection due to a protocol * error." */ - public static final CloseStatus PROTOCOL_ERROR = new CloseStatus(1002); + public static final CloseStatus PROTOCOL_ERROR = new CloseStatus(1002); /** * "1003 indicates that an endpoint is terminating the connection because it has diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/LoggingWebSocketHandlerDecorator.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/LoggingWebSocketHandlerDecorator.java index 7c20b217283..8bd6590eef8 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/handler/LoggingWebSocketHandlerDecorator.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/handler/LoggingWebSocketHandlerDecorator.java @@ -43,7 +43,7 @@ public class LoggingWebSocketHandlerDecorator extends WebSocketHandlerDecorator @Override public void afterConnectionEstablished(WebSocketSession session) throws Exception { if (logger.isDebugEnabled()) { - logger.debug("New " + session); + logger.debug("New " + session); } super.afterConnectionEstablished(session); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java index cf599692d08..a6ebe75ec20 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java @@ -580,7 +580,7 @@ public class WebSocketStompClient extends StompClientSupport implements SmartLif byte[] payload = message.getPayload(); byte[] bytes = ENCODER.encode(accessor.getMessageHeaders(), payload); - boolean useBinary = (payload.length > 0 && + boolean useBinary = (payload.length > 0 && !(SockJsSession.class.isAssignableFrom(sessionType)) && MimeTypeUtils.APPLICATION_OCTET_STREAM.isCompatibleWith(accessor.getContentType())); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractClientSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractClientSockJsSession.java index c042721a43e..cc48741246b 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractClientSockJsSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractClientSockJsSession.java @@ -186,7 +186,7 @@ public abstract class AbstractClientSockJsSession implements WebSocketSession { throw new IllegalArgumentException("Invalid close status: " + status); } if (logger.isDebugEnabled()) { - logger.debug("Closing session with " + status + " in " + this); + logger.debug("Closing session with " + status + " in " + this); } closeInternal(status); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java index 60181bb929e..48e47a24ec0 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java @@ -202,7 +202,7 @@ public class JettyXhrTransport extends AbstractXhrTransport implements Lifecycle private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - public SockJsResponseListener(URI url, HttpHeaders headers, XhrClientSockJsSession sockJsSession, + public SockJsResponseListener(URI url, HttpHeaders headers, XhrClientSockJsSession sockJsSession, CompletableFuture connectFuture) { this.transportUrl = url; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java index 4318afe5437..703d50bb9a4 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java @@ -433,10 +433,10 @@ public class MessageBrokerBeanDefinitionParserTests { private void testChannel( - String channelName, List> subscriberTypes, int interceptorCount) { + String channelName, List> subscriberTypes, int interceptorCount) { AbstractSubscribableChannel channel = this.appContext.getBean(channelName, AbstractSubscribableChannel.class); - for (Class subscriberType : subscriberTypes) { + for (Class subscriberType : subscriberTypes) { MessageHandler subscriber = this.appContext.getBean(subscriberType); assertThat(subscriber).as("No subscription for " + subscriberType).isNotNull(); assertThat(channel.hasSubscription(subscriber)).isTrue(); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/handler/BeanCreatingHandlerProviderTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/handler/BeanCreatingHandlerProviderTests.java index e33077c63c8..d9ffb159244 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/handler/BeanCreatingHandlerProviderTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/handler/BeanCreatingHandlerProviderTests.java @@ -92,6 +92,6 @@ public class BeanCreatingHandlerProviderTests { } } - private static class EchoService { } + private static class EchoService { } } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointRegistrationTests.java index 64571a2dfd7..225102efbe4 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/ServerEndpointRegistrationTests.java @@ -87,6 +87,6 @@ public class ServerEndpointRegistrationTests { } } - private static class EchoService { } + private static class EchoService { } } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/SpringConfiguratorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/SpringConfiguratorTests.java index 48f25ce7d82..95b2381ecd4 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/SpringConfiguratorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/standard/SpringConfiguratorTests.java @@ -135,6 +135,6 @@ public class SpringConfiguratorTests { } } - private static class EchoService { } + private static class EchoService { } } diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index a18fcb5b339..d83c59248df 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -190,6 +190,9 @@ + + +