From 5f167fd7f85f20305db290f86dd9758f1069391a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 27 Sep 2017 01:46:16 +0200 Subject: [PATCH] Polishing --- .../jmx/export/naming/KeyNamingStrategy.java | 4 +-- .../support/ReflectiveMethodExecutor.java | 10 ++++--- .../transaction/TransactionContext.java | 6 ++-- .../InterceptingAsyncClientHttpRequest.java | 4 +-- .../mvc/method/RequestMappingInfo.java | 28 +++++++++---------- .../web/servlet/tags/Param.java | 2 +- .../web/servlet/tags/UrlTag.java | 2 +- ...MvcStompWebSocketEndpointRegistration.java | 2 +- 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java index ec6f972e58d..43cefe4c8db 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java @@ -89,14 +89,14 @@ public class KeyNamingStrategy implements ObjectNamingStrategy, InitializingBean * 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; } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java index c31ae8be57b..feb8ae62e76 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java @@ -106,10 +106,12 @@ public class ReflectiveMethodExecutor implements MethodExecutor { 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); diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.java index 0b29c8df5b8..0319dbdb8e1 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionContext.java @@ -96,13 +96,15 @@ class TransactionContext { 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)); } } diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java index 0815d0ce77a..4a63799fff8 100644 --- a/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingAsyncClientHttpRequest.java @@ -67,8 +67,8 @@ class InterceptingAsyncClientHttpRequest extends AbstractBufferingAsyncClientHtt protected ListenableFuture executeInternal(HttpHeaders headers, byte[] body) throws IOException { - return new AsyncRequestExecution().executeAsync(this, body); - } + return new AsyncRequestExecution().executeAsync(this, body); + } @Override public HttpMethod getMethod() { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java index 6967d39f2f0..db4efe3def9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java @@ -110,55 +110,55 @@ public final class RequestMappingInfo implements RequestCondition getCustomCondition() { return this.customConditionHolder.getCondition(); @@ -166,7 +166,7 @@ public final class RequestMappingInfo implements RequestConditionExample: combine type- and method-level request mappings. * @return a new request mapping info instance; never {@code null} */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java index ce3fc8d7a49..21639b380cd 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java @@ -56,7 +56,7 @@ public class Param { } /** - * Return the raw parameter value + * Return the raw parameter value. */ public String getValue() { return this.value; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java index fd60e9dece1..6566cd831e1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java @@ -231,7 +231,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware { // 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; } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java index 0ba5f488af7..f01696739fd 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java @@ -34,11 +34,11 @@ import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler 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 {