Polishing

spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java

@@ -393,17 +393,14 @@ public abstract class YamlProcessor {
 	 */
 	protected static class StrictMapAppenderConstructor extends Constructor {
 
-		public 	StrictMapAppenderConstructor() {
-			super();
-		}
-
 		@Override
 		protected Map<Object, Object> constructMapping(MappingNode node) {
 			try {
 				return super.constructMapping(node);
-			} catch (IllegalStateException e) {
+			}
+			catch (IllegalStateException ex) {
 				throw new ParserException("while parsing MappingNode",
-						node.getStartMark(), e.getMessage(), node.getEndMark());
+						node.getStartMark(), ex.getMessage(), node.getEndMark());
 			}
 		}
 
@@ -414,7 +411,7 @@ public abstract class YamlProcessor {
 				@Override
 				public Object put(Object key, Object value) {
 					if (delegate.containsKey(key)) {
-						throw new IllegalStateException("duplicate key: " + key);
+						throw new IllegalStateException("Duplicate key: " + key);
 					}
 					return delegate.put(key, value);
 				}

spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -80,13 +80,14 @@ public class ReflectiveMethodExecutor implements MethodExecutor {
 			try {
 				clazz.getDeclaredMethod(method.getName(), method.getParameterTypes());
 				return clazz;
-			} catch (NoSuchMethodException nsme) {
+			}
-
+			catch (NoSuchMethodException ex) {
+				// Continue below...
 			}
 		}
-		Class<?>[] intfaces = clazz.getInterfaces();
+		Class<?>[] ifcs = clazz.getInterfaces();
-		for (Class<?> intface: intfaces) {
+		for (Class<?> ifc: ifcs) {
-			discoverPublicClass(method, intface);
+			discoverPublicClass(method, ifc);
 		}
 		if (clazz.getSuperclass() != null) {
 			return discoverPublicClass(method, clazz.getSuperclass());

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java

@@ -58,9 +58,8 @@ public class StompDecoder {
 
 
 	/**
-	 * Configure a
+	 * Configure a {@link MessageHeaderInitializer} to apply to the headers of
-	 * {@link org.springframework.messaging.support.MessageHeaderInitializer MessageHeaderInitializer}
+	 * {@link Message}s from decoded STOMP frames.
-	 * to apply to the headers of {@link Message}s from decoded STOMP frames.
 	 */
 	public void setHeaderInitializer(MessageHeaderInitializer headerInitializer) {
 		this.headerInitializer = headerInitializer;

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

@@ -33,7 +33,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
-
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
@@ -499,7 +498,8 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		dateFormat.setTimeZone(GMT);
 		try {
 			return dateFormat.parse(getHeader(name)).getTime();
-		} catch (ParseException exception) {
+		}
+		catch (ParseException ex) {
 			throw new IllegalArgumentException(
 					"Value for header '" + name + "' is not a valid Date: " + getHeader(name));
 		}

spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -38,7 +38,6 @@ public class ResponseBodyTests {
 
 	@Test
 	public void json() throws Exception {
-
 		standaloneSetup(new PersonController()).build()
 				.perform(get("/person/Lee").accept(MediaType.APPLICATION_JSON))
 				.andExpect(status().isOk())
@@ -46,14 +45,14 @@ public class ResponseBodyTests {
 				.andExpect(jsonPath("$.name").value("Lee"));
 	}
 
+
 	@Controller
 	private class PersonController {
 
 		@RequestMapping(value="/person/{name}")
 		@ResponseBody
 		public Person get(@PathVariable String name) {
-			Person person = new Person(name);
+			return new Person(name);
-			return person;
 		}
 	}
 

spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.

spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java

@@ -35,7 +35,6 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotWritableException;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpResponse;
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import org.springframework.web.accept.ContentNegotiationManager;
@@ -121,8 +120,9 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
 		List<MediaType> requestedMediaTypes = getAcceptableMediaTypes(servletRequest);
 		List<MediaType> producibleMediaTypes = getProducibleMediaTypes(servletRequest, returnValueClass, returnValueType);
 
-		Assert.isTrue(returnValue == null || !producibleMediaTypes.isEmpty(),
+		if (returnValue != null && producibleMediaTypes.isEmpty()) {
-				"No converter found for return value of type: " + returnValueClass);
+			throw new IllegalArgumentException("No converter found for return value of type: " + returnValueClass);
+		}
 
 		Set<MediaType> compatibleMediaTypes = new LinkedHashSet<MediaType>();
 		for (MediaType requestedType : requestedMediaTypes) {

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java

@@ -144,8 +144,7 @@ public class RequestResponseBodyMethodProcessor extends AbstractMessageConverter
 		HttpServletRequest servletRequest = webRequest.getNativeRequest(HttpServletRequest.class);
 		ServletServerHttpRequest inputMessage = new ServletServerHttpRequest(servletRequest);
 
-		Object arg = null;
+		Object arg = readWithMessageConverters(inputMessage, methodParam, paramType);
-		arg = readWithMessageConverters(inputMessage, methodParam, paramType);
 		if (arg == null) {
 			if (methodParam.getParameterAnnotation(RequestBody.class).required()) {
 				throw new HttpMessageNotReadableException("Required request body is missing: " +