Browse Source

Polishing

Closes gh-29410
pull/29412/head
Johnny Lim 2 years ago committed by Sam Brannen
parent
commit
85d029f7c3
  1. 2
      spring-core/src/main/java/org/springframework/aot/hint/ResourceBundleHint.java
  2. 4
      spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java
  3. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
  4. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
  5. 4
      src/docs/asciidoc/web/webflux.adoc
  6. 4
      src/docs/asciidoc/web/webmvc.adoc

2
spring-core/src/main/java/org/springframework/aot/hint/ResourceBundleHint.java

@ -100,7 +100,7 @@ public final class ResourceBundleHint implements ConditionalHint { @@ -100,7 +100,7 @@ public final class ResourceBundleHint implements ConditionalHint {
}
/**
* Use the the {@code baseName} of the resource bundle.
* Use the {@code baseName} of the resource bundle.
* @return {@code this}, to facilitate method chaining
*/
public Builder baseName(String baseName) {

4
spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java

@ -780,7 +780,7 @@ public abstract class AnnotatedElementUtils { @@ -780,7 +780,7 @@ public abstract class AnnotatedElementUtils {
if (containerType == null) {
// Invoke RepeatableContainers.of() in order to adhere to the contract of
// getMergedRepeatableAnnotations() which states that an IllegalArgumentException
// will be thrown if the the container cannot be resolved.
// will be thrown if the container cannot be resolved.
//
// In any case, we use standardRepeatables() in order to support repeatable
// annotations on other types of repeatable annotations (i.e., nested repeatable
@ -807,7 +807,7 @@ public abstract class AnnotatedElementUtils { @@ -807,7 +807,7 @@ public abstract class AnnotatedElementUtils {
if (containerType == null) {
// Invoke RepeatableContainers.of() in order to adhere to the contract of
// findMergedRepeatableAnnotations() which states that an IllegalArgumentException
// will be thrown if the the container cannot be resolved.
// will be thrown if the container cannot be resolved.
//
// In any case, we use standardRepeatables() in order to support repeatable
// annotations on other types of repeatable annotations (i.e., nested repeatable

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java

@ -88,7 +88,7 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce @@ -88,7 +88,7 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce
@Nullable
private HandlerMethodReturnValueHandlerComposite returnValueHandlers;
private List<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
private final List<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
private ContentNegotiationManager contentNegotiationManager = new ContentNegotiationManager();

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java

@ -150,7 +150,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter @@ -150,7 +150,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
private ContentNegotiationManager contentNegotiationManager = new ContentNegotiationManager();
private List<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
private final List<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
private final List<Object> requestResponseBodyAdvice = new ArrayList<>();

4
src/docs/asciidoc/web/webflux.adoc

@ -3652,9 +3652,9 @@ from an existing `ProblemDetail`. This could be done centrally, e.g. from an @@ -3652,9 +3652,9 @@ from an existing `ProblemDetail`. This could be done centrally, e.g. from an
[[webflux-ann-rest-exceptions-i8n]]
[[webflux-ann-rest-exceptions-i18n]]
=== Internationalization
[.small]#<<webmvc.adoc#mvc-ann-rest-exceptions-i8n, Web MVC>>#
[.small]#<<webmvc.adoc#mvc-ann-rest-exceptions-i18n, Web MVC>>#
It is a common requirement to internationalize error response details, and good practice
to customize the problem details for Spring WebFlux exceptions. This is supported as follows:

4
src/docs/asciidoc/web/webmvc.adoc

@ -4948,9 +4948,9 @@ from an existing `ProblemDetail`. This could be done centrally, e.g. from an @@ -4948,9 +4948,9 @@ from an existing `ProblemDetail`. This could be done centrally, e.g. from an
[[mvc-ann-rest-exceptions-i8n]]
[[mvc-ann-rest-exceptions-i18n]]
=== Internationalization
[.small]#<<web-reactive.adoc#webflux-ann-rest-exceptions-i8n, WebFlux>>#
[.small]#<<web-reactive.adoc#webflux-ann-rest-exceptions-i18n, WebFlux>>#
It is a common requirement to internationalize error response details, and good practice
to customize the problem details for Spring MVC exceptions. This is supported as follows:

Loading…
Cancel
Save