Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made AbstractMethodEndpointMapping generic

Browse Source
This commit is contained in:
Arjen Poutsma
2010-09-17 10:27:28 +00:00
parent 714b9334c1
commit 327011a3a3
5 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java
View File

@@ -32,7 +32,7 @@ import org.springframework.ws.server.endpoint.annotation.Endpoint;
* @author Arjen Poutsma
* @since 1.0.0
*/
public abstract class AbstractAnnotationMethodEndpointMapping extends AbstractMethodEndpointMapping {
public abstract class AbstractAnnotationMethodEndpointMapping<T> extends AbstractMethodEndpointMapping<T> {
private boolean detectEndpointsInAncestorContexts = false;

32
core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java
View File

@@ -26,7 +26,6 @@ import org.springframework.context.ApplicationContextException;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.ws.context.MessageContext;
import org.springframework.ws.server.endpoint.MethodEndpoint;
@@ -34,16 +33,15 @@ import org.springframework.ws.server.endpoint.MethodEndpoint;
* Abstract base class for {@link MethodEndpoint} mappings.
* <p/>
* Subclasses typically implement {@link org.springframework.beans.factory.config.BeanPostProcessor} to look for beans
* that qualify as enpoint. The methods of this bean are then registered under a specific key with {@link
* that qualify as endpoint. The methods of this bean are then registered under a specific key with {@link
* #registerEndpoint(String,MethodEndpoint)}.
*
* @author Arjen Poutsma
* @since 1.0.0
*/
public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapping {
public abstract class AbstractMethodEndpointMapping<T> extends AbstractEndpointMapping {
/** Keys are Strings, values are {@link MethodEndpoint}s. */
private final Map<String, MethodEndpoint> endpointMap = new HashMap<String, MethodEndpoint>();
private final Map<T, MethodEndpoint> endpointMap = new HashMap<T, MethodEndpoint>();
/**
* Lookup an endpoint for the given message. The extraction of the endpoint key is delegated to the concrete
@@ -54,8 +52,8 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapp
*/
@Override
protected Object getEndpointInternal(MessageContext messageContext) throws Exception {
String key = getLookupKeyForMessage(messageContext);
if (!StringUtils.hasLength(key)) {
T key = getLookupKeyForMessage(messageContext);
if (key == null) {
return null;
}
if (logger.isDebugEnabled()) {
@@ -69,7 +67,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapp
*
* @return the registration keys
*/
protected abstract String getLookupKeyForMessage(MessageContext messageContext) throws Exception;
protected abstract T getLookupKeyForMessage(MessageContext messageContext) throws Exception;
/**
* Looks up an endpoint instance for the given keys. All keys are tried in order.
@@ -77,8 +75,8 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapp
* @param key key the beans are mapped to
* @return the associated endpoint instance, or <code>null</code> if not found
*/
protected MethodEndpoint lookupEndpoint(String key) {
return (MethodEndpoint) endpointMap.get(key);
protected MethodEndpoint lookupEndpoint(T key) {
return endpointMap.get(key);
}
/**
@@ -88,7 +86,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapp
* @param endpoint the method endpoint instance
* @throws BeansException if the endpoint could not be registered
*/
protected void registerEndpoint(String key, MethodEndpoint endpoint) throws BeansException {
protected void registerEndpoint(T key, MethodEndpoint endpoint) throws BeansException {
Object mappedEndpoint = endpointMap.get(key);
if (mappedEndpoint != null) {
throw new ApplicationContextException("Cannot map endpoint [" + endpoint + "] on registration key [" + key +
@@ -106,7 +104,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapp
/**
* Helper method that registers the methods of the given bean. This method iterates over the methods of the bean,
* and calls {@link #getLookupKeyForMethod(Method)} for each. If this returns a string, the method is registered
* using {@link #registerEndpoint(String,MethodEndpoint)}.
* using {@link #registerEndpoint(T,MethodEndpoint)}.
*
* @see #getLookupKeyForMethod(Method)
*/
@@ -116,8 +114,8 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapp
ReflectionUtils.doWithMethods(endpointClass, new ReflectionUtils.MethodCallback() {
public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
String key = getLookupKeyForMethod(method);
if (StringUtils.hasLength(key)) {
T key = getLookupKeyForMethod(method);
if (key != null) {
registerEndpoint(key, new MethodEndpoint(endpoint, method));
}
}
@@ -137,8 +135,8 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapp
ReflectionUtils.doWithMethods(endpointClass, new ReflectionUtils.MethodCallback() {
public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
String key = getLookupKeyForMethod(method);
if (StringUtils.hasLength(key)) {
T key = getLookupKeyForMethod(method);
if (key != null) {
registerEndpoint(key, new MethodEndpoint(beanName, getApplicationContext(), method));
}
}
@@ -153,7 +151,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapp
* @param method the method
* @return a registration key, or <code>null</code> if the method is not to be registered
*/
protected String getLookupKeyForMethod(Method method) {
protected T getLookupKeyForMethod(Method method) {
return null;
}

13
core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java
View File

@@ -45,7 +45,7 @@ import org.springframework.ws.server.endpoint.support.PayloadRootUtils;
* @author Arjen Poutsma
* @since 1.0.0
*/
public class PayloadRootAnnotationMethodEndpointMapping extends AbstractAnnotationMethodEndpointMapping {
public class PayloadRootAnnotationMethodEndpointMapping extends AbstractAnnotationMethodEndpointMapping<QName> {
private static TransformerFactory transformerFactory;
@@ -54,15 +54,12 @@ public class PayloadRootAnnotationMethodEndpointMapping extends AbstractAnnotati
}
@Override
protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception {
QName qName =
PayloadRootUtils.getPayloadRootQName(messageContext.getRequest().getPayloadSource(), transformerFactory)
;
return qName != null ? qName.toString() : null;
protected QName getLookupKeyForMessage(MessageContext messageContext) throws Exception {
return PayloadRootUtils.getPayloadRootQName(messageContext.getRequest().getPayloadSource(), transformerFactory);
}
@Override
protected String getLookupKeyForMethod(Method method) {
protected QName getLookupKeyForMethod(Method method) {
PayloadRoot annotation = method.getAnnotation(PayloadRoot.class);
if (annotation != null) {
QName qname;
@@ -72,7 +69,7 @@ public class PayloadRootAnnotationMethodEndpointMapping extends AbstractAnnotati
else {
qname = new QName(annotation.localPart());
}
return qname.toString();
return qname;
}
else {
return null;

2
core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java
View File

@@ -47,7 +47,7 @@ import org.springframework.ws.server.endpoint.support.PayloadRootUtils;
* @see #setEndpoints(Object[])
* @since 1.0.0
*/
public class SimpleMethodEndpointMapping extends AbstractMethodEndpointMapping implements InitializingBean {
public class SimpleMethodEndpointMapping extends AbstractMethodEndpointMapping<String> implements InitializingBean {
/** Default method prefix. */
public static final String DEFAULT_METHOD_PREFIX = "handle";

2
core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java
View File

@@ -47,7 +47,7 @@ import org.springframework.ws.soap.server.endpoint.annotation.SoapAction;
* @author Arjen Poutsma
* @since 1.0.0
*/
public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotationMethodEndpointMapping
public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotationMethodEndpointMapping<String>
implements SoapEndpointMapping {
private String[] actorsOrRoles;