From 214d0d76a5e149b0b848fd7fcc6b94863cb15ebe Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Sat, 18 Feb 2017 01:01:35 +0100
Subject: [PATCH] Polishing

---
 .../interceptor/CacheResultInterceptor.java   | 12 ++---
 .../interceptor/JCacheErrorHandlerTests.java  | 44 +++++++--------
 .../expression/spel/ast/Elvis.java            |  6 +--
 .../expression/spel/ast/Ternary.java          |  4 +-
 .../spel/SpelCompilationCoverageTests.java    | 54 ++++++++++---------
 .../http/client/Netty4ClientHttpRequest.java  |  6 +--
 6 files changed, 60 insertions(+), 66 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResultInterceptor.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResultInterceptor.java
index e42c334b94..3f01b009c0 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResultInterceptor.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/CacheResultInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -39,6 +39,7 @@ class CacheResultInterceptor extends AbstractKeyCacheInterceptor<CacheResultOper
 		super(errorHandler);
 	}
 
+
 	@Override
 	protected Object invoke(CacheOperationInvocationContext<CacheResultOperation> context,
 			CacheOperationInvoker invoker) {
@@ -82,7 +83,6 @@ class CacheResultInterceptor extends AbstractKeyCacheInterceptor<CacheResultOper
 		}
 	}
 
-
 	protected void cacheException(Cache exceptionCache, ExceptionTypeFilter filter, Object cacheKey, Throwable ex) {
 		if (exceptionCache == null) {
 			return;
@@ -92,7 +92,6 @@ class CacheResultInterceptor extends AbstractKeyCacheInterceptor<CacheResultOper
 		}
 	}
 
