diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java similarity index 91% rename from core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpointAdapter.java rename to core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java index 824e679e..989b803e 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.ws.server.endpoint; +package org.springframework.ws.server.endpoint.adapter; import org.springframework.ws.context.MessageContext; import org.springframework.ws.server.EndpointAdapter; +import org.springframework.ws.server.endpoint.MessageEndpoint; /** * Adapter to use a MessageEndpoint as the endpoint for a EndpointInvocationChain. diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java similarity index 91% rename from core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapter.java rename to core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java index b14b3d26..5506ebcb 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.server.endpoint; +package org.springframework.ws.server.endpoint.adapter; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -22,13 +22,14 @@ import javax.xml.transform.Transformer; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.context.MessageContext; import org.springframework.ws.server.EndpointAdapter; +import org.springframework.ws.server.endpoint.PayloadEndpoint; import org.springframework.xml.transform.TransformerObjectSupport; /** * Adapter to use a PayloadEndpoint as the endpoint for a EndpointInvocationChain. * * @author Arjen Poutsma - * @see PayloadEndpoint + * @see org.springframework.ws.server.endpoint.PayloadEndpoint * @see org.springframework.ws.server.EndpointInvocationChain */ public class PayloadEndpointAdapter extends TransformerObjectSupport implements EndpointAdapter { diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/package.html b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/package.html new file mode 100644 index 00000000..febadcb4 --- /dev/null +++ b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/package.html @@ -0,0 +1,5 @@ + + +Provides miscellaneous endpoints EndpointAdapter implementations. + + diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java index 9f950848..8bb8bd7a 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java @@ -85,9 +85,7 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa temporaryEndpointMap.putAll(mappings); } - /** - * Validates the given endpoint key. Should return true is the given string is valid. - */ + /** Validates the given endpoint key. Should return true is the given string is valid. */ protected abstract boolean validateLookupKey(String key); /** @@ -103,7 +101,7 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa * * @return the looked up endpoint, or null */ - protected Object getEndpointInternal(MessageContext messageContext) throws Exception { + protected final Object getEndpointInternal(MessageContext messageContext) throws Exception { String key = getLookupKeyForMessage(messageContext); if (!StringUtils.hasLength(key)) { return null; diff --git a/core/src/main/resources/org/springframework/ws/MessageDispatcher.properties b/core/src/main/resources/org/springframework/ws/MessageDispatcher.properties deleted file mode 100644 index f5b271bd..00000000 --- a/core/src/main/resources/org/springframework/ws/MessageDispatcher.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default implementation classes for MessageDispatcher's strategy interfaces. -# Used as fallback when no matching beans are found in the MessageDispatcher context. -# Not meant to be customized by application developers -org.springframework.ws.server.EndpointAdapter=org.springframework.ws.server.endpoint.MessageEndpointAdapter,\ - org.springframework.ws.server.endpoint.PayloadEndpointAdapter \ No newline at end of file diff --git a/core/src/main/resources/org/springframework/ws/server/MessageDispatcher.properties b/core/src/main/resources/org/springframework/ws/server/MessageDispatcher.properties index 42e96401..8eeecbfd 100644 --- a/core/src/main/resources/org/springframework/ws/server/MessageDispatcher.properties +++ b/core/src/main/resources/org/springframework/ws/server/MessageDispatcher.properties @@ -2,5 +2,5 @@ # Used as fallback when no matching beans are found in the application context. # Not meant to be customized by application developers. -org.springframework.ws.server.EndpointAdapter=org.springframework.ws.server.endpoint.MessageEndpointAdapter,\ - org.springframework.ws.server.endpoint.PayloadEndpointAdapter \ No newline at end of file +org.springframework.ws.server.EndpointAdapter=org.springframework.ws.server.endpoint.adapter.MessageEndpointAdapter,\ + org.springframework.ws.server.endpoint.adapter.PayloadEndpointAdapter \ No newline at end of file diff --git a/core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java b/core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java index f86636ed..7af3934b 100644 --- a/core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java +++ b/core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java @@ -26,7 +26,7 @@ import org.springframework.ws.NoEndpointFoundException; import org.springframework.ws.WebServiceMessageFactory; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.server.endpoint.PayloadEndpointAdapter; +import org.springframework.ws.server.endpoint.adapter.PayloadEndpointAdapter; import org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping; import org.springframework.ws.soap.server.endpoint.SimpleSoapExceptionResolver; diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/MessageEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java similarity index 93% rename from core/src/test/java/org/springframework/ws/server/endpoint/MessageEndpointAdapterTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java index 32fc248c..8736740f 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/MessageEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.ws.server.endpoint; +package org.springframework.ws.server.endpoint.adapter; import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.ws.MockWebServiceMessageFactory; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.endpoint.MessageEndpoint; public class MessageEndpointAdapterTest extends TestCase { diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java similarity index 96% rename from core/src/test/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapterTest.java rename to core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java index 5bddfdd6..834d1284 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/PayloadEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.ws.server.endpoint; +package org.springframework.ws.server.endpoint.adapter; import java.io.StringReader; import java.io.StringWriter; @@ -30,6 +30,7 @@ import org.springframework.ws.MockWebServiceMessage; import org.springframework.ws.MockWebServiceMessageFactory; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; +import org.springframework.ws.server.endpoint.PayloadEndpoint; public class PayloadEndpointAdapterTest extends XMLTestCase {