ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1729504 - in /webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl: intf/AxiomSerializable.java mixin/AxiomContainerSupport.aj mixin/AxiomLeafNodeSupport.aj mixin/AxiomSerializableSupport.aj
Date Tue, 09 Feb 2016 23:32:00 GMT
Author: veithen
Date: Tue Feb  9 23:32:00 2016
New Revision: 1729504

URL: http://svn.apache.org/viewvc?rev=1729504&view=rev
Log:
In the Axiom API the 'close' method is a no-op for leaf nodes.

Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomLeafNodeSupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java?rev=1729504&r1=1729503&r2=1729504&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/AxiomSerializable.java
Tue Feb  9 23:32:00 2016
@@ -20,13 +20,10 @@ package org.apache.axiom.om.impl.intf;
 
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMSerializable;
-import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.stream.StreamException;
 import org.apache.axiom.om.impl.stream.XmlHandler;
 
 public interface AxiomSerializable extends OMSerializable, AxiomInformationItem {
-    OMXMLParserWrapper coreGetBuilder();
-    
     void setComplete(boolean state);
 
     /**

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1729504&r1=1729503&r2=1729504&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
Tue Feb  9 23:32:00 2016
@@ -421,4 +421,17 @@ public aspect AxiomContainerSupport {
             this.setComplete(true);
         }
     }
+
+    public final void AxiomContainer.close(boolean build) {
+        OMXMLParserWrapper builder = coreGetBuilder();
+        if (build) {
+            this.build();
+        }
+        setComplete(true);
+        
+        // If this is a StAXBuilder, close it.
+        if (builder instanceof Builder) {
+            ((Builder) builder).close();
+        }
+    }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomLeafNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomLeafNodeSupport.aj?rev=1729504&r1=1729503&r2=1729504&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomLeafNodeSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomLeafNodeSupport.aj
Tue Feb  9 23:32:00 2016
@@ -69,4 +69,8 @@ public aspect AxiomLeafNodeSupport {
     public final void AxiomLeafNode.discard() throws OMException {
         detach();
     }
+
+    public final void AxiomLeafNode.close(boolean build) {
+        // No-op on leaf nodes
+    }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj?rev=1729504&r1=1729503&r2=1729504&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSerializableSupport.aj
Tue Feb  9 23:32:00 2016
@@ -21,9 +21,7 @@ package org.apache.axiom.om.impl.mixin;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.om.impl.builder.Builder;
 import org.apache.axiom.om.impl.common.AxiomExceptionTranslator;
 import org.apache.axiom.om.impl.common.serializer.push.stax.StAXSerializer;
 import org.apache.axiom.om.impl.intf.AxiomSerializable;
@@ -50,17 +48,4 @@ public aspect AxiomSerializableSupport {
         }
         writer.flush();
     }
-
-    public void AxiomSerializable.close(boolean build) {
-        OMXMLParserWrapper builder = coreGetBuilder();
-        if (build) {
-            this.build();
-        }
-        setComplete(true);
-        
-        // If this is a StAXBuilder, close it.
-        if (builder instanceof Builder) {
-            ((Builder) builder).close();
-        }
-    }
 }



Mime
View raw message