You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2017/02/16 10:22:44 UTC
svn commit: r1783188 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/c14n/implementations/
main/java/org/apache/xml/security/utils/
test/java/javax/xml/crypto/test/dsig/
test/java/org/apache/xml/security/test/dom/ test/ja...
Author: coheigea
Date: Thu Feb 16 10:22:44 2017
New Revision: 1783188
URL: http://svn.apache.org/viewvc?rev=1783188&view=rev
Log:
More whitespace tidy-up
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java Thu Feb 16 10:22:44 2017
@@ -531,7 +531,7 @@ public abstract class Canonicalizer11 ex
private static String removeDotSegments(String path) {
if (LOG.isDebugEnabled()) {
- LOG.debug("STEP OUTPUT BUFFER\t\tINPUT BUFFER");
+ LOG.debug("STEP OUTPUT BUFFER\t\tINPUT BUFFER");
}
// 1. The input buffer is initialized with the now-appended path
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java Thu Feb 16 10:22:44 2017
@@ -766,7 +766,7 @@ public class Base64 {
* remove WhiteSpace from MIME containing encoded Base64 data.
*
* @param data the byte array of base64 data (with WS)
- * @return the new length
+ * @return the new length
*/
protected static final int removeWhiteSpace(byte[] data) {
if (data == null) {
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java Thu Feb 16 10:22:44 2017
@@ -50,7 +50,7 @@ public class ManifestTest extends org.ju
String id = "manifest_id";
List<Reference> refs = new ArrayList<>();
// test XMLSignatureFactory.newManifest(List references)
- // and XMLSignatureFactory.newManifest(List references,
+ // and XMLSignatureFactory.newManifest(List references,
// String id)
// for generating Manifest objects
refs.add(VALID_REF);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java Thu Feb 16 10:22:44 2017
@@ -96,8 +96,8 @@ public class XMLSignatureTest extends or
@org.junit.Test
public void testConstructor() throws Exception {
XMLSignature sig = null;
- // test XMLSignatureFactory.newXMLSignature(SignedInfo, KeyInfo)
- // and XMLSignatureFactory.newXMLSignature(SignedInfo,
+ // test XMLSignatureFactory.newXMLSignature(SignedInfo, KeyInfo)
+ // and XMLSignatureFactory.newXMLSignature(SignedInfo,
// KeyInfo, List, String, String)
// for generating XMLSignature objects
for (int i = 0; i < 2; i++) {
@@ -229,7 +229,7 @@ public class XMLSignatureTest extends or
@org.junit.Test
public void testSignWithEmptyNSPrefix() throws Exception {
SignedInfo si = createSignedInfo(SIG_METHODS[1]);
- KeyInfo ki = kifac.newKeyInfo(Collections.singletonList
+ KeyInfo ki = kifac.newKeyInfo(Collections.singletonList
(kifac.newKeyValue((PublicKey) VALIDATE_KEYS[1])));
XMLSignature sig = fac.newXMLSignature(si, ki, objs, id, sigValueId);
Document doc = TestUtils.newDocument();
@@ -273,7 +273,7 @@ public class XMLSignatureTest extends or
objs.add(fac.newXMLObject(Collections.singletonList
(new DOMStructure(nc)), "object-2", null, null));
- KeyInfo ki = kifac.newKeyInfo(Collections.singletonList
+ KeyInfo ki = kifac.newKeyInfo(Collections.singletonList
(kifac.newKeyValue((PublicKey) VALIDATE_KEYS[1])));
// create XMLSignature
@@ -361,7 +361,7 @@ public class XMLSignatureTest extends or
(new DOMStructure(doc.createTextNode("I am the text."))),
"", "text/plain", null);
- KeyInfo ki = kifac.newKeyInfo(Collections.singletonList
+ KeyInfo ki = kifac.newKeyInfo(Collections.singletonList
(kifac.newKeyValue((PublicKey) VALIDATE_KEYS[1])));
// create XMLSignature
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java Thu Feb 16 10:22:44 2017
@@ -264,7 +264,7 @@ public class CreateExclC14nInteropValues
String xmlStr = "" + "<included xml:lang='de'>" + "\n"
+ "<notIncluded xml:lang='de'>" + "\n"
+ "<notIncluded xml:lang='uk'>" + "\n"
- + "<included xml:lang='de'>" + "\n" + "</included>"
+ + "<included xml:lang='de'>" + "\n" + "</included>"
+ "\n" + "</notIncluded>" + "\n" + "</notIncluded>"
+ "\n" + "</included>";
Document importDoc = null;
@@ -298,7 +298,7 @@ public class CreateExclC14nInteropValues
obj.setId(id);
String xmlStr = "" + "<included xml:lang='de'>" + "\n"
- + "<included xml:lang='de'>" + "\n"
+ + "<included xml:lang='de'>" + "\n"
+ "<notIncluded xml:lang='uk'>" + "\n"
+ "<included >" + "\n" + "</included>"
+ "\n" + "</notIncluded>" + "\n" + "</included>"
@@ -334,7 +334,7 @@ public class CreateExclC14nInteropValues
String xmlStr = "" + "<included xml:lang='de'>"
+ "\n"
- + "<included xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ "\n"
+ "<notIncluded xml:space='preserve' xml:lang='uk'>"
+ "\n" + "<included >" + "\n"
@@ -371,9 +371,9 @@ public class CreateExclC14nInteropValues
String xmlStr = "" + "<included xml:space='preserve' xml:lang='de'>"
+ "\n"
- + "<included xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ "\n"
- + "<notIncluded xml:lang='uk'>"
+ + "<notIncluded xml:lang='uk'>"
+ "\n" + "<included>" + "\n" + "</included>" + "\n"
+ "</notIncluded>" + "\n" + "</included>" + "\n"
+ "</included>";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Thu Feb 16 10:22:44 2017
@@ -667,8 +667,8 @@ public class Canonicalizer20010315Test e
//J-
String inputStr = ""
- + "<absolute:correct xmlns:absolute='http://www.absolute.org/#likeVodka'>"
- + "<relative:incorrect xmlns:relative='../cheating#away'>"
+ + "<absolute:correct xmlns:absolute='http://www.absolute.org/#likeVodka'>"
+ + "<relative:incorrect xmlns:relative='../cheating#away'>"
+ "</relative:incorrect>"
+ "</absolute:correct>"
+ "\n"
@@ -754,7 +754,7 @@ public class Canonicalizer20010315Test e
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
//J-
String input = ""
- + "<included xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ "<notIncluded xml:lang='de'>"
+ "<notIncluded xml:lang='uk'>"
+ "<included >"
@@ -791,7 +791,7 @@ public class Canonicalizer20010315Test e
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
//J-
String input = ""
- + "<included xml:lang='uk'>"
+ + "<included xml:lang='uk'>"
+ "<notIncluded xml:lang='de'>"
+ "<notIncluded xml:lang='uk'>"
+ "<included >"
@@ -828,10 +828,10 @@ public class Canonicalizer20010315Test e
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
//J-
String input = ""
- + "<included xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ "<notIncluded xml:lang='de'>"
+ "<notIncluded xml:lang='uk'>"
- + "<included xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ "</included>"
+ "</notIncluded>"
+ "</notIncluded>"
@@ -866,8 +866,8 @@ public class Canonicalizer20010315Test e
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
//J-
String input = ""
- + "<included xml:lang='de'>"
- + "<included xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ "<notIncluded xml:lang='uk'>"
+ "<included >"
+ "</included>"
@@ -906,8 +906,8 @@ public class Canonicalizer20010315Test e
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
//J-
String input = ""
- + "<included xml:lang='de'>"
- + "<included xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ "<notIncluded xml:space='preserve' xml:lang='uk'>"
+ "<included >"
+ "</included>"
@@ -946,9 +946,9 @@ public class Canonicalizer20010315Test e
InvalidCanonicalizerException, TransformerException, XPathExpressionException {
//J-
String input = ""
- + "<included xml:space='preserve' xml:lang='de'>"
- + "<included xml:lang='de'>"
- + "<notIncluded xml:lang='uk'>"
+ + "<included xml:space='preserve' xml:lang='de'>"
+ + "<included xml:lang='de'>"
+ + "<notIncluded xml:lang='uk'>"
+ "<included>"
+ "</included>"
+ "</notIncluded>"
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java Thu Feb 16 10:22:44 2017
@@ -62,8 +62,8 @@ import org.w3c.dom.NodeList;
/**
*
- * @author Axl Mattheus
- * @author Berin Lautenbach
+ * @author Axl Mattheus
+ * @author Berin Lautenbach
*/
public class XMLCipherTest extends org.junit.Assert {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java Thu Feb 16 10:22:44 2017
@@ -103,7 +103,7 @@ public class TransformBase64DecodeTest e
String input = ""
+ "<Object xmlns:signature='http://www.w3.org/2000/09/xmldsig#'>\n"
+ "<signature:Base64>\n"
- + "VGhlIFVSSSBvZiB0aGU gdHJhbn<RealText>Nmb 3JtIGlzIG<test/>h0dHA6</RealText>Ly93d3cudzMub3JnLzIwMDAvMDkveG1s\n"
+ + "VGhlIFVSSSBvZiB0aGU gdHJhbn<RealText>Nmb 3JtIGlzIG<test/>h0dHA6</RealText>Ly93d3cudzMub3JnLzIwMDAvMDkveG1s\n"
+ "ZHNpZyNiYXNlNjQ=\n"
+ "</signature:Base64>\n"
+ "</Object>\n"
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java Thu Feb 16 10:22:44 2017
@@ -380,7 +380,7 @@ public class Canonicalizer11Test extends
// public static void testXMLAttributes1() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "<notIncluded xml:lang='de'>"
// + "<notIncluded xml:lang='uk'>"
// + "<included >"
@@ -412,7 +412,7 @@ public class Canonicalizer11Test extends
// public static void testXMLAttributes2() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='uk'>"
+// + "<included xml:lang='uk'>"
// + "<notIncluded xml:lang='de'>"
// + "<notIncluded xml:lang='uk'>"
// + "<included >"
@@ -444,10 +444,10 @@ public class Canonicalizer11Test extends
// public static void testXMLAttributes3() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "<notIncluded xml:lang='de'>"
// + "<notIncluded xml:lang='uk'>"
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "</included>"
// + "</notIncluded>"
// + "</notIncluded>"
@@ -476,8 +476,8 @@ public class Canonicalizer11Test extends
// public static void _testXMLAttributes4() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='de'>"
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "<notIncluded xml:lang='uk'>"
// + "<included >"
// + "</included>"
@@ -510,8 +510,8 @@ public class Canonicalizer11Test extends
// public static void _testXMLAttributes5() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='de'>"
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "<notIncluded xml:space='preserve' xml:lang='uk'>"
// + "<included >"
// + "</included>"
@@ -544,9 +544,9 @@ public class Canonicalizer11Test extends
// public static void _testXMLAttributes6() throws Exception {
// //J-
// String input = ""
-// + "<included xml:space='preserve' xml:lang='de'>"
-// + "<included xml:lang='de'>"
-// + "<notIncluded xml:lang='uk'>"
+// + "<included xml:space='preserve' xml:lang='de'>"
+// + "<included xml:lang='de'>"
+// + "<notIncluded xml:lang='uk'>"
// + "<included>"
// + "</included>"
// + "</notIncluded>"
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java?rev=1783188&r1=1783187&r2=1783188&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java Thu Feb 16 10:22:44 2017
@@ -458,7 +458,7 @@ public class Canonicalizer20010315Test e
// public static void testXMLAttributes1() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "<notIncluded xml:lang='de'>"
// + "<notIncluded xml:lang='uk'>"
// + "<included >"
@@ -490,7 +490,7 @@ public class Canonicalizer20010315Test e
// public static void testXMLAttributes2() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='uk'>"
+// + "<included xml:lang='uk'>"
// + "<notIncluded xml:lang='de'>"
// + "<notIncluded xml:lang='uk'>"
// + "<included >"
@@ -522,10 +522,10 @@ public class Canonicalizer20010315Test e
// public static void testXMLAttributes3() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "<notIncluded xml:lang='de'>"
// + "<notIncluded xml:lang='uk'>"
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "</included>"
// + "</notIncluded>"
// + "</notIncluded>"
@@ -554,8 +554,8 @@ public class Canonicalizer20010315Test e
// public static void _testXMLAttributes4() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='de'>"
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "<notIncluded xml:lang='uk'>"
// + "<included >"
// + "</included>"
@@ -588,8 +588,8 @@ public class Canonicalizer20010315Test e
// public static void _testXMLAttributes5() throws Exception {
// //J-
// String input = ""
-// + "<included xml:lang='de'>"
-// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
+// + "<included xml:lang='de'>"
// + "<notIncluded xml:space='preserve' xml:lang='uk'>"
// + "<included >"
// + "</included>"
@@ -622,9 +622,9 @@ public class Canonicalizer20010315Test e
// public static void _testXMLAttributes6() throws Exception {
// //J-
// String input = ""
-// + "<included xml:space='preserve' xml:lang='de'>"
-// + "<included xml:lang='de'>"
-// + "<notIncluded xml:lang='uk'>"
+// + "<included xml:space='preserve' xml:lang='de'>"
+// + "<included xml:lang='de'>"
+// + "<notIncluded xml:lang='uk'>"
// + "<included>"
// + "</included>"
// + "</notIncluded>"