ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1729541 - in /webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl: factory/SOAP12Factory.java factory/SOAPFactoryImpl.java mixin/AxiomSOAP12FaultClassifierSupport.aj
Date Wed, 10 Feb 2016 07:45:12 GMT
Author: veithen
Date: Wed Feb 10 07:45:12 2016
New Revision: 1729541

URL: http://svn.apache.org/viewvc?rev=1729541&view=rev
Log:
Remove unused code.

Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.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/mixin/AxiomSOAP12FaultClassifierSupport.aj

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java?rev=1729541&r1=1729540&r2=1729541&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
Wed Feb 10 07:45:12 2016
@@ -20,7 +20,6 @@ package org.apache.axiom.soap.impl.facto
 
 import org.apache.axiom.core.NodeFactory;
 import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFault;
@@ -46,76 +45,52 @@ public class SOAP12Factory extends SOAPF
         return SOAPHelper.SOAP12;
     }
 
-    public final SOAPFaultValue internalCreateSOAPFaultValue(SOAPFaultClassifier parent,
OMXMLParserWrapper builder) {
-        return createSOAPElement(AxiomSOAP12FaultValue.class, parent, SOAP12Constants.QNAME_FAULT_VALUE,
builder);
-    }
-
-    public final SOAPFaultValue createSOAPFaultValue(SOAPFaultCode parent, OMXMLParserWrapper
builder) {
-        return internalCreateSOAPFaultValue(parent, builder);
-    }
-
-    public final SOAPFaultValue createSOAPFaultValue(SOAPFaultSubCode parent, OMXMLParserWrapper
builder) {
-        return internalCreateSOAPFaultValue(parent, builder);
+    public final SOAPFaultValue internalCreateSOAPFaultValue(SOAPFaultClassifier parent)
{
+        return createSOAPElement(AxiomSOAP12FaultValue.class, parent, SOAP12Constants.QNAME_FAULT_VALUE);
     }
 
     public final SOAPFaultValue createSOAPFaultValue(SOAPFaultCode parent) {
-        return internalCreateSOAPFaultValue(parent, null);
+        return internalCreateSOAPFaultValue(parent);
     }
 
     public final SOAPFaultValue createSOAPFaultValue(SOAPFaultSubCode parent) {
-        return internalCreateSOAPFaultValue(parent, null);
+        return internalCreateSOAPFaultValue(parent);
     }
 
     public final SOAPFaultValue createSOAPFaultValue() {
-        return internalCreateSOAPFaultValue(null, null);
-    }
-
-    private SOAPFaultSubCode internalCreateSOAPFaultSubCode(SOAPFaultClassifier parent, OMXMLParserWrapper
builder) {
-        return createSOAPElement(AxiomSOAP12FaultSubCode.class, parent, SOAP12Constants.QNAME_FAULT_SUBCODE,
builder);
+        return internalCreateSOAPFaultValue(null);
     }
 
-    public final SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultCode parent, OMXMLParserWrapper
builder) {
-        return internalCreateSOAPFaultSubCode(parent, builder);
-    }
-
-    public final SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultSubCode parent, OMXMLParserWrapper
builder) {
-        return internalCreateSOAPFaultSubCode(parent, builder);
+    private SOAPFaultSubCode internalCreateSOAPFaultSubCode(SOAPFaultClassifier parent) {
+        return createSOAPElement(AxiomSOAP12FaultSubCode.class, parent, SOAP12Constants.QNAME_FAULT_SUBCODE);
     }
 
     public final SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultCode parent) {
-        return internalCreateSOAPFaultSubCode(parent, null);
+        return internalCreateSOAPFaultSubCode(parent);
     }
 
     public final SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultSubCode parent) {
-        return internalCreateSOAPFaultSubCode(parent, null);
+        return internalCreateSOAPFaultSubCode(parent);
     }
 
     public final SOAPFaultSubCode createSOAPFaultSubCode() {
-        return internalCreateSOAPFaultSubCode(null, null);
-    }
-
-    public final SOAPFaultText createSOAPFaultText(SOAPFaultReason parent, OMXMLParserWrapper
builder) {
-        return createSOAPElement(AxiomSOAP12FaultText.class, parent, SOAP12Constants.QNAME_FAULT_TEXT,
builder);
+        return internalCreateSOAPFaultSubCode(null);
     }
 
     public final SOAPFaultText createSOAPFaultText(SOAPFaultReason parent) {
-        return createSOAPFaultText(parent, null);
+        return createSOAPElement(AxiomSOAP12FaultText.class, parent, SOAP12Constants.QNAME_FAULT_TEXT);
     }
 
     public final SOAPFaultText createSOAPFaultText() {
-        return createSOAPFaultText(null, null);
-    }
-
-    public final SOAPFaultNode createSOAPFaultNode(SOAPFault parent, OMXMLParserWrapper builder)
{
-        return createSOAPElement(AxiomSOAP12FaultNode.class, parent, SOAP12Constants.QNAME_FAULT_NODE,
builder);
+        return createSOAPFaultText(null);
     }
 
     public final SOAPFaultNode createSOAPFaultNode(SOAPFault parent) {
-        return createSOAPFaultNode(parent, null);
+        return createSOAPElement(AxiomSOAP12FaultNode.class, parent, SOAP12Constants.QNAME_FAULT_NODE);
     }
 
     public final SOAPFaultNode createSOAPFaultNode() {
-        return createSOAPFaultNode(null, null);
+        return createSOAPFaultNode(null);
     }
 
     public final SOAPEnvelope getDefaultFaultEnvelope() {

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=1729541&r1=1729540&r2=1729541&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 10 07:45:12 2016
@@ -25,7 +25,6 @@ import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.common.factory.OMFactoryImpl;
 import org.apache.axiom.om.impl.intf.AxiomContainer;
 import org.apache.axiom.soap.SOAPBody;
@@ -65,19 +64,13 @@ public abstract class SOAPFactoryImpl ex
         return getSOAPHelper().getNamespace();
     }
     
