ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1740922 - in /webservices/axiom/trunk: aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/ axiom-api/src/main/java/org/apache/axiom/om/ axiom-api/src/main/java/org/apache/axiom/om/util/ implementations/axiom-dom/src/m...
Date Mon, 25 Apr 2016 23:04:48 GMT
Author: veithen
Date: Mon Apr 25 23:04:48 2016
New Revision: 1740922

URL: http://svn.apache.org/viewvc?rev=1740922&view=rev
Log:
Remove the unused OMFactory arguments from methods in OMMetaFactory.

Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java
    webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/DOOMDocumentBuilder.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/BuilderFactory.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestClone.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromParser.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
Mon Apr 25 23:04:48 2016
@@ -41,7 +41,6 @@ import org.apache.axiom.core.stream.XmlI
 import org.apache.axiom.core.stream.dom.DOMInput;
 import org.apache.axiom.core.stream.sax.SAXInput;
 import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.builder.Detachable;
@@ -202,13 +201,13 @@ public abstract class AbstractOMMetaFact
         return new SOAPModelBuilderImpl(builder, detachable);
     }
     
-    public OMXMLParserWrapper createStAXOMBuilder(OMFactory omFactory, XMLStreamReader parser)
{
+    public OMXMLParserWrapper createStAXOMBuilder(XMLStreamReader parser) {
         return createOMBuilder(
                 new StAXPullInput(getXMLStreamReader(parser), false, null),
                 true, null);
     }
 
-    public OMXMLParserWrapper createOMBuilder(OMFactory omFactory, StAXParserConfiguration
configuration, InputSource is) {
+    public OMXMLParserWrapper createOMBuilder(StAXParserConfiguration configuration, InputSource
is) {
         SourceInfo sourceInfo = createXMLStreamReader(configuration, is, true);
         return createOMBuilder(
                 new StAXPullInput(sourceInfo.getReader(), true, sourceInfo.getCloseable()),
@@ -224,14 +223,13 @@ public abstract class AbstractOMMetaFact
         return is;
     }
     
-    public OMXMLParserWrapper createOMBuilder(OMFactory omFactory, Source source) {
+    public OMXMLParserWrapper createOMBuilder(Source source) {
         if (source instanceof SAXSource) {
-            return createOMBuilder(omFactory, (SAXSource)source, true);
+            return createOMBuilder((SAXSource)source, true);
         } else if (source instanceof DOMSource) {
-            return createOMBuilder(omFactory, ((DOMSource)source).getNode(), true);
+            return createOMBuilder(((DOMSource)source).getNode(), true);
         } else if (source instanceof StreamSource) {
-            return createOMBuilder(omFactory, StAXParserConfiguration.DEFAULT,
-                    toInputSource((StreamSource)source));
+            return createOMBuilder(StAXParserConfiguration.DEFAULT, toInputSource((StreamSource)source));
         } else {
             try {
                 return createOMBuilder(
@@ -243,21 +241,18 @@ public abstract class AbstractOMMetaFact
         }
     }
 
-    public OMXMLParserWrapper createOMBuilder(OMFactory omFactory, Node node,
-            boolean expandEntityReferences) {
+    public OMXMLParserWrapper createOMBuilder(Node node, boolean expandEntityReferences)
{
         return createOMBuilder(
                 new DOMInput(node, expandEntityReferences),
                 true, null);
     }
 
-    // TODO: don't need the omFactory argument anymore
-    public OMXMLParserWrapper createOMBuilder(OMFactory omFactory, SAXSource source,
-            boolean expandEntityReferences) {
+    public OMXMLParserWrapper createOMBuilder(SAXSource source, boolean expandEntityReferences)
{
         return createOMBuilder(new SAXInput(source, expandEntityReferences), true, null);
     }
 
     public OMXMLParserWrapper createOMBuilder(StAXParserConfiguration configuration,
-            OMFactory omFactory, InputSource rootPart, MimePartProvider mimePartProvider)
{
+            InputSource rootPart, MimePartProvider mimePartProvider) {
         SourceInfo sourceInfo = createXMLStreamReader(configuration, rootPart, false);
         return createOMBuilder(
                 new StAXPullInput(new XOPDecodingStreamReader(sourceInfo.getReader(), mimePartProvider),
true, sourceInfo.getCloseable()), 

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java
(original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java
Mon Apr 25 23:04:48 2016
@@ -70,60 +70,36 @@ public interface OMMetaFactory {
      * The implementation must perform namespace repairing, i.e. it must add appropriate
namespace
      * declarations if undeclared namespaces appear in the StAX stream.
      * 
-     * @param omFactory
-     *            The object model factory to use. This factory must be obtained from the
same
-     *            {@link OMMetaFactory} instance as the one used to invoke this method. In
general
-     *            the factory will be retrieved from {@link #getOMFactory()}), but in some
cases it
-     *            may be necessary to pass a {@link SOAPFactory} instance, although this
method will
-     *            never produce a SOAP infoset.
      * @param parser
      *            the stream reader to read the XML data from
      * @return the builder
      */
-    OMXMLParserWrapper createStAXOMBuilder(OMFactory omFactory, XMLStreamReader parser);
+    OMXMLParserWrapper createStAXOMBuilder(XMLStreamReader parser);
     
     /**
      * Create an object model builder for plain XML that reads a document from the provided
input
      * source.
      * 
-     * @param omFactory
-     *            The object model factory to use. This factory must be obtained from the
same
-     *            {@link OMMetaFactory} instance as the one used to invoke this method. In
general
-     *            the factory will be retrieved from {@link #getOMFactory()}), but in some
cases it
-     *            may be necessary to pass a {@link SOAPFactory} instance, although this
method will
-     *            never produce a SOAP infoset.
      * @param configuration
      *            the parser configuration to use
      * @param is
      *            the source of the XML document
      * @return the builder
      */
-    OMXMLParserWrapper createOMBuilder(OMFactory omFactory, StAXParserConfiguration configuration,
InputSource is);
+    OMXMLParserWrapper createOMBuilder(StAXParserConfiguration configuration, InputSource
is);
     
     /**
      * Create an object model builder for plain XML that gets its input from a {@link Source}.
      * 
-     * @param omFactory
-     *            The object model factory to use. This factory must be obtained from the
same
-     *            {@link OMMetaFactory} instance as the one used to invoke this method. In
general
-     *            the factory will be retrieved from {@link #getOMFactory()}), but in some
cases it
-     *            may be necessary to pass a {@link SOAPFactory} instance, although this
method will
-     *            never produce a SOAP infoset.
      * @param source
      *            the source of the XML document
      * @return the builder
      */
-    OMXMLParserWrapper createOMBuilder(OMFactory omFactory, Source source);
+    OMXMLParserWrapper createOMBuilder(Source source);
     
     /**
      * Create an object model builder for plain XML that gets its input from a DOM tree.
      * 
-     * @param omFactory
-     *            The object model factory to use. This factory must be obtained from the
same
-     *            {@link OMMetaFactory} instance as the one used to invoke this method. In
general
-     *            the factory will be retrieved from {@link #getOMFactory()}), but in some
cases it
-     *            may be necessary to pass a {@link SOAPFactory} instance, although this
method will
-     *            never produce a SOAP infoset.
      * @param node
      *            the DOM node; must be a {@link Node#DOCUMENT_NODE} or {@link Node#ELEMENT_NODE}
      * @param expandEntityReferences
@@ -138,17 +114,13 @@ public interface OMMetaFactory {
      *            </ul>
      * @return the builder
      */
-    OMXMLParserWrapper createOMBuilder(OMFactory omFactory, Node node, boolean expandEntityReferences);
+    OMXMLParserWrapper createOMBuilder(Node node, boolean expandEntityReferences);
     
     /**
      * Create an object model builder for plain XML that gets its input from a {@link SAXSource}.
      * 
-     * @param omFactory
-     *            The object model factory to use. This factory must be obtained from the
same
-     *            {@link OMMetaFactory} instance as the one used to invoke this method. In
general
-     *            the factory will be retrieved from {@link #getOMFactory()}), but in some
cases it
-     *            may be necessary to pass a {@link SOAPFactory} instance, although this
method will
-     *            never produce a SOAP infoset.
+     * @param source
+     *            the source of the XML document
      * @param expandEntityReferences
      *            Determines how entity references (i.e. {@link LexicalHandler#startEntity(String)}
      *            and {@link LexicalHandler#endEntity(String)} events) are handled:
@@ -163,20 +135,15 @@ public interface OMMetaFactory {
      *            between {@link LexicalHandler#startEntity(String)} and
      *            {@link LexicalHandler#endEntity(String)} are processed normally.
      *            </ul>
-     * @param source
-     *            the source of the XML document
      * @return the builder
      */
-    OMXMLParserWrapper createOMBuilder(OMFactory omFactory, SAXSource source, boolean expandEntityReferences);
+    OMXMLParserWrapper createOMBuilder(SAXSource source, boolean expandEntityReferences);
     
     /**
      * Create an XOP aware object model builder.
      * 
      * @param configuration
      *            the parser configuration to use
-     * @param omFactory
-     *            The object model factory to use. This factory must be obtained from the
same
-     *            {@link OMMetaFactory} instance as the one used to invoke this method.
      * @param rootPart
      *            the source of the root part of the XOP message
      * @param mimePartProvider
@@ -184,7 +151,7 @@ public interface OMMetaFactory {
      * @return the builder
      */
     OMXMLParserWrapper createOMBuilder(StAXParserConfiguration configuration,
-            OMFactory omFactory, InputSource rootPart, MimePartProvider mimePartProvider);
+            InputSource rootPart, MimePartProvider mimePartProvider);
     
     /**
      * Create an object model builder for SOAP that pulls events from a StAX stream reader.
The

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
(original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
Mon Apr 25 23:04:48 2016
@@ -80,7 +80,7 @@ public class OMXMLBuilderFactory {
      */
     public static OMXMLParserWrapper createStAXOMBuilder(XMLStreamReader parser) {
         OMMetaFactory metaFactory = OMAbstractFactory.getMetaFactory();
-        return metaFactory.createStAXOMBuilder(metaFactory.getOMFactory(), parser);
+        return metaFactory.createStAXOMBuilder(parser);
     }
     
     /**
@@ -97,7 +97,7 @@ public class OMXMLBuilderFactory {
      * @return the builder
      */
     public static OMXMLParserWrapper createStAXOMBuilder(OMFactory omFactory, XMLStreamReader
parser) {
-        return omFactory.getMetaFactory().createStAXOMBuilder(omFactory, parser);
+        return omFactory.getMetaFactory().createStAXOMBuilder(parser);
     }
     
     /**
@@ -158,7 +158,7 @@ public class OMXMLBuilderFactory {
         OMMetaFactory metaFactory = OMAbstractFactory.getMetaFactory();
         InputSource is = new InputSource(in);
         is.setEncoding(encoding);
-        return metaFactory.createOMBuilder(metaFactory.getOMFactory(), configuration, is);
+        return metaFactory.createOMBuilder(configuration, is);
     }
     
     /**
@@ -228,7 +228,7 @@ public class OMXMLBuilderFactory {
     public static OMXMLParserWrapper createOMBuilder(OMFactory omFactory, StAXParserConfiguration
configuration, InputStream in, String encoding) {
         InputSource is = new InputSource(in);
         is.setEncoding(encoding);
-        return omFactory.getMetaFactory().createOMBuilder(omFactory, configuration, is);
+        return omFactory.getMetaFactory().createOMBuilder(configuration, is);
     }
     
     /**
@@ -256,7 +256,7 @@ public class OMXMLBuilderFactory {
      */
     public static OMXMLParserWrapper createOMBuilder(StAXParserConfiguration configuration,
Reader in) {
         OMMetaFactory metaFactory = OMAbstractFactory.getMetaFactory();
-        return metaFactory.createOMBuilder(metaFactory.getOMFactory(), configuration, new
InputSource(in));
+        return metaFactory.createOMBuilder(configuration, new InputSource(in));
     }
     
     /**
@@ -287,7 +287,7 @@ public class OMXMLBuilderFactory {
      * @return the builder
      */
     public static OMXMLParserWrapper createOMBuilder(OMFactory omFactory, StAXParserConfiguration
configuration, Reader in) {
-        return omFactory.getMetaFactory().createOMBuilder(omFactory, configuration, new InputSource(in));
+        return omFactory.getMetaFactory().createOMBuilder(configuration, new InputSource(in));
     }
     
     /**
@@ -303,7 +303,7 @@ public class OMXMLBuilderFactory {
      */
     public static OMXMLParserWrapper createOMBuilder(Source source) {
         OMMetaFactory metaFactory = OMAbstractFactory.getMetaFactory();
-        return metaFactory.createOMBuilder(metaFactory.getOMFactory(), source);
+        return metaFactory.createOMBuilder(source);
     }
     
     /**
@@ -325,7 +325,7 @@ public class OMXMLBuilderFactory {
      */
     public static OMXMLParserWrapper createOMBuilder(Node node, boolean expandEntityReferences)
{
         OMMetaFactory metaFactory = OMAbstractFactory.getMetaFactory();
-        return metaFactory.createOMBuilder(metaFactory.getOMFactory(), node, expandEntityReferences);
+        return metaFactory.createOMBuilder(node, expandEntityReferences);
     }
     
     /**
@@ -352,7 +352,7 @@ public class OMXMLBuilderFactory {
      */
     public static OMXMLParserWrapper createOMBuilder(SAXSource source, boolean expandEntityReferences)
{
         OMMetaFactory metaFactory = OMAbstractFactory.getMetaFactory();
-        return metaFactory.createOMBuilder(metaFactory.getOMFactory(), source, expandEntityReferences);
+        return metaFactory.createOMBuilder(source, expandEntityReferences);
     }
     
     /**
@@ -370,7 +370,7 @@ public class OMXMLBuilderFactory {
      * @return the builder
      */
     public static OMXMLParserWrapper createOMBuilder(OMFactory omFactory, Source source)
{
-        return omFactory.getMetaFactory().createOMBuilder(omFactory, source);
+        return omFactory.getMetaFactory().createOMBuilder(source);
     }
     
     /**
@@ -394,7 +394,7 @@ public class OMXMLBuilderFactory {
      * @return the builder
      */
     public static OMXMLParserWrapper createOMBuilder(OMFactory omFactory, Node node, boolean
expandEntityReferences) {
-        return omFactory.getMetaFactory().createOMBuilder(omFactory, node, expandEntityReferences);
+        return omFactory.getMetaFactory().createOMBuilder(node, expandEntityReferences);
     }
     
     /**
@@ -422,7 +422,7 @@ public class OMXMLBuilderFactory {
      * @return the builder
      */
     public static OMXMLParserWrapper createOMBuilder(OMFactory omFactory, SAXSource source,
boolean expandEntityReferences) {
-        return omFactory.getMetaFactory().createOMBuilder(omFactory, source, expandEntityReferences);
+        return omFactory.getMetaFactory().createOMBuilder(source, expandEntityReferences);
     }
     
     /**
@@ -466,8 +466,8 @@ public class OMXMLBuilderFactory {
             throw new OMException(ex);
         }
         InputSource rootPart = getRootPartInputSource(attachments, contentType);
-        return omFactory.getMetaFactory().createOMBuilder(configuration, omFactory,
-                rootPart, new AttachmentsMimePartProvider(attachments));
+        return omFactory.getMetaFactory().createOMBuilder(configuration, rootPart,
+                new AttachmentsMimePartProvider(attachments));
     }
     
     /**

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java
(original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/ElementHelper.java
Mon Apr 25 23:04:48 2016
@@ -176,7 +176,7 @@ public class ElementHelper {
             return omElement;
         } else {
             OMElement documentElement = omFactory.getMetaFactory().createStAXOMBuilder(
-                    omFactory, omElement.getXMLStreamReader()).getDocumentElement();
+                    omElement.getXMLStreamReader()).getDocumentElement();
             documentElement.build();
             return documentElement;
         }

Modified: webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/DOOMDocumentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/DOOMDocumentBuilder.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/DOOMDocumentBuilder.java
(original)
+++ webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/DOOMDocumentBuilder.java
Mon Apr 25 23:04:48 2016
@@ -96,8 +96,8 @@ final class DOOMDocumentBuilder extends
     }
 
     public Document parse(InputSource inputSource) throws SAXException, IOException {
-        OMDocument document = factory.getMetaFactory().createOMBuilder(factory,
-                parserConfiguration, inputSource).getDocument();
+        OMDocument document = factory.getMetaFactory().createOMBuilder(parserConfiguration,
+                inputSource).getDocument();
         document.close(true);
         return (Document)document;
     }

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/BuilderFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/BuilderFactory.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/BuilderFactory.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/dimension/BuilderFactory.java
Mon Apr 25 23:04:48 2016
@@ -54,8 +54,8 @@ public abstract class BuilderFactory ext
         }
 
         public OMXMLParserWrapper getBuilder(OMMetaFactory metaFactory, InputSource inputSource)
throws Exception {
-            return metaFactory.createOMBuilder(metaFactory.getOMFactory(),
-                    AxiomTestCase.TEST_PARSER_CONFIGURATION, inputSource);
+            return metaFactory.createOMBuilder(AxiomTestCase.TEST_PARSER_CONFIGURATION,
+                    inputSource);
         }
     };
 

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
Mon Apr 25 23:04:48 2016
@@ -38,7 +38,7 @@ public class TestCloseWithXMLStreamReade
         InputStream in = XMLSample.SIMPLE.getInputStream();
         try {
             XMLStreamReader reader = StAXUtils.createXMLStreamReader(in);
-            OMXMLParserWrapper builder = metaFactory.createStAXOMBuilder(metaFactory.getOMFactory(),
reader);
+            OMXMLParserWrapper builder = metaFactory.createStAXOMBuilder(reader);
             WeakReference<XMLStreamReader> readerWeakRef = new WeakReference<XMLStreamReader>(reader);
             reader = null;
             builder.getDocument().build();

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing.java
Mon Apr 25 23:04:48 2016
@@ -24,14 +24,13 @@ import java.util.Iterator;
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.ts.AxiomTestCase;
 
 /**
- * Tests that {@link OMMetaFactory#createStAXOMBuilder(OMFactory, XMLStreamReader)} performs
+ * Tests that {@link OMMetaFactory#createStAXOMBuilder(XMLStreamReader)} performs
  * namespace repairing.
  */
 public class TestCreateStAXOMBuilderNamespaceRepairing extends AxiomTestCase {
@@ -42,8 +41,7 @@ public class TestCreateStAXOMBuilderName
     protected void runTest() throws Throwable {
         XMLStreamReader reader = StAXUtils.createXMLStreamReader(new StringReader(
                 "<p:root xmlns:p='urn:ns1' xmlns:q='urn:ns2'><child q:attr='value'/></p:root>"));
-        OMElement element = metaFactory.createStAXOMBuilder(metaFactory.getOMFactory(),
-                new NamespaceDeclarationFilter(reader)).getDocumentElement();
+        OMElement element = metaFactory.createStAXOMBuilder(new NamespaceDeclarationFilter(reader)).getDocumentElement();
         
         Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
         assertTrue(it.hasNext());

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
Mon Apr 25 23:04:48 2016
@@ -24,14 +24,13 @@ import java.util.Iterator;
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.ts.AxiomTestCase;
 
 /**
- * Tests that {@link OMMetaFactory#createStAXOMBuilder(OMFactory, XMLStreamReader)} correctly
+ * Tests that {@link OMMetaFactory#createStAXOMBuilder(XMLStreamReader)} correctly
  * performs namespace repairing in cases where a namespace declaration of the form <tt>xmlns=""</tt>
  * is required. This is a regression test for <a
  * href="https://issues.apache.org/jira/browse/AXIOM-408">AXIOM-408</a>.
@@ -44,8 +43,7 @@ public class TestCreateStAXOMBuilderName
     protected void runTest() throws Throwable {
         XMLStreamReader reader = StAXUtils.createXMLStreamReader(new StringReader(
                 "<test xmlns='urn:test'><arg0 xmlns=''>dGVzdA==</arg0></test>"));
-        OMElement element = metaFactory.createStAXOMBuilder(metaFactory.getOMFactory(),
-                new NamespaceDeclarationFilter(reader)).getDocumentElement();
+        OMElement element = metaFactory.createStAXOMBuilder(new NamespaceDeclarationFilter(reader)).getDocumentElement();
         
         Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
         assertTrue(it.hasNext());

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
Mon Apr 25 23:04:48 2016
@@ -50,8 +50,8 @@ public class TestSerialize extends Confo
     }
 
     protected void runTest() throws Throwable {
-        OMXMLParserWrapper builder = metaFactory.createOMBuilder(metaFactory.getOMFactory(),
-                TEST_PARSER_CONFIGURATION, new InputSource(file.getUrl().toString()));
+        OMXMLParserWrapper builder = metaFactory.createOMBuilder(TEST_PARSER_CONFIGURATION,
+                new InputSource(file.getUrl().toString()));
         try {
             OMContainer container = containerExtractor.getContainer(builder);
             // We need to clone the InputSource objects so that we can dump their contents

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestClone.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestClone.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestClone.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestClone.java
Mon Apr 25 23:04:48 2016
@@ -34,8 +34,8 @@ public class TestClone extends Conforman
     }
 
     protected void runTest() throws Throwable {
-        OMDocument original = metaFactory.createOMBuilder(metaFactory.getOMFactory(),
-                TEST_PARSER_CONFIGURATION, new InputSource(file.getUrl().toString())).getDocument();
+        OMDocument original = metaFactory.createOMBuilder(TEST_PARSER_CONFIGURATION,
+                new InputSource(file.getUrl().toString())).getDocument();
         OMDocument clone = (OMDocument)original.clone(new OMCloneOptions());
         assertAbout(xml())
                 .that(xml(OMDocument.class, clone))

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromParser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromParser.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromParser.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCDATAEventFromParser.java
Mon Apr 25 23:04:48 2016
@@ -43,7 +43,7 @@ public class TestGetXMLStreamReaderCDATA
         // reported). This is not the default for Woodstox (see WSTX-140).
         XMLStreamReader reader = StAXUtils.createXMLStreamReader(StAXParserConfiguration.NON_COALESCING,
is);
         
-        OMElement element = metaFactory.createStAXOMBuilder(metaFactory.getOMFactory(), reader).getDocumentElement();
+        OMElement element = metaFactory.createStAXOMBuilder(reader).getDocumentElement();
         
         // Build the element so we have a full StAX tree
         element.build();

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java?rev=1740922&r1=1740921&r2=1740922&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestCloneBinary.java
Mon Apr 25 23:04:48 2016
@@ -45,7 +45,7 @@ public class TestCloneBinary extends Axi
         DataHandler dh = new DataHandler(new RandomDataSource(600613L, 4096));
         InputStream rootPart = new ByteArrayInputStream("<root><xop:Include xmlns:xop='http://www.w3.org/2004/08/xop/include'
href='cid:123456@example.org'/></root>".getBytes("utf-8"));
         DummyMimePartProvider mimePartProvider = new DummyMimePartProvider("123456@example.org",
dh);
-        OMElement root = metaFactory.createOMBuilder(StAXParserConfiguration.DEFAULT, metaFactory.getOMFactory(),
new InputSource(rootPart), mimePartProvider).getDocumentElement();
+        OMElement root = metaFactory.createOMBuilder(StAXParserConfiguration.DEFAULT, new
InputSource(rootPart), mimePartProvider).getDocumentElement();
         OMText text = (OMText)root.getFirstOMChild();
         OMCloneOptions options = new OMCloneOptions();
         options.setFetchDataHandlers(fetch);



Mime
View raw message