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 [3/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...
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java Thu Oct 13 10:41:15 2016
@@ -99,8 +99,11 @@ public class PhaosTest extends Assert {
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();
@@ -132,9 +135,12 @@ public class PhaosTest extends Assert {
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -160,9 +166,12 @@ public class PhaosTest extends Assert {
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -205,9 +214,12 @@ public class PhaosTest extends Assert {
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();
properties.setSignatureVerificationKey(key);
@@ -243,9 +255,12 @@ public class PhaosTest extends Assert {
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();
properties.setSignatureVerificationKey(key);
@@ -276,9 +291,12 @@ public class PhaosTest extends Assert {
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();
properties.setSignatureVerificationKey(key);
@@ -323,9 +341,12 @@ public class PhaosTest extends Assert {
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -356,9 +377,12 @@ public class PhaosTest extends Assert {
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -389,9 +413,12 @@ public class PhaosTest extends Assert {
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -417,9 +444,12 @@ public class PhaosTest extends Assert {
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java Thu Oct 13 10:41:15 2016
@@ -76,9 +76,12 @@ public class RSASecurityTest extends Abs
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -109,9 +112,12 @@ public class RSASecurityTest extends Abs
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java Thu Oct 13 10:41:15 2016
@@ -98,8 +98,10 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- 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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -147,8 +149,10 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- 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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -202,8 +206,10 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- 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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts(), resolverDirectHTTP);
@@ -247,8 +253,10 @@ public class SignatureCreationReferenceU
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- 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("http://www.w3.org/2000/09/xmldsig#", "Reference");
Assert.assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java Thu Oct 13 10:41:15 2016
@@ -93,8 +93,10 @@ public class SignatureCreationTest exten
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);
+ }
//first child element must be the dsig:Signature @see SANTUARIO-324:
Node childNode = document.getDocumentElement().getFirstChild();
@@ -197,8 +199,10 @@ public class SignatureCreationTest exten
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);
+ }
//first child element must be the dsig:Signature @see SANTUARIO-324:
Node childNode = document.getDocumentElement().getFirstChild();
@@ -259,8 +263,10 @@ public class SignatureCreationTest exten
// 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);
+ }
//first child element must be the dsig:Signature @see SANTUARIO-324:
Node childNode = document.getDocumentElement().getFirstChild();
@@ -332,8 +338,10 @@ public class SignatureCreationTest exten
//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);
+ }
//find first child element:
Node childNode = XMLUtils.getNextElement(document.getDocumentElement().getFirstChild());
@@ -403,8 +411,10 @@ public class SignatureCreationTest exten
//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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts(),null,true,"ID");
@@ -450,8 +460,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -504,8 +516,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
XPathFactory xpf = XPathFactory.newInstance();
@@ -566,8 +580,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -612,8 +628,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -670,8 +688,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -729,8 +749,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -774,8 +796,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -820,8 +844,10 @@ public class SignatureCreationTest exten
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(XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -886,8 +912,10 @@ public class SignatureCreationTest exten
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(XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_CanonicalizationMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -951,9 +979,11 @@ public class SignatureCreationTest exten
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);
+ }
+
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
}
@@ -997,8 +1027,10 @@ public class SignatureCreationTest exten
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(XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces.getNamespaceURI(), XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces.getLocalPart());
Assert.assertEquals(2, nodeList.getLength());
@@ -1046,8 +1078,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1099,8 +1133,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1143,8 +1179,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1187,8 +1225,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1233,8 +1273,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -1279,8 +1321,10 @@ public class SignatureCreationTest exten
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts(), null, false, "Id");
@@ -1325,8 +1369,10 @@ public class SignatureCreationTest exten
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(XMLSecurityConstants.TAG_dsig_KeyName.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_KeyName.getLocalPart());
assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java Thu Oct 13 10:41:15 2016
@@ -121,8 +121,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -174,8 +176,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -227,8 +231,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -280,8 +286,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -333,8 +341,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -389,8 +399,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -445,8 +457,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -501,8 +515,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -557,8 +573,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -613,8 +631,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
@@ -669,8 +689,10 @@ public class SignatureDigestCreationTest
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(XMLSecurityConstants.TAG_dsig_DigestMethod.getNamespaceURI(), XMLSecurityConstants.TAG_dsig_DigestMethod.getLocalPart());
Assert.assertEquals(1, nodeList.getLength());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java Thu Oct 13 10:41:15 2016
@@ -128,9 +128,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -177,9 +180,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -226,9 +232,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -275,9 +284,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -324,9 +336,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -376,9 +391,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -428,9 +446,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -480,9 +501,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -532,9 +556,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -584,9 +611,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -636,9 +666,12 @@ public class SignatureDigestVerification
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java Thu Oct 13 10:41:15 2016
@@ -98,8 +98,10 @@ public class SignatureEncryptionTest ext
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);
+ }
// Decrypt using DOM API
Document doc =
@@ -165,8 +167,10 @@ public class SignatureEncryptionTest ext
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);
+ }
// Decrypt using DOM API
Document doc =
@@ -240,8 +244,10 @@ public class SignatureEncryptionTest ext
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);
+ }
// Decrypt using DOM API
Document doc =
@@ -315,8 +321,10 @@ public class SignatureEncryptionTest ext
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);
+ }
// Decrypt using DOM API
Document doc =
@@ -390,8 +398,10 @@ public class SignatureEncryptionTest ext
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);
+ }
// Verify using DOM
verifyUsingDOM(document, cert, properties.getSignatureSecureParts());
@@ -472,7 +482,9 @@ public class SignatureEncryptionTest ext
private TestSecurityEventListener verifyUsingStAX(
byte[] doc, Key decryptionKey, PublicKey signatureVerificationKey) throws Exception {
- return verifyUsingStAX(new ByteArrayInputStream(doc), decryptionKey, signatureVerificationKey);
+ try (InputStream is = new ByteArrayInputStream(doc)) {
+ return verifyUsingStAX(is, decryptionKey, signatureVerificationKey);
+ }
}
private TestSecurityEventListener verifyUsingStAX(
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java Thu Oct 13 10:41:15 2016
@@ -112,8 +112,10 @@ public class SignatureHMACCreationTest e
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);
+ }
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -155,8 +157,10 @@ public class SignatureHMACCreationTest e
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);
+ }
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -198,8 +202,10 @@ public class SignatureHMACCreationTest e
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);
+ }
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -241,8 +247,10 @@ public class SignatureHMACCreationTest e
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);
+ }
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -284,8 +292,10 @@ public class SignatureHMACCreationTest e
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);
+ }
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
@@ -330,8 +340,10 @@ public class SignatureHMACCreationTest e
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);
+ }
// Verify using DOM
verifyUsingDOM(document, key, properties.getSignatureSecureParts());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java Thu Oct 13 10:41:15 2016
@@ -119,8 +119,11 @@ public class SignatureHMACVerificationTe
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();
@@ -162,8 +165,11 @@ public class SignatureHMACVerificationTe
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();
@@ -205,8 +211,11 @@ public class SignatureHMACVerificationTe
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();
@@ -248,9 +257,12 @@ public class SignatureHMACVerificationTe
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();
properties.setSignatureVerificationKey(key);
@@ -291,8 +303,11 @@ public class SignatureHMACVerificationTe
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();
@@ -337,8 +352,11 @@ public class SignatureHMACVerificationTe
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/signature/SignatureVerificationReferenceURIResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java Thu Oct 13 10:41:15 2016
@@ -110,9 +110,12 @@ public class SignatureVerificationRefere
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();
properties.setSignatureVerificationKey(cert.getPublicKey());
@@ -177,9 +180,12 @@ public class SignatureVerificationRefere
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();
properties.setSignatureVerificationKey(cert.getPublicKey());
@@ -254,9 +260,12 @@ public class SignatureVerificationRefere
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();
properties.setSignatureVerificationKey(cert.getPublicKey());
@@ -329,9 +338,12 @@ public class SignatureVerificationRefere
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();
properties.setSignatureVerificationKey(cert.getPublicKey());
@@ -400,9 +412,12 @@ public class SignatureVerificationRefere
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();
properties.setSignatureVerificationKey(cert.getPublicKey());
@@ -464,8 +479,10 @@ public class SignatureVerificationRefere
//System.out.println(baos.toString());
- 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/signature/SignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java?rev=1764650&r1=1764649&r2=1764650&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java Thu Oct 13 10:41:15 2016
@@ -118,8 +118,11 @@ public class SignatureVerificationTest e
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();
@@ -195,8 +198,11 @@ public class SignatureVerificationTest e
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();
@@ -286,9 +292,12 @@ public class SignatureVerificationTest e
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -350,8 +359,11 @@ public class SignatureVerificationTest e
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();
@@ -395,8 +407,11 @@ public class SignatureVerificationTest e
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();
@@ -472,8 +487,11 @@ public class SignatureVerificationTest e
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();
@@ -540,8 +558,11 @@ public class SignatureVerificationTest e
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();
@@ -620,8 +641,11 @@ public class SignatureVerificationTest e
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();
@@ -700,8 +724,11 @@ public class SignatureVerificationTest e
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();
@@ -780,8 +807,11 @@ public class SignatureVerificationTest e
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();
@@ -864,8 +894,11 @@ public class SignatureVerificationTest e
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();
@@ -944,8 +977,11 @@ public class SignatureVerificationTest e
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();
@@ -1032,9 +1068,12 @@ public class SignatureVerificationTest e
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();
properties.setSignatureVerificationKey(cert.getPublicKey());
@@ -1109,8 +1148,11 @@ public class SignatureVerificationTest e
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();
@@ -1187,8 +1229,11 @@ public class SignatureVerificationTest e
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();
@@ -1257,8 +1302,11 @@ public class SignatureVerificationTest e
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();
@@ -1314,8 +1362,11 @@ public class SignatureVerificationTest e
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();
@@ -1371,8 +1422,11 @@ public class SignatureVerificationTest e
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();
@@ -1431,8 +1485,11 @@ public class SignatureVerificationTest e
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();
@@ -1488,9 +1545,12 @@ public class SignatureVerificationTest e
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();
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
@@ -1560,8 +1620,11 @@ public class SignatureVerificationTest e
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();
@@ -1609,8 +1672,11 @@ public class SignatureVerificationTest e
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();
@@ -1671,8 +1737,11 @@ public class SignatureVerificationTest e
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();
@@ -1739,8 +1808,11 @@ public class SignatureVerificationTest e
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();
@@ -1814,8 +1886,11 @@ public class SignatureVerificationTest e
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();