Browse Source

Polish

See gh-31930
pull/31932/head
Johnny Lim 2 years ago committed by Stéphane Nicoll
parent
commit
ff8097d37c
  1. 2
      spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
  2. 2
      spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java
  3. 4
      spring-beans/src/test/java/org/springframework/beans/factory/support/SimpleInstantiationStrategyTests.java
  4. 8
      spring-context/src/test/java/org/springframework/jmx/export/naming/MetadataNamingStrategyTests.java
  5. 2
      spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java

2
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. * The class against which to match.
* <p>Available for use in subclasses since 6.1. * @since 6.1
*/ */
protected final Class<?> clazz; protected final Class<?> clazz;

2
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 castNecessary whether a cast is necessary
* @param castType the type to cast to * @param castType the type to cast to
* @param valueCode the code for the value * @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 * cast is necessary
*/ */
private CodeBlock castIfNecessary(boolean castNecessary, Class<?> castType, CodeBlock valueCode) { private CodeBlock castIfNecessary(boolean castNecessary, Class<?> castType, CodeBlock valueCode) {

4
spring-beans/src/test/java/org/springframework/beans/factory/support/SimpleInstantiationStrategyTests.java

@ -46,7 +46,7 @@ class SimpleInstantiationStrategyTests {
} }
@Test @Test
void instantiateWitArgs() { void instantiateWithArgs() {
RootBeanDefinition bd = new RootBeanDefinition(String.class); RootBeanDefinition bd = new RootBeanDefinition(String.class);
Object simpleBean = instantiate(bd, new SampleFactory(), Object simpleBean = instantiate(bd, new SampleFactory(),
method(SampleFactory.class, "beanWithTwoArgs"), "Test", 42); method(SampleFactory.class, "beanWithTwoArgs"), "Test", 42);
@ -54,7 +54,7 @@ class SimpleInstantiationStrategyTests {
} }
@Test @Test
void instantiateWitSubClassFactoryArgs() { void instantiateWithSubClassFactoryArgs() {
RootBeanDefinition bd = new RootBeanDefinition(String.class); RootBeanDefinition bd = new RootBeanDefinition(String.class);
Object simpleBean = instantiate(bd, new ExtendedSampleFactory(), Object simpleBean = instantiate(bd, new ExtendedSampleFactory(),
method(SampleFactory.class, "beanWithTwoArgs"), "Test", 42); method(SampleFactory.class, "beanWithTwoArgs"), "Test", 42);

8
spring-context/src/test/java/org/springframework/jmx/export/naming/MetadataNamingStrategyTests.java

@ -62,25 +62,25 @@ class MetadataNamingStrategyTests {
} }
@Test @Test
void getObjectNameWhenBeanNamContainsComma() throws MalformedObjectNameException { void getObjectNameWhenBeanNameContainsComma() throws MalformedObjectNameException {
ObjectName name = this.strategy.getObjectName(TEST_BEAN, "myBean,"); ObjectName name = this.strategy.getObjectName(TEST_BEAN, "myBean,");
assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"myBean,\"")); assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"myBean,\""));
} }
@Test @Test
void getObjectNameWhenBeanNamContainsEquals() throws MalformedObjectNameException { void getObjectNameWhenBeanNameContainsEquals() throws MalformedObjectNameException {
ObjectName name = this.strategy.getObjectName(TEST_BEAN, "my=Bean"); ObjectName name = this.strategy.getObjectName(TEST_BEAN, "my=Bean");
assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"my=Bean\"")); assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"my=Bean\""));
} }
@Test @Test
void getObjectNameWhenBeanNamContainsColon() throws MalformedObjectNameException { void getObjectNameWhenBeanNameContainsColon() throws MalformedObjectNameException {
ObjectName name = this.strategy.getObjectName(TEST_BEAN, "my:Bean"); ObjectName name = this.strategy.getObjectName(TEST_BEAN, "my:Bean");
assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"my:Bean\"")); assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"my:Bean\""));
} }
@Test @Test
void getObjectNameWhenBeanNamContainsQuote() throws MalformedObjectNameException { void getObjectNameWhenBeanNameContainsQuote() throws MalformedObjectNameException {
ObjectName name = this.strategy.getObjectName(TEST_BEAN, "\"myBean\""); ObjectName name = this.strategy.getObjectName(TEST_BEAN, "\"myBean\"");
assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"\\\"myBean\\\"\"")); assertThat(name).satisfies(hasDefaultProperties(TEST_BEAN, "\"\\\"myBean\\\"\""));
} }

2
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 { public class ContentCachingRequestWrapper extends HttpServletRequestWrapper {
private FastByteArrayOutputStream cachedContent; private final FastByteArrayOutputStream cachedContent;
@Nullable @Nullable
private final Integer contentCacheLimit; private final Integer contentCacheLimit;

Loading…
Cancel
Save