CAY-1925 cayenne-crypto: add optional compression to the encryption p…

…ipeline

proper name for header encryptor and decryptor

git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/trunk@1586978 13f79535-47bb-0310-9956-ffa450edef68

cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/CbcBytesTransformerFactory.java

@@ -111,7 +111,7 @@ public BytesEncryptor encryptor() {
         BytesEncryptor cbcEncryptor = new CbcEncryptor(cipher, key, generateSeedIv());
 
         // TODO: make adding key name for versioning an optional property
-        return new EncryptorWithKeyName(cbcEncryptor, keyName, blockSize);
+        return new HeaderEncryptor(cbcEncryptor, keyName, blockSize);
     }
 
     @Override
@@ -120,7 +120,7 @@ public BytesDecryptor decryptor() {
         BytesDecryptor cbcDecryptor = new CbcDecryptor(cipher);
 
         // TODO: make checking for key name an optional property
-        return new DecryptorWithKeyName(cbcDecryptor, keySource, blockSize);
+        return new HeaderDecryptor(cbcDecryptor, keySource, blockSize);
     }
 
 }

cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyName.java → cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptor.java

@@ -27,15 +27,15 @@
 /**
  * @since 3.2
  */
-class DecryptorWithKeyName implements BytesDecryptor {
+class HeaderDecryptor implements BytesDecryptor {
 
     private static final String KEY_NAME_CHARSET = "UTF-8";
 
     private KeySource keySource;
     private BytesDecryptor delegate;
     private int blockSize;
 
-    public DecryptorWithKeyName(BytesDecryptor delegate, KeySource keySource, int blockSize) {
+    public HeaderDecryptor(BytesDecryptor delegate, KeySource keySource, int blockSize) {
         this.delegate = delegate;
         this.blockSize = blockSize;
         this.keySource = keySource;

cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyName.java → cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptor.java

@@ -20,13 +20,13 @@
 
 import org.apache.cayenne.crypto.CayenneCryptoException;
 
-class EncryptorWithKeyName implements BytesEncryptor {
+class HeaderEncryptor implements BytesEncryptor {
 
     private BytesEncryptor delegate;
     private int blockSize;
     private byte[] keyName;
 
-    EncryptorWithKeyName(BytesEncryptor delegate, byte[] keyName, int blockSize) {
+    HeaderEncryptor(BytesEncryptor delegate, byte[] keyName, int blockSize) {
         this.delegate = delegate;
         this.blockSize = blockSize;
         this.keyName = keyName;

cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/DecryptorWithKeyNameTest.java → cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderDecryptorTest.java

@@ -24,7 +24,7 @@
 import org.apache.cayenne.crypto.key.KeySource;
 import org.junit.Test;
 
-public class DecryptorWithKeyNameTest {
+public class HeaderDecryptorTest {
 
     @Test
     public void testKeyName() {
@@ -33,7 +33,7 @@ public void testKeyName() {
         byte[] input2 = { 'a', 'b', 'c', 0, 'e' };
         byte[] input3 = { 'a', 'b', 0, 0, 'e' };
 
-        DecryptorWithKeyName decryptor = new DecryptorWithKeyName(mock(BytesDecryptor.class), mock(KeySource.class), 3);
+        HeaderDecryptor decryptor = new HeaderDecryptor(mock(BytesDecryptor.class), mock(KeySource.class), 3);
         assertEquals("bcd", decryptor.keyName(input1, 1));
         assertEquals("bc", decryptor.keyName(input2, 1));
         assertEquals("b", decryptor.keyName(input3, 1));

cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/EncryptorWithKeyNameTest.java → cayenne-crypto/src/test/java/org/apache/cayenne/crypto/transformer/bytes/HeaderEncryptorTest.java

@@ -25,7 +25,7 @@
 import org.apache.cayenne.crypto.unit.SwapBytesTransformer;
 import org.junit.Test;
 
-public class EncryptorWithKeyNameTest {
+public class HeaderEncryptorTest {
 
     @Test
     public void testTransform() throws UnsupportedEncodingException {
@@ -37,7 +37,7 @@ public void testTransform() throws UnsupportedEncodingException {
         byte[] input = { 1, 2, 3, 4, 5, 6, 7, 8 };
 
         // intentionally non-standard block size..
-        EncryptorWithKeyName encryptor = new EncryptorWithKeyName(delegate, keyName, 5);
+        HeaderEncryptor encryptor = new HeaderEncryptor(delegate, keyName, 5);
 
         byte[] output = encryptor.encrypt(input, 1);
         assertArrayEquals(new byte[] { 0, 'm', 'y', 'k', 'e', 'y', 8, 7, 6, 5, 4, 3, 2, 1 }, output);