ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1697047 - in /webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common: AxiomSOAP11FactorySupport.aj AxiomSOAP12FactorySupport.aj AxiomSOAPFactory.java AxiomSOAPFactorySupport.aj SOAPHelper.java
Date Fri, 21 Aug 2015 19:21:30 GMT
Author: veithen
Date: Fri Aug 21 19:21:30 2015
New Revision: 1697047

URL: http://svn.apache.org/r1697047
Log:
Move getSOAPHeaderBlockClass to SOAPHelper.

Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FactorySupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FactorySupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAPHelper.java

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FactorySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FactorySupport.aj?rev=1697047&r1=1697046&r2=1697047&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FactorySupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP11FactorySupport.aj
Fri Aug 21 19:21:30 2015
@@ -19,7 +19,7 @@
 package org.apache.axiom.soap.impl.common;
 
 public aspect AxiomSOAP11FactorySupport {
-    public final Class<? extends AxiomSOAPHeaderBlock> AxiomSOAP11Factory.getSOAPHeaderBlockClass()
{
-        return AxiomSOAP11HeaderBlock.class;
+    public final SOAPHelper AxiomSOAP11Factory.getSOAPHelper() {
+        return SOAPHelper.SOAP11;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FactorySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FactorySupport.aj?rev=1697047&r1=1697046&r2=1697047&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FactorySupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAP12FactorySupport.aj
Fri Aug 21 19:21:30 2015
@@ -19,7 +19,7 @@
 package org.apache.axiom.soap.impl.common;
 
 public aspect AxiomSOAP12FactorySupport {
-    public final Class<? extends AxiomSOAPHeaderBlock> AxiomSOAP12Factory.getSOAPHeaderBlockClass()
{
-        return AxiomSOAP12HeaderBlock.class;
+    public final SOAPHelper AxiomSOAP12Factory.getSOAPHelper() {
+        return SOAPHelper.SOAP12;
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java?rev=1697047&r1=1697046&r2=1697047&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactory.java
Fri Aug 21 19:21:30 2015
@@ -22,6 +22,6 @@ import org.apache.axiom.om.impl.common.f
 import org.apache.axiom.soap.impl.builder.SOAPFactoryEx;
 
 public interface AxiomSOAPFactory extends AxiomNodeFactory, SOAPFactoryEx {
-    Class<? extends AxiomSOAPHeaderBlock> getSOAPHeaderBlockClass();
+    SOAPHelper getSOAPHelper();
     AxiomSOAPMessage createSOAPMessage();
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj?rev=1697047&r1=1697046&r2=1697047&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/AxiomSOAPFactorySupport.aj
Fri Aug 21 19:21:30 2015
@@ -49,14 +49,14 @@ public aspect AxiomSOAPFactorySupport {
     }
 
     public final SOAPHeaderBlock AxiomSOAPFactory.createSOAPHeaderBlock(String localName,
OMNamespace ns, SOAPHeader parent) {
-        return createAxiomElement(getSOAPHeaderBlockClass(), parent, localName, ns, null,
true);
+        return createAxiomElement(getSOAPHelper().getHeaderBlockClass(), parent, localName,
ns, null, true);
     }
 
     public final SOAPHeaderBlock AxiomSOAPFactory.createSOAPHeaderBlock(String localName,
OMNamespace ns) {
-        return createAxiomElement(getSOAPHeaderBlockClass(), null, localName, ns, null, true);
+        return createAxiomElement(getSOAPHelper().getHeaderBlockClass(), null, localName,
ns, null, true);
     }
 
     public final SOAPHeaderBlock AxiomSOAPFactory.createSOAPHeaderBlock(String localName,
SOAPHeader parent, OMXMLParserWrapper builder) {
-        return createAxiomElement(getSOAPHeaderBlockClass(), parent, localName, null, builder,
false);
+        return createAxiomElement(getSOAPHelper().getHeaderBlockClass(), parent, localName,
null, builder, false);
     }
 }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAPHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAPHelper.java?rev=1697047&r1=1697046&r2=1697047&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAPHelper.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/SOAPHelper.java
Fri Aug 21 19:21:30 2015
@@ -34,6 +34,7 @@ import org.apache.axiom.soap.SOAPVersion
  */
 abstract class SOAPHelper {
     static final SOAPHelper SOAP11 = new SOAPHelper(SOAP11Version.getSingleton(), "SOAP 1.1",
+            AxiomSOAP11HeaderBlock.class,
             SOAP11Constants.ATTR_ACTOR, null) {
         public Boolean parseBoolean(String literal) {
             if (literal.equals("1")) {
@@ -52,6 +53,7 @@ abstract class SOAPHelper {
     };
     
     static final SOAPHelper SOAP12 = new SOAPHelper(SOAP12Version.getSingleton(), "SOAP 1.2",
+            AxiomSOAP12HeaderBlock.class,
             SOAP12Constants.SOAP_ROLE, SOAP12Constants.SOAP_RELAY) {
         public Boolean parseBoolean(String literal) {
             if (literal.equals("true") || literal.equals("1")) {
@@ -71,13 +73,17 @@ abstract class SOAPHelper {
     
     private final SOAPVersion version;
     private final String specName;
+    private final Class<? extends AxiomSOAPHeaderBlock> headerBlockClass;
     private final QName mustUnderstandAttributeQName;
     private final QName roleAttributeQName;
     private final QName relayAttributeQName;
     
-    private SOAPHelper(SOAPVersion version, String specName, String roleAttributeLocalName,
String relayAttributeLocalName) {
+    private SOAPHelper(SOAPVersion version, String specName,
+            Class<? extends AxiomSOAPHeaderBlock> headerBlockClass,
+            String roleAttributeLocalName, String relayAttributeLocalName) {
         this.version = version;
         this.specName = specName;
+        this.headerBlockClass = headerBlockClass;
         mustUnderstandAttributeQName = new QName(
                 version.getEnvelopeURI(), SOAPConstants.ATTR_MUSTUNDERSTAND, SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
         roleAttributeQName = new QName(
@@ -94,6 +100,10 @@ abstract class SOAPHelper {
         return specName;
     }
 
+    final Class<? extends AxiomSOAPHeaderBlock> getHeaderBlockClass() {
+        return headerBlockClass;
+    }
+
     final QName getMustUnderstandAttributeQName() {
         return mustUnderstandAttributeQName;
     }



Mime
View raw message