Repository: cayenne Updated Branches: refs/heads/master 448c540d4 -> 1cffda80a
making JCacheQueryCache ivars protected to simplify subclassing Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1cffda80 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1cffda80 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1cffda80 Branch: refs/heads/master Commit: 1cffda80aa6676b57317adc2d8467cad4735e2fa Parents: 448c540 Author: Andrus Adamchik <and...@objectstyle.com> Authored: Thu Mar 9 20:50:11 2017 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Thu Mar 9 20:50:11 2017 +0300 ---------------------------------------------------------------------- .../apache/cayenne/jcache/JCacheQueryCache.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/1cffda80/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheQueryCache.java ---------------------------------------------------------------------- diff --git a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheQueryCache.java b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheQueryCache.java index eb25696..90e059a 100644 --- a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheQueryCache.java +++ b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheQueryCache.java @@ -19,14 +19,6 @@ package org.apache.cayenne.jcache; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import javax.cache.Cache; -import javax.cache.CacheException; -import javax.cache.CacheManager; - import org.apache.cayenne.cache.QueryCache; import org.apache.cayenne.cache.QueryCacheEntryFactory; import org.apache.cayenne.di.BeforeScopeEnd; @@ -35,6 +27,14 @@ import org.apache.cayenne.query.QueryMetadata; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.cache.Cache; +import javax.cache.CacheException; +import javax.cache.CacheManager; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + /** * @since 4.0 */ @@ -43,10 +43,10 @@ public class JCacheQueryCache implements QueryCache { private static final Log LOGGER = LogFactory.getLog(JCacheQueryCache.class); @Inject - private CacheManager cacheManager; + protected CacheManager cacheManager; @Inject - private JCacheConfigurationFactory configurationFactory; + protected JCacheConfigurationFactory configurationFactory; private ConcurrentMap<String, Object> seenCacheNames = new ConcurrentHashMap<>();
