Author: veithen
Date: Fri May 19 07:49:25 2017
New Revision: 1795588
URL: http://svn.apache.org/viewvc?rev=1795588&view=rev
Log:
Eliminate usages of StAXUtils.createXMLStreamWriter from axiom-testsuite.
Added:
webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/stax/StAX.java
(with props)
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/pom.xml
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/serialization/SerializeToXMLStreamWriter.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/jaxb/TestExceptionDuringSerialization.java
Added:
webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/stax/StAX.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/stax/StAX.java?rev=1795588&view=auto
==============================================================================
---
webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/stax/StAX.java
(added)
+++
webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/stax/StAX.java
Fri May 19 07:49:25 2017
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.core.stream.stax;
+
+import java.io.OutputStream;
+
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.axiom.core.stream.NullXmlHandler;
+import org.apache.axiom.core.stream.serializer.Serializer;
+import org.apache.axiom.core.stream.stax.push.XmlHandlerStreamWriter;
+
+public final class StAX {
+ private StAX() {}
+
+ public static XMLStreamWriter createNullXMLStreamWriter() {
+ return new XmlHandlerStreamWriter(NullXmlHandler.INSTANCE, null, null);
+ }
+
+ public static XMLStreamWriter createXMLStreamWriter(OutputStream out,
String encoding) {
+ Serializer serializer = new Serializer(out, encoding);
+ return new XmlHandlerStreamWriter(serializer, serializer, null);
+ }
+}
Propchange:
webservices/axiom/trunk/components/core-streams/src/main/java/org/apache/axiom/core/stream/stax/StAX.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/testing/axiom-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/pom.xml?rev=1795588&r1=1795587&r2=1795588&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/pom.xml Fri May 19 07:49:25
2017
@@ -98,6 +98,11 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-streams</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/serialization/SerializeToXMLStreamWriter.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/serialization/SerializeToXMLStreamWriter.java?rev=1795588&r1=1795587&r2=1795588&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/serialization/SerializeToXMLStreamWriter.java
(original)
+++
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/serialization/SerializeToXMLStreamWriter.java
Fri May 19 07:49:25 2017
@@ -22,9 +22,9 @@ import java.io.ByteArrayOutputStream;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.core.stream.stax.StAX;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocument;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.testutils.suite.MatrixTestCase;
/**
@@ -57,7 +57,7 @@ public class SerializeToXMLStreamWriter
if (encoding == null) {
encoding = "UTF-8";
}
- XMLStreamWriter writer = StAXUtils.createXMLStreamWriter(baos,
encoding);
+ XMLStreamWriter writer = StAX.createXMLStreamWriter(baos, encoding);
if (cache) {
container.serialize(writer);
} else {
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java?rev=1795588&r1=1795587&r2=1795588&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
(original)
+++
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumeConsumed.java
Fri May 19 07:49:25 2017
@@ -21,13 +21,13 @@ package org.apache.axiom.ts.om.element;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.core.stream.stax.StAX;
import org.apache.axiom.om.NodeUnavailableException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.ts.AxiomTestCase;
/**
@@ -60,8 +60,7 @@ public class TestSerializeAndConsumeCons
//try to find the children of the document element. This should
produce an
//error since the underlying stream is fully consumed without building
the object tree
try {
- XMLStreamWriter writer =
StAXUtils.createXMLStreamWriter(System.out);
- documentElement.serializeAndConsume(writer);
+
documentElement.serializeAndConsume(StAX.createNullXMLStreamWriter());
fail("Expected NodeUnavailableException");
} catch (NodeUnavailableException e) {
//wea re cool
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/jaxb/TestExceptionDuringSerialization.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/jaxb/TestExceptionDuringSerialization.java?rev=1795588&r1=1795587&r2=1795588&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/jaxb/TestExceptionDuringSerialization.java
(original)
+++
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/jaxb/TestExceptionDuringSerialization.java
Fri May 19 07:49:25 2017
@@ -18,18 +18,16 @@
*/
package org.apache.axiom.ts.om.sourcedelement.jaxb;
-import java.io.ByteArrayOutputStream;
-
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.core.stream.stax.StAX;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.ds.jaxb.JAXBOMDataSource;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.ts.AxiomTestCase;
import org.apache.axiom.ts.jaxb.beans.DocumentBean;
@@ -52,7 +50,7 @@ public class TestExceptionDuringSerializ
OMSourcedElement element = omFactory.createOMElement(new
JAXBOMDataSource(context, object));
XMLStreamException exception = new XMLStreamException("TEST");
try {
- element.serialize(new
ExceptionXMLStreamWriterWrapper(StAXUtils.createXMLStreamWriter(new
ByteArrayOutputStream()), exception));
+ element.serialize(new
ExceptionXMLStreamWriterWrapper(StAX.createNullXMLStreamWriter(), exception));
fail("Expected XMLStreamException");
} catch (XMLStreamException ex) {
assertSame(exception, ex);
