You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2017/05/30 07:23:38 UTC
[3/5] cayenne git commit: CAY-2166 Auto-loading of Cayenne modules
CAY-2166 Auto-loading of Cayenne modules
* renaming module builder to extender, as the base module is autoloaded and is never changed
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/882ae387
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/882ae387
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/882ae387
Branch: refs/heads/master
Commit: 882ae38720a89fe3beae220025e79b62ae3292e0
Parents: 78102cf
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Tue May 30 09:43:26 2017 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Tue May 30 10:02:12 2017 +0300
----------------------------------------------------------------------
.../cache/CacheInvalidationModuleExtender.java | 2 +-
.../cache/CacheInvalidationCacheGroupsHandlerIT.java | 6 +++---
.../cache/CacheInvalidationCustomHandlerIT.java | 13 ++++++-------
.../org/apache/cayenne/crypto/Runtime_AES128_Base.java | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/882ae387/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 066b341..b58d35f 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
@@ -60,7 +60,7 @@ public class CacheInvalidationModuleExtender {
return this;
}
- public Module build() {
+ public Module module() {
return new Module() {
@Override
public void configure(Binder binder) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/882ae387/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 972378a..45f27b2 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
@@ -19,8 +19,6 @@
package org.apache.cayenne.lifecycle.cache;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.cache.MapQueryCache;
import org.apache.cayenne.cache.QueryCache;
@@ -33,6 +31,8 @@ import org.apache.cayenne.query.ObjectSelect;
import org.junit.Before;
import org.junit.Test;
+import java.util.concurrent.atomic.AtomicInteger;
+
import static org.junit.Assert.assertEquals;
/**
@@ -51,7 +51,7 @@ public class CacheInvalidationCacheGroupsHandlerIT extends CacheInvalidationCase
@Override
protected Module buildInvalidationModule() {
- return CacheInvalidationModuleExtender.builder().build();
+ return CacheInvalidationModule.extend().module();
}
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/882ae387/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 0135b63..837cdff 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
@@ -19,18 +19,17 @@
package org.apache.cayenne.lifecycle.cache;
-import java.util.Collection;
-import java.util.Collections;
-
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.lifecycle.db.E1;
import org.apache.cayenne.lifecycle.unit.CacheInvalidationCase;
import org.apache.cayenne.query.ObjectSelect;
-
import org.junit.Test;
+import java.util.Collection;
+import java.util.Collections;
+
import static org.junit.Assert.assertEquals;
/**
@@ -40,10 +39,10 @@ public class CacheInvalidationCustomHandlerIT extends CacheInvalidationCase {
@Override
protected Module buildInvalidationModule() {
- return CacheInvalidationModuleExtender.builder()
+ return CacheInvalidationModule.extend()
.noCacheGroupsHandler()
- .invalidationHandler(G1InvalidationHandler.class)
- .build();
+ .addInvalidationHandler(G1InvalidationHandler.class)
+ .module();
}
@Test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/882ae387/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
index 38e8daa..db85c36 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Runtime_AES128_Base.java
@@ -63,7 +63,7 @@ public class Runtime_AES128_Base {
URL keyStoreUrl = JceksKeySourceTest.class.getResource(JceksKeySourceTest.KS1_JCEKS);
CryptoModuleExtender builder = CryptoModule
- .builder()
+ .extend()
.keyStore(keyStoreUrl, JceksKeySourceTest.TEST_KEY_PASS, "k3");
if (compress) {