Add Kotlin code snippets to WebMvc refdoc

See gh-21778

Author: sdeleuze

src/docs/asciidoc/web/web-uris.adoc

@@ -4,8 +4,8 @@
 
 `UriComponentsBuilder` helps to build URI's from URI templates with variables, as the following example shows:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
 	UriComponents uriComponents = UriComponentsBuilder
 			.fromUriString("https://example.com/hotels/{hotel}")  // <1>
@@ -21,12 +21,28 @@
 <4> Build a `UriComponents`.
 <5> Expand variables and obtain the `URI`.
 
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	val uriComponents = UriComponentsBuilder
+			.fromUriString("https://example.com/hotels/{hotel}")  // <1>
+			.queryParam("q", "{q}")  // <2>
+			.encode() // <3>
+			.build() // <4>
+
+	val uri = uriComponents.expand("Westin", "123").toUri()  // <5>
+----
+<1> Static factory method with a URI template.
+<2> Add or replace URI components.
+<3> Request to have the URI template and URI variables encoded.
+<4> Build a `UriComponents`.
+<5> Expand variables and obtain the `URI`.
 
 The preceding example can be consolidated into one chain and shortened with `buildAndExpand`,
 as the following example shows:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
 	URI uri = UriComponentsBuilder
 			.fromUriString("https://example.com/hotels/{hotel}")
@@ -35,28 +51,54 @@ as the following example shows:
 			.buildAndExpand("Westin", "123")
 			.toUri();
 ----
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	val uri = UriComponentsBuilder
+			.fromUriString("https://example.com/hotels/{hotel}")
+			.queryParam("q", "{q}")
+			.encode()
+			.buildAndExpand("Westin", "123")
+			.toUri()
+----
 
 You can shorten it further by going directly to a URI (which implies encoding),
 as the following example shows:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
 	URI uri = UriComponentsBuilder
 			.fromUriString("https://example.com/hotels/{hotel}")
 			.queryParam("q", "{q}")
 			.build("Westin", "123");
 ----
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	val uri = UriComponentsBuilder
+			.fromUriString("https://example.com/hotels/{hotel}")
+			.queryParam("q", "{q}")
+			.build("Westin", "123")
+----
 
 You shorter it further still with a full URI template, as the following example shows:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
 	URI uri = UriComponentsBuilder
 			.fromUriString("https://example.com/hotels/{hotel}?q={q}")
 			.build("Westin", "123");
 ----
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+val uri = UriComponentsBuilder
+		.fromUriString("https://example.com/hotels/{hotel}?q={q}")
+		.build("Westin", "123")
+----
+
 
 
 
@@ -76,39 +118,62 @@ exposes shared configuration options.
 
 The following example shows how to configure a `RestTemplate`:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
 	// import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode;
 
 	String baseUrl = "https://example.org";
 	DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(baseUrl);
-	factory.setEncodingMode(EncodingMode.TEMPLATE_AND_VARIABLES);
+	factory.setEncodingMode(EncodingMode.TEMPLATE_AND_VALUES);
 
 	RestTemplate restTemplate = new RestTemplate();
 	restTemplate.setUriTemplateHandler(factory);
 ----
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	// import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode
+	
+	val baseUrl = "https://example.org"
+	val factory = DefaultUriBuilderFactory(baseUrl)
+	factory.encodingMode = EncodingMode.TEMPLATE_AND_VALUES
+
+	val restTemplate = RestTemplate()
+	restTemplate.uriTemplateHandler = factory
+----
 
 The following example configures a `WebClient`:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
 	// import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode;
 
 	String baseUrl = "https://example.org";
 	DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(baseUrl);
