From 37bd3e9c7c56ed2d57eb0a823043a673f1d30cee Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 6 Jan 2010 15:13:13 +0000
Subject: [PATCH] SWS-537 - Add getters to WS-A ActionCallback

---
 .../addressing/client/ActionCallback.java     | 69 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java b/core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java
index 754d948e..1fc23498 100644
--- a/core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java
+++ b/core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java
@@ -132,6 +132,24 @@ public class ActionCallback implements WebServiceMessageCallback {
         }
     }
 
+    /**
+     * Returns the WS-Addressing version
+     * @return
+     */
+    public AddressingVersion getVersion() {
+        return version;
+    }
+
+    /**
+     * Returns the message id strategy used for creating WS-Addressing MessageIds.
+     * <p/>
+     * By default, the {@link UuidMessageIdStrategy} is used on Java 5 and higher, and the {@link
+     * RandomGuidMessageIdStrategy} on Java 1.4.
+     */
+    public MessageIdStrategy getMessageIdStrategy() {
+        return messageIdStrategy;
+    }
+
     /**
      * Sets the message id strategy used for creating WS-Addressing MessageIds.
      * <p/>
@@ -143,18 +161,64 @@ public class ActionCallback implements WebServiceMessageCallback {
         this.messageIdStrategy = messageIdStrategy;
     }
 
+    /**
+     * Returns the {@code Action}.
+     * @see org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getAction()
+     */
+    public URI getAction() {
+        return action;
+    }
+
+    /**
+     * Returns the {@code From}.
+     * @see org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getFrom()
+     */
+    public EndpointReference getFrom() {
+        return from;
+    }
+
+    /**
+     * Sets the {@code From}.
+     * @see org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getFrom()
+     */
     public void setFrom(EndpointReference from) {
         this.from = from;
     }
 
+    /**
+     * Returns the {@code ReplyTo}.
+     * @see org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getReplyTo()
+     */
+    public EndpointReference getReplyTo() {
+        return replyTo;
+    }
+
+    /**
+     * Sets the {@code ReplyTo}.
+     * @see org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getReplyTo()
+     */
     public void setReplyTo(EndpointReference replyTo) {
         this.replyTo = replyTo;
     }
 
+    /**
+     * Returns the {@code FaultTo}.
+     * @see org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getFaultTo()
+     */
+    public EndpointReference getFaultTo() {
+        return faultTo;
+    }
+
+    /**
+     * Sets the {@code FaultTo}.
+     * @see org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getFaultTo()
+     */
     public void setFaultTo(EndpointReference faultTo) {
         this.faultTo = faultTo;
     }
 
+
+
     /**
      * Returns the <code>Destination</code> for outgoing messages.
      * <p/>
@@ -182,10 +246,9 @@ public class ActionCallback implements WebServiceMessageCallback {
     public void doWithMessage(WebServiceMessage message) throws IOException, TransformerException {
         Assert.isInstanceOf(SoapMessage.class, message);
         SoapMessage soapMessage = (SoapMessage) message;
-        URI to = getTo();
-        URI messageId = messageIdStrategy.newMessageId(soapMessage);
+        URI messageId = getMessageIdStrategy().newMessageId(soapMessage);
         MessageAddressingProperties map =
-                new MessageAddressingProperties(to, from, replyTo, faultTo, action, messageId);
+                new MessageAddressingProperties(getTo(), getFrom(), getReplyTo(), getFaultTo(), getAction(), messageId);
         version.addAddressingHeaders(soapMessage, map);
     }