Polishing

Author: jhoeller

spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java

@@ -89,14 +89,14 @@ public void setMappings(Properties mappings) {
 	 * containing object name mappings.
 	 */
 	public void setMappingLocation(Resource location) {
-		this.mappingLocations = new Resource[]{location};
+		this.mappingLocations = new Resource[] {location};
 	}
 
 	/**
 	 * Set location of properties files to be loaded,
 	 * containing object name mappings.
 	 */
-	public void setMappingLocations(Resource[] mappingLocations) {
+	public void setMappingLocations(Resource... mappingLocations) {
 		this.mappingLocations = mappingLocations;
 	}
 

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

@@ -106,10 +106,12 @@ public boolean didArgumentConversionOccur() {
 	public TypedValue execute(EvaluationContext context, Object target, Object... arguments) throws AccessException {
 		try {
 			if (arguments != null) {
-				this.argumentConversionOccurred = ReflectionHelper.convertArguments(context.getTypeConverter(), arguments, this.method, this.varargsPosition);
-			}
-			if (this.method.isVarArgs()) {
-				arguments = ReflectionHelper.setupArgumentsForVarargsInvocation(this.method.getParameterTypes(), arguments);
+				this.argumentConversionOccurred = ReflectionHelper.convertArguments(
+						context.getTypeConverter(), arguments, this.method, this.varargsPosition);
+				if (this.method.isVarArgs()) {
+					arguments = ReflectionHelper.setupArgumentsForVarargsInvocation(
+							this.method.getParameterTypes(), arguments);
+				}
 			}
 			ReflectionUtils.makeAccessible(this.method);
 			Object value = this.method.invoke(target, arguments);

spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.java

@@ -96,13 +96,15 @@ void startTransaction() {
 			throw new IllegalStateException(
 				"Cannot start a new transaction without ending the existing transaction first.");
 		}
+
 		this.flaggedForRollback = this.defaultRollback;
 		this.transactionStatus = this.transactionManager.getTransaction(this.transactionDefinition);
 		++this.transactionsStarted;
+
 		if (logger.isInfoEnabled()) {
 			logger.info(String.format(
-				"Began transaction (%s) for test context %s; transaction manager [%s]; rollback [%s]",
-				this.transactionsStarted, this.testContext, this.transactionManager, flaggedForRollback));
+					"Began transaction (%s) for test context %s; transaction manager [%s]; rollback [%s]",
+					this.transactionsStarted, this.testContext, this.transactionManager, flaggedForRollback));
 		}
 	}
 

spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java

@@ -67,8 +67,8 @@ public InterceptingAsyncClientHttpRequest(AsyncClientHttpRequestFactory requestF
 	protected ListenableFuture<ClientHttpResponse> executeInternal(HttpHeaders headers, byte[] body)
 			throws IOException {
 
-        return new AsyncRequestExecution().executeAsync(this, body);
-    }
+		return new AsyncRequestExecution().executeAsync(this, body);
+	}
 
 	@Override
 	public HttpMethod getMethod() {

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

@@ -110,63 +110,63 @@ public String getName() {
 	}
 
 	/**
-	 * Returns the URL patterns of this {@link RequestMappingInfo};
-	 * or instance with 0 patterns, never {@code null}.
+	 * Return the URL patterns of this {@link RequestMappingInfo};
+	 * or instance with 0 patterns (never {@code null}).
 	 */
 	public PatternsRequestCondition getPatternsCondition() {
 		return this.patternsCondition;
 	}
 
 	/**
-	 * Returns the HTTP request methods of this {@link RequestMappingInfo};
-	 * or instance with 0 request methods, never {@code null}.
+	 * Return the HTTP request methods of this {@link RequestMappingInfo};
+	 * or instance with 0 request methods (never {@code null}).
 	 */
 	public RequestMethodsRequestCondition getMethodsCondition() {
 		return this.methodsCondition;
 	}
 
 	/**
-	 * Returns the "parameters" condition of this {@link RequestMappingInfo};
-	 * or instance with 0 parameter expressions, never {@code null}.
+	 * Return the "parameters" condition of this {@link RequestMappingInfo};
+	 * or instance with 0 parameter expressions (never {@code null}).
 	 */
 	public ParamsRequestCondition getParamsCondition() {
 		return this.paramsCondition;
 	}
 
 	/**
-	 * Returns the "headers" condition of this {@link RequestMappingInfo};
-	 * or instance with 0 header expressions, never {@code null}.
+	 * Return the "headers" condition of this {@link RequestMappingInfo};
+	 * or instance with 0 header expressions (never {@code null}).
 	 */
 	public HeadersRequestCondition getHeadersCondition() {
 		return this.headersCondition;
 	}
 
 	/**
-	 * Returns the "consumes" condition of this {@link RequestMappingInfo};
-	 * or instance with 0 consumes expressions, never {@code null}.
+	 * Return the "consumes" condition of this {@link RequestMappingInfo};
+	 * or instance with 0 consumes expressions (never {@code null}).
 	 */
 	public ConsumesRequestCondition getConsumesCondition() {
 		return this.consumesCondition;
 	}
 
 	/**
-	 * Returns the "produces" condition of this {@link RequestMappingInfo};
-	 * or instance with 0 produces expressions, never {@code null}.
+	 * Return the "produces" condition of this {@link RequestMappingInfo};
+	 * or instance with 0 produces expressions (never {@code null}).
 	 */
 	public ProducesRequestCondition getProducesCondition() {
 		return this.producesCondition;
 	}
 
 	/**
-	 * Returns the "custom" condition of this {@link RequestMappingInfo}; or {@code null}.
+	 * Return the "custom" condition of this {@link RequestMappingInfo}, or {@code null}.
 	 */
 	public RequestCondition<?> getCustomCondition() {
 		return this.customConditionHolder.getCondition();
 	}
 
 
 	/**
-	 * Combines "this" request mapping info (i.e. the current instance) with another request mapping info instance.
+	 * Combine "this" request mapping info (i.e. the current instance) with another request mapping info instance.
 	 * <p>Example: combine type- and method-level request mappings.
 	 * @return a new request mapping info instance; never {@code null}
 	 */

spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java

@@ -56,7 +56,7 @@ public void setValue(String value) {
 	}
 
 	/**
-	 * Return the raw parameter value
+	 * Return the raw parameter value.
 	 */
 	public String getValue() {
 		return this.value;

spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java

@@ -231,7 +231,7 @@ private String createUrl() throws JspException {
 
 		// HTML and/or JavaScript escape, if demanded.
 		urlStr = htmlEscape(urlStr);
-		urlStr = this.javaScriptEscape ? JavaScriptUtils.javaScriptEscape(urlStr) : urlStr;
+		urlStr = (this.javaScriptEscape ? JavaScriptUtils.javaScriptEscape(urlStr) : urlStr);
 
 		return urlStr;
 	}

spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java

@@ -34,11 +34,11 @@
 import org.springframework.web.socket.sockjs.SockJsService;
 import org.springframework.web.socket.sockjs.support.SockJsHttpRequestHandler;
 import org.springframework.web.socket.sockjs.transport.handler.WebSocketTransportHandler;
+
 /**
  * An abstract base class for configuring STOMP over WebSocket/SockJS endpoints.
  *
  * @author Rossen Stoyanchev
- * @author Juergen Hoeller
  * @since 4.0
  */
 public class WebMvcStompWebSocketEndpointRegistration implements StompWebSocketEndpointRegistration {