Extract remaining WebMVC configuration snippets

Closes spring-projectsgh-36088

Author: sdeleuze

framework-docs/modules/ROOT/pages/web/webmvc-cors.adoc

@@ -286,84 +286,9 @@ the `allowOriginPatterns` property may be used to match to a dynamic set of orig
 
 `maxAge` is set to 30 minutes.
 
-[[mvc-cors-global-java]]
-=== Java Configuration
-[.small]#xref:web/webflux-cors.adoc#webflux-cors-global[See equivalent in the Reactive stack]#
-
-To enable CORS in the MVC Java config, you can use the `CorsRegistry` callback,
-as the following example shows:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	public class WebConfig implements WebMvcConfigurer {
-
-		@Override
-		public void addCorsMappings(CorsRegistry registry) {
-
-			registry.addMapping("/api/**")
-				.allowedOrigins("https://domain2.com")
-				.allowedMethods("PUT", "DELETE")
-				.allowedHeaders("header1", "header2", "header3")
-				.exposedHeaders("header1", "header2")
-				.allowCredentials(true).maxAge(3600);
-
-			// Add more mappings...
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebMvc
-	class WebConfig : WebMvcConfigurer {
-
-		override fun addCorsMappings(registry: CorsRegistry) {
-
-			registry.addMapping("/api/**")
-					.allowedOrigins("https://domain2.com")
-					.allowedMethods("PUT", "DELETE")
-					.allowedHeaders("header1", "header2", "header3")
-					.exposedHeaders("header1", "header2")
-					.allowCredentials(true).maxAge(3600)
-
-			// Add more mappings...
-		}
-	}
-----
-======
-
-[[mvc-cors-global-xml]]
-=== XML Configuration
-
-To enable CORS in the XML namespace, you can use the `<mvc:cors>` element,
-as the following example shows:
-
-[source,xml,indent=0,subs="verbatim"]
-----
-<mvc:cors>
-
-	<mvc:mapping path="/api/**"
-		allowed-origins="https://domain1.com, https://domain2.com"
-		allowed-methods="GET, PUT"
-		allowed-headers="header1, header2, header3"
-		exposed-headers="header1, header2" allow-credentials="true"
-		max-age="123" />
-
-	<mvc:mapping path="/resources/**"
-		allowed-origins="https://domain1.com" />
-
-</mvc:cors>
-----
+You can enable CORS in the Spring MVC configuration as the following example shows:
 
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 [[mvc-cors-filter]]
 == CORS Filter

framework-docs/modules/ROOT/pages/web/webmvc-functional.adoc

@@ -900,81 +900,9 @@ processing lifecycle and also (potentially) run side by side with annotated cont
 any are declared. It is also how functional endpoints are enabled by the Spring Boot Web
 starter.
 
-The following example shows a WebMvc Java configuration:
+The following example shows a related Spring MVC configuration:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableMvc
-	public class WebConfig implements WebMvcConfigurer {
-
-		@Bean
-		public RouterFunction<?> routerFunctionA() {
-			// ...
-		}
-
-		@Bean
-		public RouterFunction<?> routerFunctionB() {
-			// ...
-		}
-
-		// ...
-
-		@Override
-		public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-			// configure message conversion...
-		}
-
-		@Override
-		public void addCorsMappings(CorsRegistry registry) {
-			// configure CORS...
-		}
-
-		@Override
-		public void configureViewResolvers(ViewResolverRegistry registry) {
-			// configure view resolution for HTML rendering...
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableMvc
-	class WebConfig : WebMvcConfigurer {
-
-		@Bean
-		fun routerFunctionA(): RouterFunction<*> {
-			// ...
-		}
-
-		@Bean
-		fun routerFunctionB(): RouterFunction<*> {
-			// ...
-		}
-
-		// ...
-
-		override fun configureMessageConverters(converters: List<HttpMessageConverter<*>>) {
-			// configure message conversion...
-		}
-
-		override fun addCorsMappings(registry: CorsRegistry) {
-			// configure CORS...
-		}
-
-		override fun configureViewResolvers(registry: ViewResolverRegistry) {
-			// configure view resolution for HTML rendering...
-		}
-	}
-----
-======
+include-code::./WebConfiguration[tag=snippet,indent=0]
 
 
 [[webmvc-fn-handler-filter-function]]

framework-docs/modules/ROOT/pages/web/webmvc/mvc-controller/ann-requestmapping.adoc

@@ -550,53 +550,7 @@ You can programmatically register handler methods, which you can use for dynamic
 registrations or for advanced cases, such as different instances of the same handler
 under different URLs. The following example registers a handler method:
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	public class MyConfig {
-
-		@Autowired
-		public void setHandlerMapping(RequestMappingHandlerMapping mapping, UserHandler handler) // <1>
-				throws NoSuchMethodException {
-
-			RequestMappingInfo info = RequestMappingInfo
-					.paths("/user/{id}").methods(RequestMethod.GET).build(); // <2>
-
-			Method method = UserHandler.class.getMethod("getUser", Long.class); // <3>
-
-			mapping.registerMapping(info, handler, method); // <4>
-		}
-	}
-----
-<1> Inject the target handler and the handler mapping for controllers.
-<2> Prepare the request mapping meta data.
-<3> Get the handler method.
-<4> Add the registration.
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	class MyConfig {
-
-		@Autowired
-		fun setHandlerMapping(mapping: RequestMappingHandlerMapping, handler: UserHandler) { // <1>
-			val info = RequestMappingInfo.paths("/user/{id}").methods(RequestMethod.GET).build() // <2>
-			val method = UserHandler::class.java.getMethod("getUser", Long::class.java) // <3>
-			mapping.registerMapping(info, handler, method) // <4>
-		}
-	}
-----
-<1> Inject the target handler and the handler mapping for controllers.
-<2> Prepare the request mapping meta data.
-<3> Get the handler method.
-<4> Add the registration.
-======
+include-code::./MyConfiguration[tag=snippet,indent=0]
 
 
 

framework-docs/modules/ROOT/pages/web/websocket/fallback.adoc

@@ -152,26 +152,9 @@ from the iframe. By default, the iframe is set to download the SockJS client
 from a CDN location. It is a good idea to configure this option to use
 a URL from the same origin as the application.
 
-The following example shows how to do so in Java configuration:
+The following example shows how to configure it:
 
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	@EnableWebSocketMessageBroker
-	public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
-
-		@Override
-		public void registerStompEndpoints(StompEndpointRegistry registry) {
-			registry.addEndpoint("/portfolio").withSockJS()
-					.setClientLibraryUrl("http://localhost:8080/myapp/js/sockjs-client.js");
-		}
-
-		// ...
-
-	}
-----
-
-The XML namespace provides a similar option through the `<websocket:sockjs>` element.
+include-code::./WebSocketConfiguration[tag=snippet,indent=0]
 
 NOTE: During initial development, do enable the SockJS client `devel` mode that prevents
 the browser from caching SockJS requests (like the iframe) that would otherwise
@@ -307,23 +290,4 @@ jettyHttpClient.setExecutor(new QueuedThreadPool(1000));
 The following example shows the server-side SockJS-related properties (see javadoc for details)
 that you should also consider customizing:
 
-[source,java,indent=0,subs="verbatim,quotes"]
-----
-	@Configuration
-	public class WebSocketConfig extends WebSocketMessageBrokerConfigurationSupport {
-
-		@Override
-		public void registerStompEndpoints(StompEndpointRegistry registry) {
-			registry.addEndpoint("/sockjs").withSockJS()
-				.setStreamBytesLimit(512 * 1024) <1>
-				.setHttpMessageCacheSize(1000) <2>
-				.setDisconnectDelay(30 * 1000); <3>
-		}
-
-		// ...
-	}
-----
-<1> Set the `streamBytesLimit` property to 512KB (the default is 128KB -- `128 * 1024`).
-<2> Set the `httpMessageCacheSize` property to 1,000 (the default is `100`).
-<3> Set the `disconnectDelay` property to 30 property seconds (the default is five seconds
--- `5 * 1000`).
+include-code::./WebSocketConfiguration[tag=snippet,indent=0]

framework-docs/src/main/java/org/springframework/docs/web/mvccorsglobal/WebConfiguration.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.mvccorsglobal;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+// tag::snippet[]
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+	@Override
+	public void addCorsMappings(CorsRegistry registry) {
+		registry.addMapping("/api/**")
+			.allowedOrigins("https://domain1.com", "https://domain2.com")
+			.allowedMethods("GET", "PUT")
+			.allowedHeaders("header1", "header2", "header3")
+			.exposedHeaders("header1", "header2")
+			.allowCredentials(true)
+			.maxAge(3600);
+
+		// Add more mappings...
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvccontroller/mvcannrequestmappingregistration/MyConfiguration.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvc.mvccontroller.mvcannrequestmappingregistration;
+
+import java.lang.reflect.Method;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+// tag::snippet[]
+@Configuration
+public class MyConfiguration {
+
+	// Inject the target handler and the handler mapping for controllers
+	@Autowired
+	public void setHandlerMapping(RequestMappingHandlerMapping mapping, UserHandler handler)
+			throws NoSuchMethodException {
+
+		// Prepare the request mapping meta data
+		RequestMappingInfo info = RequestMappingInfo
+				.paths("/user/{id}").methods(RequestMethod.GET).build();
+
+		// Get the handler method
+		Method method = UserHandler.class.getMethod("getUser", Long.class);
+
+		// Add the registration
+		mapping.registerMapping(info, handler, method);
+	}
+}
+// end::snippet[]
+

framework-docs/src/main/java/org/springframework/docs/web/webmvc/mvccontroller/mvcannrequestmappingregistration/UserHandler.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2002-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.springframework.docs.web.webmvc.mvccontroller.mvcannrequestmappingregistration;
+
+public class UserHandler {
+
+	public void getUser(Long id) {
+		// ...
+	}
+}
+