From 2147175898e475541179a3014f3b1ed1c31d1e42 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 29 Nov 2022 13:51:34 +0100 Subject: [PATCH] Polishing --- .../src/docs/asciidoc/data-access.adoc | 10 +++++----- .../data-access/data-access-appendix.adoc | 17 +++++++++++------ .../integration/integration-appendix.adoc | 18 ++++++++++++------ .../src/docs/asciidoc/integration/jms.adoc | 12 +++++++----- .../src/docs/asciidoc/web/web-uris.adoc | 12 ++++++------ .../src/docs/asciidoc/web/websocket.adoc | 2 +- 6 files changed, 42 insertions(+), 29 deletions(-) diff --git a/framework-docs/src/docs/asciidoc/data-access.adoc b/framework-docs/src/docs/asciidoc/data-access.adoc index b90002d0fc..f86087b48b 100644 --- a/framework-docs/src/docs/asciidoc/data-access.adoc +++ b/framework-docs/src/docs/asciidoc/data-access.adoc @@ -5484,8 +5484,7 @@ example shows such a method: .Java ---- public List searchForActors(int age, String namePattern) { - List actors = actorSearchMappingQuery.execute(age, namePattern); - return actors; + return actorSearchMappingQuery.execute(age, namePattern); } ---- [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"] @@ -8866,9 +8865,10 @@ preamble of the XML configuration file. The following example shows how to do so - xsi:schemaLocation="http://www.springframework.org/schema/beans - https://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/oxm https://www.springframework.org/schema/oxm/spring-oxm.xsd"> <2> + xsi:schemaLocation="http://www.springframework.org/schema/beans + https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/oxm + https://www.springframework.org/schema/oxm/spring-oxm.xsd"> <2> ---- <1> Reference the `oxm` schema. <2> Specify the `oxm` schema location. diff --git a/framework-docs/src/docs/asciidoc/data-access/data-access-appendix.adoc b/framework-docs/src/docs/asciidoc/data-access/data-access-appendix.adoc index f876e464bf..449c86095d 100644 --- a/framework-docs/src/docs/asciidoc/data-access/data-access-appendix.adoc +++ b/framework-docs/src/docs/asciidoc/data-access/data-access-appendix.adoc @@ -38,12 +38,15 @@ are available to you: + xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation=" - http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd <2> - http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd"> + http://www.springframework.org/schema/beans + https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/tx + https://www.springframework.org/schema/tx/spring-tx.xsd <2> + http://www.springframework.org/schema/aop + https://www.springframework.org/schema/aop/spring-aop.xsd"> @@ -79,8 +82,10 @@ the correct schema so that the elements in the `jdbc` namespace are available to xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jdbc="http://www.springframework.org/schema/jdbc" <1> xsi:schemaLocation=" - http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd"> <2> + http://www.springframework.org/schema/beans + https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/jdbc + https://www.springframework.org/schema/jdbc/spring-jdbc.xsd"> <2> diff --git a/framework-docs/src/docs/asciidoc/integration/integration-appendix.adoc b/framework-docs/src/docs/asciidoc/integration/integration-appendix.adoc index 4b71d75873..e714522b61 100644 --- a/framework-docs/src/docs/asciidoc/integration/integration-appendix.adoc +++ b/framework-docs/src/docs/asciidoc/integration/integration-appendix.adoc @@ -28,8 +28,10 @@ correct schema so that the elements in the `jee` namespace are available to you: xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jee="http://www.springframework.org/schema/jee" xsi:schemaLocation=" - http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/jee https://www.springframework.org/schema/jee/spring-jee.xsd"> + http://www.springframework.org/schema/beans + https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/jee + https://www.springframework.org/schema/jee/spring-jee.xsd"> @@ -287,8 +289,10 @@ are available to you: xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jms="http://www.springframework.org/schema/jms" xsi:schemaLocation=" - http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/jms https://www.springframework.org/schema/jms/spring-jms.xsd"> + http://www.springframework.org/schema/beans + https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/jms + https://www.springframework.org/schema/jms/spring-jms.xsd"> @@ -324,8 +328,10 @@ the correct schema so that the elements in the `cache` namespace are available t xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cache="http://www.springframework.org/schema/cache" xsi:schemaLocation=" - http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd"> + http://www.springframework.org/schema/beans + https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/cache + https://www.springframework.org/schema/cache/spring-cache.xsd"> diff --git a/framework-docs/src/docs/asciidoc/integration/jms.adoc b/framework-docs/src/docs/asciidoc/integration/jms.adoc index f7b1c91f76..d5336dea0e 100644 --- a/framework-docs/src/docs/asciidoc/integration/jms.adoc +++ b/framework-docs/src/docs/asciidoc/integration/jms.adoc @@ -1181,11 +1181,13 @@ namespace elements, you need to reference the JMS schema, as the following examp ---- - xsi:schemaLocation=" - http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/jms https://www.springframework.org/schema/jms/spring-jms.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:jms="http://www.springframework.org/schema/jms" <1> + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/jms + https://www.springframework.org/schema/jms/spring-jms.xsd"> diff --git a/framework-docs/src/docs/asciidoc/web/web-uris.adoc b/framework-docs/src/docs/asciidoc/web/web-uris.adoc index 593fd97ffe..26027a1a8d 100644 --- a/framework-docs/src/docs/asciidoc/web/web-uris.adoc +++ b/framework-docs/src/docs/asciidoc/web/web-uris.adoc @@ -8,12 +8,12 @@ .Java ---- UriComponents uriComponents = UriComponentsBuilder - .fromUriString("https://example.com/hotels/{hotel}") // <1> - .queryParam("q", "{q}") // <2> + .fromUriString("https://example.com/hotels/{hotel}") // <1> + .queryParam("q", "{q}") // <2> .encode() // <3> .build(); // <4> - URI uri = uriComponents.expand("Westin", "123").toUri(); // <5> + URI uri = uriComponents.expand("Westin", "123").toUri(); // <5> ---- <1> Static factory method with a URI template. <2> Add or replace URI components. @@ -25,12 +25,12 @@ .Kotlin ---- val uriComponents = UriComponentsBuilder - .fromUriString("https://example.com/hotels/{hotel}") // <1> - .queryParam("q", "{q}") // <2> + .fromUriString("https://example.com/hotels/{hotel}") // <1> + .queryParam("q", "{q}") // <2> .encode() // <3> .build() // <4> - val uri = uriComponents.expand("Westin", "123").toUri() // <5> + val uri = uriComponents.expand("Westin", "123").toUri() // <5> ---- <1> Static factory method with a URI template. <2> Add or replace URI components. diff --git a/framework-docs/src/docs/asciidoc/web/websocket.adoc b/framework-docs/src/docs/asciidoc/web/websocket.adoc index efa11b0516..16298cf136 100644 --- a/framework-docs/src/docs/asciidoc/web/websocket.adoc +++ b/framework-docs/src/docs/asciidoc/web/websocket.adoc @@ -962,7 +962,7 @@ endpoints, over WebSocket with <>, as the following example @Override public void registerStompEndpoints(StompEndpointRegistry registry) { - registry.addEndpoint("/portfolio").withSockJS(); // <1> + registry.addEndpoint("/portfolio").withSockJS(); // <1> } @Override