Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Provide predetermined capacity for cache operation collections

Browse Source 
Issue: SPR-17079
This commit is contained in:
Juergen Hoeller
2018-07-24 13:27:02 +02:00
parent 8e5f243320
commit 20c34cbb9b
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-context/src/main/java/org/springframework/cache/interceptor/AbstractCacheResolver.java vendored
View File

@@ -32,6 +32,7 @@ import org.springframework.util.Assert;
* invocation context. * invocation context.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Juergen Hoeller
* @since 4.1 * @since 4.1
*/ */
public abstract class AbstractCacheResolver implements CacheResolver, InitializingBean { public abstract class AbstractCacheResolver implements CacheResolver, InitializingBean {
@@ -83,18 +84,16 @@ public abstract class AbstractCacheResolver implements CacheResolver, Initializi
if (cacheNames == null) { if (cacheNames == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
else { Collection<Cache> result = new ArrayList<>(cacheNames.size());
Collection<Cache> result = new ArrayList<>(); for (String cacheName : cacheNames) {
for (String cacheName : cacheNames) { Cache cache = getCacheManager().getCache(cacheName);
Cache cache = getCacheManager().getCache(cacheName); if (cache == null) {
if (cache == null) { throw new IllegalArgumentException("Cannot find cache named '" +
throw new IllegalArgumentException("Cannot find cache named '" + cacheName + "' for " + context.getOperation());
cacheName + "' for " + context.getOperation());
}
result.add(cache);
} }
return result; result.add(cache);
} }
return result;
} }
/** /**

20
spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java vendored
View File

@@ -586,16 +586,16 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
private class CacheOperationContexts { private class CacheOperationContexts {
private final MultiValueMap<Class<? extends CacheOperation>, CacheOperationContext> contexts = private final MultiValueMap<Class<? extends CacheOperation>, CacheOperationContext> contexts;
new LinkedMultiValueMap<>();
private final boolean sync; private final boolean sync;
public CacheOperationContexts(Collection<? extends CacheOperation> operations, Method method, public CacheOperationContexts(Collection<? extends CacheOperation> operations, Method method,
Object[] args, Object target, Class<?> targetClass) { Object[] args, Object target, Class<?> targetClass) {
for (CacheOperation operation : operations) { this.contexts = new LinkedMultiValueMap<>(operations.size());
this.contexts.add(operation.getClass(), getOperationContext(operation, method, args, target, targetClass)); for (CacheOperation op : operations) {
this.contexts.add(op.getClass(), getOperationContext(op, method, args, target, targetClass));
} }
this.sync = determineSyncFlag(method); this.sync = determineSyncFlag(method);
} }
@@ -623,18 +623,22 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
} }
if (syncEnabled) { if (syncEnabled) {
if (this.contexts.size() > 1) { if (this.contexts.size() > 1) {
throw new IllegalStateException("@Cacheable(sync=true) cannot be combined with other cache operations on '" + method + "'"); throw new IllegalStateException(
"@Cacheable(sync=true) cannot be combined with other cache operations on '" + method + "'");
} }
if (cacheOperationContexts.size() > 1) { if (cacheOperationContexts.size() > 1) {
throw new IllegalStateException("Only one @Cacheable(sync=true) entry is allowed on '" + method + "'"); throw new IllegalStateException(
"Only one @Cacheable(sync=true) entry is allowed on '" + method + "'");
} }
CacheOperationContext cacheOperationContext = cacheOperationContexts.iterator().next(); CacheOperationContext cacheOperationContext = cacheOperationContexts.iterator().next();
CacheableOperation operation = (CacheableOperation) cacheOperationContext.getOperation(); CacheableOperation operation = (CacheableOperation) cacheOperationContext.getOperation();
if (cacheOperationContext.getCaches().size() > 1) { if (cacheOperationContext.getCaches().size() > 1) {
throw new IllegalStateException("@Cacheable(sync=true) only allows a single cache on '" + operation + "'"); throw new IllegalStateException(
"@Cacheable(sync=true) only allows a single cache on '" + operation + "'");
} }
if (StringUtils.hasText(operation.getUnless())) { if (StringUtils.hasText(operation.getUnless())) {
throw new IllegalStateException("@Cacheable(sync=true) does not support unless attribute on '" + operation + "'"); throw new IllegalStateException(
"@Cacheable(sync=true) does not support unless attribute on '" + operation + "'");
} }
return true; return true;
} }