ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1728372 - in /webservices/axiom/trunk: aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/ aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/ aspects/om-aspects/src/main/java/org/apache/axiom/soap/...
Date Wed, 03 Feb 2016 20:52:27 GMT
Author: veithen
Date: Wed Feb  3 20:52:27 2016
New Revision: 1728372

URL: http://svn.apache.org/viewvc?rev=1728372&view=rev
Log:
Code simplification enabled by the fact that With the improved builder design, the SOAPFactory
is never known when a SOAPMessage is built.

Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/StAXSOAPModelBuilder.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/SOAPFactoryEx.java
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFactory.java

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/StAXSOAPModelBuilder.java?rev=1728372&r1=1728371&r2=1728372&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/StAXSOAPModelBuilder.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/StAXSOAPModelBuilder.java
Wed Feb  3 20:52:27 2016
@@ -183,11 +183,7 @@ public class StAXSOAPModelBuilder extend
     }
 
     protected OMDocument createDocument() {
-        if (soapFactory != null) {
-            return soapFactory.createSOAPMessage(this);
-        } else {
-            return ((OMMetaFactoryEx)metaFactory).createSOAPMessage(this);
-        }
+        return ((OMMetaFactoryEx)metaFactory).createSOAPMessage(this);
     }
 
     /** Method createDTD. Overriding the default behaviour as a SOAPMessage should not have
a DTD. */

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java?rev=1728372&r1=1728371&r2=1728372&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
Wed Feb  3 20:52:27 2016
@@ -91,16 +91,6 @@ public abstract class SOAPFactoryImpl ex
         return message;
     }
 
-    public final SOAPMessage createSOAPMessage(OMXMLParserWrapper builder) {
-        AxiomSOAPMessage message = createNode(AxiomSOAPMessage.class);
-        message.initSOAPFactory(this);
-        // Null check for Spring-WS compatibility
-        if (builder != null) {
-            message.coreSetBuilder(builder);
-        }
-        return message;
-    }
-    
     public final SOAPEnvelope createSOAPEnvelope() {
         return createSOAPEnvelope(getNamespace());
     }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/SOAPFactoryEx.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/SOAPFactoryEx.java?rev=1728372&r1=1728371&r2=1728372&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/SOAPFactoryEx.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/intf/SOAPFactoryEx.java
Wed Feb  3 20:52:27 2016
@@ -18,10 +18,8 @@
  */
 package org.apache.axiom.soap.impl.intf;
 
-import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.intf.OMFactoryEx;
 import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPMessage;
 
 /**
  * Interface that is used internally by Axiom and that should not be considered being part
of the
@@ -31,6 +29,4 @@ public interface SOAPFactoryEx extends S
 
     SOAPHelper getSOAPHelper();
 
-    SOAPMessage createSOAPMessage(OMXMLParserWrapper builder);
-
 }

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFactory.java?rev=1728372&r1=1728371&r2=1728372&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFactory.java
(original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFactory.java
Wed Feb  3 20:52:27 2016
@@ -23,7 +23,6 @@ import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMXMLParserWrapper;
 
 public interface SOAPFactory extends OMFactory {
 
@@ -34,12 +33,6 @@ public interface SOAPFactory extends OMF
     SOAPMessage createSOAPMessage();
 
     /**
-     * @deprecated This method only exists for compatibility with Spring-WS and should not
be used
-     *             by application code.
-     */
-    SOAPMessage createSOAPMessage(OMXMLParserWrapper builder);
-
-    /**
      * Create a SOAP envelope. The returned element will have the namespace URI specified
by the
      * SOAP version that this factory represents. It will have the prefix given by
      * {@link SOAPConstants#SOAP_DEFAULT_NAMESPACE_PREFIX}. It will also have a corresponding



Mime
View raw message