Polishing

Author: jhoeller

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java

@@ -90,7 +90,6 @@ protected AbstractNamedValueMethodArgumentResolver(ConversionService conversionS
 
 	@Override
 	public Object resolveArgument(MethodParameter parameter, Message<?> message) throws Exception {
-
 		NamedValueInfo namedValueInfo = getNamedValueInfo(parameter);
 		MethodParameter nestedParameter = parameter.nestedIfOptional();
 

spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -158,7 +158,7 @@ public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 		String contentType = getMultipartContentType(paramOrFileName);
 		if (contentType != null) {
 			HttpHeaders headers = new HttpHeaders();
-			headers.add("Content-Type", contentType);
+			headers.add(HttpHeaders.CONTENT_TYPE, contentType);
 			return headers;
 		}
 		else {

spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java

@@ -84,7 +84,8 @@ public HttpHeaders getHeaders() {
 	@Override
 	public InputStream getBody() throws IOException {
 		// Prefer Servlet Part resolution to cover file as well as parameter streams
-		if (this.multipartRequest instanceof StandardMultipartHttpServletRequest) {
+		boolean servletParts = (this.multipartRequest instanceof StandardMultipartHttpServletRequest);
+		if (servletParts) {
 			Part part = retrieveServletPart();
 			if (part != null) {
 				return part.getInputStream();
@@ -102,9 +103,11 @@ public InputStream getBody() throws IOException {
 		}
 
 		// Fallback: Servlet Part resolution even if not indicated
-		Part part = retrieveServletPart();
-		if (part != null) {
-			return part.getInputStream();
+		if (!servletParts) {
+			Part part = retrieveServletPart();
+			if (part != null) {
+				return part.getInputStream();
+			}
 		}
 
 		throw new IllegalStateException("No body available for request part '" + this.requestPartName + "'");

spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java

@@ -139,12 +139,11 @@ public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 		assertThat(result).isEqualTo(bytes);
 	}
 
-	@Test
+	@Test  // gh-25829
 	public void getBodyViaRequestPart() throws Exception {
 		byte[] bytes = "content".getBytes("UTF-8");
 		MockPart mockPart = new MockPart("part", bytes);
 		mockPart.getHeaders().setContentType(MediaType.APPLICATION_JSON);
-		mockRequest.addPart(mockPart);
 		this.mockRequest.addPart(mockPart);
 		ServerHttpRequest request = new RequestPartServletServerHttpRequest(this.mockRequest, "part");
 

spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockMultipartHttpServletRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -158,7 +158,7 @@ public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 		String contentType = getMultipartContentType(paramOrFileName);
 		if (contentType != null) {
 			HttpHeaders headers = new HttpHeaders();
-			headers.add("Content-Type", contentType);
+			headers.add(HttpHeaders.CONTENT_TYPE, contentType);
 			return headers;
 		}
 		else {

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java

@@ -92,7 +92,7 @@ public Mono<Object> resolveArgument(
 		NamedValueInfo namedValueInfo = getNamedValueInfo(parameter);
 		MethodParameter nestedParameter = parameter.nestedIfOptional();
 
-		Object resolvedName = resolveStringValue(namedValueInfo.name);
+		Object resolvedName = resolveEmbeddedValuesAndExpressions(namedValueInfo.name);
 		if (resolvedName == null) {
 			return Mono.error(new IllegalArgumentException(
 					"Specified name must not resolve to null: [" + namedValueInfo.name + "]"));
@@ -103,7 +103,7 @@ public Mono<Object> resolveArgument(
 		return resolveName(resolvedName.toString(), nestedParameter, exchange)
 				.flatMap(arg -> {
 					if ("".equals(arg) && namedValueInfo.defaultValue != null) {
-						arg = resolveStringValue(namedValueInfo.defaultValue);
+						arg = resolveEmbeddedValuesAndExpressions(namedValueInfo.defaultValue);
 					}
 					arg = applyConversion(arg, namedValueInfo, parameter, bindingContext, exchange);
 					handleResolvedValue(arg, namedValueInfo.name, parameter, model, exchange);
@@ -158,7 +158,7 @@ private NamedValueInfo updateNamedValueInfo(MethodParameter parameter, NamedValu
 	 * potentially containing placeholders and expressions.
 	 */
 	@Nullable
-	private Object resolveStringValue(String value) {
+	private Object resolveEmbeddedValuesAndExpressions(String value) {
 		if (this.configurableBeanFactory == null || this.expressionContext == null) {
 			return value;
 		}
@@ -209,7 +209,7 @@ private Mono<Object> getDefaultValue(NamedValueInfo namedValueInfo, MethodParame
 		return Mono.fromSupplier(() -> {
 			Object value = null;
 			if (namedValueInfo.defaultValue != null) {
-				value = resolveStringValue(namedValueInfo.defaultValue);
+				value = resolveEmbeddedValuesAndExpressions(namedValueInfo.defaultValue);
 			}
 			else if (namedValueInfo.required && !parameter.isOptional()) {
 				handleMissingValue(namedValueInfo.name, parameter, exchange);