Browse Source

Merge pull request #27827 from izeye

* pr/27827:
  Polish

Closes gh-27827
pull/27848/head
Stephane Nicoll 4 years ago
parent
commit
5532615361
  1. 2
      spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
  2. 2
      spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
  3. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java
  4. 2
      spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
  5. 1
      spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java

2
spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java

@ -47,7 +47,7 @@ import org.springframework.util.StringUtils; @@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
*
* <p>If the annotation's value doesn't indicate a bean name, an appropriate
* name will be built based on the short name of the class (with the first
* letter lower-cased), unless the two first letters are uppercase. For example:
* letter lower-cased), unless the first two letters are uppercase. For example:
*
* <pre class="code">com.xyz.FooServiceImpl -&gt; fooServiceImpl</pre>
* <pre class="code">com.xyz.URLFooServiceImpl -&gt; URLFooServiceImpl</pre>

2
spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java

@ -189,7 +189,7 @@ public class ContentCachingRequestWrapper extends HttpServletRequestWrapper { @@ -189,7 +189,7 @@ public class ContentCachingRequestWrapper extends HttpServletRequestWrapper {
* Return the cached request content as a byte array.
* <p>The returned array will never be larger than the content cache limit.
* <p><strong>Note:</strong> The byte array returned from this method
* reflects the amount of content that has has been read at the time when it
* reflects the amount of content that has been read at the time when it
* is called. If the application does not read the content, this method
* returns an empty array.
* @see #ContentCachingRequestWrapper(HttpServletRequest, int)

2
spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java

@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Arjen Poutsma
* @author Brian Clozel
*/
public class RouterFunctionMappingTests {
class RouterFunctionMappingTests {
private final ServerCodecConfigurer codecConfigurer = ServerCodecConfigurer.create();

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java

@ -340,7 +340,7 @@ public class ExceptionHandlerExceptionResolverTests { @@ -340,7 +340,7 @@ public class ExceptionHandlerExceptionResolverTests {
}
@Test //gh-27156
void resolveExceptionWithReasonResovledByMessageSource() throws Exception {
void resolveExceptionWithReasonResolvedByMessageSource() throws Exception {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(MyConfig.class);
StaticApplicationContext context = new StaticApplicationContext(ctx);
Locale locale = Locale.ENGLISH;

1
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java

@ -196,7 +196,6 @@ public class ServletInvocableHandlerMethodTests { @@ -196,7 +196,6 @@ public class ServletInvocableHandlerMethodTests {
context.refresh();
ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
System.out.println(beanFactory.getType(beanName));
LocaleContextHolder.setLocale(locale);
try {

Loading…
Cancel
Save