import order

Author: padilo

spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java

@@ -16,8 +16,19 @@
 
 package org.springframework.cache.interceptor;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -39,16 +50,6 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
  * Base class for caching aspects, such as the {@link CacheInterceptor}
  * or an AspectJ aspect.
@@ -332,7 +333,7 @@ private Class<?> getTargetClass(Object target) {
 		return targetClass;
 	}
 
-	private Object execute(final CacheOperationInvoker invoker, Method method, final CacheOperationContexts contexts) {
+	private Object execute(final CacheOperationInvoker invoker, Method method, CacheOperationContexts contexts) {
 		// Special handling of synchronized invocation
 		if (contexts.isSynchronized()) {
 			CacheOperationContext context = contexts.get(CacheableOperation.class).iterator().next();
@@ -368,7 +369,7 @@ public Object call() throws Exception {
 		Cache.ValueWrapper cacheHit = findCachedItem(contexts.get(CacheableOperation.class));
 
 		// Collect puts from any @Cacheable miss, if no cached item is found
-		final List<CachePutRequest> cachePutRequests = new LinkedList<>();
+		List<CachePutRequest> cachePutRequests = new LinkedList<>();
 		if (cacheHit == null) {
 			collectPutRequests(contexts.get(CacheableOperation.class),
 					CacheOperationExpressionEvaluator.NO_RESULT, cachePutRequests);
@@ -395,7 +396,7 @@ public void onValue(Object cacheValue) {
 
 				@Override
 				public void onError(Throwable throwable) {
-					// Nothing to do, I think...
+					// Exceptions are not cached
 				}
 			}));
 		}
@@ -409,7 +410,7 @@ private void updateCache(Object cacheValue, CacheOperationContexts contexts, Lis
 
 		// Process any collected put requests, either from @CachePut or a @Cacheable miss
 		for (CachePutRequest cachePutRequest : cachePutRequests) {
-		  cachePutRequest.apply(cacheValue);
+			cachePutRequest.apply(cacheValue);
 		}
 
 		// Process any late evictions

spring-context/src/main/java/org/springframework/cache/interceptor/CacheResultWrapperManager.java

@@ -15,17 +15,20 @@
  */
 package org.springframework.cache.interceptor;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import reactor.core.publisher.Mono;
+
+import rx.Single;
+
 import org.springframework.core.ReactiveAdapter;
 import org.springframework.core.ReactiveAdapterRegistry;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
-import reactor.core.publisher.Mono;
-import rx.Single;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Supplier;
 
 /**
  * Manages the {@link CacheResultWrapper} instances to apply only the appropriate.

spring-context/src/test/java/org/springframework/cache/CacheRxJavaTests.java

@@ -16,21 +16,24 @@
 
 package org.springframework.cache;
 
+import static org.junit.Assert.*;
+
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+
+import rx.Observable;
+import rx.Single;
+import rx.observers.TestSubscriber;
+
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.cache.interceptor.SimpleKey;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import rx.Observable;
-import rx.Single;
-import rx.observers.TestSubscriber;
 
-import static org.junit.Assert.*;
 
 /**
  * Tests to check RxJava support.

spring-context/src/test/java/org/springframework/cache/ReactorTests.java

@@ -16,8 +16,13 @@
 
 package org.springframework.cache;
 
+import static org.junit.Assert.*;
+
 import org.junit.Before;
 import org.junit.Test;
+
+import reactor.core.publisher.Mono;
+
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
@@ -26,9 +31,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.tests.TestSubscriber;
-import reactor.core.publisher.Mono;
 
-import static org.junit.Assert.*;
 
 /**
  * Tests to check RxJava support.