From 6f07a504b8f505028469944b8aea359aa69dd19e Mon Sep 17 00:00:00 2001 From: stsypanov Date: Thu, 16 May 2019 22:53:01 +0300 Subject: [PATCH] A couple of trivial simplifications --- .../org/springframework/aop/framework/JdkDynamicAopProxy.java | 3 +-- .../java/org/springframework/beans/TypeConverterDelegate.java | 3 +-- .../org/springframework/expression/spel/ast/Projection.java | 4 +--- .../web/socket/sockjs/support/AbstractSockJsService.java | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java index 43895091f46..241d58d3b52 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java @@ -154,7 +154,6 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa @Override @Nullable public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - MethodInvocation invocation; Object oldProxy = null; boolean setProxyContext = false; @@ -207,7 +206,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa } else { // We need to create a method invocation... - invocation = new ReflectiveMethodInvocation(proxy, target, method, args, targetClass, chain); + MethodInvocation invocation = new ReflectiveMethodInvocation(proxy, target, method, args, targetClass, chain); // Proceed to the joinpoint through the interceptor chain. retVal = invocation.proceed(); } diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java b/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java index 192d08060d3..38a59ba3d68 100644 --- a/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java +++ b/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java @@ -522,8 +522,7 @@ class TypeConverterDelegate { return original; } - int i = 0; - for (; it.hasNext(); i++) { + for (int i = 0; it.hasNext(); i++) { Object element = it.next(); String indexedPropertyName = buildIndexedPropertyName(propertyName, i); Object convertedElement = convertIfNecessary(indexedPropertyName, null, element, diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java index 8859a50e5d4..1639a9e4416 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java @@ -92,12 +92,11 @@ public class Projection extends SpelNodeImpl { (Iterable) operand : Arrays.asList(ObjectUtils.toObjectArray(operand))); List result = new ArrayList<>(); - int idx = 0; Class arrayElementType = null; for (Object element : data) { try { state.pushActiveContextObject(new TypedValue(element)); - state.enterScope("index", idx); + state.enterScope("index", result.size()); Object value = this.children[0].getValueInternal(state).getValue(); if (value != null && operandIsArray) { arrayElementType = determineCommonType(arrayElementType, value.getClass()); @@ -108,7 +107,6 @@ public class Projection extends SpelNodeImpl { state.exitScope(); state.popActiveContextObject(); } - idx++; } if (operandIsArray) { diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java index 1d399b80491..1ef76efa6b2 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java @@ -354,7 +354,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig String requestInfo = (logger.isDebugEnabled() ? request.getMethod() + " " + request.getURI() : null); try { - if (sockJsPath.equals("") || sockJsPath.equals("/")) { + if (sockJsPath.isEmpty() || sockJsPath.equals("/")) { if (requestInfo != null) { logger.debug("Processing transport request: " + requestInfo); }