1
1
/*
2
- * Copyright 2002-2017 the original author or authors.
2
+ * Copyright 2002-2018 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ public Collection<CacheOperation> parseCacheAnnotations(Method method) {
62
62
}
63
63
64
64
@ Nullable
65
- protected Collection <CacheOperation > parseCacheAnnotations (DefaultCacheConfig cachingConfig , AnnotatedElement ae ) {
65
+ private Collection <CacheOperation > parseCacheAnnotations (DefaultCacheConfig cachingConfig , AnnotatedElement ae ) {
66
66
Collection <CacheOperation > ops = parseCacheAnnotations (cachingConfig , ae , false );
67
67
if (ops != null && ops .size () > 1 && ae .getAnnotations ().length > 0 ) {
68
68
// More than one operation found -> local declarations override interface-declared ones...
@@ -88,6 +88,7 @@ private Collection<CacheOperation> parseCacheAnnotations(
88
88
ops .add (parseCacheableAnnotation (ae , cachingConfig , cacheable ));
89
89
}
90
90
}
91
+
91
92
Collection <CacheEvict > evicts = (localOnly ? AnnotatedElementUtils .getAllMergedAnnotations (ae , CacheEvict .class ) :
92
93
AnnotatedElementUtils .findAllMergedAnnotations (ae , CacheEvict .class ));
93
94
if (!evicts .isEmpty ()) {
@@ -96,6 +97,7 @@ private Collection<CacheOperation> parseCacheAnnotations(
96
97
ops .add (parseEvictAnnotation (ae , cachingConfig , evict ));
97
98
}
98
99
}
100
+
99
101
Collection <CachePut > puts = (localOnly ? AnnotatedElementUtils .getAllMergedAnnotations (ae , CachePut .class ) :
100
102
AnnotatedElementUtils .findAllMergedAnnotations (ae , CachePut .class ));
101
103
if (!puts .isEmpty ()) {
@@ -104,6 +106,7 @@ private Collection<CacheOperation> parseCacheAnnotations(
104
106
ops .add (parsePutAnnotation (ae , cachingConfig , put ));
105
107
}
106
108
}
109
+
107
110
Collection <Caching > cachings = (localOnly ? AnnotatedElementUtils .getAllMergedAnnotations (ae , Caching .class ) :
108
111
AnnotatedElementUtils .findAllMergedAnnotations (ae , Caching .class ));
109
112
if (!cachings .isEmpty ()) {
@@ -313,7 +316,6 @@ else if (StringUtils.hasText(this.cacheManager)) {
313
316
builder .setCacheManager (this .cacheManager );
314
317
}
315
318
}
316
-
317
319
}
318
320
319
321
}
0 commit comments