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/01/22 21:50:18 UTC
svn commit: r1726310 - 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/ds/
axiom-api/src/main/java/org/apache/axiom/om/impl/builder/
axiom-api/src/main/j...
Author: veithen
Date: Fri Jan 22 20:50:18 2016
New Revision: 1726310
URL: http://svn.apache.org/viewvc?rev=1726310&view=rev
Log:
Remove deprecated constructors from StAXBuilder, StAXOMBuilder and StAXSOAPModelBuilder. Also remove some classes from axiom-compat that were using them.
Removed:
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/dom/jaxp/
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/llom/factory/
webservices/axiom/trunk/axiom-compat/src/test/java/org/apache/axiom/om/impl/dom/
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/OMDataSourceExtBase.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
webservices/axiom/trunk/axiom-c14n/src/main/java/org/apache/axiom/c14n/CanonicalizerSpi.java
webservices/axiom/trunk/axiom-c14n/src/test/java/org/apache/axiom/c14n/DataParser.java
webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java?rev=1726310&r1=1726309&r2=1726310&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java Fri Jan 22 20:50:18 2016
@@ -40,6 +40,7 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMProcessingInstruction;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMContainerEx;
import org.apache.axiom.om.impl.builder.OMFactoryEx;
@@ -370,7 +371,7 @@ public class OMFactoryImpl implements OM
switch (type) {
case OMNode.ELEMENT_NODE: {
OMElement childElement = (OMElement) child;
- OMElement newElement = (new StAXOMBuilder(this, childElement
+ OMElement newElement = (OMXMLBuilderFactory.createStAXOMBuilder(this, childElement
.getXMLStreamReader())).getDocumentElement();
newElement.buildWithAttachments();
return newElement;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/OMDataSourceExtBase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/OMDataSourceExtBase.java?rev=1726310&r1=1726309&r2=1726310&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/OMDataSourceExtBase.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/OMDataSourceExtBase.java Fri Jan 22 20:50:18 2016
@@ -36,8 +36,9 @@ import org.apache.axiom.om.OMDataSourceE
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -148,7 +149,7 @@ public abstract class OMDataSourceExtBas
*/
private static void reader2writer(XMLStreamReader reader,
XMLStreamWriter writer) throws XMLStreamException {
- StAXOMBuilder builder = new StAXOMBuilder(reader);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(reader);
try {
OMDocument omDocument = builder.getDocument();
Iterator it = omDocument.getChildren();
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java?rev=1726310&r1=1726309&r2=1726310&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java Fri Jan 22 20:50:18 2016
@@ -147,22 +147,6 @@ public abstract class StAXBuilder implem
this(omFactory, parser, parser.getEncoding(), detachable, closeable);
}
- /**
- * @deprecated
- */
- protected StAXBuilder(OMFactory omFactory, XMLStreamReader parser) {
- this(omFactory, parser, null, null);
- }
-
- /**
- * @deprecated
- */
- protected StAXBuilder(OMFactory omFactory,
- XMLStreamReader parser,
- String encoding) {
- this(omFactory, parser, encoding, null, null);
- }
-
private void initParser(XMLStreamReader parser) {
if (parser instanceof BuilderAwareReader) {
((BuilderAwareReader) parser).setBuilder(this);
@@ -172,21 +156,6 @@ public abstract class StAXBuilder implem
}
/**
- * @deprecated
- */
- protected StAXBuilder(XMLStreamReader parser) {
- this(OMAbstractFactory.getOMFactory(), parser);
- }
-
- /**
- * @deprecated
- */
- protected StAXBuilder() {
- detachable = null;
- closeable = null;
- }
-
- /**
* @deprecated Not used anywhere
*/
public void init(InputStream inputStream, String charSetEncoding, String url,
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java?rev=1726310&r1=1726309&r2=1726310&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXOMBuilder.java Fri Jan 22 20:50:18 2016
@@ -21,17 +21,14 @@ package org.apache.axiom.om.impl.builder
import org.apache.axiom.ext.stax.DTDReader;
import org.apache.axiom.om.DeferredParsingException;
-import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.impl.OMContainerEx;
import org.apache.axiom.om.impl.OMElementEx;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.util.stax.XMLEventUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -43,9 +40,6 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.Location;
import java.io.Closeable;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
/**
* Internal implementation class.
@@ -99,13 +93,6 @@ public class StAXOMBuilder extends StAXB
}
/**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXOMBuilder(OMFactory ombuilderFactory, XMLStreamReader parser) {
- super(ombuilderFactory, parser);
- }
-
- /**
* For internal use only.
*/
public StAXOMBuilder(OMFactory factory,
@@ -119,41 +106,6 @@ public class StAXOMBuilder extends StAXB
populateOMElement(element);
}
- /**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXOMBuilder(OMFactory factory, XMLStreamReader parser, OMElement element) {
- this(factory, parser, element, null);
- }
-
- /**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXOMBuilder(String filePath) throws XMLStreamException, FileNotFoundException {
- this(StAXUtils.createXMLStreamReader(new FileInputStream(filePath)));
- }
-
- /**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXOMBuilder(XMLStreamReader parser) {
- this(OMAbstractFactory.getOMFactory(), parser);
- }
-
- /**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXOMBuilder(InputStream inStream) throws XMLStreamException {
- this(StAXUtils.createXMLStreamReader(inStream));
- }
-
- /**
- * @deprecated
- */
- public StAXOMBuilder() {
- super();
- }
-
protected OMDocument createDocument() {
return omfactory.createOMDocument(this);
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?rev=1726310&r1=1726309&r2=1726310&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java Fri Jan 22 20:50:18 2016
@@ -76,30 +76,6 @@ public class StAXSOAPModelBuilder extend
private SOAPBuilderHelper builderHelper;
/**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXSOAPModelBuilder(XMLStreamReader parser, String soapVersion) {
- this(OMAbstractFactory.getMetaFactory(), parser, soapVersion);
- }
-
- /**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXSOAPModelBuilder(OMMetaFactory metaFactory, XMLStreamReader parser,
- String soapVersion) {
- super(metaFactory.getOMFactory(), parser);
- this.metaFactory = metaFactory;
- identifySOAPVersion(soapVersion);
- }
-
- /**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXSOAPModelBuilder(XMLStreamReader parser) {
- this(OMAbstractFactory.getMetaFactory(), parser);
- }
-
- /**
* For internal use only.
*/
public StAXSOAPModelBuilder(OMMetaFactory metaFactory, XMLStreamReader parser,
@@ -109,13 +85,6 @@ public class StAXSOAPModelBuilder extend
}
/**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXSOAPModelBuilder(OMMetaFactory metaFactory, XMLStreamReader parser) {
- this(metaFactory, parser, null, null);
- }
-
- /**
* For internal use only.
*/
public StAXSOAPModelBuilder(XMLStreamReader parser, SOAPFactory factory, String soapVersion,
@@ -125,13 +94,6 @@ public class StAXSOAPModelBuilder extend
identifySOAPVersion(soapVersion);
}
- /**
- * @deprecated Please use the {@link OMXMLBuilderFactory} API.
- */
- public StAXSOAPModelBuilder(XMLStreamReader parser, SOAPFactory factory, String soapVersion) {
- this(parser, factory, soapVersion, null, null);
- }
-
/** @param soapVersionURIFromTransport */
protected void identifySOAPVersion(String soapVersionURIFromTransport) {
Modified: webservices/axiom/trunk/axiom-c14n/src/main/java/org/apache/axiom/c14n/CanonicalizerSpi.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-c14n/src/main/java/org/apache/axiom/c14n/CanonicalizerSpi.java?rev=1726310&r1=1726309&r2=1726310&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-c14n/src/main/java/org/apache/axiom/c14n/CanonicalizerSpi.java (original)
+++ webservices/axiom/trunk/axiom-c14n/src/main/java/org/apache/axiom/c14n/CanonicalizerSpi.java Fri Jan 22 20:50:18 2016
@@ -23,9 +23,9 @@ package org.apache.axiom.c14n;
import org.apache.axiom.c14n.exceptions.CanonicalizationException;
import org.apache.axiom.c14n.omwrapper.factory.WrapperFactory;
import org.apache.axiom.c14n.omwrapper.interfaces.Node;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
-import javax.xml.stream.XMLStreamException;
import java.io.ByteArrayInputStream;
import java.io.OutputStream;
@@ -54,12 +54,7 @@ public abstract class CanonicalizerSpi {
public byte[] engineCanonicalize(byte[] inputBytes) throws CanonicalizationException {
ByteArrayInputStream bais = new ByteArrayInputStream(inputBytes);
- StAXOMBuilder builder = null;
- try {
- builder = new StAXOMBuilder(bais);
- } catch (XMLStreamException e) {
- throw new CanonicalizationException(e);
- }
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(bais);
byte [] result = this.engineCanonicalizeSubTree(
new WrapperFactory().getNode(builder.getDocument()));
return result;
Modified: webservices/axiom/trunk/axiom-c14n/src/test/java/org/apache/axiom/c14n/DataParser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-c14n/src/test/java/org/apache/axiom/c14n/DataParser.java?rev=1726310&r1=1726309&r2=1726310&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-c14n/src/test/java/org/apache/axiom/c14n/DataParser.java (original)
+++ webservices/axiom/trunk/axiom-c14n/src/test/java/org/apache/axiom/c14n/DataParser.java Fri Jan 22 20:50:18 2016
@@ -22,16 +22,17 @@ package org.apache.axiom.c14n;
import org.apache.axiom.c14n.omwrapper.factory.WrapperFactory;
import org.apache.axiom.c14n.omwrapper.interfaces.Document;
import org.apache.axiom.c14n.omwrapper.interfaces.Element;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import java.net.URL;
import java.io.RandomAccessFile;
public class DataParser {
private String fileName = null;
- private StAXOMBuilder builder = null;
+ private OMXMLParserWrapper builder = null;
private byte [] bytes;
public WrapperFactory fac = null;
@@ -45,7 +46,7 @@ public class DataParser {
}
public void init() throws Exception {
- builder = new StAXOMBuilder(this.getClass().getResourceAsStream(fileName));
+ builder = OMXMLBuilderFactory.createOMBuilder(this.getClass().getResourceAsStream(fileName));
fac = new WrapperFactory();
omDoc = builder.getDocument();
omDocEle = omDoc.getOMDocumentElement();
Modified: webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md?rev=1726310&r1=1726309&r2=1726310&view=diff
==============================================================================
--- webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md (original)
+++ webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md Fri Jan 22 20:50:18 2016
@@ -19,3 +19,5 @@ Changes in this release
As explained in the Axiom 1.2.11 release notes, application code
should use the `OMXMLBuilderFactory` API to create builders. Code written for
Axiom 1.2.x that uses that API remains compatible with Axiom 1.3.x.
+
+* Some (most? all?) of the classes in `axiom-compat` have been removed.