CAY-2259 QueryCache: support for referencing type-safe caches * naming refactoring
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cdf5f61d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cdf5f61d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cdf5f61d Branch: refs/heads/master Commit: cdf5f61d54272a49e3841562fa30bfa9f147c716 Parents: 5aed626 Author: Andrus Adamchik <and...@objectstyle.com> Authored: Tue May 30 10:11:36 2017 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Tue May 30 10:15:47 2017 +0300 ---------------------------------------------------------------------- .../lifecycle/cache/CacheInvalidationModuleExtender.java | 6 +++--- .../lifecycle/cache/CacheInvalidationCacheGroupsHandlerIT.java | 3 ++- .../lifecycle/cache/CacheInvalidationCustomHandlerIT.java | 4 ++-- .../apache/cayenne/lifecycle/unit/CacheInvalidationCase.java | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/cdf5f61d/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationModuleExtender.java ---------------------------------------------------------------------- diff --git a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationModuleExtender.java b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationModuleExtender.java index 2be5eae..ecf61ab 100644 --- a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationModuleExtender.java +++ b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationModuleExtender.java @@ -45,15 +45,15 @@ public class CacheInvalidationModuleExtender { * annotations. */ public CacheInvalidationModuleExtender addCacheGroupsHandler() { - return addInvalidationHandler(CacheGroupsHandler.class); + return addHandler(CacheGroupsHandler.class); } - public CacheInvalidationModuleExtender addInvalidationHandler(Class<? extends InvalidationHandler> handlerType) { + public CacheInvalidationModuleExtender addHandler(Class<? extends InvalidationHandler> handlerType) { handlerTypes.add(handlerType); return this; } - public CacheInvalidationModuleExtender addInvalidationHandler(InvalidationHandler handlerInstance) { + public CacheInvalidationModuleExtender addHandler(InvalidationHandler handlerInstance) { handlerInstances.add(handlerInstance); return this; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/cdf5f61d/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCacheGroupsHandlerIT.java ---------------------------------------------------------------------- diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCacheGroupsHandlerIT.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCacheGroupsHandlerIT.java index 108c83e..7050429 100644 --- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCacheGroupsHandlerIT.java +++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCacheGroupsHandlerIT.java @@ -50,8 +50,9 @@ public class CacheInvalidationCacheGroupsHandlerIT extends CacheInvalidationCase } @Override - protected Module buildInvalidationModule() { + protected Module extendInvalidationModule() { return CacheInvalidationModule.extend() + .addCacheGroupsHandler() .module(); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/cdf5f61d/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCustomHandlerIT.java ---------------------------------------------------------------------- diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCustomHandlerIT.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCustomHandlerIT.java index 71767b4..8769aa5 100644 --- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCustomHandlerIT.java +++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationCustomHandlerIT.java @@ -38,9 +38,9 @@ import static org.junit.Assert.assertEquals; public class CacheInvalidationCustomHandlerIT extends CacheInvalidationCase { @Override - protected Module buildInvalidationModule() { + protected Module extendInvalidationModule() { return CacheInvalidationModule.extend() - .addInvalidationHandler(G1InvalidationHandler.class) + .addHandler(G1InvalidationHandler.class) .module(); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/cdf5f61d/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/unit/CacheInvalidationCase.java ---------------------------------------------------------------------- diff --git a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/unit/CacheInvalidationCase.java b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/unit/CacheInvalidationCase.java index bfe6272..1446c90 100644 --- a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/unit/CacheInvalidationCase.java +++ b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/lifecycle/unit/CacheInvalidationCase.java @@ -48,7 +48,7 @@ public abstract class CacheInvalidationCase { this.e2.deleteAll(); } - protected abstract Module buildInvalidationModule(); + protected abstract Module extendInvalidationModule(); protected Module buildCustomModule() { return new Module() { @@ -60,7 +60,7 @@ public abstract class CacheInvalidationCase { protected ServerRuntimeBuilder configureCayenne() { return ServerRuntime.builder() - .addModule(buildInvalidationModule()) + .addModule(extendInvalidationModule()) .addModule(buildCustomModule()) .addConfig("cayenne-lifecycle.xml"); }
