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 2016/12/11 18:00:04 UTC
[10/10] cayenne git commit: CAY-2166 Auto-loading of Cayenne modules
CAY-2166 Auto-loading of Cayenne modules
* auto-loading CryptoModule
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2bc717d2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2bc717d2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2bc717d2
Branch: refs/heads/master
Commit: 2bc717d28d80f3b025bc2b52e4cefbc8c5d839f0
Parents: 302ca65
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sun Dec 11 17:05:33 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sun Dec 11 20:56:05 2016 +0300
----------------------------------------------------------------------
cayenne-crypto/pom.xml | 7 +++++
.../org.apache.cayenne.di.spi.ModuleProvider | 1 +
.../cayenne/crypto/CryptoModuleBuilderTest.java | 14 ++++-----
.../crypto/CryptoModuleProviderTest.java | 30 ++++++++++++++++++++
.../cayenne/crypto/Runtime_AES128_Base.java | 5 ++--
5 files changed, 48 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2bc717d2/cayenne-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-crypto/pom.xml b/cayenne-crypto/pom.xml
index ea4e759..0d7d1fb 100644
--- a/cayenne-crypto/pom.xml
+++ b/cayenne-crypto/pom.xml
@@ -41,6 +41,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-server</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2bc717d2/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider b/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
new file mode 100644
index 0000000..e782376
--- /dev/null
+++ b/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.di.spi.ModuleProvider
@@ -0,0 +1 @@
+org.apache.cayenne.crypto.CryptoModuleProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2bc717d2/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleBuilderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleBuilderTest.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleBuilderTest.java
index 1741c0a..f6c4b20 100644
--- a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleBuilderTest.java
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleBuilderTest.java
@@ -18,12 +18,6 @@
****************************************************************/
package org.apache.cayenne.crypto;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.net.URL;
-import java.security.Key;
-
import org.apache.cayenne.crypto.key.JceksKeySourceTest;
import org.apache.cayenne.crypto.key.KeySource;
import org.apache.cayenne.crypto.transformer.value.DefaultValueTransformerFactory;
@@ -32,6 +26,12 @@ import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Module;
import org.junit.Test;
+import java.net.URL;
+import java.security.Key;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
public class CryptoModuleBuilderTest {
@Test
@@ -41,7 +41,7 @@ public class CryptoModuleBuilderTest {
Module m = new CryptoModuleBuilder().keyStore(ksUrl, JceksKeySourceTest.TEST_KEY_PASS, "k1")
.valueTransformer(DefaultValueTransformerFactory.class).build();
- Injector injector = DIBootstrap.createInjector(m);
+ Injector injector = DIBootstrap.createInjector(new CryptoModule(), m);
KeySource ks = injector.getInstance(KeySource.class);
Key k1 = ks.getKey("k1");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2bc717d2/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
new file mode 100644
index 0000000..80db1fc
--- /dev/null
+++ b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cayenne.crypto;
+
+import org.apache.cayenne.unit.util.ModuleProviderChecker;
+import org.junit.Test;
+
+public class CryptoModuleProviderTest {
+
+ @Test
+ public void testProviderPresent() {
+ ModuleProviderChecker.testProviderPresent(CryptoModuleProvider.class);
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2bc717d2/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 2d11f86..aea8775 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
@@ -62,8 +62,9 @@ public class Runtime_AES128_Base {
protected Module createCryptoModule(boolean compress) {
URL keyStoreUrl = JceksKeySourceTest.class.getResource(JceksKeySourceTest.KS1_JCEKS);
- CryptoModuleBuilder builder = new CryptoModuleBuilder().keyStore(keyStoreUrl, JceksKeySourceTest.TEST_KEY_PASS,
- "k3");
+ CryptoModuleBuilder builder = CryptoModule
+ .builder()
+ .keyStore(keyStoreUrl, JceksKeySourceTest.TEST_KEY_PASS, "k3");
if (compress) {
builder.compress();