-	factory.setEncodingMode(EncodingMode.TEMPLATE_AND_VARIABLES);
+	factory.setEncodingMode(EncodingMode.TEMPLATE_AND_VALUES);
 
 	WebClient client = WebClient.builder().uriBuilderFactory(factory).build();
 ----
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	// import org.springframework.web.util.DefaultUriBuilderFactory.EncodingMode
+
+	val baseUrl = "https://example.org"
+	val factory = DefaultUriBuilderFactory(baseUrl)
+	factory.encodingMode = EncodingMode.TEMPLATE_AND_VALUES
+
+	val client = WebClient.builder().uriBuilderFactory(factory).build()
+----
 
 In addition, you can also use `DefaultUriBuilderFactory` directly. It is similar to using
 `UriComponentsBuilder` but, instead of static factory methods, it is an actual instance
 that holds configuration and preferences, as the following example shows:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
 	String baseUrl = "https://example.com";
 	DefaultUriBuilderFactory uriBuilderFactory = new DefaultUriBuilderFactory(baseUrl);
@@ -117,6 +182,16 @@ that holds configuration and preferences, as the following example shows:
 			.queryParam("q", "{q}")
 			.build("Westin", "123");
 ----
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	val baseUrl = "https://example.com"
+	val uriBuilderFactory = DefaultUriBuilderFactory(baseUrl)
+
+	val uri = uriBuilderFactory.uriString("/hotels/{hotel}")
+			.queryParam("q", "{q}")
+			.build("Westin", "123")
+----
 
 
 
@@ -144,44 +219,68 @@ URI variables intentionally contain reserved characters.
 
 The following example uses the first option:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
-URI uri = UriComponentsBuilder.fromPath("/hotel list/{city}")
+	URI uri = UriComponentsBuilder.fromPath("/hotel list/{city}")
 			.queryParam("q", "{q}")
 			.encode()
 			.buildAndExpand("New York", "foo+bar")
 			.toUri();
 
 	// Result is "/hotel%20list/New%20York?q=foo%2Bbar"
 ----
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	val uri = UriComponentsBuilder.fromPath("/hotel list/{city}")
+			.queryParam("q", "{q}")
+			.encode()
+			.buildAndExpand("New York", "foo+bar")
+			.toUri()
+
+	// Result is "/hotel%20list/New%20York?q=foo%2Bbar"
+----
 
 You can shorten the preceding example by going directly to the URI (which implies encoding),
 as the following example shows:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
-URI uri = UriComponentsBuilder.fromPath("/hotel list/{city}")
+	URI uri = UriComponentsBuilder.fromPath("/hotel list/{city}")
+			.queryParam("q", "{q}")
+			.build("New York", "foo+bar")
+----
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	val uri = UriComponentsBuilder.fromPath("/hotel list/{city}")
 			.queryParam("q", "{q}")
 			.build("New York", "foo+bar")
 ----
 
 You can shorten it further still with a full URI template, as the following example shows:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
+----
+	RI uri = UriComponentsBuilder.fromPath("/hotel list/{city}?q={q}")
+			.build("New York", "foo+bar")
 ----
-URI uri = UriComponentsBuilder.fromPath("/hotel list/{city}?q={q}")
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	val uri = UriComponentsBuilder.fromPath("/hotel list/{city}?q={q}")
 			.build("New York", "foo+bar")
 ----
 
 The `WebClient` and the `RestTemplate` expand and encode URI templates internally through
 the `UriBuilderFactory` strategy. Both can be configured with a custom strategy.
 as the following example shows:
 
-[source,java,indent=0]
-[subs="verbatim,quotes"]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+.Java
 ----
 	String baseUrl = "https://example.com";
 	DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(baseUrl)
@@ -194,6 +293,22 @@ as the following example shows:
 	// Customize the WebClient..
 	WebClient client = WebClient.builder().uriBuilderFactory(factory).build();
 ----
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+.Kotlin
+----
+	val baseUrl = "https://example.com"
+	val factory = DefaultUriBuilderFactory(baseUrl).apply {
+		encodingMode = EncodingMode.TEMPLATE_AND_VALUES
+	}
+
+	// Customize the RestTemplate..
+	val restTemplate = RestTemplate().apply {
+		uriTemplateHandler = factory
+	}
+
+	// Customize the WebClient..
+	val client = WebClient.builder().uriBuilderFactory(factory).build()
+----
 
 The `DefaultUriBuilderFactory` implementation uses `UriComponentsBuilder` internally to
 expand and encode URI templates. As a factory, it provides a single place to configure