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/14 23:14:41 UTC
svn commit: r1743869 - in
/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer:
SerializationHandler.java SerializerBase.java ToStream.java ToXMLStream.java
Author: veithen
Date: Sat May 14 23:14:41 2016
New Revision: 1743869
URL: http://svn.apache.org/viewvc?rev=1743869&view=rev
Log:
Clean up the flush/close methods.
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java?rev=1743869&r1=1743868&r2=1743869&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializationHandler.java Sat May 14 23:14:41 2016
@@ -20,8 +20,6 @@
*/
package org.apache.axiom.core.stream.serializer;
-import org.apache.axiom.core.stream.StreamException;
-
/**
* This interface is the one that a serializer implements. It is a group of
* other interfaces, such as ExtendedContentHandler, ExtendedLexicalHandler etc.
@@ -38,35 +36,6 @@ public interface SerializationHandler
XSLOutputAttributes,
Serializer
{
- public void close();
-
- /**
- * A SerializationHandler accepts SAX-like events, so
- * it can accumulate attributes or namespace nodes after
- * a startElement().
- * <p>
- * If the SerializationHandler has a Writer or OutputStream,
- * a call to this method will flush such accumulated
- * events as a closed start tag for an element.
- * <p>
- * If the SerializationHandler wraps a ContentHandler,
- * a call to this method will flush such accumulated
- * events as a SAX (not SAX-like) calls to
- * startPrefixMapping() and startElement().
- * <p>
- * If one calls endDocument() then one need not call
- * this method since a call to endDocument() will
- * do what this method does. However, in some
- * circumstances, such as with document fragments,
- * endDocument() is not called and it may be
- * necessary to call this method to flush
- * any pending events.
- * <p>
- * For performance reasons this method should not be called
- * very often.
- */
- public void flushPending() throws StreamException;
-
/**
* Default behavior is to expand DTD entities,
* that is the initall default value is true.
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java?rev=1743869&r1=1743868&r2=1743869&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerBase.java Sat May 14 23:14:41 2016
@@ -200,16 +200,6 @@ public abstract class SerializerBase
}
/**
- * Flush and close the underlying java.io.Writer. This method applies to
- * ToStream serializers, not ToSAXHandler serializers.
- * @see ToStream
- */
- public void close()
- {
- // do nothing (base behavior)
- }
-
- /**
* Initialize global variables
*/
protected void initCDATA()
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java?rev=1743869&r1=1743868&r2=1743869&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java Sat May 14 23:14:41 2016
@@ -1333,7 +1333,6 @@ abstract public class ToStream extends S
}
public void startProcessingInstruction(String target) throws StreamException {
- flushPending();
switchContext(Context.TAG);
try {
m_writer.write("<?");
@@ -1389,20 +1388,12 @@ abstract public class ToStream extends S
}
}
- /**
- * This method flushes any pending events, which can be startDocument()
- * closing the opening tag of an element, or closing an open CDATA section.
- */
- public void flushPending() throws StreamException
- {
- if (m_writer != null) {
- try {
- m_writer.flushBuffer();
- }
- catch(IOException e) {
- // what? me worry?
- }
- }
+ public void flushBuffer() throws StreamException {
+ try {
+ m_writer.flushBuffer();
+ } catch (IOException ex) {
+ throw new StreamException(ex);
+ }
}
/**
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java?rev=1743869&r1=1743868&r2=1743869&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java Sat May 14 23:14:41 2016
@@ -117,13 +117,7 @@ public class ToXMLStream extends ToStrea
*/
public void endDocument() throws StreamException
{
- flushPending();
-
- try {
- m_writer.flushBuffer();
- } catch (IOException ex) {
- throw new StreamException(ex);
- }
+ flushBuffer();
}
/**