-    protected final <T extends AxiomSOAPElement> T createSOAPElement(Class<T>
type, OMElement parent, QName qname, OMXMLParserWrapper builder) {
+    protected final <T extends AxiomSOAPElement> T createSOAPElement(Class<T>
type, OMElement parent, QName qname) {
         T element = createNode(type);
-        if (builder != null) {
-            element.coreSetBuilder(builder);
-        } else if (parent != null) {
-            element.checkParent(parent);
-        }
         if (parent != null) {
-            ((AxiomContainer)parent).addChild(element, builder != null);
+            element.checkParent(parent);
+            ((AxiomContainer)parent).addChild(element, false);
         }
-        if (builder != null) {
-            element.internalSetLocalName(qname.getLocalPart());
-        } else if (qname.getNamespaceURI().length() == 0) {
+        if (qname.getNamespaceURI().length() == 0) {
             element.initName(qname.getLocalPart(), null, true);
         } else if (parent != null) {
             element.initName(qname.getLocalPart(), parent.getNamespace(), false);
@@ -103,7 +96,7 @@ public abstract class SOAPFactoryImpl ex
 
     public final SOAPHeader createSOAPHeader(SOAPEnvelope parent) {
         SOAPHelper helper = getSOAPHelper();
-        return createSOAPElement(helper.getHeaderClass(), parent, helper.getHeaderQName(),
null);
+        return createSOAPElement(helper.getHeaderClass(), parent, helper.getHeaderQName());
     }
 
     public final SOAPHeader createSOAPHeader() {
@@ -132,7 +125,7 @@ public abstract class SOAPFactoryImpl ex
 
     public final SOAPBody createSOAPBody(SOAPEnvelope parent) {
         SOAPHelper helper = getSOAPHelper();
-        return createSOAPElement(helper.getBodyClass(), parent, helper.getBodyQName(), null);
+        return createSOAPElement(helper.getBodyClass(), parent, helper.getBodyQName());
     }
 
     public final SOAPBody createSOAPBody() {
@@ -141,7 +134,7 @@ public abstract class SOAPFactoryImpl ex
 
     public final SOAPFault createSOAPFault(SOAPBody parent) {
         SOAPHelper helper = getSOAPHelper();
-        return createSOAPElement(helper.getFaultClass(), parent, helper.getFaultQName(),
null);
+        return createSOAPElement(helper.getFaultClass(), parent, helper.getFaultQName());
     }
 
     public final SOAPFault createSOAPFault() {
@@ -156,7 +149,7 @@ public abstract class SOAPFactoryImpl ex
 
     public final SOAPFaultCode createSOAPFaultCode(SOAPFault parent) {
         SOAPHelper helper = getSOAPHelper();
-        return createSOAPElement(helper.getFaultCodeClass(), parent, helper.getFaultCodeQName(),
null);
+        return createSOAPElement(helper.getFaultCodeClass(), parent, helper.getFaultCodeQName());
     }
 
     public final SOAPFaultCode createSOAPFaultCode() {
@@ -165,7 +158,7 @@ public abstract class SOAPFactoryImpl ex
 
     public final SOAPFaultReason createSOAPFaultReason(SOAPFault parent) {
         SOAPHelper helper = getSOAPHelper();
-        return createSOAPElement(helper.getFaultReasonClass(), parent, helper.getFaultReasonQName(),
null);
+        return createSOAPElement(helper.getFaultReasonClass(), parent, helper.getFaultReasonQName());
     }
 
     public final SOAPFaultReason createSOAPFaultReason() {
@@ -174,7 +167,7 @@ public abstract class SOAPFactoryImpl ex
 
     public final SOAPFaultRole createSOAPFaultRole(SOAPFault parent) {
         SOAPHelper helper = getSOAPHelper();
-        return createSOAPElement(helper.getFaultRoleClass(), parent, helper.getFaultRoleQName(),
null);
+        return createSOAPElement(helper.getFaultRoleClass(), parent, helper.getFaultRoleQName());
     }
 
     public final SOAPFaultRole createSOAPFaultRole() {
@@ -183,7 +176,7 @@ public abstract class SOAPFactoryImpl ex
 
     public final SOAPFaultDetail createSOAPFaultDetail(SOAPFault parent) {
         SOAPHelper helper = getSOAPHelper();
-        return createSOAPElement(helper.getFaultDetailClass(), parent, helper.getFaultDetailQName(),
null);
+        return createSOAPElement(helper.getFaultDetailClass(), parent, helper.getFaultDetailQName());
     }
 
     public final SOAPFaultDetail createSOAPFaultDetail() {

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultClassifierSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultClassifierSupport.aj?rev=1729541&r1=1729540&r2=1729541&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultClassifierSupport.aj
(original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAP12FaultClassifierSupport.aj
Wed Feb 10 07:45:12 2016
@@ -53,7 +53,7 @@ public aspect AxiomSOAP12FaultClassifier
     public final void AxiomSOAP12FaultClassifier.setValue(QName value) {
         SOAPFaultValue valueElement = getValue();
         if (valueElement == null) {
-            valueElement = ((SOAP12Factory)getOMFactory()).internalCreateSOAPFaultValue(this,
null);
+            valueElement = ((SOAP12Factory)getOMFactory()).internalCreateSOAPFaultValue(this);
         }
         valueElement.setText(value);
     }



Mime
View raw message