You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/04/26 00:25:47 UTC
svn commit: r1740919 -
/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
Author: veithen
Date: Mon Apr 25 22:25:47 2016
New Revision: 1740919
URL: http://svn.apache.org/viewvc?rev=1740919&view=rev
Log:
Clean up after earlier refactoring: no need to pass nodeFactory around; use attribute instead.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.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=1740919&r1=1740918&r2=1740919&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 22:25:47 2016
@@ -183,7 +183,7 @@ public abstract class AbstractOMMetaFact
return new OMXMLParserWrapperImpl(new BuilderImpl(input, nodeFactory, model, root, repairNamespaces), detachable);
}
- private SOAPModelBuilder createSOAPModelBuilder(XmlInput input, NodeFactory nodeFactory,
+ private SOAPModelBuilder createSOAPModelBuilder(XmlInput input,
boolean repairNamespaces, Detachable detachable) {
BuilderImpl builder = new BuilderImpl(new FilteredXmlInput(input, SOAPFilter.INSTANCE), nodeFactory, new SOAPModel(), null, true);
// The SOAPFactory instance linked to the SOAPMessage is unknown until we reach the
@@ -269,14 +269,14 @@ public abstract class AbstractOMMetaFact
}
public SOAPModelBuilder createStAXSOAPModelBuilder(XMLStreamReader parser) {
- return createSOAPModelBuilder(new StAXPullInput(getXMLStreamReader(parser), false, null), nodeFactory, true, null);
+ return createSOAPModelBuilder(new StAXPullInput(getXMLStreamReader(parser), false, null), true, null);
}
public SOAPModelBuilder createSOAPModelBuilder(StAXParserConfiguration configuration, InputSource is) {
SourceInfo sourceInfo = createXMLStreamReader(configuration, is, true);
return createSOAPModelBuilder(
new StAXPullInput(sourceInfo.getReader(), true, sourceInfo.getCloseable()),
- nodeFactory, false, sourceInfo.getDetachable());
+ false, sourceInfo.getDetachable());
}
public SOAPModelBuilder createSOAPModelBuilder(Source source) {
@@ -284,13 +284,13 @@ public abstract class AbstractOMMetaFact
// TODO: supporting this will require some refactoring of the builders
throw new UnsupportedOperationException();
} else if (source instanceof DOMSource) {
- return createSOAPModelBuilder(new DOMInput(((DOMSource)source).getNode(), true), nodeFactory, true, null);
+ return createSOAPModelBuilder(new DOMInput(((DOMSource)source).getNode(), true), true, null);
} else if (source instanceof StreamSource) {
return createSOAPModelBuilder(StAXParserConfiguration.SOAP,
toInputSource((StreamSource)source));
} else {
try {
- return createSOAPModelBuilder(new StAXPullInput(StAXUtils.getXMLInputFactory().createXMLStreamReader(source), true, null), nodeFactory, true, null);
+ return createSOAPModelBuilder(new StAXPullInput(StAXUtils.getXMLInputFactory().createXMLStreamReader(source), true, null), true, null);
} catch (XMLStreamException ex) {
throw new OMException(ex);
}
@@ -302,7 +302,7 @@ public abstract class AbstractOMMetaFact
SourceInfo sourceInfo = createXMLStreamReader(configuration, rootPart, false);
SOAPModelBuilder builder = createSOAPModelBuilder(
new StAXPullInput(new XOPDecodingStreamReader(sourceInfo.getReader(), mimePartProvider), true, sourceInfo.getCloseable()),
- nodeFactory, false,
+ false,
mimePartProvider instanceof Detachable ? (Detachable)mimePartProvider : null);
if (builder.getSOAPMessage().getOMFactory() != soapFactory) {
throw new SOAPProcessingException("Invalid SOAP namespace URI. " +