git commit: [CXF-5944] Refactoring some of JWE class constractors

2014-09-18 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 5a40d6ece - 1a1259841


[CXF-5944] Refactoring some of JWE class constractors


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1a125984
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1a125984
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1a125984

Branch: refs/heads/master
Commit: 1a1259841d025bce316dbb2400963347bfa92bfc
Parents: 5a40d6e
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Sep 18 14:13:21 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Sep 18 14:13:21 2014 +0100

--
 .../jose/jaxrs/JweWriterInterceptor.java|  8 +++--
 .../jwe/AbstractContentEncryptionAlgorithm.java | 15 -
 .../jwe/AbstractWrapKeyEncryptionAlgorithm.java | 18 ++-
 .../jose/jwe/AesCbcHmacJweEncryption.java   | 18 ++-
 .../jwe/AesGcmContentEncryptionAlgorithm.java   | 33 ++--
 .../jose/jwe/ContentEncryptionAlgorithm.java|  1 +
 .../jose/jwe/DirectKeyEncryptionAlgorithm.java  |  5 +++
 .../jose/jwe/DirectKeyJweEncryption.java|  2 +-
 .../jose/jwe/KeyEncryptionAlgorithm.java|  1 +
 .../PbesHmacAesWrapKeyEncryptionAlgorithm.java  |  6 +++-
 .../jose/jwe/WrappedKeyJweEncryption.java   | 24 --
 .../cxf/rs/security/jose/jwk/JwkUtils.java  |  4 +--
 .../jose/jwe/JweCompactReaderWriterTest.java| 11 +++
 .../jose/jwe/JwePbeHmacAesWrapTest.java |  5 +--
 .../jaxrs/security/jwt/JAXRSJweJwsTest.java |  3 +-
 .../cxf/systest/jaxrs/security/jwt/server.xml   |  1 -
 16 files changed, 96 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1a125984/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
index 2fac63e..1daf285 100644
--- 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
+++ 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
@@ -41,6 +41,7 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.rs.security.jose.jwa.Algorithm;
 import org.apache.cxf.rs.security.jose.jwe.AesCbcHmacJweEncryption;
+import org.apache.cxf.rs.security.jose.jwe.AesGcmContentEncryptionAlgorithm;
 import org.apache.cxf.rs.security.jose.jwe.AesGcmWrapKeyEncryptionAlgorithm;
 import org.apache.cxf.rs.security.jose.jwe.AesWrapKeyEncryptionAlgorithm;
 import org.apache.cxf.rs.security.jose.jwe.JweCompactProducer;
@@ -171,10 +172,11 @@ public class JweWriterInterceptor implements 
WriterInterceptor {
 }
 boolean isAesHmac = Algorithm.isAesCbcHmac(contentEncryptionAlgo);
 if (isAesHmac) { 
-return new AesCbcHmacJweEncryption(
-keyEncryptionAlgo, contentEncryptionAlgo, 
keyEncryptionProvider);
+return new AesCbcHmacJweEncryption(contentEncryptionAlgo, 
keyEncryptionProvider);
 } else {
-return new WrappedKeyJweEncryption(headers, 
keyEncryptionProvider);
+return new WrappedKeyJweEncryption(headers, 
+   keyEncryptionProvider,
+   new 
AesGcmContentEncryptionAlgorithm(contentEncryptionAlgo));
 }
 } catch (SecurityException ex) {
 throw ex;

http://git-wip-us.apache.org/repos/asf/cxf/blob/1a125984/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
index ef1fbbb..adf6d59 100644
--- 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
+++ 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
@@ -20,8 +20,6 @@ package org.apache.cxf.rs.security.jose.jwe;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import

git commit: [CXF-5944] Refactoring some of JWE class constractors

2014-09-18 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 21472024a - d7cec5b8c


[CXF-5944] Refactoring some of JWE class constractors


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d7cec5b8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d7cec5b8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d7cec5b8

Branch: refs/heads/3.0.x-fixes
Commit: d7cec5b8c8d107b98237e4e31c6d02accf765427
Parents: 2147202
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Sep 18 14:13:21 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Sep 18 14:17:05 2014 +0100

--
 .../jose/jaxrs/JweWriterInterceptor.java|  8 +++--
 .../jwe/AbstractContentEncryptionAlgorithm.java | 15 -
 .../jwe/AbstractWrapKeyEncryptionAlgorithm.java | 18 ++-
 .../jose/jwe/AesCbcHmacJweEncryption.java   | 18 ++-
 .../jwe/AesGcmContentEncryptionAlgorithm.java   | 33 ++--
 .../jose/jwe/ContentEncryptionAlgorithm.java|  1 +
 .../jose/jwe/DirectKeyEncryptionAlgorithm.java  |  5 +++
 .../jose/jwe/DirectKeyJweEncryption.java|  2 +-
 .../jose/jwe/KeyEncryptionAlgorithm.java|  1 +
 .../PbesHmacAesWrapKeyEncryptionAlgorithm.java  |  6 +++-
 .../jose/jwe/WrappedKeyJweEncryption.java   | 24 --
 .../cxf/rs/security/jose/jwk/JwkUtils.java  |  4 +--
 .../jose/jwe/JweCompactReaderWriterTest.java| 11 +++
 .../jose/jwe/JwePbeHmacAesWrapTest.java |  5 +--
 .../jaxrs/security/jwt/JAXRSJweJwsTest.java |  3 +-
 .../cxf/systest/jaxrs/security/jwt/server.xml   |  1 -
 16 files changed, 96 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d7cec5b8/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
index 2fac63e..1daf285 100644
--- 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
+++ 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
@@ -41,6 +41,7 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.rs.security.jose.jwa.Algorithm;
 import org.apache.cxf.rs.security.jose.jwe.AesCbcHmacJweEncryption;
+import org.apache.cxf.rs.security.jose.jwe.AesGcmContentEncryptionAlgorithm;
 import org.apache.cxf.rs.security.jose.jwe.AesGcmWrapKeyEncryptionAlgorithm;
 import org.apache.cxf.rs.security.jose.jwe.AesWrapKeyEncryptionAlgorithm;
 import org.apache.cxf.rs.security.jose.jwe.JweCompactProducer;
@@ -171,10 +172,11 @@ public class JweWriterInterceptor implements 
WriterInterceptor {
 }
 boolean isAesHmac = Algorithm.isAesCbcHmac(contentEncryptionAlgo);
 if (isAesHmac) { 
-return new AesCbcHmacJweEncryption(
-keyEncryptionAlgo, contentEncryptionAlgo, 
keyEncryptionProvider);
+return new AesCbcHmacJweEncryption(contentEncryptionAlgo, 
keyEncryptionProvider);
 } else {
-return new WrappedKeyJweEncryption(headers, 
keyEncryptionProvider);
+return new WrappedKeyJweEncryption(headers, 
+   keyEncryptionProvider,
+   new 
AesGcmContentEncryptionAlgorithm(contentEncryptionAlgo));
 }
 } catch (SecurityException ex) {
 throw ex;

http://git-wip-us.apache.org/repos/asf/cxf/blob/d7cec5b8/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
index ef1fbbb..adf6d59 100644
--- 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
+++ 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java
@@ -20,8 +20,6 @@ package org.apache.cxf.rs.security.jose.jwe;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import