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 2016/04/03 11:53:37 UTC
svn commit: r1737567 - in /axis/axis2/java/core/trunk/modules:
addressing/src/org/apache/axis2/handlers/addressing/
jaxws/src/org/apache/axis2/jaxws/message/util/ kernel/src/org/apache/axis2/
kernel/test/org/apache/axis2/util/ saaj/src/org/apache/axis2...
Author: veithen
Date: Sun Apr 3 09:53:37 2016
New Revision: 1737567
URL: http://svn.apache.org/viewvc?rev=1737567&view=rev
Log:
Use SOAPFaultClassifier.getValueAsQName() where appropriate.
Modified:
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/AxisFault.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
Modified: axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java?rev=1737567&r1=1737566&r2=1737567&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java (original)
+++ axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java Sun Apr 3 09:53:37 2016
@@ -90,12 +90,12 @@ public class AddressingInFaultHandler ex
SOAPFaultCode code = fault.getCode();
SOAPFaultSubCode subCode = code.getSubCode();
if (subCode == null) {
- faultLocalName = code.getTextAsQName().getLocalPart();
+ faultLocalName = code.getValueAsQName().getLocalPart();
} else {
while (subCode.getSubCode() != null) {
subCode = subCode.getSubCode();
}
- faultLocalName = subCode.getValue().getTextAsQName().getLocalPart();
+ faultLocalName = subCode.getValueAsQName().getLocalPart();
}
String newReason = AddressingFaultsHelper
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java?rev=1737567&r1=1737566&r2=1737567&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java Sun Apr 3 09:53:37 2016
@@ -152,13 +152,7 @@ public class XMLFaultUtils {
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
SOAPFaultCode soapCode = soapFault.getCode();
- QName codeQName = null;
- if (isSoap11) {
- codeQName = soapCode.getTextAsQName();
- } else {
- codeQName = soapCode.getValue().getTextAsQName();
- }
- XMLFaultCode code = XMLFaultCode.fromQName(codeQName);
+ XMLFaultCode code = XMLFaultCode.fromQName(soapCode.getValueAsQName());
// Get the primary reason text
// TODO what if this fails
@@ -188,9 +182,7 @@ public class XMLFaultUtils {
// Walk the nested sub codes and collect the qnames
while (soapSubCode != null) {
- SOAPFaultValue soapSubCodeValue = soapSubCode.getValue();
- QName qName = soapSubCodeValue.getTextAsQName();
- list.add(qName);
+ list.add(soapSubCode.getValueAsQName());
soapSubCode = soapSubCode.getSubCode();
}
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/AxisFault.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/AxisFault.java?rev=1737567&r1=1737566&r2=1737567&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/AxisFault.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/AxisFault.java Sun Apr 3 09:53:37 2016
@@ -235,13 +235,13 @@ public class AxisFault extends RemoteExc
if (soapFaultCode != null) {
// This works the same regardless of SOAP version
- faultCode = soapFaultCode.getTextAsQName();
+ faultCode = soapFaultCode.getValueAsQName();
SOAPFaultSubCode subCode = soapFaultCode.getSubCode();
if (subCode != null) {
faultSubCodes = new ArrayList<QName>();
while (subCode != null) {
- faultSubCodes.add(subCode.getValue().getTextAsQName());
+ faultSubCodes.add(subCode.getValueAsQName());
subCode = subCode.getSubCode();
}
}
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java?rev=1737567&r1=1737566&r2=1737567&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/util/MessageContextBuilderTest.java Sun Apr 3 09:53:37 2016
@@ -76,7 +76,7 @@ public class MessageContextBuilderTest e
SOAPFault fault = faultContext.getEnvelope().getBody().getFault();
String se = faultContext.getEnvelope().getNamespace().getPrefix();
- assertEquals (fault.getCode().getTextAsQName().getPrefix(), se);
+ assertEquals (fault.getCode().getValueAsQName().getPrefix(), se);
}
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=1737567&r1=1737566&r2=1737567&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 Sun Apr 3 09:53:37 2016
@@ -446,14 +446,7 @@ public class SOAPFaultImpl extends SOAPB
*/
public QName getFaultCodeAsQName() {
SOAPFaultCode soapFaultCode = this.omTarget.getCode();
- if (soapFaultCode != null) {
- if (((SOAPFactory)this.omTarget.getOMFactory()).getSOAPVersion() == SOAP11Version.getSingleton()) {
- return soapFaultCode.getTextAsQName();
- } else {
- return soapFaultCode.getValue().getTextAsQName();
- }
- }
- return null;
+ return soapFaultCode != null ? soapFaultCode.getValueAsQName() : null;
}
/**
@@ -613,8 +606,7 @@ public class SOAPFaultImpl extends SOAPB
ArrayList faultSubcodes = new ArrayList();
SOAPFaultSubCode subCodeElement = this.omTarget.getCode().getSubCode();
while (subCodeElement != null) {
- QName qname = subCodeElement.getValue().getTextAsQName();
- faultSubcodes.add(qname);
+ faultSubcodes.add(subCodeElement.getValueAsQName());
subCodeElement = subCodeElement.getSubCode();
}
return faultSubcodes.iterator();