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/05/24 18:36:11 UTC
svn commit: r1745390 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java
axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
Author: veithen
Date: Tue May 24 18:36:11 2016
New Revision: 1745390
URL: http://svn.apache.org/viewvc?rev=1745390&view=rev
Log:
Remove deprecated methods from MTOMXMLStreamWriter.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java?rev=1745390&r1=1745389&r2=1745390&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java Tue May 24 18:36:11 2016
@@ -36,7 +36,6 @@ import org.apache.axiom.core.stream.XmlH
import org.apache.axiom.core.stream.serializer.Serializer;
import org.apache.axiom.ext.stax.datahandler.DataHandlerWriter;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.OMText;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
import org.apache.axiom.om.impl.OMMultipartWriter;
import org.apache.axiom.om.impl.stream.xop.CompletionListener;
@@ -392,22 +391,6 @@ public class MTOMXMLStreamWriterImpl ext
return format.getContentType();
}
- public void writeOptimized(OMText node) {
- log.debug("Start MTOMXMLStreamWriter.writeOptimized()");
- otherParts.add(new Part(node.getContentID(), node.getDataHandler()));
- log.debug("Exit MTOMXMLStreamWriter.writeOptimized()");
- }
-
- public boolean isOptimizedThreshold(OMText node){
- // The optimize argument is set to true for compatibility. Indeed, older versions
- // left it to the caller to check OMText#isOptimized().
- try {
- return optimizationPolicy.isOptimized(node.getDataHandler(), true);
- } catch (IOException ex) {
- return true;
- }
- }
-
public String prepareDataHandler(DataHandler dataHandler) {
boolean doOptimize;
try {
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java?rev=1745390&r1=1745389&r2=1745390&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java Tue May 24 18:36:11 2016
@@ -28,7 +28,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
import org.apache.axiom.ext.stax.datahandler.DataHandlerWriter;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.OMText;
import org.apache.axiom.om.util.XMLStreamWriterFilter;
import org.apache.axiom.util.stax.XMLStreamWriterUtils;
@@ -63,31 +62,6 @@ public abstract class MTOMXMLStreamWrite
public abstract String getContentType();
/**
- * @deprecated
- * Serialization code should use
- * {@link XMLStreamWriterUtils#writeDataHandler(XMLStreamWriter, DataHandler, String, boolean)}
- * or {@link XMLStreamWriterUtils#writeDataHandler(XMLStreamWriter, DataHandlerProvider, String, boolean)}
- * to submit any binary content and let this writer decide whether the content should be
- * written as base64 encoded character data or using <tt>xop:Include</tt>. If this is not
- * possible, then {@link #prepareDataHandler(DataHandler)} should be used.
- */
- public abstract void writeOptimized(OMText node);
-
- /**
- * @deprecated
- * Serialization code should use
- * {@link XMLStreamWriterUtils#writeDataHandler(XMLStreamWriter, DataHandler, String, boolean)}
- * or {@link XMLStreamWriterUtils#writeDataHandler(XMLStreamWriter, DataHandlerProvider, String, boolean)}
- * to submit any binary content and let this writer decide whether the content should be
- * written as base64 encoded character data or using <tt>xop:Include</tt>. If this is not
- * possible, then {@link #prepareDataHandler(DataHandler)} should be used.
- * All the aforementioned methods take into account the settings defined in
- * {@link OMOutputFormat} to determine whether the binary data should be optimized or not.
- * Therefore, there is not need for this method anymore.
- */
- public abstract boolean isOptimizedThreshold(OMText node);
-
- /**
* Prepare a {@link DataHandler} for serialization without using the {@link DataHandlerWriter}
* API. The method first determines whether the binary data represented by the
* {@link DataHandler} should be optimized or inlined. If the data should not be optimized, then