You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/05/29 19:11:46 UTC
svn commit: r1487545 - in /cxf/trunk/rt/ws/eventing/src:
main/java/org/apache/cxf/ws/eventing/backend/manager/
main/java/org/apache/cxf/ws/eventing/shared/faults/
main/java/org/apache/cxf/ws/eventing/shared/handlers/
test/java/org/apache/cxf/ws/eventin...
Author: dkulp
Date: Wed May 29 17:11:45 2013
New Revision: 1487545
URL: http://svn.apache.org/r1487545
Log:
First pass at cleaning up some ws-eventing warnings in eclipse
Modified:
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/CannotProcessFilter.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/DeliveryFormatRequestedUnavailable.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EmptyFilter.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EndToNotSupported.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/FilteringRequestedUnavailable.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/NoDeliveryMechanismEstablished.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnknownSubscription.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationType.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationValue.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnusableEPR.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/SubscriptionReferenceParsingHandler.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java Wed May 29 17:11:45 2013
@@ -224,9 +224,10 @@ public class SubscriptionManagerImpl imp
subscriptionManagerReference.setAddress(getSubscriptionManagerAddress());
// generate a ID for this subscription
UUID uuid = UUID.randomUUID();
- JAXBElement idqn = new JAXBElement(new QName(subscriptionIdNamespace, subscriptionIdElementName),
- String.class,
- uuid.toString());
+ JAXBElement<String> idqn
+ = new JAXBElement<String>(new QName(subscriptionIdNamespace, subscriptionIdElementName),
+ String.class,
+ uuid.toString());
subscriptionManagerReference.setReferenceParameters(new ReferenceParametersType());
subscriptionManagerReference.getReferenceParameters().getAny().add(idqn);
ticket.setUuid(uuid);
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/CannotProcessFilter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/CannotProcessFilter.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/CannotProcessFilter.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/CannotProcessFilter.java Wed May 29 17:11:45 2013
@@ -24,10 +24,12 @@ import javax.xml.namespace.QName;
import org.apache.cxf.ws.eventing.shared.EventingConstants;
public class CannotProcessFilter extends WSEventingFault {
-
+
public static final String REASON = "Cannot filter as requested.";
public static final String LOCAL_PART = "CannotProcessFilter";
+ private static final long serialVersionUID = 1L;
+
public CannotProcessFilter() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/DeliveryFormatRequestedUnavailable.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/DeliveryFormatRequestedUnavailable.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/DeliveryFormatRequestedUnavailable.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/DeliveryFormatRequestedUnavailable.java Wed May 29 17:11:45 2013
@@ -28,6 +28,8 @@ public class DeliveryFormatRequestedUnav
public static final String REASON = "The requested delivery format is not supported.";
public static final String LOCAL_PART = "DeliveryFormatRequestedUnavailable";
+ private static final long serialVersionUID = 1L;
+
public DeliveryFormatRequestedUnavailable() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EmptyFilter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EmptyFilter.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EmptyFilter.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EmptyFilter.java Wed May 29 17:11:45 2013
@@ -28,6 +28,8 @@ public class EmptyFilter extends WSEvent
public static final String REASON = "The wse:Filter would result in zero notifications.";
public static final String LOCAL_PART = "EmptyFilter";
+ private static final long serialVersionUID = 1L;
+
public EmptyFilter() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EndToNotSupported.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EndToNotSupported.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EndToNotSupported.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/EndToNotSupported.java Wed May 29 17:11:45 2013
@@ -28,6 +28,8 @@ public class EndToNotSupported extends W
public static final String REASON = "wse:EndTo semantics is not supported.";
public static final String LOCAL_PART = "EndToNotSupported";
+ private static final long serialVersionUID = 1L;
+
public EndToNotSupported() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/FilteringRequestedUnavailable.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/FilteringRequestedUnavailable.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/FilteringRequestedUnavailable.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/FilteringRequestedUnavailable.java Wed May 29 17:11:45 2013
@@ -28,6 +28,8 @@ public class FilteringRequestedUnavailab
public static final String REASON = "The requested filter dialect is not supported.";
public static final String LOCAL_PART = "FilteringRequestedUnavailable";
+ private static final long serialVersionUID = 1L;
+
public FilteringRequestedUnavailable() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/NoDeliveryMechanismEstablished.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/NoDeliveryMechanismEstablished.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/NoDeliveryMechanismEstablished.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/NoDeliveryMechanismEstablished.java Wed May 29 17:11:45 2013
@@ -28,6 +28,8 @@ public class NoDeliveryMechanismEstablis
public static final String REASON = "No delivery mechanism specified.";
public static final String LOCAL_PART = "NoDeliveryMechanismEstablished";
+ private static final long serialVersionUID = 1L;
+
public NoDeliveryMechanismEstablished() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnknownSubscription.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnknownSubscription.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnknownSubscription.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnknownSubscription.java Wed May 29 17:11:45 2013
@@ -28,6 +28,8 @@ public class UnknownSubscription extends
public static final String REASON = "The subscription is not known.";
public static final String LOCAL_PART = "UnknownSubscription";
+ private static final long serialVersionUID = 1L;
+
public UnknownSubscription() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationType.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationType.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationType.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationType.java Wed May 29 17:11:45 2013
@@ -28,6 +28,8 @@ public class UnsupportedExpirationType e
public static final String REASON = "Only expiration durations are supported.";
public static final String LOCAL_PART = "UnsupportedExpirationType";
+ private static final long serialVersionUID = 1L;
+
public UnsupportedExpirationType() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationValue.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationValue.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationValue.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnsupportedExpirationValue.java Wed May 29 17:11:45 2013
@@ -28,6 +28,8 @@ public class UnsupportedExpirationValue
public static final String REASON = "The expiration time requested is not within the min/max range.";
public static final String LOCAL_PART = "UnsupportedExpirationValue";
+ private static final long serialVersionUID = 1L;
+
public UnsupportedExpirationValue() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnusableEPR.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnusableEPR.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnusableEPR.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/UnusableEPR.java Wed May 29 17:11:45 2013
@@ -28,6 +28,8 @@ public class UnusableEPR extends WSEvent
public static final String REASON = "An EPR in the Subscribe request message is unusable.";
public static final String LOCAL_PART = "UnusableEPR";
+ private static final long serialVersionUID = 1L;
+
public UnusableEPR() {
super(REASON,
null,
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/faults/WSEventingFault.java Wed May 29 17:11:45 2013
@@ -32,6 +32,8 @@ import org.apache.cxf.ws.eventing.shared
@FaultAction(EventingConstants.ACTION_FAULT)
public abstract class WSEventingFault extends SoapFault {
+ private static final long serialVersionUID = 1L;
+
public WSEventingFault(String reason, Element detail, QName faultCode) {
super(reason, faultCode);
if (detail != null) {
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/SubscriptionReferenceParsingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/SubscriptionReferenceParsingHandler.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/SubscriptionReferenceParsingHandler.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/SubscriptionReferenceParsingHandler.java Wed May 29 17:11:45 2013
@@ -19,8 +19,8 @@
package org.apache.cxf.ws.eventing.shared.handlers;
-import java.util.Iterator;
import java.util.Set;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
@@ -30,7 +30,9 @@ import javax.xml.ws.handler.soap.SOAPHan
import javax.xml.ws.handler.soap.SOAPMessageContext;
import org.w3c.dom.Element;
+
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.ws.eventing.shared.EventingConstants;
/**
@@ -72,15 +74,14 @@ public class SubscriptionReferenceParsin
}
try {
// read headers
- Iterator headerElements = context.getMessage().getSOAPHeader().examineAllHeaderElements();
- Element o;
LOG.finer("Examining header elements");
- while (headerElements.hasNext()) {
- o = (Element)headerElements.next();
- if (o.getNamespaceURI().equals(namespace)
- && o.getLocalName().equals(elementName)) {
- LOG.fine("found UUID parameter in header, uuid=" + o.getTextContent());
- context.put("uuid", o.getTextContent());
+ Element el = DOMUtils.getFirstElement(context.getMessage().getSOAPHeader());
+ while (el != null) {
+ if (el.getNamespaceURI().equals(namespace)
+ && el.getLocalName().equals(elementName)) {
+ LOG.log(Level.FINE, "found UUID parameter in header, uuid={0}", el.getTextContent());
+ context.put("uuid", el.getTextContent());
+ el = DOMUtils.getNextElement(el);
}
}
} catch (SOAPException e) {
Modified: cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java (original)
+++ cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java Wed May 29 17:11:45 2013
@@ -204,10 +204,12 @@ public class NotificationTest extends Si
EndpointReferenceType eventSinkERT = new EndpointReferenceType();
- JAXBElement idqn = new JAXBElement(new QName("http://www.example.org", "MyReferenceParameter"),
+ JAXBElement<String> idqn
+ = new JAXBElement<String>(new QName("http://www.example.org", "MyReferenceParameter"),
String.class,
"380");
- JAXBElement idqn2 = new JAXBElement(new QName("http://www.example.org", "MyReferenceParameter2"),
+ JAXBElement<String> idqn2
+ = new JAXBElement<String>(new QName("http://www.example.org", "MyReferenceParameter2"),
String.class,
"381");
eventSinkERT.setReferenceParameters(new ReferenceParametersType());
Modified: cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java (original)
+++ cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java Wed May 29 17:11:45 2013
@@ -63,7 +63,8 @@ public class SubscriptionEndTest extends
subscribe.getDelivery().getContent().add(new NotifyTo());
((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
- JAXBElement idqn = new JAXBElement(new QName("http://www.example.org", "MyReferenceParameter"),
+ JAXBElement<String> idqn
+ = new JAXBElement<String>(new QName("http://www.example.org", "MyReferenceParameter"),
String.class,
"380");
ReferenceParametersType myParams = new ReferenceParametersType();
Modified: cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java (original)
+++ cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java Wed May 29 17:11:45 2013
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.eventing.integration.notificationapi.assertions;
-import java.util.Iterator;
import java.util.Set;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
@@ -30,6 +29,8 @@ import javax.xml.ws.handler.soap.SOAPMes
import org.w3c.dom.Element;
+import com.ibm.wsdl.util.xml.DOMUtils;
+
import org.apache.cxf.ws.eventing.ReferenceParametersType;
public class ReferenceParametersAssertingHandler implements SOAPHandler<SOAPMessageContext> {
@@ -56,17 +57,17 @@ public class ReferenceParametersAssertin
try {
// every element in the ReferenceParametersType should be present somewhere in the headers
for (Object exp : params.getAny()) {
- JAXBElement expectedElement = (JAXBElement)exp;
+ JAXBElement<?> expectedElement = (JAXBElement<?>)exp;
boolean found = false;
- Iterator i = context.getMessage().getSOAPHeader().examineAllHeaderElements();
- while (i.hasNext()) {
- Element actualHeaderelement = (Element)i.next();
+ Element actualHeaderelement = DOMUtils.getFirstChildElement(context.getMessage().getSOAPHeader());
+ while (actualHeaderelement != null) {
if (expectedElement.getName().getLocalPart().equals(actualHeaderelement.getLocalName())
&& expectedElement.getName().getNamespaceURI()
.equals(actualHeaderelement.getNamespaceURI())) {
found = true;
break;
}
+ actualHeaderelement = DOMUtils.getNextSiblingElement(actualHeaderelement);
}
if (!found) {
throw new RuntimeException("Event sink should have received Reference parameter: "
Modified: cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java?rev=1487545&r1=1487544&r2=1487545&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java (original)
+++ cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/WSAActionAssertingHandler.java Wed May 29 17:11:45 2013
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.eventing.integration.notificationapi.assertions;
-import java.util.Iterator;
import java.util.Set;
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPException;
@@ -29,6 +28,8 @@ import javax.xml.ws.handler.soap.SOAPMes
import org.w3c.dom.Element;
+import com.ibm.wsdl.util.xml.DOMUtils;
+
/**
* Handler that asserts a particular value of WS-Addressing Action in the headers
* of an incoming message. Used only for testing.
@@ -57,11 +58,8 @@ public class WSAActionAssertingHandler i
return true;
}
try {
- Iterator i = context.getMessage().getSOAPHeader().examineAllHeaderElements();
- Object header;
- while (i.hasNext()) {
- header = i.next();
- Element elm = (Element)header;
+ Element elm = DOMUtils.getFirstChildElement(context.getMessage().getSOAPHeader());
+ while (elm != null) {
if (elm.getTagName().equals("Action") && elm.getNamespaceURI().contains("addressing")) {
if (!elm.getTextContent().equals(action)) {
throw new RuntimeException("The event sink should have received "
@@ -70,6 +68,7 @@ public class WSAActionAssertingHandler i
}
return true;
}
+ elm = DOMUtils.getNextSiblingElement(elm);
}
} catch (SOAPException e) {
throw new RuntimeException(e);