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 2016/10/13 10:41:16 UTC
svn commit: r1764650 [1/4] - in
/santuario/xml-security-java/trunk/src/test/java: javax/xml/crypto/test/
javax/xml/crypto/test/dsig/ org/apache/xml/security/test/dom/
org/apache/xml/security/test/dom/c14n/implementations/
org/apache/xml/security/test/d...
Author: coheigea
Date: Thu Oct 13 10:41:15 2016
New Revision: 1764650
URL: http://svn.apache.org/viewvc?rev=1764650&view=rev
Log:
Try-with-resources refactoring
Modified:
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.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/c14n/implementations/Santuario191Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.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/signature/CreateSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.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/dom/transforms/implementations/Xpath2TransformationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java Thu Oct 13 10:41:15 2016
@@ -33,7 +33,7 @@ import javax.xml.crypto.*;
public class OctetStreamDataTest extends org.junit.Assert {
@org.junit.Test
- public void testConstructor() {
+ public void testConstructor() throws Exception {
// test OctetStreamData(InputStream) and
// OctetStreamData(InputStream, String, String)
OctetStreamData osdata;
@@ -49,8 +49,8 @@ public class OctetStreamDataTest extends
int len = 300;
byte[] in = new byte[len];
new Random().nextBytes(in);
- ByteArrayInputStream bais = new ByteArrayInputStream(in);
- try {
+
+ try (ByteArrayInputStream bais = new ByteArrayInputStream(in)) {
osdata = new OctetStreamData(bais);
assertNotNull(osdata);
assertEquals(osdata.getOctetStream(), bais);
@@ -62,20 +62,14 @@ public class OctetStreamDataTest extends
assertEquals(osdata.getOctetStream(), bais);
assertNull(osdata.getURI());
assertNull(osdata.getMimeType());
- } catch (Exception ex) {
- fail("Unexpected Exception: " + ex);
- }
- String uri="testUri";
- String mimeType="test";
- try {
+ String uri="testUri";
+ String mimeType="test";
osdata = new OctetStreamData(bais, uri, mimeType);
assertNotNull(osdata);
assertEquals(osdata.getOctetStream(), bais);
assertEquals(osdata.getURI(), uri);
assertEquals(osdata.getMimeType(), mimeType);
- } catch (Exception ex) {
- fail("Unexpected Exception: " + ex);
}
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java Thu Oct 13 10:41:15 2016
@@ -493,7 +493,10 @@ public class CreateBaltimore23Test exten
+ " </html>\n"
+ " </xsl:template>\n"
+ "</xsl:stylesheet>\n";
- Document docxslt = db.parse(new ByteArrayInputStream(xslt.getBytes()));
+ Document docxslt = null;
+ try (InputStream is = new ByteArrayInputStream(xslt.getBytes())) {
+ docxslt = db.parse(is);
+ }
Node xslElem = docxslt.getDocumentElement();
manTrans.add(fac.newTransform(Transform.XSLT,
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=1764650&r1=1764649&r2=1764650&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 Oct 13 10:41:15 2016
@@ -22,6 +22,7 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
@@ -196,8 +197,10 @@ public class CreateExclC14nInteropValues
+ "<included >" + "\n" + "</included>"
+ "\n" + "</notIncluded>" + "\n" + "</notIncluded>"
+ "\n" + "</included>";
- Document importDoc =
- db.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ Document importDoc = null;
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
+ importDoc = db.parse(is);
+ }
obj.getElement().appendChild(doc.createTextNode("\n"));
obj.getElement()
@@ -229,8 +232,10 @@ public class CreateExclC14nInteropValues
+ "<included >" + "\n" + "</included>"
+ "\n" + "</notIncluded>" + "\n" + "</notIncluded>"
+ "\n" + "</included>";
- Document importDoc =
- db.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ Document importDoc = null;
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
+ importDoc = db.parse(is);
+ }
obj.getElement().appendChild(doc.createTextNode("\n"));
obj.getElement()
@@ -262,8 +267,10 @@ public class CreateExclC14nInteropValues
+ "<included xml:lang='de'>" + "\n" + "</included>"
+ "\n" + "</notIncluded>" + "\n" + "</notIncluded>"
+ "\n" + "</included>";
- Document importDoc =
- db.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ Document importDoc = null;
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
+ importDoc = db.parse(is);
+ }
obj.getElement().appendChild(doc.createTextNode("\n"));
obj.getElement()
@@ -296,8 +303,10 @@ public class CreateExclC14nInteropValues
+ "<included >" + "\n" + "</included>"
+ "\n" + "</notIncluded>" + "\n" + "</included>"
+ "\n" + "</included>";
- Document importDoc =
- db.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ Document importDoc = null;
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
+ importDoc = db.parse(is);
+ }
obj.getElement().appendChild(doc.createTextNode("\n"));
obj.getElement()
@@ -331,9 +340,11 @@ public class CreateExclC14nInteropValues
+ "\n" + "<included >" + "\n"
+ "</included>" + "\n" + "</notIncluded>" + "\n"
+ "</included>" + "\n" + "</included>";
- Document importDoc =
- db.parse(new ByteArrayInputStream(xmlStr.getBytes()));
-
+ Document importDoc = null;
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
+ importDoc = db.parse(is);
+ }
+
obj.getElement().appendChild(doc.createTextNode("\n"));
obj.getElement()
.appendChild(doc.importNode(importDoc.getDocumentElement(), true));
@@ -366,8 +377,10 @@ public class CreateExclC14nInteropValues
+ "\n" + "<included>" + "\n" + "</included>" + "\n"
+ "</notIncluded>" + "\n" + "</included>" + "\n"
+ "</included>";
- Document importDoc =
- db.parse(new ByteArrayInputStream(xmlStr.getBytes()));
+ Document importDoc = null;
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
+ importDoc = db.parse(is);
+ }
obj.getElement().appendChild(doc.createTextNode("\n"));
obj.getElement()
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=1764650&r1=1764649&r2=1764650&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 Oct 13 10:41:15 2016
@@ -676,7 +676,10 @@ public class Canonicalizer20010315Test e
//J+
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(new ByteArrayInputStream(inputStr.getBytes()));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(inputStr.getBytes())) {
+ doc = db.parse(is);
+ }
boolean weCatchedTheRelativeNS = false;
try {
@@ -988,7 +991,10 @@ public class Canonicalizer20010315Test e
db.setErrorHandler(new IgnoreAllErrorHandler());
- Document doc = db.parse(new ByteArrayInputStream(input.getBytes()));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
+ doc = db.parse(is);
+ }
Canonicalizer c14nizer =
Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
@@ -1111,7 +1117,10 @@ public class Canonicalizer20010315Test e
//String ENCODING_UTF8 = "UTF-8";
String ENCODING_UTF16 = "UTF-16";
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(new ByteArrayInputStream(input));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(input)) {
+ doc = db.parse(is);
+ }
TransformerFactory tFactory = TransformerFactory.newInstance();
Transformer transformer = tFactory.newTransformer();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java Thu Oct 13 10:41:15 2016
@@ -20,6 +20,7 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
@@ -64,7 +65,10 @@ public class Santuario191Test extends or
// Parse the Data
//
db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(new ByteArrayInputStream(INPUT_DATA.getBytes("UTF8")));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(INPUT_DATA.getBytes("UTF8"))) {
+ doc = db.parse(is);
+ }
//
// Canonicalize the data
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java Thu Oct 13 10:41:15 2016
@@ -19,6 +19,7 @@
package org.apache.xml.security.test.dom.c14n.implementations;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.xpath.XPath;
@@ -79,9 +80,10 @@ public class Santuario273Test extends or
DocumentBuilder documentBuilder = XMLUtils.createDocumentBuilder(true);
documentBuilder.setErrorHandler(new org.apache.xml.security.utils.IgnoreAllErrorHandler());
- byte inputBytes[] = input.getBytes();
- Document doc =
- documentBuilder.parse(new ByteArrayInputStream(inputBytes));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
+ doc = documentBuilder.parse(is);
+ }
Canonicalizer c14n =
Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java Thu Oct 13 10:41:15 2016
@@ -19,6 +19,7 @@
package org.apache.xml.security.test.dom.encryption;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.security.NoSuchAlgorithmException;
import javax.crypto.Cipher;
@@ -112,7 +113,10 @@ public class EncryptContentTest extends
return;
}
- Document doc = db.parse(new ByteArrayInputStream(DATA.getBytes("UTF8")));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(DATA.getBytes("UTF8"))) {
+ doc = db.parse(is);
+ }
NodeList dataToEncrypt = doc.getElementsByTagName("user");
XMLCipher dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
@@ -161,7 +165,10 @@ public class EncryptContentTest extends
return;
}
- Document doc = db.parse(new ByteArrayInputStream(MULTIPLE_USER_DATA.getBytes("UTF8")));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(MULTIPLE_USER_DATA.getBytes("UTF8"))) {
+ doc = db.parse(is);
+ }
NodeList dataToEncrypt = doc.getElementsByTagName("user");
XMLCipher dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java Thu Oct 13 10:41:15 2016
@@ -40,6 +40,7 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.lang.reflect.Field;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
@@ -101,7 +102,10 @@ public class SignedEncryptedTest extends
public void secureAndVerify(TransformerFactory transformerFactory, boolean useDocumentSerializer) throws Exception {
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(new ByteArrayInputStream(SAMPLE_MSG.getBytes("UTF-8")));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(SAMPLE_MSG.getBytes("UTF8"))) {
+ document = builder.parse(is);
+ }
// Set up the Key
KeyPairGenerator rsaKeygen = KeyPairGenerator.getInstance("RSA");
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=1764650&r1=1764649&r2=1764650&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 Oct 13 10:41:15 2016
@@ -21,6 +21,7 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.security.Key;
import java.security.KeyPairGenerator;
@@ -734,7 +735,10 @@ public class XMLCipherTest extends org.j
// Test inherited namespaces don't add extra attributes
// Test unused namespaces are preserved
final String DATA1 = "<ns:root xmlns:ns=\"ns.com\"><ns:elem xmlns:ns2=\"ns2.com\">11</ns:elem></ns:root>";
- Document doc = db.parse(new ByteArrayInputStream(DATA1.getBytes("UTF8")));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(DATA1.getBytes("UTF8"))) {
+ doc = db.parse(is);
+ }
Element elem = (Element)doc.getDocumentElement().getFirstChild();
XMLCipher dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
@@ -758,7 +762,9 @@ public class XMLCipherTest extends org.j
// Test default namespace undeclaration is preserved
final String DATA2 = "<ns:root xmlns=\"defns.com\" xmlns:ns=\"ns.com\"><elem xmlns=\"\">11</elem></ns:root>";
- doc = db.parse(new ByteArrayInputStream(DATA2.getBytes("UTF8")));
+ try (InputStream is = new ByteArrayInputStream(DATA2.getBytes("UTF8"))) {
+ doc = db.parse(is);
+ }
elem = (Element)doc.getDocumentElement().getFirstChild();
dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
@@ -783,7 +789,9 @@ public class XMLCipherTest extends org.j
// Test comments and PIs are not treated specially when serializing element content.
// Other c14n algorithms add a newline after comments and PIs, when they are before or after the document element.
final String DATA3 = "<root><!--comment1--><?pi1 target1?><elem/><!--comment2--><?pi2 target2?></root>";
- doc = db.parse(new ByteArrayInputStream(DATA3.getBytes("UTF8")));
+ try (InputStream is = new ByteArrayInputStream(DATA3.getBytes("UTF8"))) {
+ doc = db.parse(is);
+ }
elem = (Element)doc.getDocumentElement();
dataCipher = XMLCipher.getInstance(XMLCipher.TRIPLEDES);
@@ -850,10 +858,10 @@ public class XMLCipherTest extends org.j
String before = baos.toString("UTF-8");
byte[] serialized = baos.toByteArray();
- EncryptedData encryptedData =
- cipher.encryptData(
- d, EncryptionConstants.TYPE_ELEMENT, new ByteArrayInputStream(serialized)
- );
+ EncryptedData encryptedData = null;
+ try (InputStream is = new ByteArrayInputStream(serialized)) {
+ encryptedData = cipher.encryptData(d, EncryptionConstants.TYPE_ELEMENT, is);
+ }
//decrypt
XMLCipher dcipher = XMLCipher.getInstance(XMLCipher.AES_128);
@@ -865,7 +873,9 @@ public class XMLCipherTest extends org.j
assertEquals(before, after);
// test with null type
- encryptedData = cipher.encryptData(d, null, new ByteArrayInputStream(serialized));
+ try (InputStream is = new ByteArrayInputStream(serialized)) {
+ encryptedData = cipher.encryptData(d, null, is);
+ }
}
@org.junit.Test
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java Thu Oct 13 10:41:15 2016
@@ -21,6 +21,7 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
+import java.io.InputStream;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.KeyStore;
@@ -193,7 +194,9 @@ public class CreateSignatureTest extends
String signedDoc = new String(bos.toByteArray());
// Now Verify
- doc = db.parse(new ByteArrayInputStream(signedDoc.getBytes()));
+ try (InputStream is = new ByteArrayInputStream(signedDoc.getBytes())) {
+ doc = db.parse(is);
+ }
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
@@ -211,7 +214,10 @@ public class CreateSignatureTest extends
public void testCanonicalizedOctetStream() throws Exception {
String signedXML = doSign();
- Document doc = db.parse(new ByteArrayInputStream(signedXML.getBytes()));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(signedXML.getBytes())) {
+ doc = db.parse(is);
+ }
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
@@ -331,7 +337,10 @@ public class CreateSignatureTest extends
}
private void doVerify(String signedXML) throws Exception {
- Document doc = db.parse(new ByteArrayInputStream(signedXML.getBytes()));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(signedXML.getBytes())) {
+ doc = db.parse(is);
+ }
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java Thu Oct 13 10:41:15 2016
@@ -126,9 +126,9 @@ public class ECDSASignatureTest extends
File file =
makeDataFile("src/test/resources/org/apache/xml/security/samples/input/ecdsaSignature.xml");
- InputStream is = new FileInputStream(file);
-
- doVerify(is);
+ try (InputStream is = new FileInputStream(file)) {
+ doVerify(is);
+ }
}
@org.junit.Test
@@ -139,9 +139,9 @@ public class ECDSASignatureTest extends
}
File file = makeDataFile("src/test/resources/at/buergerkarte/testresp.xml");
- InputStream is = new FileInputStream(file);
-
- doVerify(is);
+ try (InputStream is = new FileInputStream(file)) {
+ doVerify(is);
+ }
}
private byte[] doSign() throws Exception {
@@ -183,7 +183,9 @@ public class ECDSASignatureTest extends
}
private void doVerify(byte[] signedXml) throws Exception {
- doVerify(new ByteArrayInputStream(signedXml));
+ try (InputStream is = new ByteArrayInputStream(signedXml)) {
+ doVerify(is);
+ }
}
private void doVerify(InputStream is) throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java Thu Oct 13 10:41:15 2016
@@ -21,6 +21,7 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
+import java.io.InputStream;
import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
@@ -73,7 +74,10 @@ public class X509DataTest extends org.ju
private XMLSignature getSignature(byte[] s) throws Exception {
javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(new ByteArrayInputStream(s));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(s)) {
+ doc = db.parse(is);
+ }
Element el = (Element)doc.getFirstChild();
return new XMLSignature(el, "");
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java Thu Oct 13 10:41:15 2016
@@ -109,29 +109,32 @@ public class XMLSignatureInputTest exten
@org.junit.Test
public void testIsInitializedWithOctetStream() throws IOException {
- InputStream inputStream =
- new ByteArrayInputStream(_octetStreamTextInput.getBytes());
- XMLSignatureInput input = new XMLSignatureInput(inputStream);
+ try (InputStream inputStream =
+ new ByteArrayInputStream(_octetStreamTextInput.getBytes())) {
+ XMLSignatureInput input = new XMLSignatureInput(inputStream);
- assertTrue("Input is initialized", input.isInitialized());
+ assertTrue("Input is initialized", input.isInitialized());
+ }
}
@org.junit.Test
public void testOctetStreamIsOctetStream() throws IOException {
- InputStream inputStream =
- new ByteArrayInputStream(_octetStreamTextInput.getBytes());
- XMLSignatureInput input = new XMLSignatureInput(inputStream);
+ try (InputStream inputStream =
+ new ByteArrayInputStream(_octetStreamTextInput.getBytes())) {
+ XMLSignatureInput input = new XMLSignatureInput(inputStream);
- assertTrue("Input is octet stream", input.isOctetStream());
+ assertTrue("Input is octet stream", input.isOctetStream());
+ }
}
@org.junit.Test
public void testOctetStreamIsNotNodeSet() throws IOException {
- InputStream inputStream =
- new ByteArrayInputStream(_octetStreamTextInput.getBytes());
- XMLSignatureInput input = new XMLSignatureInput(inputStream);
+ try (InputStream inputStream =
+ new ByteArrayInputStream(_octetStreamTextInput.getBytes())) {
+ XMLSignatureInput input = new XMLSignatureInput(inputStream);
- assertTrue("Input is not node set", !input.isNodeSet());
+ assertTrue("Input is not node set", !input.isNodeSet());
+ }
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java Thu Oct 13 10:41:15 2016
@@ -77,16 +77,16 @@ public class EmptyNamespaceTest {
transformer.setProperties(properties);
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
- transformer.setOutputStream(outputStream);
- InputStream stream = new ByteArrayInputStream(message.getBytes("UTF-8"));
-
- transformer.transform(stream);
- transformer.doFinal();
-
- String result = outputStream.toString();
- Assert.assertEquals(message, result);
+ try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ InputStream stream = new ByteArrayInputStream(message.getBytes("UTF-8"))) {
+ transformer.setOutputStream(outputStream);
+
+ transformer.transform(stream);
+ transformer.doFinal();
+
+ String result = outputStream.toString();
+ Assert.assertEquals(message, result);
+ }
}
@org.junit.Test
@@ -100,7 +100,10 @@ public class EmptyNamespaceTest {
documentBuilderFactory.setNamespaceAware(true);
documentBuilderFactory.setValidating(false);
final DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
- final Document document = documentBuilder.parse(new ByteArrayInputStream(message.getBytes("UTF-8")));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(message.getBytes("UTF-8"))) {
+ document = documentBuilder.parse(is);
+ }
String inclusiveNamespaces = "SOAP-ENV ec ec1 ns0 ns1 ns11 ns2 ns4 ns9";
byte[] output =
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=1764650&r1=1764649&r2=1764650&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 Oct 13 10:41:15 2016
@@ -19,6 +19,7 @@
package org.apache.xml.security.test.dom.transforms.implementations;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
@@ -60,8 +61,10 @@ public class TransformBase64DecodeTest e
doc.appendChild(t.getElement());
t.addTransform(TransformBase64Decode.implementedTransformURI);
- XMLSignatureInput in =
- new XMLSignatureInput(new ByteArrayInputStream(s1.getBytes()));
+ XMLSignatureInput in = null;
+ try (InputStream is = new ByteArrayInputStream(s1.getBytes())) {
+ in = new XMLSignatureInput(is);
+ }
XMLSignatureInput out = t.performTransforms(in);
String result = new String(out.getBytes());
@@ -82,8 +85,10 @@ public class TransformBase64DecodeTest e
t.addTransform(TransformBase64Decode.implementedTransformURI);
- XMLSignatureInput in =
- new XMLSignatureInput(new ByteArrayInputStream(s2.getBytes()));
+ XMLSignatureInput in = null;
+ try (InputStream is = new ByteArrayInputStream(s2.getBytes())) {
+ in = new XMLSignatureInput(is);
+ }
XMLSignatureInput out = t.performTransforms(t.performTransforms(in));
String result = new String(out.getBytes());
@@ -108,7 +113,10 @@ public class TransformBase64DecodeTest e
db.setErrorHandler(new org.apache.xml.security.utils.IgnoreAllErrorHandler());
- Document doc = db.parse(new ByteArrayInputStream(input.getBytes()));
+ Document doc = null;
+ try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
+ doc = db.parse(is);
+ }
//XMLUtils.circumventBug2650(doc);
XPathFactory xpf = XPathFactory.newInstance();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java Thu Oct 13 10:41:15 2016
@@ -127,10 +127,11 @@ public class Xpath2TransformationTest ex
" </edoc:ObjectContent>\n" +
" </edoc:Object>";
- ByteArrayInputStream is = new ByteArrayInputStream(sig.getBytes());
-
javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- org.w3c.dom.Document doc = db.parse(is);
+ org.w3c.dom.Document doc = null;
+ try (ByteArrayInputStream is = new ByteArrayInputStream(sig.getBytes())) {
+ doc = db.parse(is);
+ }
Element sigElement =
(Element) doc.getElementsByTagNameNS(
Constants.SignatureSpecNS, Constants._TAG_SIGNATURE).item(0);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java Thu Oct 13 10:41:15 2016
@@ -94,8 +94,11 @@ public class ExclusiveC14NInteropTest ex
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Verify signature
XMLSecurityProperties properties = new XMLSecurityProperties();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java Thu Oct 13 10:41:15 2016
@@ -126,8 +126,11 @@ public class BaltimoreEncTest extends or
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -161,8 +164,11 @@ public class BaltimoreEncTest extends or
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -196,8 +202,11 @@ public class BaltimoreEncTest extends or
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -231,8 +240,11 @@ public class BaltimoreEncTest extends or
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -262,8 +274,11 @@ public class BaltimoreEncTest extends or
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -297,8 +312,11 @@ public class BaltimoreEncTest extends or
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -330,8 +348,11 @@ public class BaltimoreEncTest extends or
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -363,8 +384,11 @@ public class BaltimoreEncTest extends or
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -392,8 +416,11 @@ public class BaltimoreEncTest extends or
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java Thu Oct 13 10:41:15 2016
@@ -180,8 +180,11 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -237,9 +240,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
@@ -293,9 +299,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
@@ -362,9 +371,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(kek);
@@ -431,9 +443,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(priv);
@@ -496,9 +511,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(priv);
@@ -565,9 +583,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(kek);
@@ -625,9 +646,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
@@ -685,9 +709,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
@@ -747,9 +774,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
@@ -811,9 +841,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
@@ -871,9 +904,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
@@ -900,7 +936,10 @@ public class DecryptionTest extends Asse
final String DATA1 =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><ns:root xmlns:ns=\"ns.com\"><ns:elem xmlns:ns2=\"ns2.com\">11</ns:elem></ns:root>";
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document document = db.parse(new ByteArrayInputStream(DATA1.getBytes("UTF8")));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(DATA1.getBytes("UTF8"))) {
+ document = db.parse(is);
+ }
// Set up the Key
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
@@ -926,8 +965,10 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -963,7 +1004,10 @@ public class DecryptionTest extends Asse
final String DATA1 =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><ns:root xmlns=\"defns.com\" xmlns:ns=\"ns.com\"><elem xmlns=\"\">11</elem></ns:root>";
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document document = db.parse(new ByteArrayInputStream(DATA1.getBytes("UTF8")));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(DATA1.getBytes("UTF8"))) {
+ document = db.parse(is);
+ }
// Set up the Key
byte[] bits192 = "abcdefghijklmnopqrstuvwx".getBytes();
@@ -989,8 +1033,10 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1251,8 +1297,10 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1331,8 +1379,10 @@ public class DecryptionTest extends Asse
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1391,8 +1441,10 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1461,8 +1513,10 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1530,8 +1584,11 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1599,8 +1656,11 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1676,8 +1736,11 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1736,9 +1799,12 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(priv);
@@ -1784,8 +1850,11 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1843,8 +1912,11 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
@@ -1899,8 +1971,11 @@ public class DecryptionTest extends Asse
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
- xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
+
+ XMLStreamReader xmlStreamReader = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ xmlStreamReader = xmlInputFactory.createXMLStreamReader(is);
+ }
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java Thu Oct 13 10:41:15 2016
@@ -110,8 +110,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 1);
@@ -167,8 +169,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
// Check the CreditCard encrypted ok
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -256,8 +260,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -313,8 +319,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 1);
@@ -372,8 +380,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 1);
@@ -428,8 +438,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -495,8 +507,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -562,8 +576,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -630,8 +646,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -700,8 +718,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
// Check the CreditCard encrypted ok
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -761,8 +781,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -830,8 +852,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -907,8 +931,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -976,8 +1002,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1045,8 +1073,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1108,8 +1138,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1167,8 +1199,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1228,8 +1262,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1291,8 +1327,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1417,8 +1455,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1469,16 +1509,19 @@ public class EncryptionCreationTest exte
final String DATA1 =
"<ns:root xmlns:ns=\"ns.com\"><ns:elem xmlns:ns2=\"ns2.com\">11</ns:elem></ns:root>";
- InputStream sourceDocument = new ByteArrayInputStream(DATA1.getBytes("UTF8"));
- XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(sourceDocument);
+ try (InputStream sourceDocument = new ByteArrayInputStream(DATA1.getBytes("UTF8"))) {
+ XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(sourceDocument);
- XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
- xmlStreamWriter.close();
+ XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
+ xmlStreamWriter.close();
+ }
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("ns.com", "elem");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1529,16 +1572,19 @@ public class EncryptionCreationTest exte
final String DATA2 =
"<ns:root xmlns=\"defns.com\" xmlns:ns=\"ns.com\"><elem xmlns=\"\">11</elem></ns:root>";
- InputStream sourceDocument = new ByteArrayInputStream(DATA2.getBytes("UTF8"));
- XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(sourceDocument);
-
- XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
- xmlStreamWriter.close();
+ try (InputStream sourceDocument = new ByteArrayInputStream(DATA2.getBytes("UTF8"))) {
+ XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(sourceDocument);
+
+ XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
+ xmlStreamWriter.close();
+ }
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("", "elem");
Assert.assertEquals(nodeList.getLength(), 0);
@@ -1595,8 +1641,10 @@ public class EncryptionCreationTest exte
// System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = null;
+ try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ document = XMLUtils.createDocumentBuilder(false).parse(is);
+ }
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);