diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AnnotationActionMethodEndpointMapping.java b/core-tiger/src/main/java/org/springframework/ws/soap/addressing/AnnotationActionMethodEndpointMapping.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/AnnotationActionMethodEndpointMapping.java rename to core-tiger/src/main/java/org/springframework/ws/soap/addressing/AnnotationActionMethodEndpointMapping.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/annotation/Action.java b/core-tiger/src/main/java/org/springframework/ws/soap/addressing/annotation/Action.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/annotation/Action.java rename to core-tiger/src/main/java/org/springframework/ws/soap/addressing/annotation/Action.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/annotation/Address.java b/core-tiger/src/main/java/org/springframework/ws/soap/addressing/annotation/Address.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/annotation/Address.java rename to core-tiger/src/main/java/org/springframework/ws/soap/addressing/annotation/Address.java diff --git a/sandbox/src/test/java/org/springframework/ws/soap/addressing/AnnotationActionMethodEndpointMappingTest.java b/core-tiger/src/test/java/org/springframework/ws/soap/addressing/AnnotationActionMethodEndpointMappingTest.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/soap/addressing/AnnotationActionMethodEndpointMappingTest.java rename to core-tiger/src/test/java/org/springframework/ws/soap/addressing/AnnotationActionMethodEndpointMappingTest.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/addressing/AbstractActionEndpointMapping.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractActionEndpointMapping.java rename to core/src/main/java/org/springframework/ws/soap/addressing/AbstractActionEndpointMapping.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractActionMethodEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/addressing/AbstractActionMethodEndpointMapping.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractActionMethodEndpointMapping.java rename to core/src/main/java/org/springframework/ws/soap/addressing/AbstractActionMethodEndpointMapping.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractAddressingEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/addressing/AbstractAddressingEndpointMapping.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractAddressingEndpointMapping.java rename to core/src/main/java/org/springframework/ws/soap/addressing/AbstractAddressingEndpointMapping.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingVersion.java b/core/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingVersion.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingVersion.java rename to core/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingVersion.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AddressingEndpointInterceptor.java b/core/src/main/java/org/springframework/ws/soap/addressing/AddressingEndpointInterceptor.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/AddressingEndpointInterceptor.java rename to core/src/main/java/org/springframework/ws/soap/addressing/AddressingEndpointInterceptor.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/EndpointReference.java b/core/src/main/java/org/springframework/ws/soap/addressing/EndpointReference.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/EndpointReference.java rename to core/src/main/java/org/springframework/ws/soap/addressing/EndpointReference.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/MessageAddressingProperties.java b/core/src/main/java/org/springframework/ws/soap/addressing/MessageAddressingProperties.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/MessageAddressingProperties.java rename to core/src/main/java/org/springframework/ws/soap/addressing/MessageAddressingProperties.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/SimpleActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/addressing/SimpleActionEndpointMapping.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/SimpleActionEndpointMapping.java rename to core/src/main/java/org/springframework/ws/soap/addressing/SimpleActionEndpointMapping.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java b/core/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java rename to core/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200408.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java b/core/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java rename to core/src/main/java/org/springframework/ws/soap/addressing/WsAddressing200605.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressingException.java b/core/src/main/java/org/springframework/ws/soap/addressing/WsAddressingException.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressingException.java rename to core/src/main/java/org/springframework/ws/soap/addressing/WsAddressingException.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressingVersion.java b/core/src/main/java/org/springframework/ws/soap/addressing/WsAddressingVersion.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/WsAddressingVersion.java rename to core/src/main/java/org/springframework/ws/soap/addressing/WsAddressingVersion.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java b/core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java rename to core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuid.java b/core/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuid.java similarity index 99% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuid.java rename to core/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuid.java index ea46480b..cbcd6e95 100644 --- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuid.java +++ b/core/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuid.java @@ -130,7 +130,7 @@ public class RandomGuid { /** Method to generate the random GUID. */ private void getRandomGuid(boolean secure) { - MessageDigest md5 = null; + MessageDigest md5; StringBuffer sbValueBeforeMD5 = new StringBuffer(); try { @@ -141,7 +141,7 @@ public class RandomGuid { } long time = System.currentTimeMillis(); - long rand = 0; + long rand; if (secure) { rand = secureRandom.nextLong(); diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategy.java b/core/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategy.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategy.java rename to core/src/main/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategy.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java b/core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java rename to core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/package.html b/core/src/main/java/org/springframework/ws/soap/addressing/messageid/package.html similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/messageid/package.html rename to core/src/main/java/org/springframework/ws/soap/addressing/messageid/package.html diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/package.html b/core/src/main/java/org/springframework/ws/soap/addressing/package.html similarity index 100% rename from sandbox/src/main/java/org/springframework/ws/soap/addressing/package.html rename to core/src/main/java/org/springframework/ws/soap/addressing/package.html diff --git a/sandbox/src/test/java/org/springframework/ws/soap/addressing/AbstractAddressingInterceptorTestCase.java b/core/src/test/java/org/springframework/ws/soap/addressing/AbstractAddressingInterceptorTestCase.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/soap/addressing/AbstractAddressingInterceptorTestCase.java rename to core/src/test/java/org/springframework/ws/soap/addressing/AbstractAddressingInterceptorTestCase.java diff --git a/sandbox/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java b/core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java similarity index 99% rename from sandbox/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java rename to core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java index e8ef8fe0..7e39844b 100644 --- a/sandbox/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java @@ -13,9 +13,10 @@ import javax.xml.soap.SOAPException; import org.custommonkey.xmlunit.XMLTestCase; import org.custommonkey.xmlunit.XMLUnit; -import org.springframework.ws.soap.saaj.SaajSoapMessage; import org.w3c.dom.Document; +import org.springframework.ws.soap.saaj.SaajSoapMessage; + public abstract class AbstractWsAddressingTestCase extends XMLTestCase { protected MessageFactory messageFactory; diff --git a/sandbox/src/test/java/org/springframework/ws/soap/addressing/AddressingInterceptor200408Test.java b/core/src/test/java/org/springframework/ws/soap/addressing/AddressingInterceptor200408Test.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/soap/addressing/AddressingInterceptor200408Test.java rename to core/src/test/java/org/springframework/ws/soap/addressing/AddressingInterceptor200408Test.java diff --git a/sandbox/src/test/java/org/springframework/ws/soap/addressing/AddressingInterceptor200605Test.java b/core/src/test/java/org/springframework/ws/soap/addressing/AddressingInterceptor200605Test.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/soap/addressing/AddressingInterceptor200605Test.java rename to core/src/test/java/org/springframework/ws/soap/addressing/AddressingInterceptor200605Test.java diff --git a/sandbox/src/test/java/org/springframework/ws/soap/addressing/SimpleActionEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/addressing/SimpleActionEndpointMappingTest.java similarity index 100% rename from sandbox/src/test/java/org/springframework/ws/soap/addressing/SimpleActionEndpointMappingTest.java rename to core/src/test/java/org/springframework/ws/soap/addressing/SimpleActionEndpointMappingTest.java diff --git a/sandbox/src/test/java/org/springframework/ws/soap/addressing/messageid/AbstractMessageIdStrategyTestCase.java b/core/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java similarity index 77% rename from sandbox/src/test/java/org/springframework/ws/soap/addressing/messageid/AbstractMessageIdStrategyTestCase.java rename to core/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java index 0d2727a6..5deb1754 100644 --- a/sandbox/src/test/java/org/springframework/ws/soap/addressing/messageid/AbstractMessageIdStrategyTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java @@ -8,16 +8,14 @@ import java.net.URI; import junit.framework.TestCase; -public abstract class AbstractMessageIdStrategyTestCase extends TestCase { +public class RandomGuidMessageIdStrategyTest extends TestCase { private MessageIdStrategy strategy; protected final void setUp() throws Exception { - strategy = createProvider(); + strategy = new RandomGuidMessageIdStrategy(); } - protected abstract MessageIdStrategy createProvider(); - public void testStrategy() { URI messageId1 = strategy.newMessageId(null); assertNotNull("Empty messageId", messageId1); @@ -25,4 +23,4 @@ public abstract class AbstractMessageIdStrategyTestCase extends TestCase { assertNotNull("Empty messageId", messageId2); assertFalse("Equal messageIds", messageId1.equals(messageId2)); } -} +} \ No newline at end of file diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java b/core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java new file mode 100644 index 00000000..2d320a23 --- /dev/null +++ b/core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2007, Your Corporation. All Rights Reserved. + */ + +package org.springframework.ws.soap.addressing.messageid; + +import java.net.URI; + +import junit.framework.TestCase; + +public class UuidMessageIdStrategyTest extends TestCase { + + private MessageIdStrategy strategy; + + protected final void setUp() throws Exception { + strategy = new UuidMessageIdStrategy(); + } + + public void testStrategy() { + URI messageId1 = strategy.newMessageId(null); + assertNotNull("Empty messageId", messageId1); + URI messageId2 = strategy.newMessageId(null); + assertNotNull("Empty messageId", messageId2); + assertFalse("Equal messageIds", messageId1.equals(messageId2)); + } +} \ No newline at end of file diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-anonymous.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-fault-to.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-message-id.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200408/request-no-reply-to.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-anonymous.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-fault-to.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/response-no-message-id.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-no-message-id.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/response-no-message-id.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200408/response-no-message-id.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200408/valid.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-anonymous.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-anonymous.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-anonymous.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-anonymous.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-fault-to.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-fault-to.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-fault-to.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-fault-to.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-no-message-id.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-no-message-id.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-no-message-id.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-no-message-id.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-no-reply-to.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-no-reply-to.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-no-reply-to.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-no-reply-to.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-none.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-none.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/request-none.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200605/request-none.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/response-anonymous.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200605/response-anonymous.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/response-anonymous.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200605/response-anonymous.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/response-fault-to.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200605/response-fault-to.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/response-fault-to.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200605/response-fault-to.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/response-no-message-id.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200605/response-no-message-id.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/response-no-message-id.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200605/response-no-message-id.xml diff --git a/sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/valid.xml b/core/src/test/resources/org/springframework/ws/soap/addressing/200605/valid.xml similarity index 100% rename from sandbox/src/test/resources/org/springframework/ws/soap/addressing/200605/valid.xml rename to core/src/test/resources/org/springframework/ws/soap/addressing/200605/valid.xml diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingMethodEndpointMapping.java b/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingMethodEndpointMapping.java deleted file mode 100644 index 2518854d..00000000 --- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/AbstractWsAddressingMethodEndpointMapping.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * 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.soap.addressing; - -import java.lang.reflect.Method; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - -import org.springframework.aop.support.AopUtils; -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContextException; -import org.springframework.core.JdkVersion; -import org.springframework.util.Assert; -import org.springframework.ws.server.endpoint.MethodEndpoint; - -/** - * @author Arjen Poutsma - * @since 1.5.0 - */ -public abstract class AbstractWsAddressingMethodEndpointMapping extends AbstractWsAddressingEndpointMapping { - - /** Keys are URI Actions, values are {@link MethodEndpoint}s. */ - private final Map endpointMap = new HashMap(); - - protected Object getEndpointInternal(MessageAddressingProperties map) { - URI action = map.getAction(); - if (logger.isDebugEnabled()) { - logger.debug("Looking up endpoint for [" + key + "]"); - } - return lookupEndpoint(key); - - //TODO implement - throw new UnsupportedOperationException("Not implemented"); - } - - /** - * Looks up an endpoint instance for the given Action URI. - * - * @param action the Addressing action being mapped to - * @return the associated endpoint instance, or null if not found - */ - protected MethodEndpoint lookupEndpoint(URI action) { - return (MethodEndpoint) endpointMap.get(action); - } - - /** - * Register the given endpoint instance under the action URI. - * - * @param action the lookup key - * @param endpoint the method endpoint instance - * @throws BeansException if the endpoint could not be registered - */ - protected void registerEndpoint(URI action, MethodEndpoint endpoint) throws BeansException { - Object mappedEndpoint = endpointMap.get(action); - if (mappedEndpoint != null) { - throw new ApplicationContextException("Cannot map endpoint [" + endpoint + "] on action [" + action + - "]: there's already endpoint [" + mappedEndpoint + "] mapped"); - } - if (endpoint == null) { - throw new ApplicationContextException("Could not find endpoint for action [" + action + "]"); - } - endpointMap.put(action, endpoint); - if (logger.isDebugEnabled()) { - logger.debug("Mapped action [" + action + "] onto endpoint [" + endpoint + "]"); - } - } - - /** - * Helper method that registers the methods of the given bean. This method iterates over the methods of the bean, - * and calls {@link #getActionForMethod(java.lang.reflect.Method)} for each. If this returns a string, the method is - * registered using {@link #registerEndpoint(URI, MethodEndpoint)}. - * - * @see #getActionForMethod (java.lang.reflect.Method) - */ - protected void registerMethods(Object endpoint) { - Assert.notNull(endpoint, "'endpoint' must not be null"); - Method[] methods = getEndpointClass(endpoint).getMethods(); - for (int i = 0; i < methods.length; i++) { - if (JdkVersion.isAtLeastJava15() && methods[i].isSynthetic() || - methods[i].getDeclaringClass().equals(Object.class)) { - continue; - } - URI action = getActionForMethod(methods[i]); - if (action != null) { - registerEndpoint(action, new MethodEndpoint(endpoint, methods[i])); - } - } - } - - /** - * Returns the the action URI for the given method. Returns null if the method is not to be registered, - * which is the default. - * - * @param method the method - * @return the action URI, or null if the method is not to be registered - */ - protected URI getActionForMethod(Method method) { - return null; - } - - /** - * Return the class or interface to use for method reflection. - *

- * Default implementation delegates to {@link AopUtils#getTargetClass(Object)}. - * - * @param endpoint the bean instance (might be an AOP proxy) - * @return the bean class to expose - */ - protected Class getEndpointClass(Object endpoint) { - return AopUtils.getTargetClass(endpoint); - } - - -} diff --git a/sandbox/src/main/java/org/springframework/ws/soap/addressing/EndpointReferenceEditor.java b/sandbox/src/main/java/org/springframework/ws/soap/addressing/EndpointReferenceEditor.java deleted file mode 100644 index 9cf18d4e..00000000 --- a/sandbox/src/main/java/org/springframework/ws/soap/addressing/EndpointReferenceEditor.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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.soap.addressing; - -import java.beans.PropertyEditorSupport; -import java.net.URI; -import java.net.URISyntaxException; - -import org.springframework.util.StringUtils; - -/** - * Editor for EndpointReference, to directly populate a EPR property instead of using a String property as - * bridge. - * - * @author Arjen Poutsma - * @see EndpointReference - * @since 1.5.0 - */ -public class EndpointReferenceEditor extends PropertyEditorSupport { - - public void setAsText(String text) throws IllegalArgumentException { - if (StringUtils.hasText(text)) { - String uri = text.trim(); - try { - URI address = new URI(uri); - setValue(new EndpointReference(address)); - } - catch (URISyntaxException ex) { - throw new IllegalArgumentException("Invalid URI syntax: " + ex); - } - } - else { - setValue(null); - } - } - - public String getAsText() { - EndpointReference value = (EndpointReference) getValue(); - return (value != null ? value.toString() : ""); - } -} diff --git a/sandbox/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java b/sandbox/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java deleted file mode 100644 index df7a241a..00000000 --- a/sandbox/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2007, Your Corporation. All Rights Reserved. - */ - -package org.springframework.ws.soap.addressing.messageid; - -public class RandomGuidMessageIdStrategyTest extends AbstractMessageIdStrategyTestCase { - - protected MessageIdStrategy createProvider() { - return new RandomGuidMessageIdStrategy(); - } -} \ No newline at end of file diff --git a/sandbox/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java b/sandbox/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java deleted file mode 100644 index 2251dce9..00000000 --- a/sandbox/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2007, Your Corporation. All Rights Reserved. - */ - -package org.springframework.ws.soap.addressing.messageid; - -public class UuidMessageIdStrategyTest extends AbstractMessageIdStrategyTestCase { - - protected MessageIdStrategy createProvider() { - return new UuidMessageIdStrategy(); - } - -} \ No newline at end of file