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 22:58:42 UTC
svn commit: r1726328 - 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/impl/builder/
axiom-compat/src/main/j...
Author: veithen
Date: Fri Jan 22 21:58:42 2016
New Revision: 1726328
URL: http://svn.apache.org/viewvc?rev=1726328&view=rev
Log:
Remove deprecated methods from builders.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java?rev=1726328&r1=1726327&r2=1726328&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMBuilder.java Fri Jan 22 21:58:42 2016
@@ -125,18 +125,6 @@ public class SAXOMBuilder extends OMCont
return documentElement;
}
- public short getBuilderType() {
- throw new UnsupportedOperationException();
- }
-
- public void registerExternalContentHandler(Object obj) {
- throw new UnsupportedOperationException();
- }
-
- public Object getRegisteredContentHandler() {
- throw new UnsupportedOperationException();
- }
-
public String getCharacterEncoding() {
throw new UnsupportedOperationException();
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java?rev=1726328&r1=1726327&r2=1726328&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java Fri Jan 22 21:58:42 2016
@@ -24,18 +24,6 @@ import javax.xml.XMLConstants;
/** Interface OMConstants */
public interface OMConstants {
/**
- * @deprecated This constant is used as return value of
- * {@link OMXMLParserWrapper#getBuilderType()} which is deprecated.
- */
- short PUSH_TYPE_BUILDER = 0;
-
- /**
- * @deprecated This constant is used as return value of
- * {@link OMXMLParserWrapper#getBuilderType()} which is deprecated.
- */
- short PULL_TYPE_BUILDER = 1;
-
- /**
* @deprecated This constant was used in early prototypes of Axis2 and is no longer relevant.
*/
String ARRAY_ITEM_NSURI =
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java?rev=1726328&r1=1726327&r2=1726328&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java Fri Jan 22 21:58:42 2016
@@ -122,38 +122,6 @@ public interface OMXMLParserWrapper {
OMElement getDocumentElement(boolean discardDocument);
/**
- * Returns the type of the builder. Can be either {@link OMConstants#PUSH_TYPE_BUILDER}
- * or {@link OMConstants#PULL_TYPE_BUILDER}.
- *
- * @return the type of the builder
- *
- * @deprecated This method is no longer used.
- */
- short getBuilderType();
-
- /**
- * Registers an external content handler. Especially useful for push type builders. Throws an
- * {@link UnsupportedOperationException} if such handler registration is not supported.
- *
- * @param obj
- * the external content handler
- *
- * @deprecated This method is no longer used; implementations will always throw
- * {@link UnsupportedOperationException}.
- */
- void registerExternalContentHandler(Object obj);
-
- /**
- * get the registered external content handler
- *
- * @return Returns Object.
- *
- * @deprecated This method is no longer used; implementations will always throw
- * {@link UnsupportedOperationException}.
- */
- Object getRegisteredContentHandler();
-
- /**
* Returns the encoding style of the XML data
* @return the character encoding, defaults to "UTF-8"
*/
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=1726328&r1=1726327&r2=1726328&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 21:58:42 2016
@@ -20,9 +20,7 @@
package org.apache.axiom.om.impl.builder;
import org.apache.axiom.ext.stax.datahandler.DataHandlerReader;
-import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
@@ -34,7 +32,6 @@ import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMAttributeEx;
import org.apache.axiom.om.impl.OMContainerEx;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,7 +42,6 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import java.io.Closeable;
-import java.io.InputStream;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -156,19 +152,6 @@ public abstract class StAXBuilder implem
}
/**
- * @deprecated Not used anywhere
- */
- public void init(InputStream inputStream, String charSetEncoding, String url,
- String contentType) throws OMException {
- try {
- this.parser = StAXUtils.createXMLStreamReader(inputStream);
- } catch (XMLStreamException e1) {
- throw new OMException(e1);
- }
- omfactory = (OMFactoryEx)OMAbstractFactory.getOMFactory();
- }
-
- /**
* Method setOMBuilderFactory.
*
* @param ombuilderFactory
@@ -568,29 +551,6 @@ public abstract class StAXBuilder implem
return customBuilders.get(qName);
}
- /** @return Returns short. */
- public short getBuilderType() {
- return OMConstants.PULL_TYPE_BUILDER;
- }
-
- /**
- * Method registerExternalContentHandler.
- *
- * @param obj
- */
- public void registerExternalContentHandler(Object obj) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Method getRegisteredContentHandler.
- *
- * @return Returns Object.
- */
- public Object getRegisteredContentHandler() {
- throw new UnsupportedOperationException();
- }
-
protected abstract OMDocument createDocument();
protected void createDocumentIfNecessary() {
@@ -683,12 +643,6 @@ public abstract class StAXBuilder implem
return _isClosed;
}
- /**
- * @deprecated As of Axiom 1.2.15, the builder always releases the parser.
- */
- public void releaseParserOnClose(boolean value) {
- }
-
public void detach() throws OMException {
if (detachable != null) {
detachable.detach();
Modified: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java?rev=1726328&r1=1726327&r2=1726328&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java (original)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java Fri Jan 22 21:58:42 2016
@@ -487,18 +487,6 @@ public class SAXOMBuilder extends Defaul
return documentElement;
}
- public short getBuilderType() {
- throw new UnsupportedOperationException();
- }
-
- public void registerExternalContentHandler(Object obj) {
- throw new UnsupportedOperationException();
- }
-
- public Object getRegisteredContentHandler() {
- throw new UnsupportedOperationException();
- }
-
public String getCharacterEncoding() {
throw new UnsupportedOperationException();
}