You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/10/24 14:18:17 UTC

[3/3] git commit: CAMEL-7948 Fixed CS errors of camel-xmlsecurity

CAMEL-7948 Fixed CS errors of camel-xmlsecurity


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

Branch: refs/heads/master
Commit: dee48e002b566b342b0f7f7ade98bc5c33efcd6f
Parents: 6771c2b
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Oct 24 20:17:54 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Oct 24 20:17:54 2014 +0800

----------------------------------------------------------------------
 .../xmlsecurity/SignatureAlgorithmTest.java         | 16 +++++++++-------
 .../xmlsecurity/SignatureDigestMethodTest.java      | 12 +++++++-----
 .../xmlsecurity/EncryptionAlgorithmTest.java        | 16 ++++++++--------
 3 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/dee48e00/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
index 230bc3b..17e2116 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
@@ -50,6 +50,8 @@ import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
 import javax.xml.crypto.dsig.keyinfo.KeyValue;
 import javax.xml.crypto.dsig.spec.XPathFilterParameterSpec;
 
+import org.w3c.dom.Node;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -73,7 +75,7 @@ import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.Node;
+
 
 /**
  * Test signing using all available signature methods, apart from EC-algorithms which are
@@ -379,35 +381,35 @@ public class SignatureAlgorithmTest extends CamelTestSupport {
     }
     
     @Test
-    public void testRSASHA1_MGF1() throws Exception {
+    public void testRSASHA1MGF1() throws Exception {
         setupMock();
         sendBody("direct:rsasha1_mgf1", payload);
         assertMockEndpointsSatisfied();
     }
     
     @Test
-    public void testRSASHA224_MGF1() throws Exception {
+    public void testRSASHA224MGF1() throws Exception {
         setupMock();
         sendBody("direct:rsasha224_mgf1", payload);
         assertMockEndpointsSatisfied();
     }
     
     @Test
-    public void testRSASHA256_MGF1() throws Exception {
+    public void testRSASHA256MGF1() throws Exception {
         setupMock();
         sendBody("direct:rsasha256_mgf1", payload);
         assertMockEndpointsSatisfied();
     }
     
     @Test
-    public void testRSASHA384_MGF1() throws Exception {
+    public void testRSASHA384MGF1() throws Exception {
         setupMock();
         sendBody("direct:rsasha384_mgf1", payload);
         assertMockEndpointsSatisfied();
     }
     
     @Test
-    public void testRSASHA512_MGF1() throws Exception {
+    public void testRSASHA512MGF1() throws Exception {
         setupMock();
         sendBody("direct:rsasha512_mgf1", payload);
         assertMockEndpointsSatisfied();
@@ -626,7 +628,7 @@ public class SignatureAlgorithmTest extends CamelTestSupport {
             
             public String getFormat()   { return "RAW"; }
             public byte[] getEncoded()  { return secret; }
-            public String getAlgorithm(){ return "SECRET"; }
+            public String getAlgorithm() { return "SECRET"; }
         };
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/dee48e00/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
index 1adba0b..62c681e 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
@@ -49,6 +49,8 @@ import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
 import javax.xml.crypto.dsig.keyinfo.KeyValue;
 import javax.xml.crypto.dsig.spec.XPathFilterParameterSpec;
 
+import org.w3c.dom.Node;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -72,7 +74,7 @@ import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.Node;
+
 
 /**
  * Test signing using all available digest methods
@@ -277,28 +279,28 @@ public class SignatureDigestMethodTest extends CamelTestSupport {
     }
     
     @Test
-    public void testSHA3_224() throws Exception {
+    public void testSHA3224() throws Exception {
         setupMock();
         sendBody("direct:sha3_224", payload);
         assertMockEndpointsSatisfied();
     }
     
     @Test
-    public void testSHA3_256() throws Exception {
+    public void testSHA3256() throws Exception {
         setupMock();
         sendBody("direct:sha3_256", payload);
         assertMockEndpointsSatisfied();
     }
     
     @Test
-    public void testSHA3_384() throws Exception {
+    public void testSHA3384() throws Exception {
         setupMock();
         sendBody("direct:sha3_384", payload);
         assertMockEndpointsSatisfied();
     }
     
     @Test
-    public void testSHA3_512() throws Exception {
+    public void testSHA3512() throws Exception {
         setupMock();
         sendBody("direct:sha3_512", payload);
         assertMockEndpointsSatisfied();

http://git-wip-us.apache.org/repos/asf/camel/blob/dee48e00/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
index bdb2853..734a218 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/EncryptionAlgorithmTest.java
@@ -86,7 +86,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
     }
     
     @Test
-    public void testAES128_GCM() throws Exception {
+    public void testAES128GCM() throws Exception {
         // Set up the Key
         KeyGenerator keygen = KeyGenerator.getInstance("AES");
         keygen.init(128);
@@ -139,7 +139,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
     }
     
     @Test
-    public void testAES192_GCM() throws Exception {
+    public void testAES192GCM() throws Exception {
         if (!TestHelper.UNRESTRICTED_POLICIES_INSTALLED) {
             return;
         }
@@ -196,7 +196,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
     }
     
     @Test
-    public void testAES256_GCM() throws Exception {
+    public void testAES256GCM() throws Exception {
         if (!TestHelper.UNRESTRICTED_POLICIES_INSTALLED) {
             return;
         }
@@ -224,7 +224,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
     }
 
     @Test
-    public void testTRIPLE_DES() throws Exception {
+    public void testTRIPLEDES() throws Exception {
         // Set up the Key
         KeyGenerator keygen = KeyGenerator.getInstance("DESede");
         keygen.init(192);
@@ -248,7 +248,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
     }
     
     @Test
-    public void testSEED_128() throws Exception {
+    public void testSEED128() throws Exception {
         // Set up the Key
         KeyGenerator keygen = KeyGenerator.getInstance("SEED");
         keygen.init(128);
@@ -272,7 +272,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
     }
     
     @Test
-    public void testCAMELLIA_128() throws Exception {
+    public void testCAMELLIA128() throws Exception {
         // Set up the Key
         KeyGenerator keygen = KeyGenerator.getInstance("CAMELLIA");
         keygen.init(128);
@@ -296,7 +296,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
     }
     
     @Test
-    public void testCAMELLIA_192() throws Exception {
+    public void testCAMELLIA192() throws Exception {
         if (!TestHelper.UNRESTRICTED_POLICIES_INSTALLED) {
             return;
         }
@@ -324,7 +324,7 @@ public class EncryptionAlgorithmTest extends CamelTestSupport {
     }
     
     @Test
-    public void testCAMELLIA_256() throws Exception {
+    public void testCAMELLIA256() throws Exception {
         if (!TestHelper.UNRESTRICTED_POLICIES_INSTALLED) {
             return;
         }