You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/12/12 00:47:17 UTC
svn commit: r1817872 - in
/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj:
DetailImpl.java ProxyNode.java SOAPBodyImpl.java SOAPElementImpl.java
SOAPEnvelopeImpl.java SOAPFaultImpl.java SOAPHeaderImpl.java
Author: veithen
Date: Tue Dec 12 00:47:17 2017
New Revision: 1817872
URL: http://svn.apache.org/viewvc?rev=1817872&view=rev
Log:
Remove unnecessary code. The user data is set centrally in the ProxyNode constructor.
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java?rev=1817872&r1=1817871&r2=1817872&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java Tue Dec 12 00:47:17 2017
@@ -70,9 +70,7 @@ public class DetailImpl extends SOAPFaul
*/
public DetailEntry addDetailEntry(Name name) throws SOAPException {
SOAPElementImpl<?> childElement = (SOAPElementImpl<?>)addChildElement(name);
- DetailEntryImpl detailEntry = new DetailEntryImpl(childElement.omTarget);
- childElement.target.setUserData(SAAJ_NODE, detailEntry, null);
- return detailEntry;
+ return new DetailEntryImpl(childElement.omTarget);
}
/**
@@ -99,9 +97,7 @@ public class DetailImpl extends SOAPFaul
*/
public DetailEntry addDetailEntry(QName qname) throws SOAPException {
SOAPElementImpl<?> childElement = (SOAPElementImpl<?>)addChildElement(qname);
- DetailEntryImpl detailEntry = new DetailEntryImpl(childElement.omTarget);
- childElement.target.setUserData(SAAJ_NODE, detailEntry, null);
- return detailEntry;
+ return new DetailEntryImpl(childElement.omTarget);
}
public SOAPElement addAttribute(QName qname, String value) throws SOAPException {
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java?rev=1817872&r1=1817871&r2=1817872&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/ProxyNode.java Tue Dec 12 00:47:17 2017
@@ -147,46 +147,23 @@ public abstract class ProxyNode<T extend
} else if (domNode instanceof org.w3c.dom.Comment) {
return new CommentImpl((OMComment)domNode);
} else if (domNode instanceof SOAPBody) {
- javax.xml.soap.SOAPBody saajSOAPBody =
- new org.apache.axis2.saaj.SOAPBodyImpl((SOAPBody)domNode);
- domNode.setUserData(SAAJ_NODE, saajSOAPBody, null);
- return saajSOAPBody;
+ return new org.apache.axis2.saaj.SOAPBodyImpl((SOAPBody)domNode);
} else if (domNode instanceof SOAPEnvelope) {
- javax.xml.soap.SOAPEnvelope saajEnvelope
- = new org.apache.axis2.saaj.SOAPEnvelopeImpl((SOAPEnvelope)domNode);
- domNode.setUserData(SAAJ_NODE, saajEnvelope, null);
- return saajEnvelope;
+ return new org.apache.axis2.saaj.SOAPEnvelopeImpl((SOAPEnvelope)domNode);
} else if (domNode instanceof SOAPFaultNode) {
- javax.xml.soap.SOAPFaultElement saajSOAPFaultEle
- = new org.apache.axis2.saaj.SOAPFaultElementImpl<SOAPFaultNode>((SOAPFaultNode)domNode);
- domNode.setUserData(SAAJ_NODE, saajSOAPFaultEle, null);
- return saajSOAPFaultEle;
+ return new org.apache.axis2.saaj.SOAPFaultElementImpl<SOAPFaultNode>((SOAPFaultNode)domNode);
} else if (domNode instanceof SOAPFaultDetail) {
- javax.xml.soap.Detail saajDetail
- = new org.apache.axis2.saaj.DetailImpl((SOAPFaultDetail)domNode);
- domNode.setUserData(SAAJ_NODE, saajDetail, null);
- return saajDetail;
+ return new org.apache.axis2.saaj.DetailImpl((SOAPFaultDetail)domNode);
} else if (domNode instanceof SOAPFault) {
- javax.xml.soap.SOAPFault saajSOAPFault
- = new org.apache.axis2.saaj.SOAPFaultImpl((SOAPFault)domNode);
- domNode.setUserData(SAAJ_NODE, saajSOAPFault, null);
- return saajSOAPFault;
+ return new org.apache.axis2.saaj.SOAPFaultImpl((SOAPFault)domNode);
} else if (domNode instanceof SOAPHeaderBlock) {
- javax.xml.soap.SOAPHeaderElement saajSOAPHeaderEle
- = new org.apache.axis2.saaj.SOAPHeaderElementImpl((SOAPHeaderBlock)domNode);
- domNode.setUserData(SAAJ_NODE, saajSOAPHeaderEle, null);
- return saajSOAPHeaderEle;
+ return new org.apache.axis2.saaj.SOAPHeaderElementImpl((SOAPHeaderBlock)domNode);
} else if (domNode instanceof SOAPHeader) {
- javax.xml.soap.SOAPHeader saajSOAPHeader
- = new org.apache.axis2.saaj.SOAPHeaderImpl((SOAPHeader)domNode);
- domNode.setUserData(SAAJ_NODE, saajSOAPHeader, null);
- return saajSOAPHeader;
+ return new org.apache.axis2.saaj.SOAPHeaderImpl((SOAPHeader)domNode);
} else if (domNode instanceof Document) {
return new SAAJDocument((OMDocument)domNode);
} else { // instanceof org.apache.axis2.om.impl.dom.ElementImpl
- SOAPElementImpl<OMElement> saajSOAPElement = new SOAPElementImpl<OMElement>((OMElement)domNode);
- domNode.setUserData(SAAJ_NODE, saajSOAPElement, null);
- return saajSOAPElement;
+ return new SOAPElementImpl<OMElement>((OMElement)domNode);
}
}
@@ -354,12 +331,10 @@ public abstract class ProxyNode<T extend
SOAPElementImpl<OMElement> childEle = (SOAPElementImpl<OMElement>)child;
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
if (namespaceURI != null && namespaceURI.trim().length() > 0) {
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
}
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement((SOAPElement)this);
return childEle;
}
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java?rev=1817872&r1=1817871&r2=1817872&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java Tue Dec 12 00:47:17 2017
@@ -64,9 +64,7 @@ public class SOAPBodyImpl extends SOAPEl
}
SOAPBodyElementImpl<OMElement> childEle =
new SOAPBodyElementImpl<OMElement>((OMElement)target.getOwnerDocument().createElementNS(null, localName));
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
isBodyElementAdded = true;
return childEle;
}
@@ -81,10 +79,8 @@ public class SOAPBodyImpl extends SOAPEl
new SOAPBodyElementImpl<OMElement>(
(OMElement)target.getOwnerDocument().createElementNS(namespaceURI,
localName));
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -96,12 +92,10 @@ public class SOAPBodyImpl extends SOAPEl
SOAPBodyElementImpl<?> childEle = toSOAPBodyElement(child);
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
if (namespaceURI != null && namespaceURI.trim().length() > 0) {
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
}
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -146,12 +140,10 @@ public class SOAPBodyImpl extends SOAPEl
}
}
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
if (namespaceURI != null && namespaceURI.trim().length() > 0) {
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
}
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -180,10 +172,8 @@ public class SOAPBodyImpl extends SOAPEl
(OMElement)target.getOwnerDocument().createElementNS(uri,
prefix + ":" + localName));
}
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(omTarget.getOMFactory().createOMNamespace(uri, prefix));
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
isBodyElementAdded = true;
childEle.setParentElement(this);
return childEle;
@@ -205,7 +195,6 @@ public class SOAPBodyImpl extends SOAPEl
// set default fault code and string
saajSOAPFault.setDefaults();
- ((Element)omTarget.getFault()).setUserData(SAAJ_NODE, saajSOAPFault, null);
return saajSOAPFault;
}
@@ -505,11 +494,9 @@ public class SOAPBodyImpl extends SOAPEl
qname.getPrefix() + ":" +
qname.getLocalPart()));
}
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(omTarget.getOMFactory().createOMNamespace(qname.getNamespaceURI(), qname.getPrefix()));
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
isBodyElementAdded = true;
childEle.setParentElement(this);
return childEle;
@@ -576,14 +563,9 @@ public class SOAPBodyImpl extends SOAPEl
SOAPFactory omFactory = (SOAPFactory)this.omTarget.getOMFactory();
org.apache.axiom.soap.SOAPFault fault = omFactory.createSOAPFault(omTarget);
- SOAPFaultImpl saajSOAPFault = new SOAPFaultImpl(fault);
- ((Element)omTarget.getFault())
- .setUserData(SAAJ_NODE, saajSOAPFault, null);
- childElements.add(saajSOAPFault);
+ childElements.add(new SOAPFaultImpl(fault));
} else {
- SOAPBodyElement saajBodyEle = new SOAPBodyElementImpl<OMElement>((OMElement)domNode);
- domNode.setUserData(SAAJ_NODE, saajBodyEle, null);
- childElements.add(saajBodyEle);
+ childElements.add(new SOAPBodyElementImpl<OMElement>((OMElement)domNode));
}
}
} else {
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1817872&r1=1817871&r2=1817872&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Tue Dec 12 00:47:17 2017
@@ -117,12 +117,10 @@ public class SOAPElementImpl<T extends O
}
}
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
if (namespaceURI != null && namespaceURI.trim().length() > 0) {
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
}
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -138,12 +136,10 @@ public class SOAPElementImpl<T extends O
SOAPElementImpl<OMElement> childEle = (SOAPElementImpl<OMElement>)getOwnerDocument().
createElementNS(namespaceURI, prefix.length() == 0 ? localName : prefix + ":" + localName);
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(prefix.length() == 0
? childEle.omTarget.declareDefaultNamespace(namespaceURI)
: childEle.omTarget.declareNamespace(namespaceURI, prefix));
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -167,9 +163,7 @@ public class SOAPElementImpl<T extends O
public SOAPElement addChildElement(String localName) throws SOAPException {
SOAPElementImpl<OMElement> childEle =
(SOAPElementImpl<OMElement>)getOwnerDocument().createElementNS(null, localName);
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java?rev=1817872&r1=1817871&r2=1817872&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java Tue Dec 12 00:47:17 2017
@@ -129,11 +129,8 @@ public class SOAPEnvelopeImpl extends SO
public SOAPHeader addHeader() throws SOAPException {
org.apache.axiom.soap.SOAPHeader header = omTarget.getHeader();
if (header == null) {
- SOAPHeaderImpl saajSOAPHeader;
header = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeader(omTarget);
- saajSOAPHeader = new SOAPHeaderImpl(header);
- ((Element)omTarget.getHeader()).setUserData(SAAJ_NODE, saajSOAPHeader, null);
- return saajSOAPHeader;
+ return new SOAPHeaderImpl(header);
} else {
throw new SOAPException("Header already present, can't set header again without " +
"deleting the existing header. " +
@@ -158,7 +155,6 @@ public class SOAPEnvelopeImpl extends SO
body = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPBody(omTarget);
SOAPBodyImpl saajSOAPBody = new SOAPBodyImpl(body);
saajSOAPBody.setParentElement(this);
- ((Element)omTarget.getBody()).setUserData(SAAJ_NODE, saajSOAPBody, null);
return saajSOAPBody;
} else {
throw new SOAPException("Body already present, can't set body again without " +
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java?rev=1817872&r1=1817871&r2=1817872&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java Tue Dec 12 00:47:17 2017
@@ -260,7 +260,6 @@ public class SOAPFaultImpl extends SOAPB
SOAPFactory factory = (SOAPFactory)this.omTarget.getOMFactory();
omDetail = factory.createSOAPFaultDetail(this.omTarget);
Detail saajDetail = new DetailImpl(omDetail);
- ((Element)omTarget.getDetail()).setUserData(SAAJ_NODE, saajDetail, null);
isDetailAdded = true;
return saajDetail;
}
@@ -749,9 +748,7 @@ public class SOAPFaultImpl extends SOAPB
org.w3c.dom.Node saajNode = toSAAJNode(domNode);
if (!(saajNode instanceof SOAPFaultElement)) {
// silently replace node, as per saaj 1.2 spec
- SOAPFaultElement bodyEle = new SOAPFaultElementImpl<OMElement>((OMElement)domNode);
- domNode.setUserData(SAAJ_NODE, bodyEle, null);
- childElements.add(bodyEle);
+ childElements.add(new SOAPFaultElementImpl<OMElement>((OMElement)domNode));
} else {
childElements.add(saajNode);
}
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?rev=1817872&r1=1817871&r2=1817872&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java Tue Dec 12 00:47:17 2017
@@ -75,8 +75,6 @@ public class SOAPHeaderImpl extends SOAP
OMNamespace ns = omTarget.getOMFactory().createOMNamespace(uri, prefix);
SOAPHeaderBlock headerBlock = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeaderBlock(localName, ns, omTarget);
SOAPHeaderElementImpl soapHeaderElement = new SOAPHeaderElementImpl(headerBlock);
- target.setUserData(SAAJ_NODE, this, null);
- soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, null);
soapHeaderElement.setParentElement(this);
return soapHeaderElement;
}
@@ -97,8 +95,6 @@ public class SOAPHeaderImpl extends SOAP
SOAPHeaderBlock headerBlock = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeaderBlock(
soapElement.getLocalName(), ns, omTarget);
SOAPHeaderElementImpl soapHeaderElement = new SOAPHeaderElementImpl(headerBlock);
- target.setUserData(SAAJ_NODE, this, null);
- soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, null);
soapHeaderElement.setParentElement(this);
return soapHeaderElement;
}
@@ -110,11 +106,8 @@ public class SOAPHeaderImpl extends SOAP
SOAPHeaderBlock headerBlock = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeaderBlock(
child.getLocalName(), ns, omTarget);
- target.setUserData(SAAJ_NODE, this, null);
-
SOAPHeaderElementImpl soapHeaderElement = new SOAPHeaderElementImpl(headerBlock);
copyContents(soapHeaderElement, child);
- soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, null);
soapHeaderElement.setParentElement(this);
return soapHeaderElement;
}
@@ -143,8 +136,6 @@ public class SOAPHeaderImpl extends SOAP
name.getLocalName(), ns, omTarget);
SOAPHeaderElementImpl soapHeaderElement = new SOAPHeaderElementImpl(headerBlock);
- target.setUserData(SAAJ_NODE, this, null);
- soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, null);
soapHeaderElement.setParentElement(this);
return soapHeaderElement;
}
@@ -351,9 +342,7 @@ public class SOAPHeaderImpl extends SOAP
childElements.add(saajNode);
} else if (!(saajNode instanceof SOAPHeaderElement)) {
// silently replace node, as per saaj 1.2 spec
- SOAPHeaderElement headerEle = new SOAPHeaderElementImpl((SOAPHeaderBlock)domNode);
- domNode.setUserData(SAAJ_NODE, headerEle, null);
- childElements.add(headerEle);
+ childElements.add(new SOAPHeaderElementImpl((SOAPHeaderBlock)domNode));
} else {
childElements.add(saajNode);
}