You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/04/09 14:32:21 UTC
svn commit: r1738357 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/
axiom-api/src/main/java/org/apache/axiom/soap/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/
testing/axiom-...
Author: veithen
Date: Sat Apr 9 12:32:21 2016
New Revision: 1738357
URL: http://svn.apache.org/viewvc?rev=1738357&view=rev
Log:
Update signature of getAllDetailEntries.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultDetailSupport.aj
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultDetail.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultDetailSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultDetailSupport.aj?rev=1738357&r1=1738356&r2=1738357&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultDetailSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/mixin/AxiomSOAPFaultDetailSupport.aj Sat Apr 9 12:32:21 2016
@@ -33,7 +33,7 @@ public aspect AxiomSOAPFaultDetailSuppor
addChild(detailElement);
}
- public final Iterator AxiomSOAPFaultDetail.getAllDetailEntries() {
+ public final Iterator<OMElement> AxiomSOAPFaultDetail.getAllDetailEntries() {
return getChildElements();
}
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultDetail.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultDetail.java?rev=1738357&r1=1738356&r2=1738357&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultDetail.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultDetail.java Sat Apr 9 12:32:21 2016
@@ -35,6 +35,6 @@ import java.util.Iterator;
public interface SOAPFaultDetail extends OMElement {
void addDetailEntry(OMElement detailElement);
- Iterator getAllDetailEntries();
+ Iterator<OMElement> getAllDetailEntries();
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java?rev=1738357&r1=1738356&r2=1738357&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java Sat Apr 9 12:32:21 2016
@@ -52,9 +52,9 @@ public class TestCreateSOAPFaultWithExce
assertThat(fault.isComplete()).isTrue();
SOAPFaultDetail detail = fault.getDetail();
assertThat(detail).isNotNull();
- Iterator it = detail.getAllDetailEntries();
+ Iterator<OMElement> it = detail.getAllDetailEntries();
assertThat(it.hasNext()).isTrue();
- OMElement entry = (OMElement)it.next();
+ OMElement entry = it.next();
assertThat(entry.getQName()).isEqualTo(new QName(SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY));
assertThat(entry.getText()).contains("Testing soap fault");
}
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java?rev=1738357&r1=1738356&r2=1738357&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestSetException.java Sat Apr 9 12:32:21 2016
@@ -39,9 +39,9 @@ public class TestSetException extends SO
fault.setException(exception);
SOAPFaultDetail detail = fault.getDetail();
assertNotNull(detail);
- Iterator it = detail.getAllDetailEntries();
+ Iterator<OMElement> it = detail.getAllDetailEntries();
assertTrue(it.hasNext());
- OMElement entry = (OMElement)it.next();
+ OMElement entry = it.next();
assertNotNull(entry);
assertEquals(SOAPConstants.SOAP_FAULT_DETAIL_EXCEPTION_ENTRY, entry.getLocalName());
assertNull(entry.getNamespace());
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java?rev=1738357&r1=1738356&r2=1738357&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestAddDetailEntry.java Sat Apr 9 12:32:21 2016
@@ -46,8 +46,8 @@ public class TestAddDetailEntry extends
soapFactory.createOMElement("DetailEntry1", omNamespace));
soapFaultDetail.addDetailEntry(
soapFactory.createOMElement("DetailEntry2", omNamespace));
- Iterator iterator = soapFaultDetail.getAllDetailEntries();
- OMElement detailEntry1 = (OMElement) iterator.next();
+ Iterator<OMElement> iterator = soapFaultDetail.getAllDetailEntries();
+ OMElement detailEntry1 = iterator.next();
assertNotNull(
"SOAP Fault Detail Test : - After calling addDetailEntry method twice, getAllDetailEntries method returns empty iterator",
detailEntry1);
@@ -57,7 +57,7 @@ public class TestAddDetailEntry extends
assertEquals(
"SOAP Fault Detail Test : - detailEntry1 namespace uri mismatch",
"http://www.test.org", detailEntry1.getNamespace().getNamespaceURI());
- OMElement detailEntry2 = (OMElement) iterator.next();
+ OMElement detailEntry2 = iterator.next();
assertNotNull(
"SOAP Fault Detail Test : - After calling addDetailEntry method twice, getAllDetailEntries method returns an iterator with only one object",
detailEntry2);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java?rev=1738357&r1=1738356&r2=1738357&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntries.java Sat Apr 9 12:32:21 2016
@@ -41,14 +41,14 @@ public class TestGetAllDetailEntries ext
SOAPFault fault = soapFactory.createSOAPFault(body);
SOAPFaultDetail soapFaultDetail = soapFactory.createSOAPFaultDetail(fault);
OMNamespace omNamespace = soapFactory.createOMNamespace("http://www.test.org", "test");
- Iterator iterator = soapFaultDetail.getAllDetailEntries();
+ Iterator<OMElement> iterator = soapFaultDetail.getAllDetailEntries();
assertFalse(
"SOAP Fault Detail Test : - After creating SOAP11FaultDetail element, it has DetailEntries",
iterator.hasNext());
soapFaultDetail.addDetailEntry(
soapFactory.createOMElement("DetailEntry", omNamespace));
iterator = soapFaultDetail.getAllDetailEntries();
- OMElement detailEntry = (OMElement) iterator.next();
+ OMElement detailEntry = iterator.next();
assertNotNull(
"SOAP Fault Detail Test : - After calling addDetailEntry method, getAllDetailEntries method returns empty iterator",
detailEntry);
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java?rev=1738357&r1=1738356&r2=1738357&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultdetail/TestGetAllDetailEntriesWithParser.java Sat Apr 9 12:32:21 2016
@@ -36,15 +36,15 @@ public class TestGetAllDetailEntriesWith
protected void runTest(SOAPEnvelope envelope) throws Throwable {
SOAPFaultDetail soapFaultDetail = envelope.getBody().getFault().getDetail();
- Iterator iterator = soapFaultDetail.getAllDetailEntries();
- OMElement detailEntry1 = (OMElement) iterator.next();
+ Iterator<OMElement> iterator = soapFaultDetail.getAllDetailEntries();
+ OMElement detailEntry1 = iterator.next();
assertNotNull(
"SOAP Fault Detail Test With Parser : - getAllDetailEntries method returns an itrator without detail entries",
detailEntry1);
assertEquals(
"SOAP Fault Detail Test With Parser : - detailEntry1 localname mismatch",
"ErrorCode", detailEntry1.getLocalName());
- OMElement detailEntry2 = (OMElement) iterator.next();
+ OMElement detailEntry2 = iterator.next();
assertNotNull(
"SOAP Fault Detail Test With Parser : - getAllDetailEntries method returns an itrator with only one detail entries",
detailEntry2);