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/07/12 13:53:25 UTC
svn commit: r1752294 - 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/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/
Author: veithen
Date: Tue Jul 12 13:53:25 2016
New Revision: 1752294
URL: http://svn.apache.org/viewvc?rev=1752294&view=rev
Log:
Simplify the OMMetaFactorySPI interface.
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/OMMetaFactorySPI.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLBuilderFactory.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.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=1752294&r1=1752293&r2=1752294&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 Tue Jul 12 13:53:25 2016
@@ -88,8 +88,8 @@ public abstract class AbstractOMMetaFact
}
@Override
- public SOAPModelBuilder createSOAPModelBuilder(StAXParserConfiguration configuration, InputSource is) {
- return SOAP.createBuilder(nodeFactory, BuilderSpec.from(configuration, is));
+ public SOAPModelBuilder createSOAPModelBuilder(InputSource is) {
+ return SOAP.createBuilder(nodeFactory, BuilderSpec.from(StAXParserConfiguration.SOAP, is));
}
@Override
@@ -98,9 +98,8 @@ public abstract class AbstractOMMetaFact
}
@Override
- public SOAPModelBuilder createSOAPModelBuilder(StAXParserConfiguration configuration,
- InputSource rootPart, MimePartProvider mimePartProvider) {
- return SOAP.createBuilder(nodeFactory, BuilderSpec.from(configuration, rootPart, mimePartProvider));
+ public SOAPModelBuilder createSOAPModelBuilder(InputSource rootPart, MimePartProvider mimePartProvider) {
+ return SOAP.createBuilder(nodeFactory, BuilderSpec.from(StAXParserConfiguration.SOAP, rootPart, mimePartProvider));
}
@Override
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactorySPI.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactorySPI.java?rev=1752294&r1=1752293&r2=1752294&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactorySPI.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactorySPI.java Tue Jul 12 13:53:25 2016
@@ -143,14 +143,11 @@ public interface OMMetaFactorySPI extend
* The implementation will select the appropriate {@link SOAPFactory} based on the namespace URI
* of the SOAP envelope.
*
- * @param configuration
- * the parser configuration to use; for security reasons, this should in general be
- * {@link StAXParserConfiguration#SOAP}
* @param is
* the source of the SOAP message
* @return the builder
*/
- SOAPModelBuilder createSOAPModelBuilder(StAXParserConfiguration configuration, InputSource is);
+ SOAPModelBuilder createSOAPModelBuilder(InputSource is);
/**
* Create an object model builder for SOAP that reads a message from the provided {@link Source}.
@@ -166,17 +163,13 @@ public interface OMMetaFactorySPI extend
/**
* Create an MTOM aware object model builder.
*
- * @param configuration
- * the parser configuration to use; for security reasons, this should in general be
- * {@link StAXParserConfiguration#SOAP}
* @param rootPart
* the source of the root part of the MTOM message
* @param mimePartProvider
* the provider from which MIME parts referenced in the root part will be retrieved
* @return the builder
*/
- SOAPModelBuilder createSOAPModelBuilder(StAXParserConfiguration configuration,
- InputSource rootPart, MimePartProvider mimePartProvider);
+ SOAPModelBuilder createSOAPModelBuilder(InputSource rootPart, MimePartProvider mimePartProvider);
SOAPModelBuilder createSOAPModelBuilder(Source rootPart, MimePartProvider mimePartProvider);
}
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=1752294&r1=1752293&r2=1752294&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 Tue Jul 12 13:53:25 2016
@@ -582,7 +582,7 @@ public class OMXMLBuilderFactory {
public static SOAPModelBuilder createSOAPModelBuilder(OMMetaFactory metaFactory, InputStream in, String encoding) {
InputSource is = new InputSource(in);
is.setEncoding(encoding);
- return ((OMMetaFactorySPI)metaFactory).createSOAPModelBuilder(StAXParserConfiguration.SOAP, is);
+ return ((OMMetaFactorySPI)metaFactory).createSOAPModelBuilder(is);
}
/**
@@ -612,7 +612,7 @@ public class OMXMLBuilderFactory {
* @return the builder
*/
public static SOAPModelBuilder createSOAPModelBuilder(OMMetaFactory metaFactory, Reader in) {
- return ((OMMetaFactorySPI)metaFactory).createSOAPModelBuilder(StAXParserConfiguration.SOAP, new InputSource(in));
+ return ((OMMetaFactorySPI)metaFactory).createSOAPModelBuilder(new InputSource(in));
}
/**
@@ -727,7 +727,7 @@ public class OMXMLBuilderFactory {
} else {
throw new OMException("Unable to determine SOAP version");
}
- SOAPModelBuilder builder = ((OMMetaFactorySPI)metaFactory).createSOAPModelBuilder(StAXParserConfiguration.SOAP,
+ SOAPModelBuilder builder = ((OMMetaFactorySPI)metaFactory).createSOAPModelBuilder(
getRootPartInputSource(message), message);
if (builder.getSOAPMessage().getOMFactory() != soapFactory) {
throw new SOAPProcessingException("Invalid SOAP namespace URI. " +
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java?rev=1752294&r1=1752293&r2=1752294&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSampleAdapter.java Tue Jul 12 13:53:25 2016
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.soap;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMMetaFactorySPI;
-import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPMessage;
@@ -42,7 +41,7 @@ public final class SOAPSampleAdapter {
}
public SOAPModelBuilder getBuilder(OMMetaFactory metaFactory) {
- return ((OMMetaFactorySPI)metaFactory).createSOAPModelBuilder(StAXParserConfiguration.SOAP, new InputSource(sample.getInputStream()));
+ return ((OMMetaFactorySPI)metaFactory).createSOAPModelBuilder(new InputSource(sample.getInputStream()));
}
public SOAPMessage getSOAPMessage(OMMetaFactory metaFactory) {