Restored support for placeholders in mvc namespace resource locations

With the recent charset mechanism in place, we cannot rely on implicit placeholder parsing during String-to-Resource conversion anymore.

(cherry picked from commit 7af9910)

Author: jhoeller

spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java

@@ -30,7 +30,6 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.UrlResource;
 import org.springframework.util.AntPathMatcher;
-import org.springframework.util.Assert;
 import org.springframework.util.PathMatcher;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
@@ -129,44 +128,44 @@ else if (!parserContext.getRegistry().isAlias(PATH_MATCHER_BEAN_NAME)
 	 * Registers  an {@link HttpRequestHandlerAdapter} under a well-known
 	 * name unless already registered.
 	 */
-	private static void registerBeanNameUrlHandlerMapping(ParserContext parserContext, Object source) {
-		if (!parserContext.getRegistry().containsBeanDefinition(BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME)){
-			RootBeanDefinition beanNameMappingDef = new RootBeanDefinition(BeanNameUrlHandlerMapping.class);
-			beanNameMappingDef.setSource(source);
-			beanNameMappingDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-			beanNameMappingDef.getPropertyValues().add("order", 2);	// consistent with WebMvcConfigurationSupport
-			RuntimeBeanReference corsConfigurationsRef = MvcNamespaceUtils.registerCorsConfigurations(null, parserContext, source);
-			beanNameMappingDef.getPropertyValues().add("corsConfigurations", corsConfigurationsRef);
-			parserContext.getRegistry().registerBeanDefinition(BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME, beanNameMappingDef);
-			parserContext.registerComponent(new BeanComponentDefinition(beanNameMappingDef, BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME));
+	private static void registerBeanNameUrlHandlerMapping(ParserContext context, Object source) {
+		if (!context.getRegistry().containsBeanDefinition(BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME)){
+			RootBeanDefinition mappingDef = new RootBeanDefinition(BeanNameUrlHandlerMapping.class);
+			mappingDef.setSource(source);
+			mappingDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+			mappingDef.getPropertyValues().add("order", 2);	// consistent with WebMvcConfigurationSupport
+			RuntimeBeanReference corsRef = MvcNamespaceUtils.registerCorsConfigurations(null, context, source);
+			mappingDef.getPropertyValues().add("corsConfigurations", corsRef);
+			context.getRegistry().registerBeanDefinition(BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME, mappingDef);
+			context.registerComponent(new BeanComponentDefinition(mappingDef, BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME));
 		}
 	}
 
 	/**
 	 * Registers  an {@link HttpRequestHandlerAdapter} under a well-known
 	 * name unless already registered.
 	 */
-	private static void registerHttpRequestHandlerAdapter(ParserContext parserContext, Object source) {
-		if (!parserContext.getRegistry().containsBeanDefinition(HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME)) {
-			RootBeanDefinition handlerAdapterDef = new RootBeanDefinition(HttpRequestHandlerAdapter.class);
-			handlerAdapterDef.setSource(source);
-			handlerAdapterDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-			parserContext.getRegistry().registerBeanDefinition(HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME, handlerAdapterDef);
-			parserContext.registerComponent(new BeanComponentDefinition(handlerAdapterDef, HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME));
+	private static void registerHttpRequestHandlerAdapter(ParserContext context, Object source) {
+		if (!context.getRegistry().containsBeanDefinition(HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME)) {
+			RootBeanDefinition adapterDef = new RootBeanDefinition(HttpRequestHandlerAdapter.class);
+			adapterDef.setSource(source);
+			adapterDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+			context.getRegistry().registerBeanDefinition(HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME, adapterDef);
+			context.registerComponent(new BeanComponentDefinition(adapterDef, HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME));
 		}
 	}
 
 	/**
 	 * Registers a {@link SimpleControllerHandlerAdapter} under a well-known
 	 * name unless already registered.
 	 */
-	private static void registerSimpleControllerHandlerAdapter(ParserContext parserContext, Object source) {
-		if (!parserContext.getRegistry().containsBeanDefinition(SIMPLE_CONTROLLER_HANDLER_ADAPTER_BEAN_NAME)) {
-			RootBeanDefinition handlerAdapterDef = new RootBeanDefinition(SimpleControllerHandlerAdapter.class);
-			handlerAdapterDef.setSource(source);
-			handlerAdapterDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-			parserContext.getRegistry().registerBeanDefinition(SIMPLE_CONTROLLER_HANDLER_ADAPTER_BEAN_NAME, handlerAdapterDef);
-			parserContext.registerComponent(new BeanComponentDefinition(handlerAdapterDef, SIMPLE_CONTROLLER_HANDLER_ADAPTER_BEAN_NAME));
+	private static void registerSimpleControllerHandlerAdapter(ParserContext context, Object source) {
+		if (!context.getRegistry().containsBeanDefinition(SIMPLE_CONTROLLER_HANDLER_ADAPTER_BEAN_NAME)) {
+			RootBeanDefinition beanDef = new RootBeanDefinition(SimpleControllerHandlerAdapter.class);
+			beanDef.setSource(source);
+			beanDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+			context.getRegistry().registerBeanDefinition(SIMPLE_CONTROLLER_HANDLER_ADAPTER_BEAN_NAME, beanDef);
+			context.registerComponent(new BeanComponentDefinition(beanDef, SIMPLE_CONTROLLER_HANDLER_ADAPTER_BEAN_NAME));
 		}
 	}
 
@@ -177,21 +176,21 @@ private static void registerSimpleControllerHandlerAdapter(ParserContext parserC
 	 * @return a RuntimeBeanReference to this {@code Map<String, CorsConfiguration>} instance
 	 */
 	public static RuntimeBeanReference registerCorsConfigurations(
-			Map<String, CorsConfiguration> corsConfigurations, ParserContext parserContext, Object source) {
+			Map<String, CorsConfiguration> corsConfigurations, ParserContext context, Object source) {
 
-		if (!parserContext.getRegistry().containsBeanDefinition(CORS_CONFIGURATION_BEAN_NAME)) {
-			RootBeanDefinition corsConfigurationsDef = new RootBeanDefinition(LinkedHashMap.class);
-			corsConfigurationsDef.setSource(source);
-			corsConfigurationsDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		if (!context.getRegistry().containsBeanDefinition(CORS_CONFIGURATION_BEAN_NAME)) {
+			RootBeanDefinition corsDef = new RootBeanDefinition(LinkedHashMap.class);
+			corsDef.setSource(source);
+			corsDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 			if (corsConfigurations != null) {
-				corsConfigurationsDef.getConstructorArgumentValues().addIndexedArgumentValue(0, corsConfigurations);
+				corsDef.getConstructorArgumentValues().addIndexedArgumentValue(0, corsConfigurations);
 			}
-			parserContext.getReaderContext().getRegistry().registerBeanDefinition(CORS_CONFIGURATION_BEAN_NAME, corsConfigurationsDef);
-			parserContext.registerComponent(new BeanComponentDefinition(corsConfigurationsDef, CORS_CONFIGURATION_BEAN_NAME));
+			context.getReaderContext().getRegistry().registerBeanDefinition(CORS_CONFIGURATION_BEAN_NAME, corsDef);
+			context.registerComponent(new BeanComponentDefinition(corsDef, CORS_CONFIGURATION_BEAN_NAME));
 		}
 		else if (corsConfigurations != null) {
-			BeanDefinition corsConfigurationsDef = parserContext.getRegistry().getBeanDefinition(CORS_CONFIGURATION_BEAN_NAME);
-			corsConfigurationsDef.getConstructorArgumentValues().addIndexedArgumentValue(0, corsConfigurations);
+			BeanDefinition corsDef = context.getRegistry().getBeanDefinition(CORS_CONFIGURATION_BEAN_NAME);
+			corsDef.getConstructorArgumentValues().addIndexedArgumentValue(0, corsConfigurations);
 		}
 		return new RuntimeBeanReference(CORS_CONFIGURATION_BEAN_NAME);
 	}
@@ -214,7 +213,7 @@ private static void registerHandlerMappingIntrospector(ParserContext parserConte
 	/**
 	 * Find the {@code ContentNegotiationManager} bean created by or registered
 	 * with the {@code annotation-driven} element.
-	 * @return a bean definition, bean reference, or {@code null}
+	 * @return a bean definition, bean reference, or {@code null} if none defined
 	 */
 	public static Object getContentNegotiationManager(ParserContext context) {
 		String name = AnnotationDrivenBeanDefinitionParser.HANDLER_MAPPING_BEAN_NAME;
@@ -232,12 +231,11 @@ public static Object getContentNegotiationManager(ParserContext context) {
 	/**
 	 * Load the {@link Resource}'s for the given locations with the given
 	 * {@link ResourceLoader} and add them to the output list. Also for
-	 * {@link org.springframework.core.io.UrlResource URL-based resources} (e.g.
-	 * files, HTTP URLs, etc) this method supports a special prefix to indicate
-	 * the charset associated with the URL so that relative paths appended to it
-	 * can be encoded correctly, e.g.
-	 * {@code [charset=Windows-31J]http://example.org/path}. The charsets, if
-	 * any, are added to the output map.
+	 * {@link org.springframework.core.io.UrlResource URL-based resources} (e.g. files,
+	 * HTTP URLs, etc) this method supports a special prefix to indicate the charset
+	 * associated with the URL so that relative paths appended to it can be encoded
+	 * correctly, e.g. {@code [charset=Windows-31J]http://example.org/path}.
+	 * The charsets, if any, are added to the output map.
 	 * @since 4.3.13
 	 */
 	public static void loadResourceLocations(String[] locations, ResourceLoader resourceLoader,
@@ -248,15 +246,19 @@ public static void loadResourceLocations(String[] locations, ResourceLoader reso
 			location = location.trim();
 			if (location.startsWith(URL_RESOURCE_CHARSET_PREFIX)) {
 				int endIndex = location.indexOf("]", URL_RESOURCE_CHARSET_PREFIX.length());
-				Assert.isTrue(endIndex != -1, "Invalid charset syntax in location: " + location);
+				if (endIndex == -1) {
+					throw new IllegalArgumentException("Invalid charset syntax in location: " + location);
+				}
 				String value = location.substring(URL_RESOURCE_CHARSET_PREFIX.length(), endIndex);
 				charset = Charset.forName(value);
 				location = location.substring(endIndex + 1);
 			}
 			Resource resource = resourceLoader.getResource(location);
 			outputLocations.add(resource);
 			if (charset != null) {
-				Assert.isInstanceOf(UrlResource.class, resource, "Unexpected charset for: " + resource);
+				if (!(resource instanceof UrlResource)) {
+					throw new IllegalArgumentException("Unexpected charset for non-UrlResource: " + resource);
+				}
 				outputLocationCharsets.put(resource, charset);
 			}
 		}