-
 	private Cache resolveExceptionCache(CacheOperationInvocationContext<CacheResultOperation> context) {
 		CacheResolver exceptionCacheResolver = context.getOperation().getExceptionCacheResolver();
 		if (exceptionCacheResolver != null) {
@@ -101,9 +100,10 @@ class CacheResultInterceptor extends AbstractKeyCacheInterceptor<CacheResultOper
 		return null;
 	}
 
+
 	/**
 	 * Rewrite the call stack of the specified {@code exception} so that it matches
-	 * the current call stack up-to (included) the specified method invocation.
+	 * the current call stack up to (included) the specified method invocation.
 	 * <p>Clone the specified exception. If the exception is not {@code serializable},
 	 * the original exception is returned. If no common ancestor can be found, returns
 	 * the original exception.
@@ -111,8 +111,8 @@ class CacheResultInterceptor extends AbstractKeyCacheInterceptor<CacheResultOper
 	 * @param exception the exception to merge with the current call stack
 	 * @param className the class name of the common ancestor
 	 * @param methodName the method name of the common ancestor
-	 * @return a clone exception with a rewritten call stack composed of the current
-	 * call stack up to (included) the common ancestor specified by the {@code className} and
+	 * @return a clone exception with a rewritten call stack composed of the current call
+	 * stack up to (included) the common ancestor specified by the {@code className} and
 	 * {@code methodName} arguments, followed by stack trace elements of the specified
 	 * {@code exception} after the common ancestor.
 	 */
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java
index 6e96e5447c..da4435b1d8 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -49,9 +49,6 @@ import static org.mockito.BDDMockito.*;
  */
 public class JCacheErrorHandlerTests {
 
-	@Rule
-	public final ExpectedException thrown = ExpectedException.none();
-
 	private Cache cache;
 
 	private Cache errorCache;
@@ -60,20 +57,23 @@ public class JCacheErrorHandlerTests {
 
 	private SimpleService simpleService;
 
+	@Rule
+	public final ExpectedException thrown = ExpectedException.none();
+
+
 	@Before
 	public void setup() {
-		AnnotationConfigApplicationContext context =
-				new AnnotationConfigApplicationContext(Config.class);
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 		this.cache = context.getBean("mockCache", Cache.class);
 		this.errorCache = context.getBean("mockErrorCache", Cache.class);
 		this.errorHandler = context.getBean(CacheErrorHandler.class);
 		this.simpleService = context.getBean(SimpleService.class);
 	}
 
+
 	@Test
 	public void getFail() {
-		UnsupportedOperationException exception =
-				new UnsupportedOperationException("Test exception on get");
+		UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on get");
 		Object key = SimpleKeyGenerator.generateKey(0L);
 		willThrow(exception).given(this.cache).get(key);
 
@@ -83,8 +83,7 @@ public class JCacheErrorHandlerTests {
 
 	@Test
 	public void getPutNewElementFail() {
-		UnsupportedOperationException exception =
-				new UnsupportedOperationException("Test exception on put");
+		UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on put");
 		Object key = SimpleKeyGenerator.generateKey(0L);
 		given(this.cache.get(key)).willReturn(null);
 		willThrow(exception).given(this.cache).put(key, 0L);
@@ -95,12 +94,10 @@ public class JCacheErrorHandlerTests {
 
 	@Test
 	public void getFailPutExceptionFail() {
-		UnsupportedOperationException exceptionOnPut =
-				new UnsupportedOperationException("Test exception on put");
+		UnsupportedOperationException exceptionOnPut = new UnsupportedOperationException("Test exception on put");
 		Object key = SimpleKeyGenerator.generateKey(0L);
 		given(this.cache.get(key)).willReturn(null);
-		willThrow(exceptionOnPut).given(this.errorCache).put(key,
-				SimpleService.TEST_EXCEPTION);
+		willThrow(exceptionOnPut).given(this.errorCache).put(key, SimpleService.TEST_EXCEPTION);
 
 		try {
 			this.simpleService.getFail(0L);
@@ -108,14 +105,13 @@ public class JCacheErrorHandlerTests {
 		catch (IllegalStateException ex) {
 			assertEquals("Test exception", ex.getMessage());
 		}
-		verify(this.errorHandler).handleCachePutError(exceptionOnPut,
-				this.errorCache, key, SimpleService.TEST_EXCEPTION);
+		verify(this.errorHandler).handleCachePutError(
+				exceptionOnPut, this.errorCache, key, SimpleService.TEST_EXCEPTION);
 	}
 
 	@Test
 	public void putFail() {
-		UnsupportedOperationException exception =
-				new UnsupportedOperationException("Test exception on put");
+		UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on put");
 		Object key = SimpleKeyGenerator.generateKey(0L);
 		willThrow(exception).given(this.cache).put(key, 234L);
 
@@ -125,8 +121,7 @@ public class JCacheErrorHandlerTests {
 
 	@Test
 	public void evictFail() {
-		UnsupportedOperationException exception =
-				new UnsupportedOperationException("Test exception on evict");
+		UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on evict");
 		Object key = SimpleKeyGenerator.generateKey(0L);
 		willThrow(exception).given(this.cache).evict(key);
 
@@ -136,8 +131,7 @@ public class JCacheErrorHandlerTests {
 
 	@Test
 	public void clearFail() {
-		UnsupportedOperationException exception =
-				new UnsupportedOperationException("Test exception on evict");
+		UnsupportedOperationException exception = new UnsupportedOperationException("Test exception on evict");
 		willThrow(exception).given(this.cache).clear();
 
 		this.simpleService.clear();
@@ -181,14 +175,13 @@ public class JCacheErrorHandlerTests {
 			given(cache.getName()).willReturn("error");
 			return cache;
 		}
-
 	}
 
+
 	@CacheDefaults(cacheName = "test")
 	public static class SimpleService {
 
-		private static final IllegalStateException TEST_EXCEPTION =
-				new IllegalStateException("Test exception");
+		private static final IllegalStateException TEST_EXCEPTION = new IllegalStateException("Test exception");
 
 		private AtomicLong counter = new AtomicLong();
 
@@ -214,4 +207,5 @@ public class JCacheErrorHandlerTests {
 		public void clear() {
 		}
 	}
+
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Elvis.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Elvis.java
index 12ec3243f1..bcf2aea70f 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Elvis.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Elvis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -35,7 +35,7 @@ import org.springframework.util.StringUtils;
 public class Elvis extends SpelNodeImpl {
 
 	public Elvis(int pos, SpelNodeImpl... args) {
-		super(pos,args);
+		super(pos, args);
 	}
 
 
@@ -88,7 +88,7 @@ public class Elvis extends SpelNodeImpl {
 		mv.visitLdcInsn("");
 		mv.visitInsn(SWAP);
 		mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "equals", "(Ljava/lang/Object;)Z",false);
-		mv.visitJumpInsn(IFEQ, endOfIf); // If not empty, drop through to elseTarget
+		mv.visitJumpInsn(IFEQ, endOfIf);  // if not empty, drop through to elseTarget
 		mv.visitLabel(elseTarget);
 		mv.visitInsn(POP);
 		this.children[1].generateCode(mv, cf);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
index 33668128f1..cb86567bc9 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -35,7 +35,7 @@ import org.springframework.expression.spel.SpelMessage;
 public class Ternary extends SpelNodeImpl {
 
 	public Ternary(int pos, SpelNodeImpl... args) {
-		super(pos,args);
+		super(pos, args);
 	}
 
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
index 77dbd7bdbd..4d7efd22ef 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -4787,30 +4787,6 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
 		assertIsCompiled(exp);
 	}
 
-	private void assertIsCompiled(Expression ex) {
-		try {
-			Field f = SpelExpression.class.getDeclaredField("compiledAst");
-			f.setAccessible(true);
-			Object object = f.get(ex);
-			assertNotNull(object);
-		} catch (Exception e) {
-			fail(e.toString());
-		}
-	}
- 
-	public static class Foo {
- 
-		public String bar() {
-			return "BAR";
-		}
- 
-		public String bar(String arg) {
-			return arg.toUpperCase();
-		}
- 
-	}
- 
-
 
 	// helper methods
 
@@ -4871,6 +4847,20 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
 		}
 	}
 
+	private void assertIsCompiled(Expression expression) {
+		try {
+			Field field = SpelExpression.class.getDeclaredField("compiledAst");
+			field.setAccessible(true);
+			Object object = field.get(expression);
+			assertNotNull(object);
+		}
+		catch (Exception ex) {
+			fail(ex.toString());
+		}
+	}
+
+
+	// nested types
 
 	public interface Message<T> {
 
@@ -4987,7 +4977,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
 				try {
 					method = Payload2.class.getDeclaredMethod("getField", String.class);
 				}
-				catch (Exception e) {
+				catch (Exception ex) {
 				}
 			}
 			String descriptor = cf.lastDescriptor();
@@ -5845,4 +5835,16 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
 		}
 	}
 
+
+	public static class Foo {
+
+		public String bar() {
+			return "BAR";
+		}
+
+		public String bar(String arg) {
+			return arg.toUpperCase();
+		}
+	}
+
 }
diff --git a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java
index 7f7e32c9d5..b85e3acecd 100644
--- a/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.java
@@ -105,8 +105,7 @@ class Netty4ClientHttpRequest extends AbstractAsyncClientHttpRequest implements
 
 	@Override
 	protected ListenableFuture<ClientHttpResponse> executeInternal(final HttpHeaders headers) throws IOException {
-		final SettableListenableFuture<ClientHttpResponse> responseFuture =
-				new SettableListenableFuture<>();
+		final SettableListenableFuture<ClientHttpResponse> responseFuture = new SettableListenableFuture<>();
 
 		ChannelFutureListener connectionListener = new ChannelFutureListener() {
 			@Override
@@ -141,8 +140,7 @@ class Netty4ClientHttpRequest extends AbstractAsyncClientHttpRequest implements
 		for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
 			nettyRequest.headers().add(entry.getKey(), entry.getValue());
 		}
-		if (!nettyRequest.headers().contains(HttpHeaders.CONTENT_LENGTH)
-				&& this.body.buffer().readableBytes() > 0) {
+		if (!nettyRequest.headers().contains(HttpHeaders.CONTENT_LENGTH) && this.body.buffer().readableBytes() > 0) {
 			nettyRequest.headers().set(HttpHeaders.CONTENT_LENGTH, this.body.buffer().readableBytes());
 		}