SWS-398

Author: poutsma

core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java

@@ -45,6 +45,7 @@
 import org.springframework.ws.client.WebServiceTransformerException;
 import org.springframework.ws.client.WebServiceTransportException;
 import org.springframework.ws.client.support.WebServiceAccessor;
+import org.springframework.ws.client.support.destination.DestinationProvider;
 import org.springframework.ws.client.support.interceptor.ClientInterceptor;
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
@@ -119,14 +120,14 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService
 
     private FaultMessageResolver faultMessageResolver;
 
-    private String defaultUri;
-
     private boolean checkConnectionForError = true;
 
     private boolean checkConnectionForFault = true;
 
     private ClientInterceptor[] interceptors;
 
+    private DestinationProvider destinationProvider;
+
     /** Creates a new <code>WebServiceTemplate</code> using default settings. */
     public WebServiceTemplate() {
         initDefaultStrategies();
@@ -144,11 +145,46 @@ public WebServiceTemplate(WebServiceMessageFactory messageFactory) {
 
     /** Returns the default URI to be used on operations that do not have a URI parameter. */
     public String getDefaultUri() {
-        return defaultUri;
+        if (destinationProvider != null) {
+            URI uri = destinationProvider.getUri();
+            return uri != null ? uri.toString() : null;
+        }
+        else {
+            return null;
+        }
     }
 
     /**
      * Set the default URI to be used on operations that do not have a URI parameter.
+     * <p/>
+     * Typically, either this property is set, or {@link #setDestinationProvider(DestinationProvider)}, but not both.
+     *
+     * @see #marshalSendAndReceive(Object)
+     * @see #marshalSendAndReceive(Object,WebServiceMessageCallback)
+     * @see #sendSourceAndReceiveToResult(Source,Result)
+     * @see #sendSourceAndReceiveToResult(Source,WebServiceMessageCallback,Result)
+     * @see #sendSourceAndReceive(Source,SourceExtractor)
+     * @see #sendSourceAndReceive(Source,WebServiceMessageCallback,SourceExtractor)
+     * @see #sendAndReceive(WebServiceMessageCallback,WebServiceMessageCallback)
+     */
+    public void setDefaultUri(final String uri) {
+        destinationProvider = new DestinationProvider() {
+
+            public URI getUri() {
+                return URI.create(uri);
+            }
+        };
+    }
+
+    /** Returns the destination provider used on operations that do not have a URI parameter. */
+    public DestinationProvider getDestinationProvider() {
+        return destinationProvider;
+    }
+
+    /**
+     * Set the destination provider URI to be used on operations that do not have a URI parameter.
+     * <p/>
+     * Typically, either this property is set, or {@link #setDefaultUri(String)}, but not both.
      *
      * @see #marshalSendAndReceive(Object)
      * @see #marshalSendAndReceive(Object,WebServiceMessageCallback)
@@ -158,8 +194,8 @@ public String getDefaultUri() {
      * @see #sendSourceAndReceive(Source,WebServiceMessageCallback,SourceExtractor)
      * @see #sendAndReceive(WebServiceMessageCallback,WebServiceMessageCallback)
      */
-    public void setDefaultUri(String uri) {
-        defaultUri = uri;
+    public void setDestinationProvider(DestinationProvider destinationProvider) {
+        this.destinationProvider = destinationProvider;
     }
 
     /** Returns the marshaller for this template. */

core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvider.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ws.client.support.destination;
+
+import java.net.URI;
+
+/**
+ * Strategy interface for providing a {@link org.springframework.ws.client.core.WebServiceTemplate} destination URI at
+ * runtime.
+ * <p/>
+ * Typically implemented by providers that use WSDL, a UDDI registry, or some other form to determine the destination
+ * URI.
+ *
+ * @author Arjen Poutsma
+ * @since 1.5.4
+ */
+public interface DestinationProvider {
+
+    /**
+     * Return the destination URI.
+     *
+     * @return the destination URI
+     */
+    URI getUri();
+
+}

core/src/main/java/org/springframework/ws/client/support/destination/package.html

@@ -0,0 +1,5 @@
+<html>
+<body>
+Provides the <code>DestinationProvider</code> interface.
+</body>
+</html>

core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java

@@ -27,6 +27,7 @@
 import org.springframework.ws.MockWebServiceMessage;
 import org.springframework.ws.MockWebServiceMessageFactory;
 import org.springframework.ws.client.WebServiceTransportException;
+import org.springframework.ws.client.support.destination.DestinationProvider;
 import org.springframework.ws.client.support.interceptor.ClientInterceptor;
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
@@ -52,8 +53,8 @@ protected void setUp() throws Exception {
         template.setMessageFactory(messageFactory);
         connectionControl = MockControl.createStrictControl(FaultAwareWebServiceConnection.class);
         connectionMock = (FaultAwareWebServiceConnection) connectionControl.getMock();
-        connectionControl.expectAndDefaultReturn(connectionMock.getUri(), new URI("mock"));
         final URI expectedUri = new URI("http://www.springframework.org/spring-ws");
+        connectionControl.expectAndDefaultReturn(connectionMock.getUri(), expectedUri);
         template.setMessageSender(new WebServiceMessageSender() {
 
             public WebServiceConnection createConnection(URI uri) throws IOException {
@@ -505,4 +506,45 @@ public void testInterceptorsInterceptedCreateResponse() throws Exception {
         interceptorControl.verify();
     }
 
+    public void testDestinationResolver() throws Exception {
+        MockControl providerControl = MockControl.createControl(DestinationProvider.class);
+        DestinationProvider providerMock = (DestinationProvider) providerControl.getMock();
+        final URI providerUri = new URI("http://www.springframework.org/spring-ws/destinationProvider");
+        providerControl.expectAndReturn(providerMock.getUri(), providerUri);
+        template.setDestinationProvider(providerMock);
+        providerControl.replay();
+
+        template.setMessageSender(new WebServiceMessageSender() {
+
+            public WebServiceConnection createConnection(URI uri) throws IOException {
+                return connectionMock;
+            }
+
+            public boolean supports(URI uri) {
+                assertEquals("Invalid uri", providerUri, uri);
+                return true;
+            }
+        });
+
+        MockControl extractorControl = MockControl.createControl(WebServiceMessageExtractor.class);
+        WebServiceMessageExtractor extractorMock = (WebServiceMessageExtractor) extractorControl.getMock();
+        extractorControl.replay();
+
+        connectionControl.reset();
+        connectionControl.expectAndDefaultReturn(connectionMock.getUri(), providerUri);
+        connectionMock.send(null);
+        connectionControl.setMatcher(MockControl.ALWAYS_MATCHER);
+        connectionControl.expectAndReturn(connectionMock.hasError(), false);
+        connectionControl.expectAndReturn(connectionMock.receive(messageFactory), null);
+        connectionMock.close();
+        connectionControl.replay();
+
+        Object result = template.sendAndReceive(null, extractorMock);
+        assertNull("Invalid response", result);
+        extractorControl.verify();
+        connectionControl.verify();
+        providerControl.verify();
+    }
+
+
 }