Browse Source

Remove superfluous empty lines after code blocks

pull/22689/head
Juergen Hoeller 6 years ago
parent
commit
78fd882141
  1. 1
      src/docs/asciidoc/core/core-aop.adoc
  2. 18
      src/docs/asciidoc/web/webmvc.adoc

1
src/docs/asciidoc/core/core-aop.adoc

@ -471,7 +471,6 @@ of any public method. @@ -471,7 +471,6 @@ of any public method.
<3> `tradingOperation` matches if a method execution represents any public method in the
trading module.
It is a best practice to build more complex pointcut expressions out of smaller named
components, as shown earlier. When referring to pointcuts by name, normal Java visibility
rules apply (you can see private pointcuts in the same type, protected pointcuts in the

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

@ -1483,7 +1483,6 @@ as the following example shows: @@ -1483,7 +1483,6 @@ as the following example shows:
----
<1> Using a `consumes` attribute to narrow the mapping by the content type.
The `consumes` attribute also supports negation expressions -- for example, `!text/plain` means any
content type other than `text/plain`.
@ -1513,7 +1512,6 @@ content types that a controller method produces, as the following example shows: @@ -1513,7 +1512,6 @@ content types that a controller method produces, as the following example shows:
----
<1> Using a `produces` attribute to narrow the mapping by the content type.
The media type can specify a character set. Negated expressions are supported -- for example,
`!text/plain` means any content type other than "text/plain".
@ -1548,7 +1546,6 @@ specific value (`myParam=myValue`). The following example shows how to test for @@ -1548,7 +1546,6 @@ specific value (`myParam=myValue`). The following example shows how to test for
----
<1> Testing whether `myParam` equals `myValue`.
You can also use the same with request header conditions, as the following example shows:
[source,java,indent=0]
@ -1561,7 +1558,6 @@ You can also use the same with request header conditions, as the following examp @@ -1561,7 +1558,6 @@ You can also use the same with request header conditions, as the following examp
----
<1> Testing whether `myHeader` equals `myValue`.
TIP: You can match `Content-Type` and `Accept` with the headers condition, but it is better to use
<<mvc-ann-requestmapping-consumes, consumes>> and <<mvc-ann-requestmapping-produces, produces>>
instead.
@ -1650,7 +1646,6 @@ public class MyConfig { @@ -1650,7 +1646,6 @@ public class MyConfig {
[[mvc-ann-methods]]
=== Handler Methods
[.small]#<<web-reactive.adoc#webflux-ann-methods, Same as in Spring WebFlux>>#
@ -2030,7 +2025,6 @@ The following example shows how to do so: @@ -2030,7 +2025,6 @@ The following example shows how to do so:
----
<1> Using `@RequestParam` to bind `petId`.
By default, method parameters that use this annotation are required, but you can specify that
a method parameter is optional by setting the `@RequestParam` annotation's `required` flag to
`false` or by declaring the argument with an `java.util.Optional` wrapper.
@ -2087,7 +2081,6 @@ The following example gets the value of the `Accept-Encoding` and `Keep-Alive` h @@ -2087,7 +2081,6 @@ The following example gets the value of the `Accept-Encoding` and `Keep-Alive` h
<1> Get the value of the `Accept-Encoding` header.
<2> Get the value of the `Keep-Alive` header.
If the target method parameter type is not
`String`, type conversion is automatically applied. See <<mvc-ann-typeconversion>>.
@ -2151,7 +2144,6 @@ converting individual query parameters and form fields. The following example sh @@ -2151,7 +2144,6 @@ converting individual query parameters and form fields. The following example sh
----
<1> Bind an instance of `Pet`.
The `Pet` instance above is resolved as follows:
* From the model if already added by using <<mvc-ann-modelattrib-methods>>.
@ -2201,7 +2193,6 @@ to the `@ModelAttribute`, as the following example shows: @@ -2201,7 +2193,6 @@ to the `@ModelAttribute`, as the following example shows:
----
<1> Adding a `BindingResult` next to the `@ModelAttribute`.
In some cases, you may want access to a model attribute without data binding. For such
cases, you can inject the `Model` into the controller and access it directly or,
alternatively, set `@ModelAttribute(binding=false)`, as the following example shows:
@ -2227,7 +2218,6 @@ alternatively, set `@ModelAttribute(binding=false)`, as the following example sh @@ -2227,7 +2218,6 @@ alternatively, set `@ModelAttribute(binding=false)`, as the following example sh
----
<1> Setting `@ModelAttribute(binding=false)`.
You can automatically apply validation after data binding by adding the
`javax.validation.Valid` annotation or Spring's `@Validated` annotation (
<<core.adoc#validation-beanvalidation, Bean Validation>> and
@ -2246,7 +2236,6 @@ You can automatically apply validation after data binding by adding the @@ -2246,7 +2236,6 @@ You can automatically apply validation after data binding by adding the
----
<1> Validate the `Pet` instance.
Note that using `@ModelAttribute` is optional (for example, to set its attributes).
By default, any argument that is not a simple value type (as determined by
{api-spring-framework}/beans/BeanUtils.html#isSimpleProperty-java.lang.Class-[BeanUtils#isSimpleProperty])
@ -2277,7 +2266,6 @@ The following example uses the `@SessionAttributes` annotation: @@ -2277,7 +2266,6 @@ The following example uses the `@SessionAttributes` annotation:
----
<1> Using the `@SessionAttributes` annotation.
On the first request, when a model attribute with the name, `pet`, is added to the model,
it is automatically promoted to and saved in the HTTP Servlet session. It remains there
until another controller method uses a `SessionStatus` method argument to clear the
@ -2307,7 +2295,6 @@ storage, as the following example shows: @@ -2307,7 +2295,6 @@ storage, as the following example shows:
<2> Clearing the `Pet` value from the Servlet session.
[[mvc-ann-sessionattribute]]
==== `@SessionAttribute`
[.small]#<<web-reactive.adoc#webflux-ann-sessionattribute, Same as in Spring WebFlux>>#
@ -2327,7 +2314,6 @@ as the following example shows: @@ -2327,7 +2314,6 @@ as the following example shows:
----
<1> Using a `@SessionAttribute` annotation.
For use cases that require adding or removing session attributes, consider injecting
`org.springframework.web.context.request.WebRequest` or
`javax.servlet.http.HttpSession` into the controller method.
@ -2356,7 +2342,6 @@ or `HandlerInterceptor`): @@ -2356,7 +2342,6 @@ or `HandlerInterceptor`):
<1> Using the `@RequestAttribute` annotation.
[[mvc-redirecting-passing-data]]
==== Redirect Attributes
@ -2872,7 +2857,6 @@ The following listing shows an example: @@ -2872,7 +2857,6 @@ The following listing shows an example:
----
<1> Defining an `@InitBinder` method.
Alternatively, when you use a `Formatter`-based setup through a shared
`FormattingConversionService`, you can re-use the same approach and register
controller-specific `Formatter` implementations, as the following example shows:
@ -2895,7 +2879,6 @@ controller-specific `Formatter` implementations, as the following example shows: @@ -2895,7 +2879,6 @@ controller-specific `Formatter` implementations, as the following example shows:
[[mvc-ann-exceptionhandler]]
=== Exceptions
[.small]#<<web-reactive.adoc#webflux-ann-controller-exceptions, Same as in Spring WebFlux>>#
@ -3901,7 +3884,6 @@ as the following example shows: @@ -3901,7 +3884,6 @@ as the following example shows:
<2> The response has been set to 304 (NOT_MODIFIED) -- no further processing.
<3> Continue with the request processing.
There are three variants for checking conditional requests against `eTag` values, `lastModified`
values, or both. For conditional `GET` and `HEAD` requests, you can set the response to
304 (NOT_MODIFIED). For conditional `POST`, `PUT`, and `DELETE`, you can instead set the response

Loading…
Cancel
Save