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 20:11:34 UTC
svn commit: r1745400 - 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 20:11:34 2016
New Revision: 1745400
URL: http://svn.apache.org/viewvc?rev=1745400&view=rev
Log:
Remove methods from MTOMXMLStreamWriter to prevent application code from messing with internal state.
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=1745400&r1=1745399&r2=1745400&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 20:11:34 2016
@@ -88,7 +88,7 @@ public class MTOMXMLStreamWriterImpl ext
* @throws FactoryConfigurationError
* @see OMOutputFormat#DEFAULT_CHAR_SET_ENCODING
*/
- public MTOMXMLStreamWriterImpl(OutputStream outStream, OMOutputFormat format, final boolean preserveAttachments)
+ public MTOMXMLStreamWriterImpl(OutputStream outStream, final OMOutputFormat format, final boolean preserveAttachments)
throws XMLStreamException, FactoryConfigurationError {
if (log.isDebugEnabled()) {
log.debug("Creating MTOMXMLStreamWriter");
@@ -127,7 +127,7 @@ public class MTOMXMLStreamWriterImpl ext
ContentIDGenerator contentIDGenerator = new ContentIDGenerator() {
@Override
public String generateContentID(String existingContentID) {
- return existingContentID != null ? existingContentID : getNextContentId();
+ return existingContentID != null ? existingContentID : format.getNextContentId();
}
};
handler = new XOPEncodingFilterHandler(serializer, contentIDGenerator, new OptimizationPolicyImpl(format), new CompletionListener() {
@@ -387,11 +387,6 @@ public class MTOMXMLStreamWriterImpl ext
}
@Override
- public String getContentType() {
- return format.getContentType();
- }
-
- @Override
public String prepareDataHandler(DataHandler dataHandler) {
XmlHandler handler = getHandler();
if (handler instanceof XOPEncodingFilterHandler) {
@@ -402,71 +397,11 @@ public class MTOMXMLStreamWriterImpl ext
}
@Override
- public void setXmlStreamWriter(XMLStreamWriter xmlWriter) {
- this.xmlWriter = xmlWriter;
- }
-
- @Override
- public XMLStreamWriter getXmlStreamWriter() {
- return xmlWriter;
- }
-
- @Override
- public String getMimeBoundary() {
- return format.getMimeBoundary();
- }
-
- @Override
- public String getRootContentId() {
- return format.getRootContentId();
- }
-
- @Override
- public String getNextContentId() {
- return format.getNextContentId();
- }
-
- @Override
public String getCharSetEncoding() {
return format.getCharSetEncoding();
}
@Override
- public void setCharSetEncoding(String charSetEncoding) {
- format.setCharSetEncoding(charSetEncoding);
- }
-
- @Override
- public String getXmlVersion() {
- return format.getXmlVersion();
- }
-
- @Override
- public void setXmlVersion(String xmlVersion) {
- format.setXmlVersion(xmlVersion);
- }
-
- @Override
- public void setSoap11(boolean b) {
- format.setSOAP11(b);
- }
-
- @Override
- public boolean isIgnoreXMLDeclaration() {
- return format.isIgnoreXMLDeclaration();
- }
-
- @Override
- public void setIgnoreXMLDeclaration(boolean ignoreXMLDeclaration) {
- format.setIgnoreXMLDeclaration(ignoreXMLDeclaration);
- }
-
- @Override
- public void setDoOptimize(boolean b) {
- format.setDoOptimize(b);
- }
-
- @Override
public OMOutputFormat getOutputFormat() {
return format;
}
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=1745400&r1=1745399&r2=1745400&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 20:11:34 2016
@@ -59,8 +59,6 @@ public abstract class MTOMXMLStreamWrite
*/
public abstract boolean isOptimized();
- public abstract String getContentType();
-
/**
* Prepare a {@link DataHandler} for serialization without using the {@link DataHandlerWriter}
* API. The method first determines whether the binary data represented by the
@@ -85,16 +83,6 @@ public abstract class MTOMXMLStreamWrite
* <code>null</code> if the base64 encoded data should not be optimized
*/
public abstract String prepareDataHandler(DataHandler dataHandler);
-
- public abstract void setXmlStreamWriter(XMLStreamWriter xmlWriter);
-
- public abstract XMLStreamWriter getXmlStreamWriter();
-
- public abstract String getMimeBoundary();
-
- public abstract String getRootContentId();
-
- public abstract String getNextContentId();
/**
* Returns the character set encoding scheme. If the value of the charSetEncoding is not set
@@ -104,20 +92,6 @@ public abstract class MTOMXMLStreamWrite
*/
public abstract String getCharSetEncoding();
- public abstract void setCharSetEncoding(String charSetEncoding);
-
- public abstract String getXmlVersion();
-
- public abstract void setXmlVersion(String xmlVersion);
-
- public abstract void setSoap11(boolean b);
-
- public abstract boolean isIgnoreXMLDeclaration();
-
- public abstract void setIgnoreXMLDeclaration(boolean ignoreXMLDeclaration);
-
- public abstract void setDoOptimize(boolean b);
-
/**
* Get the output format used by this writer.
* <p>