diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java index e04714ed792..9b4c6460bcb 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java @@ -52,7 +52,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher /** * The class against which to match. - *
Available for use in subclasses since 6.1. + * @since 6.1 */ protected final Class> clazz; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java index c4b97102807..79886921076 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java @@ -367,7 +367,7 @@ class BeanDefinitionPropertiesCodeGenerator { * @param castNecessary whether a cast is necessary * @param castType the type to cast to * @param valueCode the code for the value - * @return the existing value or a form of {@code (CastType) valueCode} if a + * @return the existing value or a form of {@code (castType) valueCode} if a * cast is necessary */ private CodeBlock castIfNecessary(boolean castNecessary, Class> castType, CodeBlock valueCode) { diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/SimpleInstantiationStrategyTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/SimpleInstantiationStrategyTests.java index 439560361c7..da3b8a9da7f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/SimpleInstantiationStrategyTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/SimpleInstantiationStrategyTests.java @@ -46,7 +46,7 @@ class SimpleInstantiationStrategyTests { } @Test - void instantiateWitArgs() { + void instantiateWithArgs() { RootBeanDefinition bd = new RootBeanDefinition(String.class); Object simpleBean = instantiate(bd, new SampleFactory(), method(SampleFactory.class, "beanWithTwoArgs"), "Test", 42); @@ -54,7 +54,7 @@ class SimpleInstantiationStrategyTests { } @Test - void instantiateWitSubClassFactoryArgs() { + void instantiateWithSubClassFactoryArgs() { RootBeanDefinition bd = new RootBeanDefinition(String.class); Object simpleBean = instantiate(bd, new ExtendedSampleFactory(), method(SampleFactory.class, "beanWithTwoArgs"), "Test", 42); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/MetadataNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/MetadataNamingStrategyTests.java index d0c13c5c8b7..aaf59a4cac4 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/MetadataNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/MetadataNamingStrategyTests.java @@ -62,25 +62,25 @@ class MetadataNamingStrategyTests { } @Test - void getObjectNameWhenBeanNamContainsComma() throws MalformedObjectNameException { + void getObjectNameWhenBeanNameContainsComma() throws MalformedObjectNameException { ObjectName name = this.strategy.getObjectName(TEST_BEAN, "myBean,"); assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"myBean,\"")); } @Test - void getObjectNameWhenBeanNamContainsEquals() throws MalformedObjectNameException { + void getObjectNameWhenBeanNameContainsEquals() throws MalformedObjectNameException { ObjectName name = this.strategy.getObjectName(TEST_BEAN, "my=Bean"); assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"my=Bean\"")); } @Test - void getObjectNameWhenBeanNamContainsColon() throws MalformedObjectNameException { + void getObjectNameWhenBeanNameContainsColon() throws MalformedObjectNameException { ObjectName name = this.strategy.getObjectName(TEST_BEAN, "my:Bean"); assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"my:Bean\"")); } @Test - void getObjectNameWhenBeanNamContainsQuote() throws MalformedObjectNameException { + void getObjectNameWhenBeanNameContainsQuote() throws MalformedObjectNameException { ObjectName name = this.strategy.getObjectName(TEST_BEAN, "\"myBean\""); assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"\\\"myBean\\\"\"")); } diff --git a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java index 95cb4d1f951..9f49e7af03f 100644 --- a/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java +++ b/spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java @@ -56,7 +56,7 @@ import org.springframework.util.FastByteArrayOutputStream; */ public class ContentCachingRequestWrapper extends HttpServletRequestWrapper { - private FastByteArrayOutputStream cachedContent; + private final FastByteArrayOutputStream cachedContent; @Nullable private final Integer contentCacheLimit;