Author: veithen
Date: Thu Jun 4 20:55:28 2015
New Revision: 1683641
URL: http://svn.apache.org/r1683641
Log:
Realign some LLOM and DOOM code.
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java?rev=1683641&r1=1683640&r2=1683641&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11FaultImpl.java
Thu Jun 4 20:55:28 2015
@@ -115,10 +115,6 @@ public class SOAP11FaultImpl extends SOA
insertChild(sequence, 3, detail);
}
- public SOAPFaultRole getRole() {
- return
(SOAP11FaultRoleImpl)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_ROLE);
- }
-
public SOAPFaultCode getCode() {
return
(SOAPFaultCode)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_CODE);
}
@@ -127,14 +123,18 @@ public class SOAP11FaultImpl extends SOA
return
(SOAPFaultReason)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_REASON);
}
- public SOAPFaultDetail getDetail() {
- return
(SOAPFaultDetail)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_DETAIL);
- }
-
public SOAPFaultNode getNode() {
return null;
}
+ public SOAPFaultRole getRole() {
+ return
(SOAPFaultRole)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_ROLE);
+ }
+
+ public SOAPFaultDetail getDetail() {
+ return
(SOAPFaultDetail)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_DETAIL);
+ }
+
protected OMElement createClone(OMCloneOptions options, ParentNode
targetParent,
boolean generateNSDecl) {
SOAPFault clone = new SOAP11FaultImpl(targetParent, getNamespace(),
null, getOMFactory(), generateNSDecl);
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java?rev=1683641&r1=1683640&r2=1683641&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12FaultImpl.java
Thu Jun 4 20:55:28 2015
@@ -36,7 +36,6 @@ import org.apache.axiom.soap.SOAPFaultRo
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.impl.dom.SOAPFaultImpl;
-import org.apache.axiom.soap.impl.dom.SOAPFaultRoleImpl;
public class SOAP12FaultImpl extends SOAPFaultImpl {
private static final Class[] sequence = { SOAPFaultCode.class,
SOAPFaultReason.class,
@@ -116,24 +115,24 @@ public class SOAP12FaultImpl extends SOA
}
}
- public SOAPFaultReason getReason() {
- return
(SOAPFaultReason)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_REASON);
- }
-
- public SOAPFaultDetail getDetail() {
- return
(SOAPFaultDetail)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_DETAIL);
- }
-
public SOAPFaultCode getCode() {
return
(SOAPFaultCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_CODE);
}
+ public SOAPFaultReason getReason() {
+ return
(SOAPFaultReason)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_REASON);
+ }
+
public SOAPFaultNode getNode() {
return
(SOAPFaultNode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_NODE);
}
public SOAPFaultRole getRole() {
- return
(SOAPFaultRoleImpl)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_ROLE);
+ return
(SOAPFaultRole)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_ROLE);
+ }
+
+ public SOAPFaultDetail getDetail() {
+ return
(SOAPFaultDetail)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_DETAIL);
}
protected OMElement createClone(OMCloneOptions options, ParentNode
targetParent,
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java?rev=1683641&r1=1683640&r2=1683641&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
Thu Jun 4 20:55:28 2015
@@ -87,7 +87,6 @@ public abstract class SOAPFaultImpl exte
super(parent, SOAPConstants.SOAPFAULT_LOCAL_NAME, builder, factory);
}
-
protected abstract SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault)
throws SOAPProcessingException;
@@ -108,7 +107,8 @@ public abstract class SOAPFaultImpl exte
return null;
}
- protected void putExceptionToSOAPFault(Exception e) throws
SOAPProcessingException {
+ protected void putExceptionToSOAPFault(Exception e)
+ throws SOAPProcessingException {
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
sw.flush();
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java?rev=1683641&r1=1683640&r2=1683641&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11FaultImpl.java
Thu Jun 4 20:55:28 2015
@@ -59,7 +59,6 @@ public class SOAP11FaultImpl extends SOA
public SOAP11FaultImpl(SOAPBody parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, factory);
-
}
protected SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault)
@@ -71,7 +70,8 @@ public class SOAP11FaultImpl extends SOA
throws SOAPProcessingException {
if (!(soapFaultCode instanceof SOAP11FaultCodeImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP11FaultCodeImpl, got " +
soapFaultCode.getClass());
+ "Expecting SOAP 1.1 implementation of SOAP Fault Code. " +
+ "But received some other implementation");
}
insertChild(sequence, 0, soapFaultCode);
}
@@ -79,7 +79,8 @@ public class SOAP11FaultImpl extends SOA
public void setReason(SOAPFaultReason reason) throws
SOAPProcessingException {
if (!(reason instanceof SOAP11FaultReasonImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP11FaultReasonImpl, got " +
reason.getClass());
+ "Expecting SOAP 1.1 implementation of SOAP Fault Reason. "
+
+ "But received some other implementation");
}
insertChild(sequence, 1, reason);
}
@@ -91,7 +92,8 @@ public class SOAP11FaultImpl extends SOA
public void setRole(SOAPFaultRole role) throws SOAPProcessingException {
if (!(role instanceof SOAP11FaultRoleImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP11FaultRoleImpl, got " + role.getClass());
+ "Expecting SOAP 1.1 implementation of SOAP Fault Role. " +
+ "But received some other implementation");
}
insertChild(sequence, 2, role);
}
@@ -99,24 +101,26 @@ public class SOAP11FaultImpl extends SOA
protected void checkParent(OMElement parent) throws
SOAPProcessingException {
if (!(parent instanceof SOAP11BodyImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP11BodyImpl, got " + parent.getClass());
+ "Expecting SOAP 1.1 implementation of SOAP Body as the " +
+ "parent. But received some other implementation");
}
}
public void setDetail(SOAPFaultDetail detail) throws
SOAPProcessingException {
if (!(detail instanceof SOAP11FaultDetailImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP11FaultDetailImpl, got " +
detail.getClass());
+ "Expecting SOAP 1.1 implementation of SOAP Fault Detail. "
+
+ "But received some other implementation");
}
insertChild(sequence, 3, detail);
}
public SOAPFaultCode getCode() {
- return (SOAPFaultCode)
getFirstChildWithName(SOAP11Constants.QNAME_FAULT_CODE);
+ return
(SOAPFaultCode)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_CODE);
}
public SOAPFaultReason getReason() {
- return (SOAPFaultReason)
getFirstChildWithName(SOAP11Constants.QNAME_FAULT_REASON);
+ return
(SOAPFaultReason)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_REASON);
}
public SOAPFaultNode getNode() {
@@ -124,10 +128,10 @@ public class SOAP11FaultImpl extends SOA
}
public SOAPFaultRole getRole() {
- return (SOAPFaultRole)
getFirstChildWithName(SOAP11Constants.QNAME_FAULT_ROLE);
+ return
(SOAPFaultRole)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_ROLE);
}
public SOAPFaultDetail getDetail() {
- return (SOAPFaultDetail)
getFirstChildWithName(SOAP11Constants.QNAME_FAULT_DETAIL);
+ return
(SOAPFaultDetail)getFirstChildWithName(SOAP11Constants.QNAME_FAULT_DETAIL);
}
}
Modified:
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java?rev=1683641&r1=1683640&r2=1683641&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultImpl.java
Thu Jun 4 20:55:28 2015
@@ -66,11 +66,11 @@ public class SOAP12FaultImpl extends SOA
}
- public void setCode(SOAPFaultCode soapFaultCode)
- throws SOAPProcessingException {
+ public void setCode(SOAPFaultCode soapFaultCode) throws
SOAPProcessingException {
if (!(soapFaultCode instanceof SOAP12FaultCodeImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP12FaultCodeImpl, got " +
soapFaultCode.getClass());
+ "Expecting SOAP 1.2 implementation of SOAP Fault Code. " +
+ "But received some other implementation");
}
insertChild(sequence, 0, soapFaultCode);
}
@@ -79,7 +79,7 @@ public class SOAP12FaultImpl extends SOA
public void setReason(SOAPFaultReason reason) throws
SOAPProcessingException {
if (!(reason instanceof SOAP12FaultReasonImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP12FaultReasonImpl, got " +
reason.getClass());
+ "Expecting SOAP 1.2 implementation of SOAP Fault Reason.
But received some other implementation");
}
insertChild(sequence, 1, reason);
}
@@ -87,7 +87,7 @@ public class SOAP12FaultImpl extends SOA
public void setNode(SOAPFaultNode node) throws SOAPProcessingException {
if (!(node instanceof SOAP12FaultNodeImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP12FaultNodeImpl, got " + node.getClass());
+ "Expecting SOAP 1.2 implementation of SOAP Fault Node. But
received some other implementation");
}
insertChild(sequence, 2, node);
}
@@ -95,7 +95,7 @@ public class SOAP12FaultImpl extends SOA
public void setRole(SOAPFaultRole role) throws SOAPProcessingException {
if (!(role instanceof SOAP12FaultRoleImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP12FaultRoleImpl, got " + role.getClass());
+ "Expecting SOAP 1.2 implementation of SOAP Fault Role. But
received some other implementation");
}
insertChild(sequence, 3, role);
}
@@ -103,7 +103,7 @@ public class SOAP12FaultImpl extends SOA
public void setDetail(SOAPFaultDetail detail) throws
SOAPProcessingException {
if (!(detail instanceof SOAP12FaultDetailImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP12FaultDetailImpl, got " +
detail.getClass());
+ "Expecting SOAP 1.2 implementation of SOAP Fault Detail.
But received some other implementation");
}
insertChild(sequence, 4, detail);
}
@@ -111,24 +111,24 @@ public class SOAP12FaultImpl extends SOA
protected void checkParent(OMElement parent) throws
SOAPProcessingException {
if (!(parent instanceof SOAP12BodyImpl)) {
throw new SOAPProcessingException(
- "Expecting SOAP12BodyImpl, got " + parent.getClass());
+ "Expecting SOAP 1.2 implementation of SOAP Body as the
parent. But received some other implementation");
}
}
- public SOAPFaultNode getNode() {
- return (SOAPFaultNode)
getFirstChildWithName(SOAP12Constants.QNAME_FAULT_NODE);
- }
-
public SOAPFaultCode getCode() {
- return (SOAPFaultCode)
getFirstChildWithName(SOAP12Constants.QNAME_FAULT_CODE);
+ return
(SOAPFaultCode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_CODE);
}
public SOAPFaultReason getReason() {
- return (SOAPFaultReason)
getFirstChildWithName(SOAP12Constants.QNAME_FAULT_REASON);
+ return
(SOAPFaultReason)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_REASON);
+ }
+
+ public SOAPFaultNode getNode() {
+ return
(SOAPFaultNode)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_NODE);
}
public SOAPFaultRole getRole() {
- return (SOAPFaultRole)
getFirstChildWithName(SOAP12Constants.QNAME_FAULT_ROLE);
+ return
(SOAPFaultRole)getFirstChildWithName(SOAP12Constants.QNAME_FAULT_ROLE);
}
public SOAPFaultDetail getDetail() {
