diff --git a/core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java b/core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java index c758c75b..1d807ce7 100644 --- a/core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java +++ b/core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -92,6 +92,7 @@ public class Wsdl11DestinationProvider extends AbstractCachingDestinationProvide .createXPathExpression(expression, expressionNamespaces); } + @Override protected URI lookupDestination() { try { DOMResult result = new DOMResult(); diff --git a/core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java b/core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java index 65662832..cd95f1e2 100644 --- a/core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -47,6 +47,7 @@ public class PayloadValidatingInterceptor extends AbstractValidatingInterceptor * @param request the request message * @return the part of the message that is to validated, or null not to validate anything */ + @Override protected Source getValidationRequestSource(WebServiceMessage request) { return request.getPayloadSource(); } @@ -57,6 +58,7 @@ public class PayloadValidatingInterceptor extends AbstractValidatingInterceptor * @param response the response message * @return the part of the message that is to validated, or null not to validate anything */ + @Override protected Source getValidationResponseSource(WebServiceMessage response) { return response.getPayloadSource(); } diff --git a/core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java b/core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java index 06a2a5e7..e5b9cf91 100644 --- a/core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java +++ b/core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -40,10 +40,12 @@ class MarshallingEndpointsBeanDefinitionParser extends AbstractSimpleBeanDefinit private static final String MARSHALLING_METHOD_ENDPOINT_ADAPTER_CLASS_NAME = "org.springframework.ws.server.endpoint.adapter.MarshallingMethodEndpointAdapter"; + @Override protected boolean shouldGenerateIdAsFallback() { return true; } + @Override protected String getBeanClassName(Element element) { if (JdkVersion.isAtLeastJava15() && genericAdapterPresent) { return GENERIC_MARSHALLING_METHOD_ENDPOINT_ADAPTER_CLASS_NAME; @@ -51,6 +53,7 @@ class MarshallingEndpointsBeanDefinitionParser extends AbstractSimpleBeanDefinit return MARSHALLING_METHOD_ENDPOINT_ADAPTER_CLASS_NAME; } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder beanDefinitionBuilder) { String marshallerName = element.getAttribute("marshaller"); if (StringUtils.hasText(marshallerName)) { diff --git a/core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java b/core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java index 86f6562e..7ec6a353 100644 --- a/core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java +++ b/core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -37,14 +37,17 @@ class XPathEndpointsBeanDefinitionParser extends AbstractSimpleBeanDefinitionPar private static final String XPATH_PARAM_ANNOTATION_METHOD_ENDPOINT_ADAPTER_CLASS_NAME = "org.springframework.ws.server.endpoint.adapter.XPathParamAnnotationMethodEndpointAdapter"; + @Override protected boolean shouldGenerateIdAsFallback() { return true; } + @Override protected String getBeanClassName(Element element) { return XPATH_PARAM_ANNOTATION_METHOD_ENDPOINT_ADAPTER_CLASS_NAME; } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder beanDefinitionBuilder) { List namespaceElements = DomUtils.getChildElementsByTagName(element, "namespace"); if (!namespaceElements.isEmpty()) { diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java index 0c1e9067..d41a0c9c 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -74,6 +74,7 @@ public abstract class AbstractValidatingMarshallingPayloadEndpoint extends Abstr this.validators = validators; } + @Override protected boolean onUnmarshalRequest(MessageContext messageContext, Object requestObject) throws Exception { Validator[] validators = getValidators(); if (validators != null) { diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java index 53a97910..be156df6 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -74,6 +74,7 @@ public class GenericMarshallingMethodEndpointAdapter extends MarshallingMethodEn super(marshaller, unmarshaller); } + @Override protected boolean supportsInternal(MethodEndpoint methodEndpoint) { Method method = methodEndpoint.getMethod(); return supportsReturnType(method) && supportsParameters(method); diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java index d24f2761..635849a7 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -129,6 +129,7 @@ public class MarshallingMethodEndpointAdapter extends AbstractMethodEndpointAdap Assert.notNull(getUnmarshaller(), "unmarshaller is required"); } + @Override protected void invokeInternal(MessageContext messageContext, MethodEndpoint methodEndpoint) throws Exception { WebServiceMessage request = messageContext.getRequest(); Object requestObject = unmarshalRequest(request); @@ -161,6 +162,7 @@ public class MarshallingMethodEndpointAdapter extends AbstractMethodEndpointAdap * @see Marshaller#supports(Class) * @see Unmarshaller#supports(Class) */ + @Override protected boolean supportsInternal(MethodEndpoint methodEndpoint) { Method method = methodEndpoint.getMethod(); return supportsReturnType(method) && supportsParameters(method); diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java index 3e65030d..9e09e553 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -39,12 +39,14 @@ import org.springframework.ws.soap.server.SoapMessageDispatcher; public class MessageMethodEndpointAdapter extends AbstractMethodEndpointAdapter { + @Override protected boolean supportsInternal(MethodEndpoint methodEndpoint) { Method method = methodEndpoint.getMethod(); return Void.TYPE.isAssignableFrom(method.getReturnType()) && method.getParameterTypes().length == 1 && MessageContext.class.isAssignableFrom(method.getParameterTypes()[0]); } + @Override protected void invokeInternal(MessageContext messageContext, MethodEndpoint methodEndpoint) throws Exception { methodEndpoint.invoke(new Object[]{messageContext}); } diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java index 1b919d3c..142a6025 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -44,6 +44,7 @@ import org.springframework.ws.soap.server.SoapMessageDispatcher; */ public class PayloadMethodEndpointAdapter extends AbstractMethodEndpointAdapter { + @Override protected boolean supportsInternal(MethodEndpoint methodEndpoint) { Method method = methodEndpoint.getMethod(); return (Void.TYPE.isAssignableFrom(method.getReturnType()) || @@ -52,6 +53,7 @@ public class PayloadMethodEndpointAdapter extends AbstractMethodEndpointAdapter } + @Override protected void invokeInternal(MessageContext messageContext, MethodEndpoint methodEndpoint) throws Exception { Source requestSource = messageContext.getRequest().getPayloadSource(); Object result = methodEndpoint.invoke(new Object[]{requestSource}); diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java index a851dea1..332486d5 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -74,6 +74,7 @@ public class XPathParamAnnotationMethodEndpointAdapter extends AbstractMethodEnd } /** Supports methods with @XPathParam parameters, and return either Source or nothing. */ + @Override protected boolean supportsInternal(MethodEndpoint methodEndpoint) { Method method = methodEndpoint.getMethod(); if (!(Source.class.isAssignableFrom(method.getReturnType()) || Void.TYPE.equals(method.getReturnType()))) { @@ -105,6 +106,7 @@ public class XPathParamAnnotationMethodEndpointAdapter extends AbstractMethodEnd String.class.isAssignableFrom(clazz); } + @Override protected void invokeInternal(MessageContext messageContext, MethodEndpoint methodEndpoint) throws Exception { Element payloadElement = getRootElement(messageContext.getRequest().getPayloadSource()); Object[] args = getMethodArguments(payloadElement, methodEndpoint.getMethod()); diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java index 062bea26..fcc2e44e 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 the original author or authors. + * Copyright 2005-2010 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. @@ -35,6 +35,7 @@ import org.springframework.ws.server.endpoint.AbstractLoggingInterceptor; */ public class PayloadLoggingInterceptor extends AbstractLoggingInterceptor { + @Override protected Source getSource(WebServiceMessage message) { return message.getPayloadSource(); } diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java index 9a8a4fb8..d577e480 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -55,6 +55,7 @@ public abstract class AbstractAnnotationMethodEndpointMapping extends AbstractMe return Endpoint.class; } + @Override protected final void initApplicationContext() throws BeansException { if (logger.isDebugEnabled()) { logger.debug("Looking for endpoints in application context: " + getApplicationContext()); 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 f81a79c8..ed03430a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -102,6 +102,7 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa * * @return the looked up endpoint, or null */ + @Override protected final Object getEndpointInternal(MessageContext messageContext) throws Exception { String key = getLookupKeyForMessage(messageContext); if (!StringUtils.hasLength(key)) { @@ -161,6 +162,7 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa * @see #setMappings(java.util.Properties) * @see #setRegisterBeanNames(boolean) */ + @Override protected final void initApplicationContext() throws BeansException { for (Iterator iter = temporaryEndpointMap.keySet().iterator(); iter.hasNext();) { String key = (String) iter.next(); diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java index 8f272e85..0b3d2916 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -52,6 +52,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapp * @return the looked up endpoint, or null * @see #getLookupKeyForMessage(MessageContext) */ + @Override protected Object getEndpointInternal(MessageContext messageContext) throws Exception { String key = getLookupKeyForMessage(messageContext); if (!StringUtils.hasLength(key)) { diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java index edfc9ca2..832fff21 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -29,6 +29,7 @@ import org.springframework.xml.namespace.QNameUtils; */ public abstract class AbstractQNameEndpointMapping extends AbstractMapBasedEndpointMapping { + @Override protected final String getLookupKeyForMessage(MessageContext messageContext) throws Exception { QName qName = resolveQName(messageContext); return qName != null ? qName.toString() : null; @@ -41,6 +42,7 @@ public abstract class AbstractQNameEndpointMapping extends AbstractMapBasedEndpo */ protected abstract QName resolveQName(MessageContext messageContext) throws Exception; + @Override protected boolean validateLookupKey(String key) { return QNameUtils.validateQName(key); } diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java index f834db6e..9c265caf 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -53,6 +53,7 @@ public class PayloadRootAnnotationMethodEndpointMapping extends AbstractAnnotati transformerFactory = TransformerFactory.newInstance(); } + @Override protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception { QName qName = PayloadRootUtils.getPayloadRootQName(messageContext.getRequest().getPayloadSource(), transformerFactory) @@ -60,6 +61,7 @@ public class PayloadRootAnnotationMethodEndpointMapping extends AbstractAnnotati return qName != null ? qName.toString() : null; } + @Override protected String getLookupKeyForMethod(Method method) { PayloadRoot annotation = method.getAnnotation(PayloadRoot.class); if (annotation != null) { diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java index 8964a8d8..9f55b3ef 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -53,6 +53,7 @@ public class PayloadRootQNameEndpointMapping extends AbstractQNameEndpointMappin transformerFactory = TransformerFactory.newInstance(); } + @Override protected QName resolveQName(MessageContext messageContext) throws TransformerException, XMLStreamException { return PayloadRootUtils.getPayloadRootQName(messageContext.getRequest().getPayloadSource(), transformerFactory); } diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java index 266b4fc4..4f92148b 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -115,6 +115,7 @@ public class SimpleMethodEndpointMapping extends AbstractMethodEndpointMapping i } /** Returns the name of the given method, with the prefix and suffix stripped off. */ + @Override protected String getLookupKeyForMethod(Method method) { String methodName = method.getName(); String prefix = getMethodPrefix(); @@ -128,6 +129,7 @@ public class SimpleMethodEndpointMapping extends AbstractMethodEndpointMapping i } /** Returns the local part of the payload root element of the request. */ + @Override protected String getLookupKeyForMessage(MessageContext messageContext) throws TransformerException, XMLStreamException { WebServiceMessage request = messageContext.getRequest(); diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java index d9181630..e69a144b 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -49,6 +49,7 @@ import org.springframework.ws.transport.context.TransportContextHolder; */ public class UriEndpointMapping extends AbstractMapBasedEndpointMapping { + @Override protected boolean validateLookupKey(String key) { try { new URI(key); @@ -59,6 +60,7 @@ public class UriEndpointMapping extends AbstractMapBasedEndpointMapping { } } + @Override protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception { TransportContext transportContext = TransportContextHolder.getTransportContext(); if (transportContext != null) { diff --git a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java index 18a02d58..348ae154 100644 --- a/core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -87,6 +87,7 @@ public class XPathPayloadEndpointMapping extends AbstractMapBasedEndpointMapping transformerFactory = TransformerFactory.newInstance(); } + @Override protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception { Element payloadElement = getMessagePayloadElement(messageContext.getRequest()); return expression.evaluateAsString(payloadElement); @@ -99,6 +100,7 @@ public class XPathPayloadEndpointMapping extends AbstractMapBasedEndpointMapping return (Element) domResult.getNode().getFirstChild(); } + @Override protected boolean validateLookupKey(String key) { return StringUtils.hasLength(key); } diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java index bc3712ae..d43b19ce 100644 --- a/core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -89,6 +89,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn this.applicationContext = applicationContext; } + @Override protected final Object getEndpointInternal(MessageAddressingProperties map) { URI action = map.getAction(); if (logger.isDebugEnabled()) { @@ -160,6 +161,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn } } + @Override protected URI getResponseAction(Object endpoint, MessageAddressingProperties requestMap) { URI requestAction = requestMap.getAction(); if (requestAction != null) { @@ -170,6 +172,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn } } + @Override protected URI getFaultAction(Object endpoint, MessageAddressingProperties requestMap) { URI requestAction = requestMap.getAction(); if (requestAction != null) { diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java index 9b2bd18c..355ce84f 100644 --- a/core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -68,6 +68,7 @@ public class AnnotationActionEndpointMapping extends AbstractActionMethodEndpoin * Returns the action value for the specified method. Default implementation looks for the {@link Action} annotation * value. */ + @Override protected URI getActionForMethod(Method method) { Action action = method.getAnnotation(Action.class); if (action != null && StringUtils.hasText(action.value())) { @@ -91,6 +92,7 @@ public class AnnotationActionEndpointMapping extends AbstractActionMethodEndpoin * @param endpoint the method endpoint to return the address for * @return the endpoint address; or null to ignore the destination property */ + @Override protected URI getEndpointAddress(Object endpoint) { MethodEndpoint methodEndpoint = (MethodEndpoint) endpoint; Class endpointClass = methodEndpoint.getMethod().getDeclaringClass(); @@ -103,6 +105,7 @@ public class AnnotationActionEndpointMapping extends AbstractActionMethodEndpoin } } + @Override protected URI getResponseAction(Object endpoint, MessageAddressingProperties map) { MethodEndpoint methodEndpoint = (MethodEndpoint) endpoint; Action action = methodEndpoint.getMethod().getAnnotation(Action.class); @@ -114,6 +117,7 @@ public class AnnotationActionEndpointMapping extends AbstractActionMethodEndpoin } } + @Override protected URI getFaultAction(Object endpoint, MessageAddressingProperties map) { MethodEndpoint methodEndpoint = (MethodEndpoint) endpoint; Action action = methodEndpoint.getMethod().getAnnotation(Action.class); diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java index b56526eb..8b31d83f 100644 --- a/core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -102,6 +102,7 @@ public class SimpleActionEndpointMapping extends AbstractActionEndpointMapping { this.address = address; } + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); registerEndpoints(actionMap); @@ -132,6 +133,7 @@ public class SimpleActionEndpointMapping extends AbstractActionEndpointMapping { } } + @Override protected URI getEndpointAddress(Object endpoint) { return address; } diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java b/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java index fa2b16ce..144b1fd8 100644 --- a/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java +++ b/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class Addressing10 extends AbstractAddressingVersion { private static final String NAMESPACE_URI = "http://www.w3.org/2005/08/addressing"; + @Override public void addAddressingHeaders(SoapMessage message, MessageAddressingProperties map) { Assert.notNull(map.getAction(), "'Action' is required"); super.addAddressingHeaders(message, map); @@ -54,42 +55,52 @@ public class Addressing10 extends AbstractAddressingVersion { } + @Override protected String getNamespaceUri() { return NAMESPACE_URI; } + @Override protected QName getReferencePropertiesName() { return null; } + @Override protected URI getDefaultTo() { return getAnonymous(); } + @Override protected EndpointReference getDefaultReplyTo(EndpointReference from) { return new EndpointReference(getAnonymous()); } + @Override protected final URI getAnonymous() { return URI.create(NAMESPACE_URI + "/anonymous"); } + @Override protected final URI getNone() { return URI.create(NAMESPACE_URI + "/none"); } + @Override protected final QName getMessageAddressingHeaderRequiredFaultSubcode() { return QNameUtils.createQName(NAMESPACE_URI, "MessageAddressingHeaderRequired", getNamespacePrefix()); } + @Override protected final String getMessageAddressingHeaderRequiredFaultReason() { return "A required header representing a Message Addressing Property is not present"; } + @Override protected QName getInvalidAddressingHeaderFaultSubcode() { return QNameUtils.createQName(NAMESPACE_URI, "InvalidAddressingHeader", getNamespacePrefix()); } + @Override protected String getInvalidAddressingHeaderFaultReason() { return "A header representing a Message Addressing Property is not valid and the message cannot be processed"; } diff --git a/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java b/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java index b30584a8..7e7a2f98 100644 --- a/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java +++ b/core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class Addressing200408 extends AbstractAddressingVersion { private static final String NAMESPACE_URI = "http://schemas.xmlsoap.org/ws/2004/08/addressing"; + @Override public void addAddressingHeaders(SoapMessage message, MessageAddressingProperties map) { Assert.notNull(map.getAction(), "'Action' is required"); Assert.notNull(map.getTo(), "'To' is required"); @@ -57,38 +58,47 @@ public class Addressing200408 extends AbstractAddressingVersion { return true; } + @Override protected final URI getAnonymous() { return URI.create(NAMESPACE_URI + "/role/anonymous"); } + @Override protected final String getInvalidAddressingHeaderFaultReason() { return "A message information header is not valid and the message cannot be processed."; } + @Override protected final QName getInvalidAddressingHeaderFaultSubcode() { return QNameUtils.createQName(NAMESPACE_URI, "InvalidMessageInformationHeader", getNamespacePrefix()); } + @Override protected final String getMessageAddressingHeaderRequiredFaultReason() { return "A required message information header, To, MessageID, or Action, is not present."; } + @Override protected final QName getMessageAddressingHeaderRequiredFaultSubcode() { return QNameUtils.createQName(NAMESPACE_URI, "MessageInformationHeaderRequired", getNamespacePrefix()); } + @Override protected final String getNamespaceUri() { return NAMESPACE_URI; } + @Override protected URI getDefaultTo() { return null; } + @Override protected final EndpointReference getDefaultReplyTo(EndpointReference from) { return from; } + @Override protected final URI getNone() { return null; } diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomResult.java b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomResult.java index bed1e274..46317ebb 100644 --- a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomResult.java +++ b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -44,6 +44,7 @@ class AxiomResult extends SAXResult { * * @throws UnsupportedOperationException always */ + @Override public void setHandler(ContentHandler handler) { throw new UnsupportedOperationException("setHandler is not supported"); } @@ -53,6 +54,7 @@ class AxiomResult extends SAXResult { * * @throws UnsupportedOperationException always */ + @Override public void setLexicalHandler(LexicalHandler handler) { throw new UnsupportedOperationException("setLexicalHandler is not supported"); } diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/CachingPayload.java b/core/src/main/java/org/springframework/ws/soap/axiom/CachingPayload.java index 4914be9a..c6a121bf 100644 --- a/core/src/main/java/org/springframework/ws/soap/axiom/CachingPayload.java +++ b/core/src/main/java/org/springframework/ws/soap/axiom/CachingPayload.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -35,10 +35,12 @@ class CachingPayload extends Payload { super(axiomBody, axiomFactory); } + @Override protected XMLStreamReader getStreamReader(OMElement payloadElement) { return payloadElement.getXMLStreamReader(); } + @Override public Result getResultInternal() { return new AxiomResult(getAxiomBody(), getAxiomFactory()); } diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/NonCachingPayload.java b/core/src/main/java/org/springframework/ws/soap/axiom/NonCachingPayload.java index 596f8e88..b35bd88e 100644 --- a/core/src/main/java/org/springframework/ws/soap/axiom/NonCachingPayload.java +++ b/core/src/main/java/org/springframework/ws/soap/axiom/NonCachingPayload.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -49,10 +49,12 @@ class NonCachingPayload extends Payload { super(axiomBody, axiomFactory); } + @Override public Result getResultInternal() { return new StaxResult(new DelegatingStreamWriter()); } + @Override protected XMLStreamReader getStreamReader(OMElement payloadElement) { return payloadElement.getXMLStreamReaderWithoutCaching(); } diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java b/core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java index 06e39cbd..922d5ff6 100644 --- a/core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java +++ b/core/src/main/java/org/springframework/ws/soap/axiom/support/AxiomUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -184,12 +184,15 @@ public abstract class AxiomUtils { /** OutputStream that does nothing. */ private static class NullOutputStream extends OutputStream { + @Override public void write(int b) throws IOException { } + @Override public void write(byte[] b) throws IOException { } + @Override public void write(byte[] b, int off, int len) throws IOException { } } diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java b/core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java index 744a4470..1843456b 100644 --- a/core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java +++ b/core/src/main/java/org/springframework/ws/soap/saaj/Saaj11Implementation.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -72,41 +72,50 @@ class Saaj11Implementation extends SaajImplementation { return INSTANCE; } + @Override public QName getName(SOAPElement element) { return SaajUtils.toQName(element.getElementName()); } + @Override public Source getSource(SOAPElement element) { return new SAXSource(new SaajXmlReader(element), new InputSource()); } + @Override public Result getResult(SOAPElement element) { return new SAXResult(new SaajContentHandler(element)); } + @Override public String getText(SOAPElement element) { return element.getValue(); } + @Override public void setText(SOAPElement element, String content) throws SOAPException { element.addTextNode(content); } + @Override public void addAttribute(SOAPElement element, QName name, String value) throws SOAPException { Name attributeName = SaajUtils.toName(name, element); element.addAttribute(attributeName, value); } + @Override public void removeAttribute(SOAPElement element, QName name) throws SOAPException { Name attributeName = SaajUtils.toName(name, element); element.removeAttribute(attributeName); } + @Override public String getAttributeValue(SOAPElement element, QName name) throws SOAPException { Name attributeName = SaajUtils.toName(name, element); return element.getAttributeValue(attributeName); } + @Override public Iterator getAllAttibutes(SOAPElement element) { List results = new ArrayList(); for (Iterator iterator = element.getAllAttributes(); iterator.hasNext();) { @@ -116,6 +125,7 @@ class Saaj11Implementation extends SaajImplementation { return results.iterator(); } + @Override public QName getFaultCode(SOAPFault fault) { String code = fault.getFaultCode(); int idx = code.indexOf(':'); @@ -133,16 +143,19 @@ class Saaj11Implementation extends SaajImplementation { return true; } + @Override public DetailEntry addDetailEntry(Detail detail, QName name) throws SOAPException { Name detailEntryName = SaajUtils.toName(name, detail); return detail.addDetailEntry(detailEntryName); } + @Override public SOAPHeaderElement addHeaderElement(SOAPHeader header, QName name) throws SOAPException { Name saajName = SaajUtils.toName(name, header); return header.addHeaderElement(saajName); } + @Override public SOAPFault addFault(SOAPBody body, QName faultCode, String faultString, Locale locale) throws SOAPException { SOAPFault fault = body.addFault(); if (StringUtils.hasLength(faultCode.getNamespaceURI()) && @@ -161,26 +174,31 @@ class Saaj11Implementation extends SaajImplementation { } /** Returns the envelope of the given message. */ + @Override public SOAPEnvelope getEnvelope(SOAPMessage message) throws SOAPException { return message.getSOAPPart().getEnvelope(); } /** Returns the header of the given envelope. */ + @Override public SOAPHeader getHeader(SOAPEnvelope envelope) throws SOAPException { return envelope.getHeader(); } /** Returns the body of the given envelope. */ + @Override public SOAPBody getBody(SOAPEnvelope envelope) throws SOAPException { return envelope.getBody(); } /** Returns all header elements. */ + @Override public Iterator examineAllHeaderElements(SOAPHeader header) { return header.getChildElements(); } /** Returns all header elements for which the must understand attribute is true, given the actor or role. */ + @Override public Iterator examineMustUnderstandHeaderElements(SOAPHeader header, String actorOrRole) { List result = new ArrayList(); for (Iterator iterator = header.examineHeaderElements(actorOrRole); iterator.hasNext();) { @@ -193,74 +211,89 @@ class Saaj11Implementation extends SaajImplementation { } /** Returns the SOAP 1.1 actor or SOAP 1.2 role attribute for the given header element. */ + @Override public String getActorOrRole(SOAPHeaderElement headerElement) { return headerElement.getActor(); } /** Sets the SOAP 1.1 actor or SOAP 1.2 role attribute for the given header element. */ + @Override public void setActorOrRole(SOAPHeaderElement headerElement, String actorOrRole) { headerElement.setActor(actorOrRole); } /** Gets the must understand attribute for the given header element. */ + @Override public boolean getMustUnderstand(SOAPHeaderElement headerElement) { return headerElement.getMustUnderstand(); } /** Sets the must understand attribute for the given header element. */ + @Override public void setMustUnderstand(SOAPHeaderElement headerElement, boolean mustUnderstand) { headerElement.setMustUnderstand(mustUnderstand); } /** Returns true if the body has a fault, false otherwise. */ + @Override public boolean hasFault(SOAPBody body) { return body.hasFault(); } /** Returns the fault for the given body, if any. */ + @Override public SOAPFault getFault(SOAPBody body) { return body.getFault(); } /** Returns the actor for the given fault. */ + @Override public String getFaultActor(SOAPFault fault) { return fault.getFaultActor(); } /** Sets the actor for the given fault. */ + @Override public void setFaultActor(SOAPFault fault, String actorOrRole) throws SOAPException { fault.setFaultActor(actorOrRole); } /** Returns the fault string for the given fault. */ + @Override public String getFaultString(SOAPFault fault) { return fault.getFaultString(); } /** Returns the fault string language for the given fault. */ + @Override public Locale getFaultStringLocale(SOAPFault fault) { return Locale.ENGLISH; } /** Returns the fault detail for the given fault. */ + @Override public Detail getFaultDetail(SOAPFault fault) { return fault.getDetail(); } /** Adds a fault detail for the given fault. */ + @Override public Detail addFaultDetail(SOAPFault fault) throws SOAPException { return fault.addDetail(); } + @Override public void addTextNode(DetailEntry detailEntry, String text) throws SOAPException { detailEntry.addTextNode(text); } /** Returns an iteration over all detail entries. */ + @Override public Iterator getDetailEntries(Detail detail) { return detail.getDetailEntries(); } + @Override public SOAPElement getFirstBodyElement(SOAPBody body) { for (Iterator iterator = body.getChildElements(); iterator.hasNext();) { Object child = iterator.next(); @@ -271,6 +304,7 @@ class Saaj11Implementation extends SaajImplementation { return null; } + @Override public void removeContents(SOAPElement element) { for (Iterator iterator = element.getChildElements(); iterator.hasNext();) { iterator.next(); @@ -278,15 +312,18 @@ class Saaj11Implementation extends SaajImplementation { } } + @Override Iterator getChildElements(SOAPElement element, QName name) throws SOAPException { Name elementName = SaajUtils.toName(name, element); return element.getChildElements(elementName); } + @Override void addNamespaceDeclaration(SOAPElement element, String prefix, String namespaceUri) throws SOAPException { element.addNamespaceDeclaration(prefix, namespaceUri); } + @Override public void writeTo(SOAPMessage message, OutputStream outputStream) throws SOAPException, IOException { if (message.saveRequired()) { message.saveChanges(); @@ -310,18 +347,22 @@ class Saaj11Implementation extends SaajImplementation { } + @Override public MimeHeaders getMimeHeaders(SOAPMessage message) { return message.getMimeHeaders(); } + @Override public Iterator getAttachments(SOAPMessage message) { return message.getAttachments(); } + @Override public Iterator getAttachment(SOAPMessage message, MimeHeaders mimeHeaders) { return message.getAttachments(mimeHeaders); } + @Override public AttachmentPart addAttachmentPart(SOAPMessage message, DataHandler dataHandler) { AttachmentPart attachmentPart = message.createAttachmentPart(dataHandler); message.addAttachmentPart(attachmentPart); @@ -332,42 +373,52 @@ class Saaj11Implementation extends SaajImplementation { // Unsupported // + @Override public String getFaultRole(SOAPFault fault) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } + @Override public void setFaultRole(SOAPFault fault, String role) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } + @Override public SOAPHeaderElement addNotUnderstoodHeaderElement(SOAPHeader header, QName name) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } + @Override public SOAPHeaderElement addUpgradeHeaderElement(SOAPHeader header, String[] supportedSoapUris) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } + @Override public Iterator getFaultSubcodes(SOAPFault fault) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } + @Override public void appendFaultSubcode(SOAPFault fault, QName subcode) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } + @Override public String getFaultNode(SOAPFault fault) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } + @Override public void setFaultNode(SOAPFault fault, String uri) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } + @Override public String getFaultReasonText(SOAPFault fault, Locale locale) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } + @Override public void setFaultReasonText(SOAPFault fault, Locale locale, String text) { throw new UnsupportedOperationException("SAAJ 1.1 does not support SOAP 1.2"); } diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java b/core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java index 5b403adb..572d11b0 100644 --- a/core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java +++ b/core/src/main/java/org/springframework/ws/soap/saaj/Saaj12Implementation.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -66,10 +66,12 @@ class Saaj12Implementation extends SaajImplementation { return INSTANCE; } + @Override public QName getName(SOAPElement element) { return SaajUtils.toQName(element.getElementName()); } + @Override public QName getFaultCode(SOAPFault fault) { return SaajUtils.toQName(fault.getFaultCodeAsName()); } @@ -78,16 +80,19 @@ class Saaj12Implementation extends SaajImplementation { return true; } + @Override public DetailEntry addDetailEntry(Detail detail, QName name) throws SOAPException { Name detailEntryName = SaajUtils.toName(name, detail); return detail.addDetailEntry(detailEntryName); } + @Override public SOAPHeaderElement addHeaderElement(SOAPHeader header, QName name) throws SOAPException { Name saajName = SaajUtils.toName(name, header); return header.addHeaderElement(saajName); } + @Override public SOAPFault addFault(SOAPBody body, QName faultCode, String faultString, Locale locale) throws SOAPException { Name name = SaajUtils.toName(faultCode, body); if (locale == null) { @@ -98,29 +103,35 @@ class Saaj12Implementation extends SaajImplementation { } } + @Override public Source getSource(SOAPElement element) { return new DOMSource(element); } + @Override public Result getResult(SOAPElement element) { return new DOMResult(element); } + @Override public void addAttribute(SOAPElement element, QName name, String value) throws SOAPException { Name attributeName = SaajUtils.toName(name, element); element.addAttribute(attributeName, value); } + @Override public void removeAttribute(SOAPElement element, QName name) throws SOAPException { Name attributeName = SaajUtils.toName(name, element); element.removeAttribute(attributeName); } + @Override public String getAttributeValue(SOAPElement element, QName name) throws SOAPException { Name attributeName = SaajUtils.toName(name, element); return element.getAttributeValue(attributeName); } + @Override public Iterator getAllAttibutes(SOAPElement element) { List results = new ArrayList(); for (Iterator iterator = element.getAllAttributes(); iterator.hasNext();) { @@ -130,90 +141,112 @@ class Saaj12Implementation extends SaajImplementation { return results.iterator(); } + @Override public String getText(SOAPElement element) { return element.getValue(); } + @Override public void setText(SOAPElement element, String content) { element.setValue(content); } + @Override public SOAPEnvelope getEnvelope(SOAPMessage message) throws SOAPException { return message.getSOAPPart().getEnvelope(); } + @Override public SOAPHeader getHeader(SOAPEnvelope envelope) throws SOAPException { return envelope.getHeader(); } + @Override public SOAPBody getBody(SOAPEnvelope envelope) throws SOAPException { return envelope.getBody(); } + @Override public Iterator examineAllHeaderElements(SOAPHeader header) { return header.examineAllHeaderElements(); } + @Override public Iterator examineMustUnderstandHeaderElements(SOAPHeader header, String actorOrRole) { return header.examineMustUnderstandHeaderElements(actorOrRole); } + @Override public String getActorOrRole(SOAPHeaderElement headerElement) { return headerElement.getActor(); } + @Override public void setActorOrRole(SOAPHeaderElement headerElement, String actorOrRole) { headerElement.setActor(actorOrRole); } + @Override public boolean getMustUnderstand(SOAPHeaderElement headerElement) { return headerElement.getMustUnderstand(); } + @Override public void setMustUnderstand(SOAPHeaderElement headerElement, boolean mustUnderstand) { headerElement.setMustUnderstand(mustUnderstand); } + @Override public boolean hasFault(SOAPBody body) { return body.hasFault(); } + @Override public SOAPFault getFault(SOAPBody body) { return body.getFault(); } + @Override public String getFaultActor(SOAPFault fault) { return fault.getFaultActor(); } + @Override public void setFaultActor(SOAPFault fault, String actorOrRole) throws SOAPException { fault.setFaultActor(actorOrRole); } + @Override public String getFaultString(SOAPFault fault) { return fault.getFaultString(); } + @Override public Locale getFaultStringLocale(SOAPFault fault) { return fault.getFaultStringLocale(); } + @Override public Detail getFaultDetail(SOAPFault fault) { return fault.getDetail(); } + @Override public Detail addFaultDetail(SOAPFault fault) throws SOAPException { return fault.addDetail(); } + @Override public void addTextNode(DetailEntry detailEntry, String text) throws SOAPException { detailEntry.addTextNode(text); } + @Override public Iterator getDetailEntries(Detail detail) { return detail.getDetailEntries(); } + @Override public SOAPElement getFirstBodyElement(SOAPBody body) { for (Iterator iterator = body.getChildElements(); iterator.hasNext();) { Object child = iterator.next(); @@ -224,19 +257,23 @@ class Saaj12Implementation extends SaajImplementation { return null; } + @Override public void removeContents(SOAPElement element) { element.removeContents(); } + @Override Iterator getChildElements(SOAPElement element, QName name) throws SOAPException { Name elementName = SaajUtils.toName(name, element); return element.getChildElements(elementName); } + @Override void addNamespaceDeclaration(SOAPElement element, String prefix, String namespaceUri) throws SOAPException { element.addNamespaceDeclaration(prefix, namespaceUri); } + @Override public void writeTo(SOAPMessage message, OutputStream outputStream) throws SOAPException, IOException { if (message.saveRequired()) { message.saveChanges(); @@ -260,18 +297,22 @@ class Saaj12Implementation extends SaajImplementation { } + @Override public MimeHeaders getMimeHeaders(SOAPMessage message) { return message.getMimeHeaders(); } + @Override public Iterator getAttachments(SOAPMessage message) { return message.getAttachments(); } + @Override public Iterator getAttachment(SOAPMessage message, MimeHeaders mimeHeaders) { return message.getAttachments(mimeHeaders); } + @Override public AttachmentPart addAttachmentPart(SOAPMessage message, DataHandler dataHandler) { AttachmentPart attachmentPart = message.createAttachmentPart(dataHandler); message.addAttachmentPart(attachmentPart); @@ -282,42 +323,52 @@ class Saaj12Implementation extends SaajImplementation { // Unsupported // + @Override public String getFaultRole(SOAPFault fault) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } + @Override public void setFaultRole(SOAPFault fault, String role) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } + @Override public SOAPHeaderElement addNotUnderstoodHeaderElement(SOAPHeader header, QName name) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } + @Override public SOAPHeaderElement addUpgradeHeaderElement(SOAPHeader header, String[] supportedSoapUris) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } + @Override public Iterator getFaultSubcodes(SOAPFault fault) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } + @Override public void appendFaultSubcode(SOAPFault fault, QName subcode) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } + @Override public String getFaultNode(SOAPFault fault) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } + @Override public void setFaultNode(SOAPFault fault, String uri) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } + @Override public String getFaultReasonText(SOAPFault fault, Locale locale) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } + @Override public void setFaultReasonText(SOAPFault fault, Locale locale, String text) { throw new UnsupportedOperationException("SAAJ 1.2 does not support SOAP 1.2"); } diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java b/core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java index 2a7cb773..8141d4a5 100644 --- a/core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java +++ b/core/src/main/java/org/springframework/ws/soap/saaj/Saaj13Implementation.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -63,10 +63,12 @@ class Saaj13Implementation extends SaajImplementation { return INSTANCE; } + @Override public QName getName(SOAPElement element) { return element.getElementQName(); } + @Override public QName getFaultCode(SOAPFault fault) { return fault.getFaultCodeAsQName(); } @@ -75,55 +77,68 @@ class Saaj13Implementation extends SaajImplementation { return SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(element.getNamespaceURI()); } + @Override public DetailEntry addDetailEntry(Detail detail, QName name) throws SOAPException { return detail.addDetailEntry(name); } + @Override public SOAPHeaderElement addHeaderElement(SOAPHeader header, QName name) throws SOAPException { return header.addHeaderElement(name); } + @Override public String getFaultRole(SOAPFault fault) { return fault.getFaultRole(); } + @Override public void setFaultRole(SOAPFault fault, String role) throws SOAPException { fault.setFaultRole(role); } + @Override public SOAPHeaderElement addNotUnderstoodHeaderElement(SOAPHeader header, QName name) throws SOAPException { return header.addNotUnderstoodHeaderElement(name); } + @Override public SOAPHeaderElement addUpgradeHeaderElement(SOAPHeader header, String[] supportedSoapUris) throws SOAPException { return header.addUpgradeHeaderElement(supportedSoapUris); } + @Override public Iterator getFaultSubcodes(SOAPFault fault) { return fault.getFaultSubcodes(); } + @Override public void appendFaultSubcode(SOAPFault fault, QName subcode) throws SOAPException { fault.appendFaultSubcode(subcode); } + @Override public String getFaultNode(SOAPFault fault) { return fault.getFaultNode(); } + @Override public void setFaultNode(SOAPFault fault, String uri) throws SOAPException { fault.setFaultNode(uri); } + @Override public String getFaultReasonText(SOAPFault fault, Locale locale) throws SOAPException { return fault.getFaultReasonText(locale); } + @Override public void setFaultReasonText(SOAPFault fault, Locale locale, String text) throws SOAPException { fault.addFaultReasonText(text, locale); } + @Override public SOAPFault addFault(SOAPBody body, QName faultCode, String faultString, Locale locale) throws SOAPException { if (locale == null) { return body.addFault(faultCode, faultString); @@ -133,114 +148,142 @@ class Saaj13Implementation extends SaajImplementation { } } + @Override public Source getSource(SOAPElement element) { return new DOMSource(element); } + @Override public Result getResult(SOAPElement element) { return new DOMResult(element); } + @Override public String getText(SOAPElement element) { return element.getValue(); } + @Override public void setText(SOAPElement element, String content) { element.setValue(content); } + @Override public void addAttribute(SOAPElement element, QName name, String value) throws SOAPException { element.addAttribute(name, value); } + @Override public void removeAttribute(SOAPElement element, QName name) throws SOAPException { element.removeAttribute(name); } + @Override public String getAttributeValue(SOAPElement element, QName name) throws SOAPException { return element.getAttributeValue(name); } + @Override public Iterator getAllAttibutes(SOAPElement element) { return element.getAllAttributesAsQNames(); } + @Override public SOAPEnvelope getEnvelope(SOAPMessage message) throws SOAPException { return message.getSOAPPart().getEnvelope(); } + @Override public SOAPHeader getHeader(SOAPEnvelope envelope) throws SOAPException { return envelope.getHeader(); } + @Override public SOAPBody getBody(SOAPEnvelope envelope) throws SOAPException { return envelope.getBody(); } + @Override public Iterator examineAllHeaderElements(SOAPHeader header) { return header.examineAllHeaderElements(); } + @Override public Iterator examineMustUnderstandHeaderElements(SOAPHeader header, String actorOrRole) { return header.examineMustUnderstandHeaderElements(actorOrRole); } + @Override public String getActorOrRole(SOAPHeaderElement headerElement) { return headerElement.getActor(); } + @Override public void setActorOrRole(SOAPHeaderElement headerElement, String actorOrRole) { headerElement.setActor(actorOrRole); } + @Override public boolean getMustUnderstand(SOAPHeaderElement headerElement) { return headerElement.getMustUnderstand(); } + @Override public void setMustUnderstand(SOAPHeaderElement headerElement, boolean mustUnderstand) { headerElement.setMustUnderstand(mustUnderstand); } + @Override public boolean hasFault(SOAPBody body) { return body.hasFault(); } + @Override public SOAPFault getFault(SOAPBody body) { return body.getFault(); } + @Override public String getFaultActor(SOAPFault fault) { return fault.getFaultActor(); } + @Override public void setFaultActor(SOAPFault fault, String actorOrRole) throws SOAPException { fault.setFaultActor(actorOrRole); } + @Override public String getFaultString(SOAPFault fault) { return fault.getFaultString(); } + @Override public Locale getFaultStringLocale(SOAPFault fault) { return fault.getFaultStringLocale(); } + @Override public Detail getFaultDetail(SOAPFault fault) { return fault.getDetail(); } + @Override public Detail addFaultDetail(SOAPFault fault) throws SOAPException { return fault.addDetail(); } + @Override public void addTextNode(DetailEntry detailEntry, String text) throws SOAPException { detailEntry.addTextNode(text); } + @Override public Iterator getDetailEntries(Detail detail) { return detail.getDetailEntries(); } + @Override public SOAPElement getFirstBodyElement(SOAPBody body) { for (Iterator iterator = body.getChildElements(); iterator.hasNext();) { Object child = iterator.next(); @@ -251,18 +294,22 @@ class Saaj13Implementation extends SaajImplementation { return null; } + @Override public void removeContents(SOAPElement element) { element.removeContents(); } + @Override Iterator getChildElements(SOAPElement element, QName name) throws SOAPException { return element.getChildElements(name); } + @Override void addNamespaceDeclaration(SOAPElement element, String prefix, String namespaceUri) throws SOAPException { element.addNamespaceDeclaration(prefix, namespaceUri); } + @Override public void writeTo(SOAPMessage message, OutputStream outputStream) throws SOAPException, IOException { if (message.saveRequired()) { message.saveChanges(); @@ -293,18 +340,22 @@ class Saaj13Implementation extends SaajImplementation { } + @Override public MimeHeaders getMimeHeaders(SOAPMessage message) { return message.getMimeHeaders(); } + @Override public Iterator getAttachments(SOAPMessage message) { return message.getAttachments(); } + @Override public Iterator getAttachment(SOAPMessage message, MimeHeaders mimeHeaders) { return message.getAttachments(mimeHeaders); } + @Override public AttachmentPart addAttachmentPart(SOAPMessage message, DataHandler dataHandler) { AttachmentPart attachmentPart = message.createAttachmentPart(dataHandler); message.addAttachmentPart(attachmentPart); diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java b/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java index 47ebe479..878d3f34 100644 --- a/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java +++ b/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -62,6 +62,7 @@ public class SaajXmlReader extends AbstractXmlReader { this.startNode = startNode; } + @Override public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException { if (NAMESPACES_FEATURE_NAME.equals(name)) { return namespacesFeature; @@ -74,6 +75,7 @@ public class SaajXmlReader extends AbstractXmlReader { } } + @Override public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException { if (NAMESPACES_FEATURE_NAME.equals(name)) { this.namespacesFeature = value; diff --git a/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java b/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java index b6735c0d..4b37ef14 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java +++ b/core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -80,6 +80,7 @@ public class SoapMessageDispatcher extends MessageDispatcher { * @see SoapEndpointInvocationChain#getActorsOrRoles() * @see org.springframework.ws.soap.SoapHeader#examineMustUnderstandHeaderElements(String) */ + @Override protected boolean handleRequest(EndpointInvocationChain mappedEndpoint, MessageContext messageContext) { if (messageContext.getRequest() instanceof SoapMessage) { String[] actorsOrRoles = null; diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java index 3e77ae0e..95c2cfd3 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -156,6 +156,7 @@ public abstract class AbstractFaultCreatingValidatingMarshallingPayloadEndpoint * @return true to continue processing the request, false (the default) otherwise * @see Errors#getAllErrors() */ + @Override protected final boolean onValidationErrors(MessageContext messageContext, Object requestObject, Errors errors) { for (Iterator iterator = errors.getAllErrors().iterator(); iterator.hasNext();) { ObjectError objectError = (ObjectError) iterator.next(); diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java index e1c60ea9..5c6c1621 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -56,6 +56,7 @@ public abstract class AbstractSoapFaultDefinitionExceptionResolver extends Abstr */ protected abstract SoapFaultDefinition getFaultDefinition(Object endpoint, Exception ex); + @Override protected final boolean resolveExceptionInternal(MessageContext messageContext, Object endpoint, Exception ex) { Assert.isInstanceOf(SoapMessage.class, messageContext.getResponse(), "AbstractSoapFaultDefinitionExceptionResolver requires a SoapMessage"); diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java index 2e84b2c1..aff7b3cd 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2005-2007 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.soap.server.endpoint; import java.util.Locale; @@ -57,6 +58,7 @@ public class SimpleSoapExceptionResolver extends AbstractEndpointExceptionResolv this.locale = locale; } + @Override protected final boolean resolveExceptionInternal(MessageContext messageContext, Object endpoint, Exception ex) { Assert.isInstanceOf(SoapMessage.class, messageContext.getResponse(), "SimpleSoapExceptionResolver requires a SoapMessage"); diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java index 4c9e0202..736bbb7e 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ import org.springframework.ws.soap.server.endpoint.annotation.SoapFault; */ public class SoapFaultAnnotationExceptionResolver extends AbstractSoapFaultDefinitionExceptionResolver { + @Override protected final SoapFaultDefinition getFaultDefinition(Object endpoint, Exception ex) { SoapFault faultAnnotation = ex.getClass().getAnnotation(SoapFault.class); if (faultAnnotation != null) { diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java index efb192d4..5bca8dcb 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -69,6 +69,7 @@ public class SoapFaultDefinitionEditor extends PropertyEditorSupport { private static final int FAULT_STRING_LOCALE_INDEX = 2; + @Override public void setAsText(String text) throws IllegalArgumentException { if (!StringUtils.hasLength(text)) { setValue(null); diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java index 7462c88b..b22eef56 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -49,6 +49,7 @@ public class SoapFaultMappingExceptionResolver extends AbstractSoapFaultDefiniti exceptionMappings = mappings; } + @Override protected SoapFaultDefinition getFaultDefinition(Object endpoint, Exception ex) { if (!CollectionUtils.isEmpty(exceptionMappings)) { String definitionText = null; diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java index 74212749..fd4c86e1 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -148,6 +148,7 @@ public abstract class AbstractFaultCreatingValidatingInterceptor extends Abstrac * @param errors the validation errors * @return true to continue processing the request, false (the default) otherwise */ + @Override protected boolean handleRequestValidationErrors(MessageContext messageContext, SAXParseException[] errors) throws TransformerException { for (int i = 0; i < errors.length; i++) { diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java index 9b70b4fe..b27d7b3c 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -42,11 +42,13 @@ import org.springframework.ws.WebServiceMessage; public class PayloadValidatingInterceptor extends AbstractFaultCreatingValidatingInterceptor { /** Returns the payload source of the given message. */ + @Override protected Source getValidationRequestSource(WebServiceMessage request) { return request.getPayloadSource(); } /** Returns the payload source of the given message. */ + @Override protected Source getValidationResponseSource(WebServiceMessage response) { return response.getPayloadSource(); } diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java index 17f81a4f..63a47ee3 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -45,6 +45,7 @@ public class SoapEnvelopeLoggingInterceptor extends AbstractLoggingInterceptor i this.logFault = logFault; } + @Override public boolean handleFault(MessageContext messageContext, Object endpoint) throws Exception { if (logFault && logger.isDebugEnabled()) { logMessageSource("Fault: ", getSource(messageContext.getResponse())); @@ -56,6 +57,7 @@ public class SoapEnvelopeLoggingInterceptor extends AbstractLoggingInterceptor i return false; } + @Override protected Source getSource(WebServiceMessage message) { if (message instanceof SoapMessage) { SoapMessage soapMessage = (SoapMessage) message; diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java index 284e0ce2..420d1789 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -78,12 +78,14 @@ public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotatio * @see #setInterceptors(org.springframework.ws.server.EndpointInterceptor[]) * @see #setActorsOrRoles(String[]) */ + @Override protected final EndpointInvocationChain createEndpointInvocationChain(MessageContext messageContext, Object endpoint, EndpointInterceptor[] interceptors) { return new SoapEndpointInvocationChain(endpoint, interceptors, actorsOrRoles, isUltimateReceiver); } + @Override protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception { if (messageContext.getRequest() instanceof SoapMessage) { SoapMessage request = (SoapMessage) messageContext.getRequest(); @@ -101,6 +103,7 @@ public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotatio } } + @Override protected String getLookupKeyForMethod(Method method) { SoapAction soapAction = method.getAnnotation(SoapAction.class); return soapAction != null ? soapAction.value() : null; diff --git a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java index 6efd838d..064ef6cc 100644 --- a/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java +++ b/core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -80,12 +80,14 @@ public class SoapActionEndpointMapping extends AbstractMapBasedEndpointMapping i * @see #setInterceptors(org.springframework.ws.server.EndpointInterceptor[]) * @see #setActorsOrRoles(String[]) */ + @Override protected final EndpointInvocationChain createEndpointInvocationChain(MessageContext messageContext, Object endpoint, EndpointInterceptor[] interceptors) { return new SoapEndpointInvocationChain(endpoint, interceptors, actorsOrRoles, isUltimateReceiver); } + @Override protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception { if (messageContext.getRequest() instanceof SoapMessage) { SoapMessage request = (SoapMessage) messageContext.getRequest(); @@ -103,6 +105,7 @@ public class SoapActionEndpointMapping extends AbstractMapBasedEndpointMapping i } } + @Override protected boolean validateLookupKey(String key) { return StringUtils.hasLength(key); } diff --git a/core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java b/core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java index 5fc95faa..3996baa6 100644 --- a/core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java +++ b/core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -33,6 +33,7 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne private TransportOutputStream responseOutputStream; + @Override protected final TransportInputStream createTransportInputStream() throws IOException { if (requestInputStream == null) { requestInputStream = new RequestTransportInputStream(); @@ -40,6 +41,7 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne return requestInputStream; } + @Override protected final TransportOutputStream createTransportOutputStream() throws IOException { if (responseOutputStream == null) { responseOutputStream = new ResponseTransportOutputStream(); @@ -52,6 +54,7 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne * * @throws IOException if an I/O error occurs when closing this connection */ + @Override protected void onClose() throws IOException { } @@ -85,14 +88,17 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne /** Implementation of TransportInputStream for receiving-side connections. */ private class RequestTransportInputStream extends TransportInputStream { + @Override protected InputStream createInputStream() throws IOException { return getRequestInputStream(); } + @Override public Iterator getHeaderNames() throws IOException { return getRequestHeaderNames(); } + @Override public Iterator getHeaders(String name) throws IOException { return getRequestHeaders(name); } @@ -102,10 +108,12 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne /** Implementation of TransportOutputStream for sending-side connections. */ private class ResponseTransportOutputStream extends TransportOutputStream { + @Override public void addHeader(String name, String value) throws IOException { addResponseHeader(name, value); } + @Override protected OutputStream createOutputStream() throws IOException { return getResponseOutputStream(); } diff --git a/core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java b/core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java index be34b59f..2c970c99 100644 --- a/core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java +++ b/core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -33,6 +33,7 @@ public abstract class AbstractSenderConnection extends AbstractWebServiceConnect private TransportInputStream responseInputStream; + @Override protected final TransportOutputStream createTransportOutputStream() throws IOException { if (requestOutputStream == null) { requestOutputStream = new RequestTransportOutputStream(); @@ -40,6 +41,7 @@ public abstract class AbstractSenderConnection extends AbstractWebServiceConnect return requestOutputStream; } + @Override protected final TransportInputStream createTransportInputStream() throws IOException { if (hasResponse()) { if (responseInputStream == null) { @@ -57,6 +59,7 @@ public abstract class AbstractSenderConnection extends AbstractWebServiceConnect * * @throws IOException if an I/O error occurs when closing this connection */ + @Override protected void onClose() throws IOException { } @@ -93,10 +96,12 @@ public abstract class AbstractSenderConnection extends AbstractWebServiceConnect /** Implementation of TransportInputStream for receiving-side connections. */ class RequestTransportOutputStream extends TransportOutputStream { + @Override public void addHeader(String name, String value) throws IOException { addRequestHeader(name, value); } + @Override protected OutputStream createOutputStream() throws IOException { return getRequestOutputStream(); } @@ -105,14 +110,17 @@ public abstract class AbstractSenderConnection extends AbstractWebServiceConnect /** Implementation of {@link TransportInputStream} for client-side HTTP. */ class ResponseTransportInputStream extends TransportInputStream { + @Override protected InputStream createInputStream() throws IOException { return getResponseInputStream(); } + @Override public Iterator getHeaderNames() throws IOException { return getResponseHeaderNames(); } + @Override public Iterator getHeaders(String name) throws IOException { return getResponseHeaders(name); } diff --git a/core/src/main/java/org/springframework/ws/transport/TransportInputStream.java b/core/src/main/java/org/springframework/ws/transport/TransportInputStream.java index 3378fb65..21219608 100644 --- a/core/src/main/java/org/springframework/ws/transport/TransportInputStream.java +++ b/core/src/main/java/org/springframework/ws/transport/TransportInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -46,14 +46,17 @@ public abstract class TransportInputStream extends InputStream { return inputStream; } + @Override public void close() throws IOException { getInputStream().close(); } + @Override public int available() throws IOException { return getInputStream().available(); } + @Override public synchronized void mark(int readlimit) { try { getInputStream().mark(readlimit); @@ -63,6 +66,7 @@ public abstract class TransportInputStream extends InputStream { } } + @Override public boolean markSupported() { try { return getInputStream().markSupported(); @@ -72,22 +76,27 @@ public abstract class TransportInputStream extends InputStream { } } + @Override public int read(byte b[]) throws IOException { return getInputStream().read(b); } + @Override public int read(byte b[], int off, int len) throws IOException { return getInputStream().read(b, off, len); } + @Override public synchronized void reset() throws IOException { getInputStream().reset(); } + @Override public long skip(long n) throws IOException { return getInputStream().skip(n); } + @Override public int read() throws IOException { return getInputStream().read(); } diff --git a/core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java b/core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java index 50e1a108..ddb2dfe0 100644 --- a/core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java +++ b/core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -44,22 +44,27 @@ public abstract class TransportOutputStream extends OutputStream { return outputStream; } + @Override public void close() throws IOException { getOutputStream().close(); } + @Override public void flush() throws IOException { getOutputStream().flush(); } + @Override public void write(byte b[]) throws IOException { getOutputStream().write(b); } + @Override public void write(byte b[], int off, int len) throws IOException { getOutputStream().write(b, off, len); } + @Override public void write(int b) throws IOException { getOutputStream().write(b); } diff --git a/core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java b/core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java index 3bb37a45..e2c108f2 100644 --- a/core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java +++ b/core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -59,6 +59,7 @@ public abstract class AbstractHttpSenderConnection extends AbstractSenderConnect /* * Receiving response */ + @Override protected final boolean hasResponse() throws IOException { int responseCode = getResponseCode(); if (HttpTransportConstants.STATUS_ACCEPTED == responseCode || @@ -75,6 +76,7 @@ public abstract class AbstractHttpSenderConnection extends AbstractSenderConnect return contentLength > 0; } + @Override protected final InputStream getResponseInputStream() throws IOException { InputStream inputStream; if (responseBuffer != null) { diff --git a/core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java b/core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java index eff285ed..105bf979 100644 --- a/core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java +++ b/core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -64,6 +64,7 @@ public class CommonsHttpConnection extends AbstractHttpSenderConnection { return postMethod; } + @Override public void onClose() throws IOException { postMethod.releaseConnection(); if (connectionManager != null) { @@ -88,18 +89,22 @@ public class CommonsHttpConnection extends AbstractHttpSenderConnection { * Sending request */ + @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { requestBuffer = new ByteArrayOutputStream(); } + @Override protected void addRequestHeader(String name, String value) throws IOException { postMethod.addRequestHeader(name, value); } + @Override protected OutputStream getRequestOutputStream() throws IOException { return requestBuffer; } + @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { postMethod.setRequestEntity(new ByteArrayRequestEntity(requestBuffer.toByteArray())); requestBuffer = null; @@ -122,22 +127,27 @@ public class CommonsHttpConnection extends AbstractHttpSenderConnection { * Receiving response */ + @Override protected int getResponseCode() throws IOException { return postMethod.getStatusCode(); } + @Override protected String getResponseMessage() throws IOException { return postMethod.getStatusText(); } + @Override protected long getResponseContentLength() throws IOException { return postMethod.getResponseContentLength(); } + @Override protected InputStream getRawResponseInputStream() throws IOException { return postMethod.getResponseBodyAsStream(); } + @Override protected Iterator getResponseHeaderNames() throws IOException { Header[] headers = postMethod.getResponseHeaders(); String[] names = new String[headers.length]; @@ -147,6 +157,7 @@ public class CommonsHttpConnection extends AbstractHttpSenderConnection { return Arrays.asList(names).iterator(); } + @Override protected Iterator getResponseHeaders(String name) throws IOException { Header[] headers = postMethod.getResponseHeaders(name); String[] values = new String[headers.length]; diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java b/core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java index a7d515b9..0dc9333a 100644 --- a/core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java +++ b/core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -97,14 +97,17 @@ public class HttpServletConnection extends AbstractReceiverConnection * Receiving request */ + @Override protected Iterator getRequestHeaderNames() throws IOException { return new EnumerationIterator(getHttpServletRequest().getHeaderNames()); } + @Override protected Iterator getRequestHeaders(String name) throws IOException { return new EnumerationIterator(getHttpServletRequest().getHeaders(name)); } + @Override protected InputStream getRequestInputStream() throws IOException { return getHttpServletRequest().getInputStream(); } @@ -113,18 +116,22 @@ public class HttpServletConnection extends AbstractReceiverConnection * Sending response */ + @Override protected void addResponseHeader(String name, String value) throws IOException { getHttpServletResponse().addHeader(name, value); } + @Override protected OutputStream getResponseOutputStream() throws IOException { return getHttpServletResponse().getOutputStream(); } + @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { statusCodeSet = true; } + @Override public void onClose() throws IOException { if (!statusCodeSet) { getHttpServletResponse().setStatus(HttpTransportConstants.STATUS_ACCEPTED); diff --git a/core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java b/core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java index ff50323e..ad534e4b 100644 --- a/core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java +++ b/core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -57,6 +57,7 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { return connection; } + @Override public void onClose() { connection.disconnect(); } @@ -73,14 +74,17 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { * Sending request */ + @Override protected void addRequestHeader(String name, String value) throws IOException { connection.addRequestProperty(name, value); } + @Override protected OutputStream getRequestOutputStream() throws IOException { return connection.getOutputStream(); } + @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { connection.connect(); } @@ -89,10 +93,12 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { * Receiving response */ + @Override protected long getResponseContentLength() throws IOException { return connection.getContentLength(); } + @Override protected Iterator getResponseHeaderNames() throws IOException { List headerNames = new ArrayList(); // Header field 0 is the status line, so we start at 1 @@ -108,6 +114,7 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { return headerNames.iterator(); } + @Override protected Iterator getResponseHeaders(String name) throws IOException { String headerField = connection.getHeaderField(name); if (headerField == null) { @@ -119,14 +126,17 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { } } + @Override protected int getResponseCode() throws IOException { return connection.getResponseCode(); } + @Override protected String getResponseMessage() throws IOException { return connection.getResponseMessage(); } + @Override protected InputStream getRawResponseInputStream() throws IOException { if (connection.getResponseCode() / 100 != 2) { return connection.getErrorStream(); diff --git a/core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java b/core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java index 9ea010dc..fbf00801 100644 --- a/core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java +++ b/core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -215,6 +215,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { this.transformWsdlLocations = transformWsdlLocations; } + @Override protected void doService(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { WsdlDefinition definition = getWsdlDefinition(httpServletRequest); @@ -230,6 +231,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { messageReceiverHandlerAdapter.handle(httpServletRequest, httpServletResponse, messageReceiver); } + @Override protected void initFrameworkServlet() throws ServletException, BeansException { initMessageReceiverHandlerAdapter(); initWsdlDefinitionHandlerAdapter(); @@ -239,6 +241,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { initXsdSchemas(); } + @Override protected long getLastModified(HttpServletRequest httpServletRequest) { WsdlDefinition definition = getWsdlDefinition(httpServletRequest); if (definition != null) { diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractBindingWsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractBindingWsdl4jDefinitionBuilder.java index 9216b499..9aa94557 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractBindingWsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractBindingWsdl4jDefinitionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -67,6 +67,7 @@ public abstract class AbstractBindingWsdl4jDefinitionBuilder extends AbstractWsd * @see #populateBindingOutput(BindingOutput, Output) * @see #populateBindingFault(BindingFault, Fault) */ + @Override public void buildBindings(Definition definition) throws WSDLException { for (Iterator iterator = definition.getPortTypes().values().iterator(); iterator.hasNext();) { PortType portType = (PortType) iterator.next(); @@ -207,6 +208,7 @@ public abstract class AbstractBindingWsdl4jDefinitionBuilder extends AbstractWsd * @throws WSDLException in case of errors * @see #populatePort(Port, Binding) */ + @Override public void buildServices(Definition definition) throws WSDLException { Service service = definition.createService(); populateService(service); diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap11Wsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap11Wsdl4jDefinitionBuilder.java index 60409b1a..63f7ef3a 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap11Wsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap11Wsdl4jDefinitionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -77,6 +77,7 @@ public abstract class AbstractSoap11Wsdl4jDefinitionBuilder extends AbstractBind } /** Adds the WSDL SOAP namespace to the definition. */ + @Override protected void populateDefinition(Definition definition) throws WSDLException { definition.addNamespace(WSDL_SOAP_PREFIX, WSDL_SOAP_NAMESPACE_URI); } @@ -89,6 +90,7 @@ public abstract class AbstractSoap11Wsdl4jDefinitionBuilder extends AbstractBind * @param portType the corresponding PortType * @throws WSDLException in case of errors */ + @Override protected void populateBinding(Binding binding, PortType portType) throws WSDLException { super.populateBinding(binding, portType); SOAPBinding soapBinding = (SOAPBinding) createSoapExtension(Binding.class, "binding"); @@ -120,6 +122,7 @@ public abstract class AbstractSoap11Wsdl4jDefinitionBuilder extends AbstractBind * @param bindingOperation the WSDL4J BindingOperation * @throws WSDLException in case of errors */ + @Override protected void populateBindingOperation(BindingOperation bindingOperation, Operation operation) throws WSDLException { super.populateBindingOperation(bindingOperation, operation); @@ -147,6 +150,7 @@ public abstract class AbstractSoap11Wsdl4jDefinitionBuilder extends AbstractBind * @param bindingInput the WSDL4J BindingInput * @throws WSDLException in case of errors */ + @Override protected void populateBindingInput(BindingInput bindingInput, Input input) throws WSDLException { super.populateBindingInput(bindingInput, input); SOAPBody soapBody = (SOAPBody) createSoapExtension(BindingInput.class, "body"); @@ -160,6 +164,7 @@ public abstract class AbstractSoap11Wsdl4jDefinitionBuilder extends AbstractBind * @param bindingOutput the WSDL4J BindingOutput * @throws WSDLException in case of errors */ + @Override protected void populateBindingOutput(BindingOutput bindingOutput, Output output) throws WSDLException { super.populateBindingOutput(bindingOutput, output); SOAPBody soapBody = (SOAPBody) createSoapExtension(BindingOutput.class, "body"); @@ -173,6 +178,7 @@ public abstract class AbstractSoap11Wsdl4jDefinitionBuilder extends AbstractBind * @param bindingFault the WSDL4J BindingFault * @throws WSDLException in case of errors */ + @Override protected void populateBindingFault(BindingFault bindingFault, Fault fault) throws WSDLException { super.populateBindingFault(bindingFault, fault); SOAPFault soapFault = (SOAPFault) createSoapExtension(BindingFault.class, "fault"); @@ -212,6 +218,7 @@ public abstract class AbstractSoap11Wsdl4jDefinitionBuilder extends AbstractBind * @param port the WSDL4J Port * @throws WSDLException in case of errors */ + @Override protected void populatePort(Port port, Binding binding) throws WSDLException { super.populatePort(port, binding); SOAPAddress soapAddress = (SOAPAddress) createSoapExtension(Port.class, "address"); diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap12Wsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap12Wsdl4jDefinitionBuilder.java index 2d139a2b..db74ba63 100755 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap12Wsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/AbstractSoap12Wsdl4jDefinitionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -78,6 +78,7 @@ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBind } /** Adds the WSDL SOAP namespace to the definition. */ + @Override protected void populateDefinition(Definition definition) throws WSDLException { definition.addNamespace(WSDL_SOAP_PREFIX, WSDL_SOAP_NAMESPACE_URI); } @@ -90,6 +91,7 @@ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBind * @param portType the corresponding PortType * @throws WSDLException in case of errors */ + @Override protected void populateBinding(Binding binding, PortType portType) throws WSDLException { super.populateBinding(binding, portType); SOAP12Binding soapBinding = (SOAP12Binding) createSoapExtension(Binding.class, "binding"); @@ -121,6 +123,7 @@ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBind * @param bindingOperation the WSDL4J BindingOperation * @throws WSDLException in case of errors */ + @Override protected void populateBindingOperation(BindingOperation bindingOperation, Operation operation) throws WSDLException { super.populateBindingOperation(bindingOperation, operation); @@ -148,6 +151,7 @@ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBind * @param bindingInput the WSDL4J BindingInput * @throws WSDLException in case of errors */ + @Override protected void populateBindingInput(BindingInput bindingInput, Input input) throws WSDLException { super.populateBindingInput(bindingInput, input); SOAP12Body soapBody = (SOAP12Body) createSoapExtension(BindingInput.class, "body"); @@ -161,6 +165,7 @@ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBind * @param bindingOutput the WSDL4J BindingOutput * @throws WSDLException in case of errors */ + @Override protected void populateBindingOutput(BindingOutput bindingOutput, Output output) throws WSDLException { super.populateBindingOutput(bindingOutput, output); SOAP12Body soapBody = (SOAP12Body) createSoapExtension(BindingOutput.class, "body"); @@ -174,6 +179,7 @@ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBind * @param bindingFault the WSDL4J BindingFault * @throws WSDLException in case of errors */ + @Override protected void populateBindingFault(BindingFault bindingFault, Fault fault) throws WSDLException { super.populateBindingFault(bindingFault, fault); SOAP12Fault soapFault = (SOAP12Fault) createSoapExtension(BindingFault.class, "fault"); @@ -213,6 +219,7 @@ public abstract class AbstractSoap12Wsdl4jDefinitionBuilder extends AbstractBind * @param port the WSDL4J Port * @throws WSDLException in case of errors */ + @Override protected void populatePort(Port port, Binding binding) throws WSDLException { super.populatePort(port, binding); SOAP12Address soapAddress = (SOAP12Address) createSoapExtension(Port.class, "address"); diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilder.java index 2539ba3a..fb7f449e 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -217,6 +217,7 @@ public class XsdBasedSoap11Wsdl4jDefinitionBuilder extends AbstractSoap11Wsdl4jD } /** Adds the target namespace and schema namespace to the definition. */ + @Override protected void populateDefinition(Definition definition) throws WSDLException { super.populateDefinition(definition); definition.setTargetNamespace(targetNamespace); @@ -227,6 +228,7 @@ public class XsdBasedSoap11Wsdl4jDefinitionBuilder extends AbstractSoap11Wsdl4jD } /** Does nothing. */ + @Override protected void buildImports(Definition definition) throws WSDLException { } @@ -238,6 +240,7 @@ public class XsdBasedSoap11Wsdl4jDefinitionBuilder extends AbstractSoap11Wsdl4jD * @param definition the WSDL4J Definition * @throws WSDLException in case of errors */ + @Override protected void buildTypes(Definition definition) throws WSDLException { Types types = definition.createTypes(); Schema schema = (Schema) createExtension(Types.class, XsdSchemaHelper.SCHEMA_NAME); @@ -275,6 +278,7 @@ public class XsdBasedSoap11Wsdl4jDefinitionBuilder extends AbstractSoap11Wsdl4jD * @param definition the WSDL4J Definition * @throws WSDLException in case of errors */ + @Override protected void buildMessages(Definition definition) throws WSDLException { List elementDeclarations = schemaHelper.getElementDeclarations(followIncludeImport); for (Iterator iterator = elementDeclarations.iterator(); iterator.hasNext();) { @@ -367,6 +371,7 @@ public class XsdBasedSoap11Wsdl4jDefinitionBuilder extends AbstractSoap11Wsdl4jD part.setName(elementName.getLocalPart()); } + @Override protected void buildPortTypes(Definition definition) throws WSDLException { PortType portType = definition.createPortType(); populatePortType(portType); @@ -499,6 +504,7 @@ public class XsdBasedSoap11Wsdl4jDefinitionBuilder extends AbstractSoap11Wsdl4jD } /** Sets the name of the service to the name of the port type, with "Service" appended to it. */ + @Override protected void populateService(Service service) throws WSDLException { service.setQName(new QName(targetNamespace, portTypeName + SERVICE_SUFFIX)); } diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilder.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilder.java index 362a0a31..1b1036be 100755 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilder.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -218,6 +218,7 @@ public class XsdBasedSoap12Wsdl4jDefinitionBuilder extends AbstractSoap12Wsdl4jD } /** Adds the target namespace and schema namespace to the definition. */ + @Override protected void populateDefinition(Definition definition) throws WSDLException { super.populateDefinition(definition); definition.setTargetNamespace(targetNamespace); @@ -228,6 +229,7 @@ public class XsdBasedSoap12Wsdl4jDefinitionBuilder extends AbstractSoap12Wsdl4jD } /** Does nothing. */ + @Override protected void buildImports(Definition definition) throws WSDLException { } @@ -239,6 +241,7 @@ public class XsdBasedSoap12Wsdl4jDefinitionBuilder extends AbstractSoap12Wsdl4jD * @param definition the WSDL4J Definition * @throws WSDLException in case of errors */ + @Override protected void buildTypes(Definition definition) throws WSDLException { Types types = definition.createTypes(); Schema schema = (Schema) createExtension(Types.class, XsdSchemaHelper.SCHEMA_NAME); @@ -276,6 +279,7 @@ public class XsdBasedSoap12Wsdl4jDefinitionBuilder extends AbstractSoap12Wsdl4jD * @param definition the WSDL4J Definition * @throws WSDLException in case of errors */ + @Override protected void buildMessages(Definition definition) throws WSDLException { List elementDeclarations = schemaHelper.getElementDeclarations(followIncludeImport); for (Iterator iterator = elementDeclarations.iterator(); iterator.hasNext();) { @@ -368,6 +372,7 @@ public class XsdBasedSoap12Wsdl4jDefinitionBuilder extends AbstractSoap12Wsdl4jD part.setName(elementName.getLocalPart()); } + @Override protected void buildPortTypes(Definition definition) throws WSDLException { PortType portType = definition.createPortType(); populatePortType(portType); @@ -500,6 +505,7 @@ public class XsdBasedSoap12Wsdl4jDefinitionBuilder extends AbstractSoap12Wsdl4jD } /** Sets the name of the service to the name of the port type, with "Service" appended to it. */ + @Override protected void populateService(Service service) throws WSDLException { service.setQName(new QName(targetNamespace, portTypeName + SERVICE_SUFFIX)); } diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java index 7219fd4f..c8e764ba 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -137,6 +137,7 @@ public class Soap11Provider extends DefaultConcretePartProvider { * @param definition the WSDL4J Definition * @param binding the WSDL4J Binding */ + @Override protected void populateBinding(Definition definition, Binding binding) throws WSDLException { definition.addNamespace(SOAP_11_NAMESPACE_PREFIX, SOAP_11_NAMESPACE_URI); super.populateBinding(definition, binding); @@ -174,6 +175,7 @@ public class Soap11Provider extends DefaultConcretePartProvider { * @param bindingFault the WSDL4J BindingFault * @param fault the corresponding WSDL4J Fault @throws WSDLException in case of errors */ + @Override protected void populateBindingFault(Definition definition, BindingFault bindingFault, Fault fault) throws WSDLException { super.populateBindingFault(definition, bindingFault, fault); @@ -210,6 +212,7 @@ public class Soap11Provider extends DefaultConcretePartProvider { * @param bindingInput the WSDL4J BindingInput * @param input the corresponding WSDL4J Input @throws WSDLException in case of errors */ + @Override protected void populateBindingInput(Definition definition, BindingInput bindingInput, Input input) throws WSDLException { super.populateBindingInput(definition, bindingInput, input); @@ -243,6 +246,7 @@ public class Soap11Provider extends DefaultConcretePartProvider { * @param bindingOperation the WSDL4J BindingOperation * @throws WSDLException in case of errors */ + @Override protected void populateBindingOperation(Definition definition, BindingOperation bindingOperation) throws WSDLException { super.populateBindingOperation(definition, bindingOperation); @@ -282,6 +286,7 @@ public class Soap11Provider extends DefaultConcretePartProvider { * @param bindingOutput the WSDL4J BindingOutput * @param output the corresponding WSDL4J Output @throws WSDLException in case of errors */ + @Override protected void populateBindingOutput(Definition definition, BindingOutput bindingOutput, Output output) throws WSDLException { super.populateBindingOutput(definition, bindingOutput, output); @@ -300,6 +305,7 @@ public class Soap11Provider extends DefaultConcretePartProvider { * @param port the WSDL4J Port * @throws WSDLException in case of errors */ + @Override protected void populatePort(Definition definition, Port port) throws WSDLException { for (Iterator iterator = port.getBinding().getExtensibilityElements().iterator(); iterator.hasNext();) { if (iterator.next() instanceof SOAPBinding) { diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java index 13ab2c4a..b3139ad6 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -138,6 +138,7 @@ public class Soap12Provider extends DefaultConcretePartProvider { * @param definition the WSDL4J Definition * @param binding the WSDL4J Binding */ + @Override protected void populateBinding(Definition definition, Binding binding) throws WSDLException { definition.addNamespace(SOAP_12_NAMESPACE_PREFIX, SOAP_12_NAMESPACE_URI); super.populateBinding(definition, binding); @@ -176,6 +177,7 @@ public class Soap12Provider extends DefaultConcretePartProvider { * @param bindingFault the WSDL4J BindingFault * @param fault the corresponding WSDL4J Fault @throws WSDLException in case of errors */ + @Override protected void populateBindingFault(Definition definition, BindingFault bindingFault, Fault fault) throws WSDLException { super.populateBindingFault(definition, bindingFault, fault); @@ -212,6 +214,7 @@ public class Soap12Provider extends DefaultConcretePartProvider { * @param bindingInput the WSDL4J BindingInput * @param input the corresponding WSDL4J Input @throws WSDLException in case of errors */ + @Override protected void populateBindingInput(Definition definition, BindingInput bindingInput, Input input) throws WSDLException { super.populateBindingInput(definition, bindingInput, input); @@ -245,6 +248,7 @@ public class Soap12Provider extends DefaultConcretePartProvider { * @param bindingOperation the WSDL4J BindingOperation * @throws javax.wsdl.WSDLException in case of errors */ + @Override protected void populateBindingOperation(Definition definition, BindingOperation bindingOperation) throws WSDLException { super.populateBindingOperation(definition, bindingOperation); @@ -285,6 +289,7 @@ public class Soap12Provider extends DefaultConcretePartProvider { * @param bindingOutput the WSDL4J BindingOutput * @param output the corresponding WSDL4J Output @throws WSDLException in case of errors */ + @Override protected void populateBindingOutput(Definition definition, BindingOutput bindingOutput, Output output) throws WSDLException { super.populateBindingOutput(definition, bindingOutput, output); @@ -303,6 +308,7 @@ public class Soap12Provider extends DefaultConcretePartProvider { * @param port the WSDL4J Port * @throws WSDLException in case of errors */ + @Override protected void populatePort(Definition definition, Port port) throws WSDLException { for (Iterator iterator = port.getBinding().getExtensibilityElements().iterator(); iterator.hasNext();) { if (iterator.next() instanceof SOAP12Binding) { diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java index 3b96b95e..6e409741 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -100,6 +100,7 @@ public class SuffixBasedMessagesProvider extends DefaultMessagesProvider { this.faultSuffix = faultSuffix; } + @Override protected boolean isMessageElement(Element element) { if (super.isMessageElement(element)) { String elementName = getElementName(element); diff --git a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java index 87995bb9..75fd763c 100644 --- a/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java +++ b/core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -100,6 +100,7 @@ public class SuffixBasedPortTypesProvider extends AbstractPortTypesProvider { this.faultSuffix = faultSuffix; } + @Override protected String getOperationName(Message message) { String messageName = getMessageName(message); if (messageName != null) { @@ -125,6 +126,7 @@ public class SuffixBasedPortTypesProvider extends AbstractPortTypesProvider { * @param message the message * @return true if to be included as input; false otherwise */ + @Override protected boolean isInputMessage(Message message) { String messageName = getMessageName(message); return messageName != null && messageName.endsWith(getRequestSuffix()); @@ -139,6 +141,7 @@ public class SuffixBasedPortTypesProvider extends AbstractPortTypesProvider { * @param message the message * @return true if to be included as output; false otherwise */ + @Override protected boolean isOutputMessage(Message message) { String messageName = getMessageName(message); return messageName != null && messageName.endsWith(getResponseSuffix()); @@ -152,6 +155,7 @@ public class SuffixBasedPortTypesProvider extends AbstractPortTypesProvider { * @param message the message * @return true if to be included as fault; false otherwise */ + @Override protected boolean isFaultMessage(Message message) { String messageName = getMessageName(message); return messageName != null && messageName.endsWith(getFaultSuffix()); diff --git a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java b/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java index aa055d46..f9ebd5b4 100644 --- a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java +++ b/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ public abstract class AbstractWebServiceMessageFactoryTestCase extends TestCase protected WebServiceMessageFactory messageFactory; + @Override protected final void setUp() throws Exception { messageFactory = createMessageFactory(); } diff --git a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java b/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java index 30674e9d..23ec75db 100644 --- a/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java +++ b/core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -68,6 +68,7 @@ public abstract class AbstractWebServiceMessageTestCase extends XMLTestCase { return expectedWriter.toString(); } + @Override protected final void setUp() throws Exception { TransformerFactory transformerFactory = TransformerFactory.newInstance(); transformer = transformerFactory.newTransformer(); diff --git a/core/src/test/java/org/springframework/ws/MockWebServiceMessage.java b/core/src/test/java/org/springframework/ws/MockWebServiceMessage.java index 34e5bad7..323243ca 100644 --- a/core/src/test/java/org/springframework/ws/MockWebServiceMessage.java +++ b/core/src/test/java/org/springframework/ws/MockWebServiceMessage.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -153,24 +153,30 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { super(content); } + @Override public void write(String str) { content.append(str); } + @Override public void write(int c) { content.append((char) c); } + @Override public void write(String str, int off, int len) { content.append(str.substring(off, off + len)); } + @Override public void close() throws IOException { } + @Override public void flush() { } + @Override public void write(char cbuf[], int off, int len) { if (off < 0 || off > cbuf.length || len < 0 || off + len > cbuf.length || off + len < 0) { throw new IndexOutOfBoundsException(); diff --git a/core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java b/core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java index 70cbf224..1baf75db 100644 --- a/core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java +++ b/core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -25,6 +25,7 @@ public class SimpleFaultMessageResolverTest extends TestCase { private SimpleFaultMessageResolver resolver; + @Override protected void setUp() throws Exception { resolver = new SimpleFaultMessageResolver(); } diff --git a/core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java b/core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java index f1a7b72c..2dde505f 100644 --- a/core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java +++ b/core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -43,6 +43,7 @@ public class SimpleSaajServlet extends HttpServlet { private MessageFactory msgFactory = null; + @Override public void init(ServletConfig servletConfig) throws ServletException { super.init(servletConfig); try { @@ -77,6 +78,7 @@ public class SimpleSaajServlet extends HttpServlet { } } + @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { try { MimeHeaders headers = getHeaders(req); diff --git a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java b/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java index a211b826..1584e4ed 100644 --- a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java +++ b/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -273,6 +273,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { this.sc = sc; } + @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { resp.sendError(sc); } @@ -285,6 +286,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { private TransformerFactory transformerFactory; + @Override public void init(ServletConfig servletConfig) throws ServletException { super.init(servletConfig); documentBuilderFactory = DocumentBuilderFactory.newInstance(); @@ -292,6 +294,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { transformerFactory = TransformerFactory.newInstance(); } + @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { try { DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); @@ -316,6 +319,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { this.sc = sc; } + @Override public void init(ServletConfig servletConfig) throws ServletException { super.init(servletConfig); try { @@ -326,6 +330,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { } } + @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { try { MimeHeaders headers = getHeaders(req); @@ -382,6 +387,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { private static class EchoSoapServlet extends AbstractSoapServlet { + @Override protected SOAPMessage onMessage(SOAPMessage message) throws SOAPException { return message; } @@ -389,6 +395,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { private static class NoResponseSoapServlet extends AbstractSoapServlet { + @Override protected SOAPMessage onMessage(SOAPMessage message) throws SOAPException { return null; } @@ -396,6 +403,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { private static class SoapFaultServlet extends AbstractSoapServlet { + @Override protected SOAPMessage onMessage(SOAPMessage message) throws SOAPException { SOAPMessage response = messageFactory.createMessage(); SOAPBody body = response.getSOAPBody(); @@ -406,6 +414,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { private static class AttachmentsServlet extends AbstractSoapServlet { + @Override protected SOAPMessage onMessage(SOAPMessage message) throws SOAPException { assertEquals("No attachments found", 1, message.countAttachments()); return null; @@ -419,6 +428,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { super(test); } + @Override protected void setUp() throws Exception { removeXmlDataContentHandler(); @@ -448,6 +458,7 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase { CommandMap.setDefaultCommandMap(new MailcapCommandMap()); } + @Override protected void tearDown() throws Exception { jettyServer.stop(); } diff --git a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java b/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java index ffc5e6bd..2e6aa688 100644 --- a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java +++ b/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -47,6 +47,7 @@ public class WebServiceTemplateTest extends XMLTestCase { private MockWebServiceMessageFactory messageFactory; + @Override protected void setUp() throws Exception { template = new WebServiceTemplate(); messageFactory = new MockWebServiceMessageFactory(); diff --git a/core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java b/core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java index 730f5970..8f367041 100644 --- a/core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java +++ b/core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -28,6 +28,7 @@ public class Wsdl11DestinationProviderTest extends TestCase { private Wsdl11DestinationProvider provider; + @Override protected void setUp() throws Exception { provider = new Wsdl11DestinationProvider(); } diff --git a/core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java b/core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java index ab92ca27..2dec781d 100644 --- a/core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java +++ b/core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -64,6 +64,7 @@ public class PayloadValidatingInterceptorTest extends XMLTestCase { private static final String SCHEMA2 = "schema2.xsd"; + @Override protected void setUp() throws Exception { interceptor = new PayloadValidatingInterceptor(); interceptor.setSchema(new ClassPathResource(SCHEMA, getClass())); diff --git a/core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java b/core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java index 6db37eb8..9cc73c02 100644 --- a/core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java +++ b/core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -28,6 +28,7 @@ public class WebServiceNamespaceHandlerTest extends TestCase { private ApplicationContext applicationContext; + @Override protected void setUp() throws Exception { applicationContext = new ClassPathXmlApplicationContext("webServiceNamespaceHandlerTest.xml", getClass()); } diff --git a/core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java b/core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java index 014033fd..46914747 100644 --- a/core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java +++ b/core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -29,6 +29,7 @@ public class WebServicesNamespaceHandlerTigerTest extends TestCase { private ApplicationContext applicationContext; + @Override protected void setUp() throws Exception { applicationContext = new ClassPathXmlApplicationContext("webServicesNamespaceHandlerTest-tiger.xml", getClass()); diff --git a/core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java b/core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java index 61b820c1..aba615c3 100644 --- a/core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java +++ b/core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public class DefaultMessageContextTest extends TestCase { private WebServiceMessage request; + @Override protected void setUp() throws Exception { factoryControl = MockControl.createControl(WebServiceMessageFactory.class); factoryMock = (WebServiceMessageFactory) factoryControl.getMock(); diff --git a/core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java b/core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java index aeccd68c..59ad0b2a 100644 --- a/core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java +++ b/core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -35,6 +35,7 @@ public abstract class AbstractMimeMessageTestCase extends AbstractWebServiceMess private String contentType; + @Override protected final WebServiceMessage createWebServiceMessage() throws Exception { mimeMessage = createMimeMessage(); picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTestCase.class); diff --git a/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java b/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java index 162b6716..1904a105 100644 --- a/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java +++ b/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -21,6 +21,7 @@ import org.springframework.ws.WebServiceMessageFactory; public class DomPoxMessageFactoryTest extends AbstractWebServiceMessageFactoryTestCase { + @Override protected WebServiceMessageFactory createMessageFactory() throws Exception { return new DomPoxMessageFactory(); } diff --git a/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java b/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java index 9aa66e03..e44e8a91 100644 --- a/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java +++ b/core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -36,6 +36,7 @@ public class DomPoxMessageTest extends XMLTestCase { private Transformer transformer; + @Override protected void setUp() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); 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 107bbf20..536dd4c0 100644 --- a/core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java +++ b/core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -40,6 +40,7 @@ public class MessageDispatcherTest extends TestCase { private WebServiceMessageFactory factoryMock; + @Override protected void setUp() throws Exception { dispatcher = new MessageDispatcher(); factoryControl = MockControl.createControl(WebServiceMessageFactory.class); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java index e1545b5f..dc90f084 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -28,6 +28,7 @@ public abstract class AbstractMessageEndpointTestCase extends AbstractEndpointTe private MessageEndpoint endpoint; + @Override protected final void setUp() throws Exception { endpoint = createResponseEndpoint(); } @@ -51,6 +52,7 @@ public abstract class AbstractMessageEndpointTestCase extends AbstractEndpointTe assertFalse("Response message created", context.hasResponse()); } + @Override protected final void testSource(Source requestSource) throws Exception { MessageContext context = new DefaultMessageContext(new MockWebServiceMessage(requestSource), new MockWebServiceMessageFactory()); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java index 818da926..2c276c27 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -29,6 +29,7 @@ public abstract class AbstractPayloadEndpointTestCase extends AbstractEndpointTe private Transformer transformer; + @Override protected final void setUp() throws Exception { endpoint = createResponseEndpoint(); transformer = TransformerFactory.newInstance().newTransformer(); @@ -47,6 +48,7 @@ public abstract class AbstractPayloadEndpointTestCase extends AbstractEndpointTe assertNull("Response source returned", resultSource); } + @Override protected final void testSource(Source requestSource) throws Exception { Source responseSource = endpoint.invoke(requestSource); assertNotNull("No response source returned", responseSource); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java index 0a5581cb..b791698a 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -21,9 +21,11 @@ import org.dom4j.Element; public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTestCase { + @Override protected PayloadEndpoint createResponseEndpoint() { return new AbstractDom4jPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { assertNotNull("No requestElement passed", requestElement); assertNotNull("No responseDocument passed", responseDocument); @@ -34,18 +36,22 @@ public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTestCase { }; } + @Override protected PayloadEndpoint createNoResponseEndpoint() throws Exception { return new AbstractDom4jPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { return null; } }; } + @Override protected PayloadEndpoint createNoRequestEndpoint() throws Exception { return new AbstractDom4jPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { assertNull("RequestElement passed", requestElement); return null; diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java index 47ea5fcb..ee5664e2 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -21,18 +21,22 @@ import org.w3c.dom.Element; public class DomPayloadEndpointTest extends AbstractPayloadEndpointTestCase { + @Override protected PayloadEndpoint createNoResponseEndpoint() throws Exception { return new AbstractDomPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement, Document document) throws Exception { return null; } }; } + @Override protected PayloadEndpoint createResponseEndpoint() throws Exception { return new AbstractDomPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { assertNotNull("No requestElement passed", requestElement); assertNotNull("No responseDocument passed", responseDocument); @@ -43,9 +47,11 @@ public class DomPayloadEndpointTest extends AbstractPayloadEndpointTestCase { }; } + @Override protected PayloadEndpoint createNoRequestEndpoint() throws Exception { return new AbstractDomPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { assertNull("RequestElement passed", requestElement); return null; diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java index 50bde2f3..4944b3fb 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.server.endpoint; import java.util.HashSet; @@ -19,9 +35,11 @@ public class EndpointExceptionResolverTest extends TestCase { private AbstractEndpointExceptionResolver exceptionResolver; + @Override protected void setUp() throws Exception { exceptionResolver = new AbstractEndpointExceptionResolver() { + @Override protected boolean resolveExceptionInternal(MessageContext messageContext, Object endpoint, Exception ex) { return true; } diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java index 6ca61960..99bea1c7 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -21,18 +21,22 @@ import org.jdom.Namespace; public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTestCase { + @Override protected PayloadEndpoint createNoResponseEndpoint() throws Exception { return new AbstractJDomPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement) throws Exception { return null; } }; } + @Override protected PayloadEndpoint createResponseEndpoint() throws Exception { return new AbstractJDomPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement) throws Exception { assertNotNull("No requestElement passed", requestElement); assertEquals("Invalid request element", REQUEST_ELEMENT, requestElement.getName()); @@ -42,9 +46,11 @@ public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTestCase { }; } + @Override protected PayloadEndpoint createNoRequestEndpoint() throws Exception { return new AbstractJDomPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement) throws Exception { assertNull("RequestElement passed", requestElement); return null; diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java index 69837761..9e24c757 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -52,6 +52,7 @@ public class MarshallingPayloadEndpointTest extends XMLTestCase { private WebServiceMessageFactory factoryMock; + @Override protected void setUp() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); transformer = TransformerFactory.newInstance().newTransformer(); @@ -63,6 +64,7 @@ public class MarshallingPayloadEndpointTest extends XMLTestCase { public void testInvoke() throws Exception { Unmarshaller unmarshaller = new SimpleMarshaller() { + @Override public Object unmarshal(Source source) throws XmlMappingException { try { StringWriter writer = new StringWriter(); @@ -77,6 +79,7 @@ public class MarshallingPayloadEndpointTest extends XMLTestCase { } }; Marshaller marshaller = new SimpleMarshaller() { + @Override public void marshal(Object graph, Result result) throws XmlMappingException { assertEquals("Invalid graph", "result", graph); try { @@ -88,6 +91,7 @@ public class MarshallingPayloadEndpointTest extends XMLTestCase { } }; AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { + @Override protected Object invokeInternal(Object requestObject) throws Exception { assertEquals("Invalid request object", new Long(42), requestObject); return "result"; @@ -110,6 +114,7 @@ public class MarshallingPayloadEndpointTest extends XMLTestCase { public void testInvokeNullResponse() throws Exception { Unmarshaller unmarshaller = new SimpleMarshaller() { + @Override public Object unmarshal(Source source) throws XmlMappingException { try { StringWriter writer = new StringWriter(); @@ -124,11 +129,13 @@ public class MarshallingPayloadEndpointTest extends XMLTestCase { } }; Marshaller marshaller = new SimpleMarshaller() { + @Override public void marshal(Object graph, Result result) throws XmlMappingException { fail("marshal not expected"); } }; AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { + @Override protected Object invokeInternal(Object requestObject) throws Exception { assertEquals("Invalid request object", new Long(42), requestObject); return null; @@ -148,6 +155,7 @@ public class MarshallingPayloadEndpointTest extends XMLTestCase { context = new DefaultMessageContext(request, factoryMock); AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { + @Override protected Object invokeInternal(Object requestObject) throws Exception { assertNull("No request expected", requestObject); return null; @@ -187,6 +195,7 @@ public class MarshallingPayloadEndpointTest extends XMLTestCase { messageControl.replay(); AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { + @Override protected Object invokeInternal(Object requestObject) throws Exception { assertEquals("Invalid request object", new Long(42), requestObject); return "result"; diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java index 9f774fda..21dedf22 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -28,6 +28,7 @@ public class MethodEndpointTest extends TestCase { private Method method; + @Override protected void setUp() throws Exception { myMethodInvoked = false; method = getClass().getMethod("myMethod", new Class[]{String.class}); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java index 86e32478..11238f02 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -26,40 +26,49 @@ import org.xml.sax.helpers.DefaultHandler; public class SaxPayloadEndpointTest extends AbstractPayloadEndpointTestCase { + @Override protected PayloadEndpoint createNoResponseEndpoint() throws Exception { return new AbstractSaxPayloadEndpoint() { + @Override protected Source getResponse(ContentHandler contentHandler) { return null; } + @Override protected ContentHandler createContentHandler() { return new DefaultHandler(); } }; } + @Override protected PayloadEndpoint createResponseEndpoint() throws Exception { return new AbstractSaxPayloadEndpoint() { + @Override protected ContentHandler createContentHandler() { return new TestContentHandler(); } + @Override protected Source getResponse(ContentHandler contentHandler) { return new StringSource(RESPONSE); } }; } + @Override protected PayloadEndpoint createNoRequestEndpoint() throws Exception { return new AbstractSaxPayloadEndpoint() { + @Override protected ContentHandler createContentHandler() throws Exception { fail("Not expected"); return null; } + @Override protected Source getResponse(ContentHandler contentHandler) throws Exception { return null; } @@ -68,12 +77,14 @@ public class SaxPayloadEndpointTest extends AbstractPayloadEndpointTestCase { private static class TestContentHandler extends DefaultHandler { + @Override public void endElement(String uri, String localName, String qName) throws SAXException { assertEquals("Invalid local name", REQUEST_ELEMENT, localName); assertEquals("Invalid qName", REQUEST_ELEMENT, localName); assertEquals("Invalid namespace", NAMESPACE_URI, uri); } + @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { assertEquals("Invalid local name", REQUEST_ELEMENT, localName); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java index 7e41b6e1..3a9275df 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -32,8 +32,10 @@ import javax.xml.stream.util.XMLEventConsumer; */ public class StaxEventPayloadEndpointTest extends AbstractMessageEndpointTestCase { + @Override protected MessageEndpoint createNoResponseEndpoint() { return new AbstractStaxEventPayloadEndpoint() { + @Override protected void invokeInternal(XMLEventReader eventReader, XMLEventConsumer eventWriter, XMLEventFactory eventFactory) throws Exception { @@ -42,9 +44,11 @@ public class StaxEventPayloadEndpointTest extends AbstractMessageEndpointTestCas }; } + @Override protected MessageEndpoint createNoRequestPayloadEndpoint() { return new AbstractStaxEventPayloadEndpoint() { + @Override protected void invokeInternal(XMLEventReader eventReader, XMLEventConsumer eventWriter, XMLEventFactory eventFactory) throws Exception { @@ -53,9 +57,11 @@ public class StaxEventPayloadEndpointTest extends AbstractMessageEndpointTestCas }; } + @Override protected MessageEndpoint createResponseEndpoint() { return new AbstractStaxEventPayloadEndpoint() { + @Override protected void invokeInternal(XMLEventReader eventReader, XMLEventConsumer eventWriter, XMLEventFactory eventFactory) throws XMLStreamException { diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java index d4d9430c..f0182f51 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -43,24 +43,30 @@ import org.springframework.xml.transform.StringSource; */ public class StaxStreamPayloadEndpointTest extends AbstractMessageEndpointTestCase { + @Override protected MessageEndpoint createNoResponseEndpoint() { return new AbstractStaxStreamPayloadEndpoint() { + @Override protected void invokeInternal(XMLStreamReader streamReader, XMLStreamWriter streamWriter) throws Exception { assertNotNull("No StreamReader passed", streamReader); } }; } + @Override protected MessageEndpoint createNoRequestPayloadEndpoint() { return new AbstractStaxStreamPayloadEndpoint() { + @Override protected void invokeInternal(XMLStreamReader streamReader, XMLStreamWriter streamWriter) throws Exception { assertNull("StreamReader passed", streamReader); } }; } + @Override protected MessageEndpoint createResponseEndpoint() { return new AbstractStaxStreamPayloadEndpoint() { + @Override protected void invokeInternal(XMLStreamReader streamReader, XMLStreamWriter streamWriter) throws Exception { assertNotNull("No streamReader passed", streamReader); assertNotNull("No streamWriter passed", streamReader); @@ -79,6 +85,7 @@ public class StaxStreamPayloadEndpointTest extends AbstractMessageEndpointTestCa streamWriter.close(); } + @Override protected XMLOutputFactory createXmlOutputFactory() { XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); outputFactory.setProperty("javax.xml.stream.isRepairingNamespaces", Boolean.TRUE); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java index 1441489e..22e48419 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -20,18 +20,22 @@ import nu.xom.Element; public class XomPayloadEndpointTest extends AbstractPayloadEndpointTestCase { + @Override protected PayloadEndpoint createNoResponseEndpoint() throws Exception { return new AbstractXomPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement) throws Exception { return null; } }; } + @Override protected PayloadEndpoint createResponseEndpoint() throws Exception { return new AbstractXomPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement) throws Exception { assertNotNull("No requestElement passed", requestElement); assertEquals("Invalid request element", REQUEST_ELEMENT, requestElement.getLocalName()); @@ -41,9 +45,11 @@ public class XomPayloadEndpointTest extends AbstractPayloadEndpointTestCase { }; } + @Override protected PayloadEndpoint createNoRequestEndpoint() throws Exception { return new AbstractXomPayloadEndpoint() { + @Override protected Element invokeInternal(Element requestElement) throws Exception { assertNull("RequestElement passed", requestElement); return null; @@ -51,6 +57,7 @@ public class XomPayloadEndpointTest extends AbstractPayloadEndpointTestCase { }; } + @Override public void testStaxSourceEventReader() throws Exception { // overriden, because XOM doesn not support it } diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java index a5ed2eaa..b0f197e7 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.server.endpoint.adapter; import java.lang.reflect.Method; @@ -28,6 +44,7 @@ public class GenericMarshallingMethodEndpointAdapterTest extends TestCase { private boolean responseInvoked; + @Override protected void setUp() throws Exception { adapter = new GenericMarshallingMethodEndpointAdapter(); marshallerMock = createMock(GenericMarshaller.class); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java index 0fb24082..a5b78270 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.server.endpoint.adapter; import java.lang.reflect.Method; @@ -30,6 +46,7 @@ public class MarshallingMethodEndpointAdapterTest extends TestCase { private boolean responseInvoked; + @Override protected void setUp() throws Exception { adapter = new MarshallingMethodEndpointAdapter(); marshallerControl = MockControl.createControl(Marshaller.class); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java index 8736740f..392526cc 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ public class MessageEndpointAdapterTest extends TestCase { private MessageEndpoint endpointMock; + @Override protected void setUp() throws Exception { adapter = new MessageEndpointAdapter(); endpointControl = MockControl.createControl(MessageEndpoint.class); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java index 20c73915..ecf9e0a9 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -30,6 +30,7 @@ public class MessageMethodEndpointAdapterTest extends TestCase { private MessageContext messageContext; + @Override protected void setUp() throws Exception { adapter = new MessageMethodEndpointAdapter(); messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java index 834d1284..b91ad0e6 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -40,6 +40,7 @@ public class PayloadEndpointAdapterTest extends XMLTestCase { private MockControl endpointControl; + @Override protected void setUp() throws Exception { adapter = new PayloadEndpointAdapter(); endpointControl = MockControl.createControl(PayloadEndpoint.class); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java index 5707de84..0bc61b5d 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class PayloadMethodEndpointAdapterTest extends TestCase { private MessageContext messageContext; + @Override protected void setUp() throws Exception { adapter = new PayloadMethodEndpointAdapter(); messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java index 4b04d706..423e172d 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -50,6 +50,7 @@ public class XPathParamAnnotationMethodEndpointAdapterTest extends TestCase { private boolean namespacesInvoked; + @Override protected void setUp() throws Exception { adapter = new XPathParamAnnotationMethodEndpointAdapter(); adapter.afterPropertiesSet(); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java index e687cc13..88d85783 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class PayloadLoggingInterceptorTest extends TestCase { private MessageContext messageContext; + @Override protected void setUp() throws Exception { interceptor = new PayloadLoggingInterceptor(); appender = new CountingAppender(); @@ -48,6 +49,7 @@ public class PayloadLoggingInterceptorTest extends TestCase { appender.reset(); } + @Override protected void tearDown() throws Exception { BasicConfigurator.resetConfiguration(); ClassPathResource resource = new ClassPathResource("log4j.properties"); @@ -96,6 +98,7 @@ public class PayloadLoggingInterceptorTest extends TestCase { count = 0; } + @Override protected void append(LoggingEvent loggingEvent) { count++; } diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java index 2e3f6125..98198d74 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -51,6 +51,7 @@ public class PayloadTransformingInterceptorTest extends XMLTestCase { private Resource xslt; + @Override protected void setUp() throws Exception { interceptor = new PayloadTransformingInterceptor(); TransformerFactory transformerFactory = TransformerFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java index 95f3a089..c35287b6 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ public class EndpointMappingTest extends TestCase { private MockControl contextControl; + @Override protected void setUp() throws Exception { contextControl = MockControl.createControl(MessageContext.class); mockContext = (MessageContext) contextControl.getMock(); @@ -39,6 +40,7 @@ public class EndpointMappingTest extends TestCase { public void testDefaultEndpoint() throws Exception { Object defaultEndpoint = new Object(); AbstractEndpointMapping mapping = new AbstractEndpointMapping() { + @Override protected Object getEndpointInternal(MessageContext givenRequest) throws Exception { assertEquals("Invalid request passed", mockContext, givenRequest); return null; @@ -56,6 +58,7 @@ public class EndpointMappingTest extends TestCase { public void testEndpoint() throws Exception { final Object endpoint = new Object(); AbstractEndpointMapping mapping = new AbstractEndpointMapping() { + @Override protected Object getEndpointInternal(MessageContext givenRequest) throws Exception { assertEquals("Invalid request passed", mockContext, givenRequest); return endpoint; @@ -73,6 +76,7 @@ public class EndpointMappingTest extends TestCase { final Object endpoint = new Object(); EndpointInterceptor interceptor = new EndpointInterceptorAdapter(); AbstractEndpointMapping mapping = new AbstractEndpointMapping() { + @Override protected Object getEndpointInternal(MessageContext givenRequest) throws Exception { assertEquals("Invalid request passed", mockContext, givenRequest); return endpoint; @@ -92,6 +96,7 @@ public class EndpointMappingTest extends TestCase { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { + @Override protected Object getEndpointInternal(MessageContext message) throws Exception { assertEquals("Invalid request", mockContext, message); return "endpoint"; @@ -111,6 +116,7 @@ public class EndpointMappingTest extends TestCase { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { + @Override protected Object getEndpointInternal(MessageContext message) throws Exception { assertEquals("Invalid request", mockContext, message); return "noSuchBean"; @@ -131,6 +137,7 @@ public class EndpointMappingTest extends TestCase { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { + @Override protected Object getEndpointInternal(MessageContext message) throws Exception { assertEquals("Invalid request", mockContext, message); return "endpoint"; diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java index f7023071..63cb3725 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -108,10 +108,12 @@ public class MapBasedSoapEndpointMappingTest extends TestCase { Arrays.sort(this.validKeys); } + @Override protected boolean validateLookupKey(String key) { return Arrays.binarySearch(validKeys, key) >= 0; } + @Override protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception { return key; } diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java index dec14f10..926ed48b 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class PayloadRootAnnotationMethodEndpointMappingTest extends AbstractDepe private PayloadRootAnnotationMethodEndpointMapping mapping; + @Override protected String getConfigPath() { return "applicationContext.xml"; } diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java index 618620fa..663559e1 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -28,6 +28,7 @@ public class PayloadRootQNameEndpointMappingTest extends TestCase { private PayloadRootQNameEndpointMapping mapping; + @Override protected void setUp() throws Exception { mapping = new PayloadRootQNameEndpointMapping(); } diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java index c90d52ba..01c77846 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -26,6 +26,7 @@ public class SimpleMethodEndpointMappingTest extends TestCase { private SimpleMethodEndpointMapping mapping; + @Override protected void setUp() throws Exception { mapping = new SimpleMethodEndpointMapping(); mapping.setMethodPrefix("prefix"); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java index 99d8b575..2684059a 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public class UriEndpointMappingTest extends TestCase { private MessageContext context; + @Override protected void setUp() throws Exception { mapping = new UriEndpointMapping(); context = new DefaultMessageContext(new MockWebServiceMessageFactory()); diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java index ea3c38c4..8441e85a 100644 --- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -26,6 +26,7 @@ public class XPathPayloadEndpointMappingTest extends TestCase { private XPathPayloadEndpointMapping mapping; + @Override protected void setUp() throws Exception { mapping = new XPathPayloadEndpointMapping(); } diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java b/core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java index 32a2cede..7063c9a3 100644 --- a/core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -30,6 +30,7 @@ public abstract class AbstractSoapBodyTestCase extends AbstractSoapElementTestCa protected SoapBody soapBody; + @Override protected final SoapElement createSoapElement() throws Exception { soapBody = createSoapBody(); return soapBody; diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java b/core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java index 0b423b2c..12337f9b 100644 --- a/core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -29,6 +29,7 @@ public abstract class AbstractSoapElementTestCase extends XMLTestCase { protected Transformer transformer; + @Override protected final void setUp() throws Exception { TransformerFactory transformerFactory = TransformerFactory.newInstance(); transformer = transformerFactory.newTransformer(); diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java b/core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java index 6f747e99..08dfa2ec 100644 --- a/core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -20,6 +20,7 @@ public abstract class AbstractSoapEnvelopeTestCase extends AbstractSoapElementTe protected SoapEnvelope soapEnvelope; + @Override protected final SoapElement createSoapElement() throws Exception { soapEnvelope = createSoapEnvelope(); return soapEnvelope; diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java b/core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java index 46b306b3..3a7ddd78 100644 --- a/core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -30,6 +30,7 @@ public abstract class AbstractSoapHeaderTestCase extends AbstractSoapElementTest protected static final String PREFIX = "spring"; + @Override protected final SoapElement createSoapElement() throws Exception { soapHeader = createSoapHeader(); return soapHeader; diff --git a/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java b/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java index 11f030fe..9b63027a 100644 --- a/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -36,6 +36,7 @@ public abstract class AbstractSoapMessageTestCase extends AbstractMimeMessageTes protected SoapMessage soapMessage; + @Override protected MimeMessage createMimeMessage() throws Exception { soapMessage = createSoapMessage(); return soapMessage; diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java b/core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java index 7abb525c..903c8403 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -33,6 +33,7 @@ public abstract class AbstractWsAddressingTestCase extends XMLTestCase { protected MessageFactory messageFactory; + @Override protected final void setUp() throws Exception { messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); XMLUnit.setIgnoreWhitespace(true); diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java b/core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java index 9ad1fa2d..204c30e5 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -48,6 +48,7 @@ public abstract class AbstractActionCallbackTestCase extends AbstractWsAddressin private WebServiceConnection connectionMock; + @Override protected final void onSetUp() throws Exception { strategyControl = MockControl.createControl(MessageIdStrategy.class); strategyMock = (MessageIdStrategy) strategyControl.getMock(); @@ -58,6 +59,7 @@ public abstract class AbstractActionCallbackTestCase extends AbstractWsAddressin TransportContextHolder.setTransportContext(transportContext); } + @Override protected void tearDown() throws Exception { TransportContextHolder.setTransportContext(null); } diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java b/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java index 465f44eb..c33d5d49 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -21,10 +21,12 @@ import org.springframework.ws.soap.addressing.version.AddressingVersion; public class ActionCallback10Test extends AbstractActionCallbackTestCase { + @Override protected AddressingVersion getVersion() { return new Addressing10(); } + @Override protected String getTestPath() { return "10"; } diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java b/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java index 0b6fc7af..2eb7067b 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -21,10 +21,12 @@ import org.springframework.ws.soap.addressing.version.AddressingVersion; public class ActionCallback200408Test extends AbstractActionCallbackTestCase { + @Override protected AddressingVersion getVersion() { return new Addressing200408(); } + @Override protected String getTestPath() { return "200408"; } diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java b/core/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java index ebe15dc2..69533022 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/messageid/RandomGuidMessageIdStrategyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -24,6 +24,7 @@ public class RandomGuidMessageIdStrategyTest extends TestCase { private MessageIdStrategy strategy; + @Override protected final void setUp() throws Exception { strategy = new RandomGuidMessageIdStrategy(); } 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 index dfd6336a..d15632cf 100644 --- 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 @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -24,6 +24,7 @@ public class UuidMessageIdStrategyTest extends TestCase { private MessageIdStrategy strategy; + @Override protected final void setUp() throws Exception { strategy = new UuidMessageIdStrategy(); } diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java b/core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java index 6a409a40..a6b88045 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -42,6 +42,7 @@ public abstract class AbstractAddressingInterceptorTestCase extends AbstractWsAd protected MessageIdStrategy strategyMock; + @Override protected final void onSetUp() throws Exception { strategyControl = MockControl.createControl(MessageIdStrategy.class); strategyMock = (MessageIdStrategy) strategyControl.getMock(); diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java b/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java index 66b1c4f6..0dd45120 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -28,10 +28,12 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; public class AddressingInterceptor10Test extends AbstractAddressingInterceptorTestCase { + @Override protected AddressingVersion getVersion() { return new Addressing10(); } + @Override protected String getTestPath() { return "10"; } diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java b/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java index 2efdd327..9dc70603 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -21,14 +21,17 @@ import org.springframework.ws.soap.addressing.version.AddressingVersion; public class AddressingInterceptor200408Test extends AbstractAddressingInterceptorTestCase { + @Override protected AddressingVersion getVersion() { return new Addressing200408(); } + @Override protected String getTestPath() { return "200408"; } + @Override public void testNoneReplyTo() throws Exception { // This version of the spec does not have none addresses } diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java index a135ad7a..fc8190eb 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -45,6 +45,7 @@ public class AnnotationActionMethodEndpointMappingTest extends XMLTestCase { private MessageFactory messageFactory; + @Override protected void setUp() throws Exception { messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); XMLUnit.setIgnoreWhitespace(true); diff --git a/core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java index 124ccbef..7ace6abd 100644 --- a/core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -36,6 +36,7 @@ public class SimpleActionEndpointMappingTest extends AbstractWsAddressingTestCas private Endpoint1 endpoint1; + @Override protected void onSetUp() throws Exception { mapping = new SimpleActionEndpointMapping(); Map map = new HashMap(); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomHandlerTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomHandlerTest.java index 97ce8bff..1bcc2e53 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomHandlerTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -54,6 +54,7 @@ public class AxiomHandlerTest extends XMLTestCase { private OMFactory factory; + @Override protected void setUp() throws Exception { factory = OMAbstractFactory.getOMFactory(); result = factory.createOMDocument(); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11BodyTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11BodyTest.java index 2aa72b32..cfdff58e 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11BodyTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11BodyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -26,6 +26,7 @@ import org.springframework.xml.transform.StringSource; public class AxiomSoap11BodyTest extends AbstractSoap11BodyTestCase { + @Override protected SoapBody createSoapBody() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory(); AxiomSoapMessage axiomSoapMessage = new AxiomSoapMessage(axiomFactory); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11EnvelopeTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11EnvelopeTest.java index 0fe68786..3ff63fa8 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11EnvelopeTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11EnvelopeTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.axiom; import org.apache.axiom.om.OMAbstractFactory; @@ -7,6 +23,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTestCase; public class AxiomSoap11EnvelopeTest extends AbstractSoap11EnvelopeTestCase { + @Override protected SoapEnvelope createSoapEnvelope() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory(); AxiomSoapMessage axiomSoapMessage = new AxiomSoapMessage(axiomFactory); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11HeaderTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11HeaderTest.java index 68df5718..ec6ce6e9 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11HeaderTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11HeaderTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.axiom; import org.apache.axiom.om.OMAbstractFactory; @@ -7,12 +23,14 @@ import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTestCase; public class AxiomSoap11HeaderTest extends AbstractSoap11HeaderTestCase { + @Override protected SoapHeader createSoapHeader() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory(); AxiomSoapMessage axiomSoapMessage = new AxiomSoapMessage(axiomFactory); return axiomSoapMessage.getSoapHeader(); } + @Override public void testGetResult() throws Exception { } } diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java index dd4e5c60..3810f374 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -36,6 +36,7 @@ public class AxiomSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryT private Transformer transformer; + @Override protected WebServiceMessageFactory createMessageFactory() throws Exception { transformer = TransformerFactory.newInstance().newTransformer(); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java index b10dc2b7..51b55822 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.axiom; import org.apache.axiom.om.OMAbstractFactory; @@ -7,6 +23,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11MessageTestCase; public class AxiomSoap11MessageTest extends AbstractSoap11MessageTestCase { + @Override protected SoapMessage createSoapMessage() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory(); return new AxiomSoapMessage(axiomFactory); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingBodyTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingBodyTest.java index a4768c8d..e108d662 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingBodyTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingBodyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11BodyTestCase; public class AxiomSoap11NonCachingBodyTest extends AbstractSoap11BodyTestCase { + @Override protected SoapBody createSoapBody() throws Exception { AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory(); messageFactory.setPayloadCaching(false); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java index 39f719a4..1be3cbb7 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.axiom; import org.apache.axiom.om.impl.llom.OMSourcedElementImpl; @@ -9,6 +25,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11MessageTestCase; public class AxiomSoap11NonCachingMessageTest extends AbstractSoap11MessageTestCase { + @Override protected SoapMessage createSoapMessage() throws Exception { AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory(); messageFactory.setPayloadCaching(false); @@ -17,6 +34,7 @@ public class AxiomSoap11NonCachingMessageTest extends AbstractSoap11MessageTestC return (SoapMessage) messageFactory.createWebServiceMessage(); } + @Override public void testWriteToTransportOutputStream() throws Exception { super.testWriteToTransportOutputStream(); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12BodyTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12BodyTest.java index 61402276..b13810b5 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12BodyTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12BodyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -26,6 +26,7 @@ import org.springframework.xml.transform.StringSource; public class AxiomSoap12BodyTest extends AbstractSoap12BodyTestCase { + @Override protected SoapBody createSoapBody() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP12Factory(); AxiomSoapMessage axiomSoapMessage = new AxiomSoapMessage(axiomFactory); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12EnvelopeTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12EnvelopeTest.java index d6f051ea..6d82e890 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12EnvelopeTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12EnvelopeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -23,6 +23,7 @@ import org.springframework.ws.soap.soap12.AbstractSoap12EnvelopeTestCase; public class AxiomSoap12EnvelopeTest extends AbstractSoap12EnvelopeTestCase { + @Override protected SoapEnvelope createSoapEnvelope() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP12Factory(); AxiomSoapMessage axiomSoapMessage = new AxiomSoapMessage(axiomFactory); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12HeaderTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12HeaderTest.java index 2be723d4..fd083e1e 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12HeaderTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12HeaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -23,12 +23,14 @@ import org.springframework.ws.soap.soap12.AbstractSoap12HeaderTestCase; public class AxiomSoap12HeaderTest extends AbstractSoap12HeaderTestCase { + @Override protected SoapHeader createSoapHeader() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP12Factory(); AxiomSoapMessage axiomSoapMessage = new AxiomSoapMessage(axiomFactory); return axiomSoapMessage.getSoapHeader(); } + @Override public void testGetResult() throws Exception { } } diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageFactoryTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageFactoryTest.java index be35d8f2..c341b692 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageFactoryTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ import org.springframework.ws.soap.soap12.AbstractSoap12MessageFactoryTestCase; public class AxiomSoap12MessageFactoryTest extends AbstractSoap12MessageFactoryTestCase { + @Override protected WebServiceMessageFactory createMessageFactory() throws Exception { AxiomSoapMessageFactory factory = new AxiomSoapMessageFactory(); factory.setSoapVersion(SoapVersion.SOAP_12); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java index 1394df1d..49f623dc 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -23,6 +23,7 @@ import org.springframework.ws.soap.soap12.AbstractSoap12MessageTestCase; public class AxiomSoap12MessageTest extends AbstractSoap12MessageTestCase { + @Override protected SoapMessage createSoapMessage() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP12Factory(); return new AxiomSoapMessage(axiomFactory); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingBodyTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingBodyTest.java index 4eead2a2..d07c347a 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingBodyTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingBodyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ import org.springframework.ws.soap.soap12.AbstractSoap12BodyTestCase; public class AxiomSoap12NonCachingBodyTest extends AbstractSoap12BodyTestCase { + @Override protected SoapBody createSoapBody() throws Exception { AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory(); messageFactory.setPayloadCaching(false); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java index a741b342..55f67ac6 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.axiom; import org.apache.axiom.om.impl.llom.OMSourcedElementImpl; @@ -9,6 +25,7 @@ import org.springframework.ws.soap.soap12.AbstractSoap12MessageTestCase; public class AxiomSoap12NonCachingMessageTest extends AbstractSoap12MessageTestCase { + @Override protected SoapMessage createSoapMessage() throws Exception { AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory(); messageFactory.setPayloadCaching(false); @@ -17,6 +34,7 @@ public class AxiomSoap12NonCachingMessageTest extends AbstractSoap12MessageTestC return (SoapMessage) messageFactory.createWebServiceMessage(); } + @Override public void testWriteToTransportOutputStream() throws Exception { super.testWriteToTransportOutputStream(); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailTest.java index 440c553e..e49601a3 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -53,6 +53,7 @@ public class AxiomSoapFaultDetailTest extends TestCase { private AxiomSoapMessage succeedingMessage; + @Override protected void setUp() throws Exception { XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(FAILING_FAULT)); StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(parser); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java index 7d856b3e..6f509a3c 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.axiom; import java.io.StringWriter; @@ -16,6 +32,7 @@ public class NonCachingPayloadTest extends XMLTestCase { private SOAPBody body; + @Override public final void setUp() { SOAPFactory soapFactory = new SOAP11Factory(); body = soapFactory.createSOAPBody(); diff --git a/core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java b/core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java index 66b25d82..25354335 100644 --- a/core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java +++ b/core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -46,6 +46,7 @@ public class AxiomUtilsTest extends XMLTestCase { private OMElement element; + @Override protected void setUp() throws Exception { OMFactory factory = OMAbstractFactory.getOMFactory(); OMNamespace namespace = factory.createOMNamespace("http://www.springframework.org", "prefix"); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/AbstractSaajImplementationTestCase.java b/core/src/test/java/org/springframework/ws/soap/saaj/AbstractSaajImplementationTestCase.java index 14c185ad..d5ae8b6c 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/AbstractSaajImplementationTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/AbstractSaajImplementationTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -54,6 +54,7 @@ public abstract class AbstractSaajImplementationTestCase extends XMLTestCase { private SOAPHeader header; + @Override protected final void setUp() throws Exception { implementation = createSaajImplementation(); MessageFactory messageFactory = MessageFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/Saaj11ImplementationTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/Saaj11ImplementationTest.java index 7e15c046..15bd8c93 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/Saaj11ImplementationTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/Saaj11ImplementationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -18,16 +18,20 @@ package org.springframework.ws.soap.saaj; public class Saaj11ImplementationTest extends AbstractSaajImplementationTestCase { + @Override protected SaajImplementation createSaajImplementation() { return Saaj11Implementation.getInstance(); } + @Override public void testGetFaultCode() throws Exception { } + @Override public void testGetFaultStringLocale() throws Exception { } + @Override public void testAddFault() throws Exception { } } diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/Saaj12ImplementationTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/Saaj12ImplementationTest.java index f94d8295..d42eb162 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/Saaj12ImplementationTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/Saaj12ImplementationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -18,6 +18,7 @@ package org.springframework.ws.soap.saaj; public class Saaj12ImplementationTest extends AbstractSaajImplementationTestCase { + @Override protected SaajImplementation createSaajImplementation() { return Saaj12Implementation.getInstance(); } diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/Saaj13ImplementationTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/Saaj13ImplementationTest.java index e25c2dce..716091b4 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/Saaj13ImplementationTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/Saaj13ImplementationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -18,6 +18,7 @@ package org.springframework.ws.soap.saaj; public class Saaj13ImplementationTest extends AbstractSaajImplementationTestCase { + @Override protected SaajImplementation createSaajImplementation() { return Saaj13Implementation.getInstance(); } diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java index 3ebb6e31..9d1f8eab 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -27,6 +27,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11BodyTestCase; public class SaajSoap11BodyTest extends AbstractSoap11BodyTestCase { + @Override protected SoapBody createSoapBody() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage saajMessage = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java index 4f5c1931..1a6963e2 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -25,6 +25,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTestCase; public class SaajSoap11EnvelopeTest extends AbstractSoap11EnvelopeTestCase { + @Override protected SoapEnvelope createSoapEnvelope() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage saajMessage = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java index b99553c5..2d878373 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -25,6 +25,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTestCase; public class SaajSoap11HeaderTest extends AbstractSoap11HeaderTestCase { + @Override protected SoapHeader createSoapHeader() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage saajMessage = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java index 9f02a7c8..e791534d 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -24,6 +24,7 @@ import org.springframework.ws.soap.soap11.AbstractSoap11MessageFactoryTestCase; public class SaajSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryTestCase { + @Override protected WebServiceMessageFactory createMessageFactory() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); return new SaajSoapMessageFactory(messageFactory); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java index 2fc58c93..4bad4cce 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public class SaajSoap11MessageTest extends AbstractSoap11MessageTestCase { private SOAPMessage saajMessage; + @Override protected final SoapMessage createSoapMessage() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); saajMessage = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java index 1c3a396b..756d5461 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -25,6 +25,7 @@ import org.springframework.ws.soap.soap12.AbstractSoap12BodyTestCase; public class SaajSoap12BodyTest extends AbstractSoap12BodyTestCase { + @Override protected SoapBody createSoapBody() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SOAPMessage saajMessage = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java index e61165cd..30ad81be 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -25,6 +25,7 @@ import org.springframework.ws.soap.soap12.AbstractSoap12EnvelopeTestCase; public class SaajSoap12EnvelopeTest extends AbstractSoap12EnvelopeTestCase { + @Override protected SoapEnvelope createSoapEnvelope() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SOAPMessage saajMessage = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java index 168bdf8e..3e5bf7ec 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -25,6 +25,7 @@ import org.springframework.ws.soap.soap12.AbstractSoap12HeaderTestCase; public class SaajSoap12HeaderTest extends AbstractSoap12HeaderTestCase { + @Override protected SoapHeader createSoapHeader() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SOAPMessage saajMessage = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java index 6121f4db..21b97ac6 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -24,6 +24,7 @@ import org.springframework.ws.soap.soap12.AbstractSoap12MessageFactoryTestCase; public class SaajSoap12MessageFactoryTest extends AbstractSoap12MessageFactoryTestCase { + @Override protected WebServiceMessageFactory createMessageFactory() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); return new SaajSoapMessageFactory(messageFactory); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java index 01965496..7b454b58 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ public class SaajSoap12MessageTest extends AbstractSoap12MessageTestCase { private SOAPMessage saajMessage; + @Override protected SoapMessage createSoapMessage() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); saajMessage = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java index 2cf1fb68..1b4eefa6 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -40,6 +40,7 @@ public class SaajContentHandlerTest extends TestCase { private SOAPEnvelope envelope; + @Override protected void setUp() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage message = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java index 10f16cd3..b8062a79 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ public class SaajUtilsTest extends XMLTestCase { private MessageFactory messageFactory; + @Override protected void setUp() throws Exception { messageFactory = MessageFactory.newInstance(); } diff --git a/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java b/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java index 66b9ff95..9be60da5 100644 --- a/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java +++ b/core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class SaajXmlReaderTest extends XMLTestCase { private Transformer transformer; + @Override protected void setUp() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(); message = messageFactory.createMessage(); diff --git a/core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java b/core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java index a1e6783a..3c64bbca 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -47,6 +47,7 @@ public class SoapMessageDispatcherTest extends TestCase { private SoapEndpointInterceptor interceptorMock; + @Override protected void setUp() throws Exception { interceptorControl = MockControl.createControl(SoapEndpointInterceptor.class); interceptorMock = (SoapEndpointInterceptor) interceptorControl.getMock(); diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java index efd6892d..a131d652 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -46,6 +46,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest extends TestC private ResourceBundleMessageSource messageSource; + @Override protected void setUp() throws Exception { this.messageSource = new ResourceBundleMessageSource(); this.messageSource.setBasename("org.springframework.ws.soap.server.endpoint.messages"); @@ -63,6 +64,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest extends TestC AbstractFaultCreatingValidatingMarshallingPayloadEndpoint endpoint = new AbstractFaultCreatingValidatingMarshallingPayloadEndpoint() { + @Override protected Object invokeInternal(Object requestObject) throws Exception { fail("No expected"); return null; @@ -103,6 +105,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest extends TestC AbstractFaultCreatingValidatingMarshallingPayloadEndpoint endpoint = new AbstractFaultCreatingValidatingMarshallingPayloadEndpoint() { + @Override protected Object invokeInternal(Object requestObject) throws Exception { return null; } diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java index f1664c52..b6c139f7 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -45,6 +45,7 @@ public class SimpleSoapExceptionResolverTest extends TestCase { private WebServiceMessageFactory factoryMock; + @Override protected void setUp() throws Exception { exceptionResolver = new SimpleSoapExceptionResolver(); factoryControl = MockControl.createControl(WebServiceMessageFactory.class); diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java index 1be969ed..796b42e7 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ public class SoapFaultAnnotationExceptionResolverTest extends TestCase { private SoapFaultAnnotationExceptionResolver resolver; + @Override protected void setUp() throws Exception { resolver = new SoapFaultAnnotationExceptionResolver(); } diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java index e34e2e68..d6ce2bb9 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -25,6 +25,7 @@ public class SoapFaultDefinitionEditorTest extends TestCase { private SoapFaultDefinitionEditor editor; + @Override protected void setUp() throws Exception { editor = new SoapFaultDefinitionEditor(); } diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java index 68f63c9d..4d254b2d 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ public class SoapFaultMappingExceptionResolverTest extends XMLTestCase { private SoapFaultMappingExceptionResolver resolver; + @Override protected void setUp() throws Exception { resolver = new SoapFaultMappingExceptionResolver(); } diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java index d8fe47a5..bedf8ccc 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -76,6 +76,7 @@ public class PayloadValidatingInterceptorTest extends XMLTestCase { private static final String SCHEMA2 = "schema2.xsd"; + @Override protected void setUp() throws Exception { interceptor = new PayloadValidatingInterceptor(); interceptor.setSchema(new ClassPathResource(SCHEMA, getClass())); diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java index 97621e80..c16f1a65 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -37,6 +37,7 @@ public class SoapEnvelopeLoggingInterceptorTest extends TestCase { private MessageContext messageContext; + @Override protected void setUp() throws Exception { interceptor = new SoapEnvelopeLoggingInterceptor(); appender = new SoapEnvelopeLoggingInterceptorTest.CountingAppender(); @@ -48,6 +49,7 @@ public class SoapEnvelopeLoggingInterceptorTest extends TestCase { appender.reset(); } + @Override protected void tearDown() throws Exception { BasicConfigurator.resetConfiguration(); ClassPathResource resource = new ClassPathResource("log4j.properties"); @@ -109,6 +111,7 @@ public class SoapEnvelopeLoggingInterceptorTest extends TestCase { count = 0; } + @Override protected void append(LoggingEvent loggingEvent) { count++; } diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java index 0859281b..66a3cb81 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -33,6 +33,7 @@ public class DelegatingSoapEndpointMappingTest extends TestCase { private EndpointMapping mock; + @Override protected void setUp() throws Exception { endpointMapping = new DelegatingSoapEndpointMapping(); control = MockControl.createControl(EndpointMapping.class); diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java index 9d44b840..650f74f8 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -37,6 +37,7 @@ public class SoapActionAnnotationMethodEndpointMappingTest extends TestCase { private StaticApplicationContext applicationContext; + @Override protected void setUp() throws Exception { applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("mapping", SoapActionAnnotationMethodEndpointMapping.class); diff --git a/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java index f0cc5bcb..0e34a2b0 100644 --- a/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java +++ b/core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ public class SoapActionEndpointMappingTest extends TestCase { private MessageContext context; + @Override protected void setUp() throws Exception { mapping = new SoapActionEndpointMapping(); context = new DefaultMessageContext(new SaajSoapMessageFactory(MessageFactory.newInstance())); diff --git a/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java b/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java index f4651eca..e3b976c7 100644 --- a/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -37,6 +37,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM assertEquals("Invalid soap version", SoapVersion.SOAP_11, soapMessage.getVersion()); } + @Override public void testCreateSoapMessageNoAttachment() throws Exception { InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11.xml"); Properties headers = new Properties(); @@ -53,6 +54,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM assertFalse("Message a XOP pacakge", soapMessage.isXopPackage()); } + @Override public void testCreateSoapMessageSwA() throws Exception { InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11-attachment.bin"); Properties headers = new Properties(); @@ -72,6 +74,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM assertEquals("Invalid content id", "interface21", attachment.getContentId()); } + @Override public void testCreateSoapMessageMtom() throws Exception { InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11-mtom.bin"); Properties headers = new Properties(); diff --git a/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java b/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java index fef8884a..06c1b624 100644 --- a/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -32,14 +32,17 @@ import org.springframework.xml.transform.StringSource; public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageTestCase { + @Override protected final Resource[] getSoapSchemas() { return new Resource[]{new ClassPathResource("soap11.xsd", AbstractSoap11MessageTestCase.class)}; } + @Override public void testGetVersion() throws Exception { Assert.assertEquals("Invalid SOAP version", SoapVersion.SOAP_11, soapMessage.getVersion()); } + @Override public void testWriteToTransportOutputStream() throws Exception { SoapBody body = soapMessage.getSoapBody(); String payload = ""; @@ -62,6 +65,7 @@ public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageT assertNotNull("Invalid accept header", resultAccept); } + @Override public void testWriteToTransportResponseAttachment() throws Exception { InputStreamSource inputStreamSource = new ByteArrayResource("contents".getBytes("UTF-8")); soapMessage.addAttachment("contentId", inputStreamSource, "text/plain"); diff --git a/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java b/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java index d354e05e..1735a7e3 100644 --- a/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ import org.springframework.ws.transport.TransportConstants; public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapMessageFactoryTestCase { + @Override public void testCreateEmptyMessage() throws Exception { WebServiceMessage message = messageFactory.createWebServiceMessage(); assertTrue("Not a SoapMessage", message instanceof SoapMessage); @@ -38,6 +39,7 @@ public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapM assertEquals("Invalid soap version", SoapVersion.SOAP_12, soapMessage.getVersion()); } + @Override public void testCreateSoapMessageNoAttachment() throws Exception { InputStream is = AbstractSoap12MessageFactoryTestCase.class.getResourceAsStream("soap12.xml"); final Properties headers = new Properties(); @@ -53,6 +55,7 @@ public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapM assertFalse("Message is a XOP pacakge", soapMessage.isXopPackage()); } + @Override public void testCreateSoapMessageSwA() throws Exception { InputStream is = AbstractSoap12MessageFactoryTestCase.class.getResourceAsStream("soap12-attachment.bin"); Properties headers = new Properties(); @@ -69,6 +72,7 @@ public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapM assertNotNull("No attachment read", attachment); } + @Override public void testCreateSoapMessageMtom() throws Exception { InputStream is = AbstractSoap12MessageFactoryTestCase.class.getResourceAsStream("soap12-mtom.bin"); Properties headers = new Properties(); diff --git a/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java b/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java index 709eb54d..5675a9bd 100644 --- a/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java +++ b/core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -33,15 +33,18 @@ import org.springframework.xml.transform.StringSource; public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageTestCase { + @Override public void testGetVersion() throws Exception { Assert.assertEquals("Invalid SOAP version", SoapVersion.SOAP_12, soapMessage.getVersion()); } + @Override protected final Resource[] getSoapSchemas() { return new Resource[]{new ClassPathResource("xml.xsd", AbstractSoap12MessageTestCase.class), new ClassPathResource("soap12.xsd", AbstractSoap12MessageTestCase.class)}; } + @Override public void testWriteToTransportOutputStream() throws Exception { SoapBody body = soapMessage.getSoapBody(); String payload = ""; @@ -65,6 +68,7 @@ public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageT assertNotNull("Invalid accept header", resultAccept); } + @Override public void testWriteToTransportResponseAttachment() throws Exception { InputStreamSource inputStreamSource = new ByteArrayResource("contents".getBytes("UTF-8")); soapMessage.addAttachment("contentId", inputStreamSource, "text/plain"); diff --git a/core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java b/core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java index b989f4fb..d75ed61b 100644 --- a/core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java +++ b/core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -44,14 +44,17 @@ public class MockTransportInputStream extends TransportInputStream { headers = new Properties(); } + @Override protected InputStream createInputStream() throws IOException { return inputStream; } + @Override public Iterator getHeaderNames() throws IOException { return headers.keySet().iterator(); } + @Override public Iterator getHeaders(String name) throws IOException { String[] values = StringUtils.delimitedListToStringArray(headers.getProperty(name), ", "); return Arrays.asList(values).iterator(); diff --git a/core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java b/core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java index d82b0277..030d8d2b 100644 --- a/core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java +++ b/core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public class MockTransportOutputStream extends TransportOutputStream { this.outputStream = outputStream; } + @Override protected OutputStream createOutputStream() throws IOException { return outputStream; } @@ -42,6 +43,7 @@ public class MockTransportOutputStream extends TransportOutputStream { return headers; } + @Override public void addHeader(String name, String value) throws IOException { headers.put(name, value); } diff --git a/core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java b/core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java index 6aaab067..bc72be81 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java +++ b/core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -89,6 +89,7 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase ext private URI connectionUri; + @Override protected final void setUp() throws Exception { connectionUri = new URI("http://localhost:8888/"); jettyServer = new Server(8888); @@ -105,6 +106,7 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase ext protected abstract AbstractHttpWebServiceMessageSender createMessageSender(); + @Override protected final void tearDown() throws Exception { if (jettyServer.isRunning()) { jettyServer.stop(); @@ -253,6 +255,7 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase ext this.gzip = gzip; } + @Override protected void doPost(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException { try { diff --git a/core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java b/core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java index e4a980e8..2699461c 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -42,6 +42,7 @@ import org.springframework.ws.transport.WebServiceConnection; public class CommonsHttpMessageSenderIntegrationTest extends AbstractHttpWebServiceMessageSenderIntegrationTestCase { + @Override protected AbstractHttpWebServiceMessageSender createMessageSender() { return new CommonsHttpMessageSender(); } @@ -110,6 +111,7 @@ public class CommonsHttpMessageSenderIntegrationTest extends AbstractHttpWebServ private class EchoServlet extends HttpServlet { + @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/xml"); diff --git a/core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java b/core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java index 81bdede0..a3e6d7ad 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -53,6 +53,7 @@ public class HttpServletConnectionTest extends XMLTestCase { private TransformerFactory transformerFactory; + @Override protected void setUp() throws Exception { httpServletRequest = new MockHttpServletRequest(); httpServletResponse = new MockHttpServletResponse(); diff --git a/core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java b/core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java index 299c2cd9..dcd5d791 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -19,6 +19,7 @@ package org.springframework.ws.transport.http; public class HttpUrlConnectionMessageSenderIntegrationTest extends AbstractHttpWebServiceMessageSenderIntegrationTestCase { + @Override protected AbstractHttpWebServiceMessageSender createMessageSender() { return new HttpUrlConnectionMessageSender(); } diff --git a/core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java b/core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java index 1812c8a8..47c2ccdd 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -37,6 +37,7 @@ public class LastModifiedHelperTest extends TestCase { private long expected; + @Override protected void setUp() throws Exception { resource = new ClassPathResource("single.xsd", getClass()); expected = resource.lastModified(); diff --git a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java b/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java index bfdcf9c3..6d122e7b 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.transport.http; import java.io.ByteArrayInputStream; @@ -31,6 +47,7 @@ public class MessageDispatcherServletTest extends XMLTestCase { private MessageDispatcherServlet servlet; + @Override protected void setUp() throws Exception { config = new MockServletConfig(new MockServletContext(), "spring-ws"); servlet = new MessageDispatcherServlet(); @@ -77,6 +94,7 @@ public class MessageDispatcherServletTest extends XMLTestCase { private static class DetectWebApplicationContext extends StaticWebApplicationContext { + @Override public void refresh() throws BeansException, IllegalStateException { registerSingleton("payloadMapping", PayloadRootQNameEndpointMapping.class); registerSingleton("payloadAdapter", PayloadEndpointAdapter.class); @@ -87,6 +105,7 @@ public class MessageDispatcherServletTest extends XMLTestCase { private static class WsdlDefinitionWebApplicationContext extends StaticWebApplicationContext { + @Override public void refresh() throws BeansException, IllegalStateException { MutablePropertyValues mpv = new MutablePropertyValues(); mpv.addPropertyValue("wsdl", new ClassPathResource("wsdl11-input.wsdl", getClass())); diff --git a/core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java b/core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java index 906d1ea9..f385ef4b 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -53,6 +53,7 @@ public class WebServiceMessageReceiverHandlerAdapterTest extends TestCase { private FaultAwareWebServiceMessage requestMock; + @Override protected void setUp() throws Exception { adapter = new WebServiceMessageReceiverHandlerAdapter(); httpRequest = new MockHttpServletRequest(); diff --git a/core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java b/core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java index 529b160a..9d2e5715 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -50,6 +50,7 @@ public class WsdlDefinitionHandlerAdapterTest extends XMLTestCase { private MockHttpServletResponse response; + @Override protected void setUp() throws Exception { adapter = new WsdlDefinitionHandlerAdapter(); definitionControl = MockControl.createControl(WsdlDefinition.class); diff --git a/core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java b/core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java index b3432a1d..93c69a5e 100644 --- a/core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java +++ b/core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -35,6 +35,7 @@ public class XsdSchemaHandlerAdapterTest extends XMLTestCase { private MockHttpServletResponse response; + @Override protected void setUp() throws Exception { adapter = new XsdSchemaHandlerAdapter(); request = new MockHttpServletRequest(); diff --git a/core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java b/core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java index 4129fcaa..813ada43 100644 --- a/core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java +++ b/core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ public class WebServiceMessageReceiverObjectSupportTest extends TestCase { private MockWebServiceMessage request; + @Override protected void setUp() throws Exception { receiverSupport = new MyReceiverSupport(); messageFactory = new MockWebServiceMessageFactory(); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java index 43fd6c1c..1150f6ed 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ public class DefaultWsdl11DefinitionTest extends XMLTestCase { private DocumentBuilder documentBuilder; + @Override protected void setUp() throws Exception { definition = new DefaultWsdl11Definition(); TransformerFactory transformerFactory = TransformerFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11DefinitionTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11DefinitionTest.java index 787c0d49..c5806819 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11DefinitionTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/DynamicWsdl11DefinitionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -27,6 +27,7 @@ public class DynamicWsdl11DefinitionTest extends TestCase { private Wsdl11DefinitionBuilder builderMock; + @Override protected void setUp() throws Exception { definition = new DynamicWsdl11Definition(); builderControl = MockControl.createControl(Wsdl11DefinitionBuilder.class); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java index 63ffd842..7d17e411 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -23,6 +23,7 @@ public class SimpleWsdl11DefinitionTest extends TestCase { private SimpleWsdl11Definition definition; + @Override protected void setUp() throws Exception { definition = new SimpleWsdl11Definition(); definition.setWsdl(new ClassPathResource("complete.wsdl", getClass())); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java index 560ff913..2f99c4d3 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class Wsdl4jDefinitionTest extends XMLTestCase { private Transformer transformer; + @Override protected void setUp() throws Exception { XMLUnit.setIgnoreWhitespace(true); WSDLFactory factory = WSDLFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilderTest.java index ce4ddd87..27a806ef 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilderTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap11Wsdl4jDefinitionBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class XsdBasedSoap11Wsdl4jDefinitionBuilderTest extends XMLTestCase { private DocumentBuilder documentBuilder; + @Override protected void setUp() throws Exception { builder = new XsdBasedSoap11Wsdl4jDefinitionBuilder(); builder.setLocationUri("http://localhost:8080/"); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilderTest.java index 37c27834..f2d1f7b1 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilderTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/builder/XsdBasedSoap12Wsdl4jDefinitionBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class XsdBasedSoap12Wsdl4jDefinitionBuilderTest extends XMLTestCase { private DocumentBuilder documentBuilder; + @Override protected void setUp() throws Exception { builder = new XsdBasedSoap12Wsdl4jDefinitionBuilder(); builder.setLocationUri("http://localhost:8080/"); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java index 0b239ea4..60abeeb1 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -41,6 +41,7 @@ public class DefaultMessagesProviderTest extends TestCase { private DocumentBuilder documentBuilder; + @Override protected void setUp() throws Exception { provider = new DefaultMessagesProvider(); WSDLFactory factory = WSDLFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java index 38344196..fb4352f1 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public class InliningXsdSchemaTypesProviderTest extends TestCase { private Definition definition; + @Override protected void setUp() throws Exception { provider = new InliningXsdSchemaTypesProvider(); WSDLFactory factory = WSDLFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java index 539c40a8..d6a913c3 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -47,6 +47,7 @@ public class Soap11ProviderTest extends TestCase { private Definition definition; + @Override protected void setUp() throws Exception { provider = new Soap11Provider(); WSDLFactory factory = WSDLFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java index 84340f55..3e1fdb2d 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -47,6 +47,7 @@ public class Soap12ProviderTest extends TestCase { private Definition definition; + @Override protected void setUp() throws Exception { provider = new Soap12Provider(); WSDLFactory factory = WSDLFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java index 9ad36847..cdf6a6e5 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class SoapProviderTest extends TestCase { private Definition definition; + @Override protected void setUp() throws Exception { provider = new SoapProvider(); WSDLFactory factory = WSDLFactory.newInstance(); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java index cc6a1c4a..0b8ff884 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -41,6 +41,7 @@ public class SuffixBasedMessagesProviderTest extends TestCase { private DocumentBuilder documentBuilder; + @Override protected void setUp() throws Exception { provider = new SuffixBasedMessagesProvider(); provider.setFaultSuffix("Foo"); diff --git a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java index 169aa046..cd9c66b5 100644 --- a/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java +++ b/core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ public class SuffixBasedPortTypesProviderTest extends TestCase { private Definition definition; + @Override protected void setUp() throws Exception { provider = new SuffixBasedPortTypesProvider(); WSDLFactory factory = WSDLFactory.newInstance(); diff --git a/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java b/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java index f1a6fbc4..7382f1b3 100644 --- a/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java +++ b/oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm.castor; import java.io.IOException; @@ -296,10 +297,12 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing // Marshalling // + @Override protected final void marshalDomNode(Object graph, Node node) throws XmlMappingException { marshalSaxHandlers(graph, new DomContentHandler(node), null); } + @Override protected final void marshalSaxHandlers(Object graph, ContentHandler contentHandler, LexicalHandler lexicalHandler) throws XmlMappingException { Marshaller marshaller = xmlContext.createMarshaller(); @@ -307,21 +310,25 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing marshal(graph, marshaller); } + @Override protected final void marshalOutputStream(Object graph, OutputStream outputStream) throws XmlMappingException, IOException { marshalWriter(graph, new OutputStreamWriter(outputStream, encoding)); } + @Override protected final void marshalWriter(Object graph, Writer writer) throws XmlMappingException, IOException { Marshaller marshaller = xmlContext.createMarshaller(); marshaller.setWriter(writer); marshal(graph, marshaller); } + @Override protected final void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) throws XmlMappingException { marshalSaxHandlers(graph, new StaxEventContentHandler(eventWriter), null); } + @Override protected final void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException { marshalSaxHandlers(graph, new StaxStreamContentHandler(streamWriter), null); } @@ -361,6 +368,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing // Unmarshalling // + @Override protected final Object unmarshalDomNode(Node node) throws XmlMappingException { try { return createUnmarshaller().unmarshal(node); @@ -370,6 +378,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing } } + @Override protected final Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException { try { return createUnmarshaller().unmarshal(new InputSource(inputStream)); @@ -379,6 +388,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing } } + @Override protected final Object unmarshalReader(Reader reader) throws XmlMappingException, IOException { try { return createUnmarshaller().unmarshal(new InputSource(reader)); @@ -388,6 +398,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing } } + @Override protected final Object unmarshalXmlEventReader(XMLEventReader eventReader) { XMLReader reader = new StaxEventXmlReader(eventReader); try { @@ -398,6 +409,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing } } + @Override protected final Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource) throws XmlMappingException, IOException { UnmarshalHandler unmarshalHandler = createUnmarshaller().createHandler(); @@ -412,6 +424,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing } } + @Override protected final Object unmarshalXmlStreamReader(XMLStreamReader streamReader) { XMLReader reader = new StaxStreamXmlReader(streamReader); try { diff --git a/oxm/src/main/java/org/springframework/oxm/config/Jaxb1MarshallerBeanDefinitionParser.java b/oxm/src/main/java/org/springframework/oxm/config/Jaxb1MarshallerBeanDefinitionParser.java index 1f051a22..cb44bd17 100644 --- a/oxm/src/main/java/org/springframework/oxm/config/Jaxb1MarshallerBeanDefinitionParser.java +++ b/oxm/src/main/java/org/springframework/oxm/config/Jaxb1MarshallerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -30,6 +30,7 @@ class Jaxb1MarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionPa public static final String JAXB1_MARSHALLER_CLASS_NAME = "org.springframework.oxm.jaxb.Jaxb1Marshaller"; + @Override protected String getBeanClassName(Element element) { return JAXB1_MARSHALLER_CLASS_NAME; } diff --git a/oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java b/oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java index b9b44e30..08806b48 100644 --- a/oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java +++ b/oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -37,10 +37,12 @@ class Jaxb2MarshallerBeanDefinitionParser extends AbstractSingleBeanDefinitionPa private static final String JAXB2_MARSHALLER_CLASS_NAME = "org.springframework.oxm.jaxb.Jaxb2Marshaller"; + @Override protected String getBeanClassName(Element element) { return JAXB2_MARSHALLER_CLASS_NAME; } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder beanDefinitionBuilder) { String contextPath = element.getAttribute("contextPath"); if (StringUtils.hasText(contextPath)) { diff --git a/oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java b/oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java index e25ac65c..7c46e129 100644 --- a/oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java +++ b/oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -30,6 +30,7 @@ class JibxMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionPar private static final String JIBX_MARSHALLER_CLASS_NAME = "org.springframework.oxm.jibx.JibxMarshaller"; + @Override protected String getBeanClassName(Element element) { return JIBX_MARSHALLER_CLASS_NAME; } diff --git a/oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java b/oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java index b3566d7b..cadb184d 100644 --- a/oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java +++ b/oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -33,10 +33,12 @@ class XmlBeansMarshallerBeanDefinitionParser extends AbstractSingleBeanDefinitio public static final String XML_BEANS_MARSHALLER_CLASS_NAME = "org.springframework.oxm.xmlbeans.XmlBeansMarshaller"; + @Override protected String getBeanClassName(Element element) { return XML_BEANS_MARSHALLER_CLASS_NAME; } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder beanDefinitionBuilder) { String optionsName = element.getAttribute("options"); if (StringUtils.hasText(optionsName)) { diff --git a/oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb1Marshaller.java b/oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb1Marshaller.java index b0a79196..4327519e 100644 --- a/oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb1Marshaller.java +++ b/oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb1Marshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm.jaxb; import javax.xml.bind.Element; @@ -84,6 +85,7 @@ public class Jaxb1Marshaller extends AbstractJaxbMarshaller implements BeanClass } + @Override protected final JAXBContext createJaxbContext() throws JAXBException { if (!StringUtils.hasLength(getContextPath())) { throw new IllegalArgumentException("contextPath is required"); @@ -95,6 +97,7 @@ public class Jaxb1Marshaller extends AbstractJaxbMarshaller implements BeanClass JAXBContext.newInstance(getContextPath()); } + @Override protected void initJaxbUnmarshaller(Unmarshaller unmarshaller) throws JAXBException { unmarshaller.setValidating(validating); } diff --git a/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java b/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java index 513e72cc..e10226d6 100644 --- a/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java +++ b/oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -173,6 +173,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe // Supported Marshalling // + @Override protected void marshalOutputStream(Object graph, OutputStream outputStream) throws XmlMappingException, IOException { try { @@ -184,6 +185,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } } + @Override protected void marshalWriter(Object graph, Writer writer) throws XmlMappingException, IOException { try { IMarshallingContext marshallingContext = createMarshallingContext(); @@ -194,6 +196,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } } + @Override protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException { try { MarshallingContext marshallingContext = (MarshallingContext) createMarshallingContext(); @@ -210,6 +213,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe // Unsupported Marshalling // + @Override protected void marshalDomNode(Object graph, Node node) throws XmlMappingException { try { // JiBX does not support DOM natively, so we write to a buffer first, and transform that to the Node @@ -227,6 +231,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } } + @Override protected void marshalSaxHandlers(Object graph, ContentHandler contentHandler, LexicalHandler lexicalHandler) throws XmlMappingException { try { @@ -247,6 +252,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } } + @Override protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) { ContentHandler contentHandler = new StaxEventContentHandler(eventWriter); marshalSaxHandlers(graph, contentHandler, null); @@ -256,6 +262,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe // Unmarshalling // + @Override protected Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException { try { IUnmarshallingContext unmarshallingContext = createUnmarshallingContext(); @@ -266,6 +273,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } } + @Override protected Object unmarshalReader(Reader reader) throws XmlMappingException, IOException { try { IUnmarshallingContext unmarshallingContext = createUnmarshallingContext(); @@ -276,6 +284,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } } + @Override protected Object unmarshalXmlStreamReader(XMLStreamReader streamReader) { try { UnmarshallingContext unmarshallingContext = (UnmarshallingContext) createUnmarshallingContext(); @@ -288,6 +297,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } } + @Override protected Object unmarshalXmlEventReader(XMLEventReader eventReader) { try { XMLStreamReader streamReader = new XmlEventStreamReader(eventReader); @@ -302,6 +312,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe // Unsupported Unmarshalling // + @Override protected Object unmarshalDomNode(Node node) throws XmlMappingException { try { Transformer transformer = transformerFactory.newTransformer(); @@ -318,6 +329,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe } } + @Override protected Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource) throws XmlMappingException, IOException { try { diff --git a/oxm/src/main/java/org/springframework/oxm/support/MarshallingView.java b/oxm/src/main/java/org/springframework/oxm/support/MarshallingView.java index 17f6b777..32b0d177 100644 --- a/oxm/src/main/java/org/springframework/oxm/support/MarshallingView.java +++ b/oxm/src/main/java/org/springframework/oxm/support/MarshallingView.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -82,10 +82,12 @@ public class MarshallingView extends AbstractUrlBasedView { this.modelKey = modelKey; } + @Override protected void initApplicationContext() throws BeansException { Assert.notNull(marshaller, "Property 'marshaller' is required"); } + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { Object toBeMarshalled = locateToBeMarshalled(model); diff --git a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java index c915ccbc..061b2b48 100644 --- a/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java +++ b/oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.oxm.xmlbeans; import java.io.IOException; @@ -88,6 +104,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller { return XmlObject.class.isAssignableFrom(clazz); } + @Override protected final void marshalDomNode(Object graph, Node node) throws XmlMappingException { Document document = node.getNodeType() == Node.DOCUMENT_NODE ? (Document) node : node.getOwnerDocument(); Node xmlBeansNode = ((XmlObject) graph).newDomNode(getXmlOptions()); @@ -99,11 +116,13 @@ public class XmlBeansMarshaller extends AbstractMarshaller { } } + @Override protected final void marshalOutputStream(Object graph, OutputStream outputStream) throws XmlMappingException, IOException { ((XmlObject) graph).save(outputStream, getXmlOptions()); } + @Override protected final void marshalSaxHandlers(Object graph, ContentHandler contentHandler, LexicalHandler lexicalHandler) throws XmlMappingException { try { @@ -114,20 +133,24 @@ public class XmlBeansMarshaller extends AbstractMarshaller { } } + @Override protected final void marshalWriter(Object graph, Writer writer) throws XmlMappingException, IOException { ((XmlObject) graph).save(writer, getXmlOptions()); } + @Override protected final void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) { ContentHandler contentHandler = new StaxEventContentHandler(eventWriter); marshalSaxHandlers(graph, contentHandler, null); } + @Override protected final void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException { ContentHandler contentHandler = new StaxStreamContentHandler(streamWriter); marshalSaxHandlers(graph, contentHandler, null); } + @Override protected final Object unmarshalDomNode(Node node) throws XmlMappingException { try { XmlObject object = XmlObject.Factory.parse(node, getXmlOptions()); @@ -139,6 +162,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller { } } + @Override protected final Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException { try { XmlObject object = XmlObject.Factory.parse(inputStream, getXmlOptions()); @@ -150,6 +174,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller { } } + @Override protected final Object unmarshalReader(Reader reader) throws XmlMappingException, IOException { try { XmlObject object = XmlObject.Factory.parse(reader, getXmlOptions()); @@ -161,6 +186,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller { } } + @Override protected final Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource) throws XmlMappingException, IOException { XmlSaxHandler saxHandler = XmlObject.Factory.newXmlSaxHandler(getXmlOptions()); @@ -188,6 +214,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller { } } + @Override protected final Object unmarshalXmlEventReader(XMLEventReader eventReader) throws XmlMappingException { XMLReader reader = new StaxEventXmlReader(eventReader); try { @@ -198,6 +225,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller { } } + @Override protected final Object unmarshalXmlStreamReader(XMLStreamReader streamReader) throws XmlMappingException { try { XmlObject object = XmlObject.Factory.parse(streamReader, getXmlOptions()); diff --git a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java index 839fa2c7..d0ecaebc 100644 --- a/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java +++ b/oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -348,6 +348,7 @@ public class XStreamMarshaller extends AbstractMarshaller { } } + @Override protected void marshalDomNode(Object graph, Node node) throws XmlMappingException { HierarchicalStreamWriter streamWriter; if (node instanceof Document) { @@ -362,11 +363,13 @@ public class XStreamMarshaller extends AbstractMarshaller { marshal(graph, streamWriter); } + @Override protected void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter) throws XmlMappingException { ContentHandler contentHandler = new StaxEventContentHandler(eventWriter); marshalSaxHandlers(graph, contentHandler, null); } + @Override protected void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter) throws XmlMappingException { try { marshal(graph, new StaxWriter(new QNameMap(), streamWriter)); @@ -376,11 +379,13 @@ public class XStreamMarshaller extends AbstractMarshaller { } } + @Override protected void marshalOutputStream(Object graph, OutputStream outputStream) throws XmlMappingException, IOException { marshalWriter(graph, new OutputStreamWriter(outputStream, getEncoding())); } + @Override protected void marshalSaxHandlers(Object graph, ContentHandler contentHandler, LexicalHandler lexicalHandler) throws XmlMappingException { SaxWriter saxWriter = new SaxWriter(); @@ -388,6 +393,7 @@ public class XStreamMarshaller extends AbstractMarshaller { marshal(graph, saxWriter); } + @Override protected void marshalWriter(Object graph, Writer writer) throws XmlMappingException, IOException { if (streamDriver != null) { marshal(graph, streamDriver.createWriter(writer)); @@ -410,6 +416,7 @@ public class XStreamMarshaller extends AbstractMarshaller { } } + @Override protected Object unmarshalDomNode(Node node) throws XmlMappingException { HierarchicalStreamReader streamReader; if (node instanceof Document) { @@ -424,6 +431,7 @@ public class XStreamMarshaller extends AbstractMarshaller { return unmarshal(streamReader); } + @Override protected Object unmarshalXmlEventReader(XMLEventReader eventReader) throws XmlMappingException { try { XMLStreamReader streamReader = new XmlEventStreamReader(eventReader); @@ -434,14 +442,17 @@ public class XStreamMarshaller extends AbstractMarshaller { } } + @Override protected Object unmarshalXmlStreamReader(XMLStreamReader streamReader) throws XmlMappingException { return unmarshal(new StaxReader(new QNameMap(), streamReader)); } + @Override protected Object unmarshalInputStream(InputStream inputStream) throws XmlMappingException, IOException { return unmarshalReader(new InputStreamReader(inputStream, getEncoding())); } + @Override protected Object unmarshalReader(Reader reader) throws XmlMappingException, IOException { if (streamDriver != null) { return unmarshal(streamDriver.createReader(reader)); @@ -451,6 +462,7 @@ public class XStreamMarshaller extends AbstractMarshaller { } } + @Override protected Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource) throws XmlMappingException, IOException { throw new UnsupportedOperationException( diff --git a/oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTestCase.java b/oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTestCase.java index 033ddc83..7325b08b 100644 --- a/oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTestCase.java +++ b/oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm; import java.io.ByteArrayOutputStream; @@ -45,6 +46,7 @@ public abstract class AbstractMarshallerTestCase extends XMLTestCase { "" + "42"; + @Override protected final void setUp() throws Exception { marshaller = createMarshaller(); flights = createFlights(); diff --git a/oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTestCase.java b/oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTestCase.java index a9b0a665..62094aaf 100644 --- a/oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTestCase.java +++ b/oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm; import java.io.ByteArrayInputStream; @@ -46,6 +47,7 @@ public abstract class AbstractUnmarshallerTestCase extends TestCase { "" + "42"; + @Override protected final void setUp() throws Exception { unmarshaller = createUnmarshaller(); } diff --git a/oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTest.java index 893c9ef4..bfcb9706 100644 --- a/oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm.castor; import javax.xml.transform.sax.SAXResult; @@ -25,6 +26,7 @@ import org.xml.sax.ContentHandler; public class CastorMarshallerTest extends AbstractMarshallerTestCase { + @Override protected Marshaller createMarshaller() throws Exception { CastorMarshaller marshaller = new CastorMarshaller(); ClassPathResource mappingLocation = new ClassPathResource("mapping.xml", CastorMarshaller.class); @@ -33,6 +35,7 @@ public class CastorMarshallerTest extends AbstractMarshallerTestCase { return marshaller; } + @Override protected Object createFlights() { Flight flight = new Flight(); flight.setNumber(42L); diff --git a/oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTest.java index d271a0ae..1eafb8c3 100644 --- a/oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm.castor; import java.io.ByteArrayInputStream; @@ -25,6 +26,7 @@ import org.springframework.oxm.Unmarshaller; public class CastorUnmarshallerTest extends AbstractUnmarshallerTestCase { + @Override protected void testFlights(Object o) { Flights flights = (Flights) o; assertNotNull("Flights is null", flights); @@ -32,12 +34,14 @@ public class CastorUnmarshallerTest extends AbstractUnmarshallerTestCase { testFlight(flights.getFlight()[0]); } + @Override protected void testFlight(Object o) { Flight flight = (Flight) o; assertNotNull("Flight is null", flight); assertEquals("Number is invalid", 42L, flight.getNumber()); } + @Override protected Unmarshaller createUnmarshaller() throws Exception { CastorMarshaller marshaller = new CastorMarshaller(); ClassPathResource mappingLocation = new ClassPathResource("mapping.xml", CastorMarshaller.class); diff --git a/oxm/src/test/java/org/springframework/oxm/config/Jaxb2OxmNamespaceHandlerTest.java b/oxm/src/test/java/org/springframework/oxm/config/Jaxb2OxmNamespaceHandlerTest.java index c7a4548e..4b24f129 100644 --- a/oxm/src/test/java/org/springframework/oxm/config/Jaxb2OxmNamespaceHandlerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/config/Jaxb2OxmNamespaceHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -26,6 +26,7 @@ public class Jaxb2OxmNamespaceHandlerTest extends TestCase { private ApplicationContext applicationContext; + @Override protected void setUp() throws Exception { applicationContext = new ClassPathXmlApplicationContext("jaxb2OxmNamespaceHandlerTest.xml", getClass()); } diff --git a/oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTest.java b/oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTest.java index aa81c6ae..9286f9ee 100644 --- a/oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -29,6 +29,7 @@ public class OxmNamespaceHandlerTest extends TestCase { private ApplicationContext applicationContext; + @Override protected void setUp() throws Exception { applicationContext = new ClassPathXmlApplicationContext("oxmNamespaceHandlerTest.xml", getClass()); } diff --git a/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1MarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1MarshallerTest.java index 74e3018a..08d430ba 100644 --- a/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1MarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1MarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm.jaxb; import java.util.Collections; @@ -29,6 +30,7 @@ public class Jaxb1MarshallerTest extends AbstractJaxbMarshallerTestCase { private static final String CONTEXT_PATH = "org.springframework.oxm.jaxb1"; + @Override protected final Marshaller createMarshaller() throws Exception { Jaxb1Marshaller marshaller = new Jaxb1Marshaller(); marshaller.setContextPaths(new String[]{CONTEXT_PATH}); @@ -36,6 +38,7 @@ public class Jaxb1MarshallerTest extends AbstractJaxbMarshallerTestCase { return marshaller; } + @Override protected Object createFlights() { FlightType flight = new FlightTypeImpl(); flight.setNumber(42L); diff --git a/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1UnmarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1UnmarshallerTest.java index 692f0314..12e29545 100644 --- a/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1UnmarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1UnmarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm.jaxb; import org.springframework.oxm.AbstractUnmarshallerTestCase; @@ -22,6 +23,7 @@ import org.springframework.oxm.jaxb1.Flights; public class Jaxb1UnmarshallerTest extends AbstractUnmarshallerTestCase { + @Override protected Unmarshaller createUnmarshaller() throws Exception { Jaxb1Marshaller marshaller = new Jaxb1Marshaller(); marshaller.setContextPath("org.springframework.oxm.jaxb1"); @@ -30,6 +32,7 @@ public class Jaxb1UnmarshallerTest extends AbstractUnmarshallerTestCase { return marshaller; } + @Override protected void testFlights(Object o) { Flights flights = (Flights) o; assertNotNull("Flights is null", flights); @@ -37,6 +40,7 @@ public class Jaxb1UnmarshallerTest extends AbstractUnmarshallerTestCase { testFlight(flights.getFlight().get(0)); } + @Override protected void testFlight(Object o) { FlightType flight = (FlightType) o; assertNotNull("Flight is null", flight); diff --git a/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java index 9172e67d..060d04b9 100644 --- a/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -79,6 +79,7 @@ public class Jaxb2MarshallerTest extends XMLTestCase { private Flights flights; + @Override protected void setUp() throws Exception { marshaller = new Jaxb2Marshaller(); marshaller.setContextPath(CONTEXT_PATH); diff --git a/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java index a0689559..017afbce 100644 --- a/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -56,6 +56,7 @@ public class Jaxb2UnmarshallerTest extends TestCase { private Jaxb2Marshaller unmarshaller; + @Override protected void setUp() throws Exception { unmarshaller = new Jaxb2Marshaller(); unmarshaller.setContextPath("org.springframework.oxm.jaxb2"); diff --git a/oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTest.java index 38c3fa27..7696cd05 100644 --- a/oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -24,6 +24,7 @@ import org.springframework.xml.transform.StringResult; public class JibxMarshallerTest extends AbstractMarshallerTestCase { + @Override protected Marshaller createMarshaller() throws Exception { JibxMarshaller marshaller = new JibxMarshaller(); marshaller.setTargetClass(Flights.class); @@ -31,6 +32,7 @@ public class JibxMarshallerTest extends AbstractMarshallerTestCase { return marshaller; } + @Override protected Object createFlights() { Flights flights = new Flights(); FlightType flight = new FlightType(); diff --git a/oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTest.java index 35db639d..1eb1d62a 100644 --- a/oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm.jibx; import org.springframework.oxm.AbstractUnmarshallerTestCase; @@ -20,6 +21,7 @@ import org.springframework.oxm.Unmarshaller; public class JibxUnmarshallerTest extends AbstractUnmarshallerTestCase { + @Override protected Unmarshaller createUnmarshaller() throws Exception { JibxMarshaller unmarshaller = new JibxMarshaller(); unmarshaller.setTargetClass(Flights.class); @@ -27,6 +29,7 @@ public class JibxUnmarshallerTest extends AbstractUnmarshallerTestCase { return unmarshaller; } + @Override protected void testFlights(Object o) { Flights flights = (Flights) o; assertNotNull("Flights is null", flights); @@ -34,12 +37,14 @@ public class JibxUnmarshallerTest extends AbstractUnmarshallerTestCase { testFlight(flights.getFlight(0)); } + @Override protected void testFlight(Object o) { FlightType flight = (FlightType) o; assertNotNull("Flight is null", flight); assertEquals("Number is invalid", 42L, flight.getNumber()); } + @Override public void testUnmarshalPartialStaxSourceXmlStreamReader() throws Exception { // JiBX does not support reading XML fragments, hence the override here } diff --git a/oxm/src/test/java/org/springframework/oxm/support/MarshallingMessageConverterTest.java b/oxm/src/test/java/org/springframework/oxm/support/MarshallingMessageConverterTest.java index 3ec36825..fceec30e 100644 --- a/oxm/src/test/java/org/springframework/oxm/support/MarshallingMessageConverterTest.java +++ b/oxm/src/test/java/org/springframework/oxm/support/MarshallingMessageConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -44,6 +44,7 @@ public class MarshallingMessageConverterTest extends TestCase { private Session sessionMock; + @Override protected void setUp() throws Exception { marshallerControl = MockControl.createControl(Marshaller.class); marshallerMock = (Marshaller) marshallerControl.getMock(); diff --git a/oxm/src/test/java/org/springframework/oxm/support/MarshallingViewTest.java b/oxm/src/test/java/org/springframework/oxm/support/MarshallingViewTest.java index 54d982e3..20a54b3d 100644 --- a/oxm/src/test/java/org/springframework/oxm/support/MarshallingViewTest.java +++ b/oxm/src/test/java/org/springframework/oxm/support/MarshallingViewTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -37,6 +37,7 @@ public class MarshallingViewTest extends TestCase { private Marshaller marshallerMock; + @Override protected void setUp() throws Exception { control = MockControl.createControl(Marshaller.class); marshallerMock = (Marshaller) control.getMock(); diff --git a/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTest.java index 5a390a77..d1021636 100644 --- a/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm.xmlbeans; import java.io.ByteArrayOutputStream; @@ -27,6 +28,7 @@ import org.springframework.samples.flight.FlightsDocument.Flights; public class XmlBeansMarshallerTest extends AbstractMarshallerTestCase { + @Override protected Marshaller createMarshaller() throws Exception { return new XmlBeansMarshaller(); } @@ -41,6 +43,7 @@ public class XmlBeansMarshallerTest extends AbstractMarshallerTestCase { } } + @Override protected Object createFlights() { FlightsDocument flightsDocument = FlightsDocument.Factory.newInstance(); Flights flights = flightsDocument.addNewFlights(); diff --git a/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTest.java index ab6c8359..36d240c3 100644 --- a/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.oxm.xmlbeans; import java.io.StringReader; @@ -31,10 +32,12 @@ import org.springframework.xml.transform.StringSource; public class XmlBeansUnmarshallerTest extends AbstractUnmarshallerTestCase { + @Override protected Unmarshaller createUnmarshaller() throws Exception { return new XmlBeansMarshaller(); } + @Override protected void testFlights(Object o) { FlightsDocument flightsDocument = (FlightsDocument) o; assertNotNull("FlightsDocument is null", flightsDocument); @@ -43,6 +46,7 @@ public class XmlBeansUnmarshallerTest extends AbstractUnmarshallerTestCase { testFlight(flights.getFlightArray(0)); } + @Override protected void testFlight(Object o) { FlightType flight = null; if (o instanceof FlightType) { @@ -56,6 +60,7 @@ public class XmlBeansUnmarshallerTest extends AbstractUnmarshallerTestCase { assertEquals("Number is invalid", 42L, flight.getNumber()); } + @Override public void testUnmarshalPartialStaxSourceXmlStreamReader() throws Exception { XMLInputFactory inputFactory = XMLInputFactory.newInstance(); XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader(INPUT_STRING)); diff --git a/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTest.java b/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTest.java index 26fc31de..1e2d21a4 100644 --- a/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTest.java +++ b/oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -25,6 +25,7 @@ public class XmlOptionsFactoryBeanTest extends TestCase { private XmlOptionsFactoryBean factoryBean; + @Override protected void setUp() throws Exception { factoryBean = new XmlOptionsFactoryBean(); } diff --git a/oxm/src/test/java/org/springframework/oxm/xstream/AnnotationXStreamMarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/xstream/AnnotationXStreamMarshallerTest.java index ab9d56b6..a6effc5f 100644 --- a/oxm/src/test/java/org/springframework/oxm/xstream/AnnotationXStreamMarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/xstream/AnnotationXStreamMarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -29,6 +29,7 @@ public class AnnotationXStreamMarshallerTest extends XMLTestCase { private Flight flight; + @Override protected void setUp() throws Exception { marshaller = new AnnotationXStreamMarshaller(); marshaller.setAnnotatedClass(Flight.class); diff --git a/oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTest.java index e7e94146..6a242110 100644 --- a/oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -53,6 +53,7 @@ public class XStreamMarshallerTest extends XMLTestCase { private Flight flight; + @Override protected void setUp() throws Exception { marshaller = new XStreamMarshaller(); Properties aliases = new Properties(); diff --git a/oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTest.java b/oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTest.java index 3b838f74..a35de5ef 100644 --- a/oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTest.java +++ b/oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ public class XStreamUnmarshallerTest extends TestCase { private XStreamMarshaller unmarshaller; + @Override protected void setUp() throws Exception { unmarshaller = new XStreamMarshaller(); Properties aliases = new Properties(); diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java b/samples/airline/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java index 10b585a3..41647710 100644 --- a/samples/airline/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java +++ b/samples/airline/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -33,6 +33,7 @@ public class SpringFrequentFlyerSecurityServiceTest extends TestCase { private FrequentFlyerDao flyerDaoMock; + @Override protected void setUp() throws Exception { flyerDaoMock = createMock(FrequentFlyerDao.class); securityService = new SpringFrequentFlyerSecurityService(flyerDaoMock); diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java b/samples/airline/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java index 1ab8f4dd..db5cb715 100644 --- a/samples/airline/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java +++ b/samples/airline/src/test/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.samples.airline.service.impl; import java.util.ArrayList; @@ -46,6 +47,7 @@ public class AirlineServiceImplTest extends TestCase { private String flightNumber; + @Override protected void setUp() throws Exception { flightDaoMock = createMock(FlightDao.class); ticketDaoMock = createMock(TicketDao.class); diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java b/samples/airline/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java index 9c248636..b527afde 100644 --- a/samples/airline/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java +++ b/samples/airline/src/test/java/org/springframework/ws/samples/airline/web/FlightsControllerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public class FlightsControllerTest extends TestCase { private AirlineService airlineServiceMock; + @Override protected void setUp() throws Exception { airlineServiceMock = createMock(AirlineService.class); flightsController = new FlightsController(airlineServiceMock); diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpointTest.java b/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpointTest.java index d30e3449..538a16c8 100644 --- a/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpointTest.java +++ b/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/GetFrequentFlyerMileageEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -33,6 +33,7 @@ public class GetFrequentFlyerMileageEndpointTest extends TestCase { private Document document; + @Override protected void setUp() throws Exception { airlineServiceMock = createMock(AirlineService.class); endpoint = new GetFrequentFlyerMileageEndpoint(airlineServiceMock); diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpointTest.java b/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpointTest.java index c99c5a56..79d7f61b 100644 --- a/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpointTest.java +++ b/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/MarshallingAirlineEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -53,6 +53,7 @@ public class MarshallingAirlineEndpointTest extends TestCase { private ObjectFactory objectFactory; + @Override protected void setUp() throws Exception { airlineServiceMock = createMock(AirlineService.class); endpoint = new MarshallingAirlineEndpoint(airlineServiceMock); diff --git a/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpointTest.java b/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpointTest.java index 71f49ef0..e5ef2230 100644 --- a/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpointTest.java +++ b/samples/airline/src/test/java/org/springframework/ws/samples/airline/ws/XPathAirlineEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -36,6 +36,7 @@ public class XPathAirlineEndpointTest extends TestCase { private Marshaller marshallerMock; + @Override protected void setUp() throws Exception { airlineServiceMock = createMock(AirlineService.class); marshallerMock = createMock(Marshaller.class); diff --git a/samples/echo/src/test/java/org/springframework/ws/samples/echo/ws/EchoEndpointTest.java b/samples/echo/src/test/java/org/springframework/ws/samples/echo/ws/EchoEndpointTest.java index a8e0b99e..c75e3bb8 100644 --- a/samples/echo/src/test/java/org/springframework/ws/samples/echo/ws/EchoEndpointTest.java +++ b/samples/echo/src/test/java/org/springframework/ws/samples/echo/ws/EchoEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ public class EchoEndpointTest extends XMLTestCase { private EchoService mock; + @Override protected void setUp() throws Exception { endpoint = new EchoEndpoint(); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); diff --git a/samples/pox/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java b/samples/pox/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java index 5498f3ab..48c7cb1c 100644 --- a/samples/pox/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java +++ b/samples/pox/src/main/java/org/springframework/ws/samples/pox/ws/ContactCountEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -64,6 +64,7 @@ public class ContactCountEndpoint extends AbstractSaxPayloadEndpoint { private int contactCount = 0; + @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { if (NAMESPACE_URI.equals(uri) && CONTANT_NAME.equals(localName)) { diff --git a/samples/pox/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java b/samples/pox/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java index 78989e42..8f9b8c8d 100644 --- a/samples/pox/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java +++ b/samples/pox/src/test/java/org/springframework/ws/samples/pox/ws/ContactCountEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -40,6 +40,7 @@ public class ContactCountEndpointTest extends XMLTestCase { private DocumentBuilder documentBuilder; + @Override protected void setUp() throws Exception { endpoint = new ContactCountEndpoint(); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); diff --git a/samples/tutorial/src/test/java/com/mycompany/hr/ws/HolidayEndpointTest.java b/samples/tutorial/src/test/java/com/mycompany/hr/ws/HolidayEndpointTest.java index 09fa2245..1dda0e6d 100644 --- a/samples/tutorial/src/test/java/com/mycompany/hr/ws/HolidayEndpointTest.java +++ b/samples/tutorial/src/test/java/com/mycompany/hr/ws/HolidayEndpointTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -40,6 +40,7 @@ public class HolidayEndpointTest extends TestCase { private Calendar endCalendar; + @Override protected void setUp() throws Exception { mockControl = MockControl.createControl(HumanResourceService.class); serviceMock = (HumanResourceService) mockControl.getMock(); diff --git a/sandbox/src/main/java/org/springframework/ws/transport/tcp/TcpReceiverConnection.java b/sandbox/src/main/java/org/springframework/ws/transport/tcp/TcpReceiverConnection.java index cc6ed7aa..020ea9cb 100644 --- a/sandbox/src/main/java/org/springframework/ws/transport/tcp/TcpReceiverConnection.java +++ b/sandbox/src/main/java/org/springframework/ws/transport/tcp/TcpReceiverConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -68,6 +68,7 @@ public class TcpReceiverConnection extends AbstractReceiverConnection { protected InputStream getRequestInputStream() throws IOException { return new FilterInputStream(socket.getInputStream()) { + @Override public void close() throws IOException { // don't close the socket socket.shutdownInput(); @@ -81,6 +82,7 @@ public class TcpReceiverConnection extends AbstractReceiverConnection { protected OutputStream getResponseOutputStream() throws IOException { return new FilterOutputStream(socket.getOutputStream()) { + @Override public void close() throws IOException { // don't close the socket socket.shutdownOutput(); diff --git a/sandbox/src/main/java/org/springframework/ws/transport/tcp/TcpSenderConnection.java b/sandbox/src/main/java/org/springframework/ws/transport/tcp/TcpSenderConnection.java index 319fab5b..32b1f375 100644 --- a/sandbox/src/main/java/org/springframework/ws/transport/tcp/TcpSenderConnection.java +++ b/sandbox/src/main/java/org/springframework/ws/transport/tcp/TcpSenderConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -78,6 +78,7 @@ public class TcpSenderConnection extends AbstractSenderConnection { protected OutputStream getRequestOutputStream() throws IOException { return new FilterOutputStream(socket.getOutputStream()) { + @Override public void close() throws IOException { // don't close the socket socket.shutdownOutput(); @@ -103,6 +104,7 @@ public class TcpSenderConnection extends AbstractSenderConnection { protected InputStream getResponseInputStream() throws IOException { return new FilterInputStream(socket.getInputStream()) { + @Override public void close() throws IOException { // don't close the socket socket.shutdownInput(); diff --git a/sandbox/src/test/java/org/springframework/ws/jaxws/JaxWsProviderEndpointAdapterTest.java b/sandbox/src/test/java/org/springframework/ws/jaxws/JaxWsProviderEndpointAdapterTest.java index 95c691ae..11fdd399 100644 --- a/sandbox/src/test/java/org/springframework/ws/jaxws/JaxWsProviderEndpointAdapterTest.java +++ b/sandbox/src/test/java/org/springframework/ws/jaxws/JaxWsProviderEndpointAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -37,6 +37,7 @@ public class JaxWsProviderEndpointAdapterTest extends TestCase { private MessageContext messageContext; + @Override protected void setUp() throws Exception { adapter = new JaxWsProviderEndpointAdapter(); MessageFactory messageFactory = MessageFactory.newInstance(); diff --git a/security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java b/security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java index affbc0b5..0ecbf804 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java +++ b/security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -40,6 +40,7 @@ public class CallbackHandlerChain extends AbstractCallbackHandler { return callbackHandlers; } + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { boolean allUnsupported = true; for (int i = 0; i < callbackHandlers.length; i++) { diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java index 11320714..0b0e553e 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -60,10 +60,12 @@ class Wss4jHandler extends WSHandler { options.setProperty(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, Boolean.toString(true)); } + @Override protected boolean checkReceiverResults(Vector wsResult, Vector actions) { return super.checkReceiverResults(wsResult, actions); } + @Override protected boolean checkReceiverResultsAnyOrder(Vector wsResult, Vector actions) { return super.checkReceiverResultsAnyOrder(wsResult, actions); } @@ -76,6 +78,7 @@ class Wss4jHandler extends WSHandler { options.setProperty(key, Boolean.toString(value)); } + @Override public Object getOption(String key) { return options.getProperty(key); } @@ -97,6 +100,7 @@ class Wss4jHandler extends WSHandler { } /** Gets the password first from securementCallbackHandler, then from securementPassword if not found. */ + @Override public WSPasswordCallback getPassword(String username, int doAction, String clsProp, @@ -137,39 +141,48 @@ class Wss4jHandler extends WSHandler { return callback; } + @Override public String getPassword(Object msgContext) { return securementPassword; } + @Override public Object getProperty(Object msgContext, String key) { return ((MessageContext) msgContext).getProperty(key); } + @Override protected Crypto loadEncryptionCrypto(RequestData reqData) throws WSSecurityException { return securementEncryptionCrypto; } + @Override public Crypto loadSignatureCrypto(RequestData reqData) throws WSSecurityException { return securementSignatureCrypto; } + @Override public void setPassword(Object msgContext, String password) { securementPassword = password; } + @Override public void setProperty(Object msgContext, String key, Object value) { ((MessageContext) msgContext).setProperty(key, value); } + @Override protected void doSenderAction(int doAction, Document doc, RequestData reqData, Vector actions, boolean isRequest) throws WSSecurityException { super.doSenderAction(doAction, doc, reqData, actions, isRequest); } + @Override protected boolean verifyTimestamp(Timestamp timestamp, int timeToLive) throws WSSecurityException { return super.verifyTimestamp(timestamp, timeToLive); } + @Override protected boolean verifyTrust(X509Certificate cert, RequestData reqData) throws WSSecurityException { return super.verifyTrust(cert, reqData); } diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java index cfc29d30..c138f2e2 100755 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -472,6 +472,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl securityEngine.getWssConfig().setAllowNamespaceQualifiedPasswordTypes(true); } + @Override protected void secureMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecuritySecurementException { if (securementAction == WSConstants.NO_SECURITY && !enableSignatureConfirmation) { @@ -520,6 +521,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl return requestData; } + @Override protected void validateMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecurityValidationException { if (logger.isDebugEnabled()) { @@ -698,6 +700,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl } } + @Override protected void cleanUp() { if (validationCallbackHandler != null) { try { diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java index ba6bd436..b30a0da5 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -42,6 +42,7 @@ public abstract class AbstractWsPasswordCallbackHandler extends AbstractCallback * @throws IOException in case of I/O errors * @throws UnsupportedCallbackException when the callback is not supported */ + @Override protected final void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof WSPasswordCallback) { WSPasswordCallback passwordCallback = (WSPasswordCallback) callback; diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java index e3dde979..8535ae67 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -82,10 +82,12 @@ public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler i } } + @Override protected void handleDecrypt(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { callback.setPassword(privateKeyPassword); } + @Override protected void handleKeyName(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { try { String identifier = callback.getIdentifier(); diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java index 40b74597..0b735634 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -59,11 +59,13 @@ public class SimplePasswordValidationCallbackHandler extends AbstractWsPasswordC Assert.notNull(users, "users is required"); } + @Override protected void handleUsernameToken(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { String identifier = callback.getIdentifier(); callback.setPassword(users.getProperty(identifier)); } + @Override protected void handleUsernameTokenUnknown(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { String identifier = callback.getIdentifier(); diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandler.java index 8f2b0fe3..a01da23c 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -68,6 +68,7 @@ public class SpringDigestPasswordValidationCallbackHandler extends AbstractWsPas Assert.notNull(userDetailsService, "userDetailsService is required"); } + @Override protected void handleUsernameToken(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { String identifier = callback.getIdentifier(); UserDetails user = loadUserDetails(identifier); @@ -77,6 +78,7 @@ public class SpringDigestPasswordValidationCallbackHandler extends AbstractWsPas } } + @Override protected void handleUsernameTokenPrincipal(UsernameTokenPrincipalCallback callback) throws IOException, UnsupportedCallbackException { UserDetails user = loadUserDetails(callback.getPrincipal().getName()); @@ -89,6 +91,7 @@ public class SpringDigestPasswordValidationCallbackHandler extends AbstractWsPas SecurityContextHolder.getContext().setAuthentication(authRequest); } + @Override protected void handleCleanup(CleanupCallback callback) throws IOException, UnsupportedCallbackException { SecurityContextHolder.clearContext(); } diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringPlainTextPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringPlainTextPasswordValidationCallbackHandler.java index b92e7d80..ed0e5c9f 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringPlainTextPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringPlainTextPasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -64,10 +64,12 @@ public class SpringPlainTextPasswordValidationCallbackHandler extends AbstractWs Assert.notNull(authenticationManager, "authenticationManager is required"); } + @Override protected void handleCleanup(CleanupCallback callback) throws IOException, UnsupportedCallbackException { SecurityContextHolder.clearContext(); } + @Override protected void handleUsernameTokenUnknown(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { String identifier = callback.getIdentifier(); diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java index 0e88580a..faa5fa05 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -71,6 +71,7 @@ public class AcegiDigestPasswordValidationCallbackHandler extends AbstractWsPass Assert.notNull(userDetailsService, "userDetailsService is required"); } + @Override protected void handleUsernameToken(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { String identifier = callback.getIdentifier(); UserDetails user = loadUserDetails(identifier); @@ -80,6 +81,7 @@ public class AcegiDigestPasswordValidationCallbackHandler extends AbstractWsPass } } + @Override protected void handleUsernameTokenPrincipal(UsernameTokenPrincipalCallback callback) throws IOException, UnsupportedCallbackException { UserDetails user = loadUserDetails(callback.getPrincipal().getName()); @@ -92,6 +94,7 @@ public class AcegiDigestPasswordValidationCallbackHandler extends AbstractWsPass SecurityContextHolder.getContext().setAuthentication(authRequest); } + @Override protected void handleCleanup(CleanupCallback callback) throws IOException, UnsupportedCallbackException { SecurityContextHolder.clearContext(); } diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java index 623893a7..1798e057 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -66,10 +66,12 @@ public class AcegiPlainTextPasswordValidationCallbackHandler extends AbstractWsP Assert.notNull(authenticationManager, "authenticationManager is required"); } + @Override protected void handleCleanup(CleanupCallback callback) throws IOException, UnsupportedCallbackException { SecurityContextHolder.clearContext(); } + @Override protected void handleUsernameTokenUnknown(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { String identifier = callback.getIdentifier(); diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java index 7a654e94..2acdfd5b 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -125,6 +125,7 @@ public class XwsSecurityInterceptor extends AbstractWsSecurityInterceptor implem * @throws XwsSecuritySecurementException in case of errors * @throws IllegalArgumentException when soapMessage is not a SaajSoapMessage */ + @Override protected void secureMessage(SoapMessage soapMessage, MessageContext messageContext) throws XwsSecuritySecurementException { Assert.isTrue(soapMessage instanceof SaajSoapMessage, "XwsSecurityInterceptor requires a SaajSoapMessage. " + @@ -150,6 +151,7 @@ public class XwsSecurityInterceptor extends AbstractWsSecurityInterceptor implem * @throws XwsSecurityValidationException in case of errors * @throws IllegalArgumentException when soapMessage is not a SaajSoapMessage */ + @Override protected void validateMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecurityValidationException { Assert.isTrue(soapMessage instanceof SaajSoapMessage, "XwsSecurityInterceptor requires a SaajSoapMessage. " + @@ -168,6 +170,7 @@ public class XwsSecurityInterceptor extends AbstractWsSecurityInterceptor implem } } + @Override protected void cleanUp() { if (callbackHandler != null) { try { diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java index 8bdd487d..fb8d118f 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/CryptographyCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ import org.springframework.ws.soap.security.callback.AbstractCallbackHandler; */ public class CryptographyCallbackHandler extends AbstractCallbackHandler { + @Override protected final void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof CertificateValidationCallback) { handleCertificateValidationCallback((CertificateValidationCallback) callback); diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java index 225c8226..8b6ae1fa 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -229,6 +229,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme } } + @Override protected final void handleAliasPrivKeyCertRequest(SignatureKeyCallback callback, SignatureKeyCallback.AliasPrivKeyCertRequest request) throws IOException { @@ -238,6 +239,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setX509Certificate(certificate); } + @Override protected final void handleAliasSymmetricKeyRequest(DecryptionKeyCallback callback, DecryptionKeyCallback.AliasSymmetricKeyRequest request) throws IOException { @@ -249,6 +251,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme // Encryption // + @Override protected final void handleAliasSymmetricKeyRequest(EncryptionKeyCallback callback, EncryptionKeyCallback.AliasSymmetricKeyRequest request) throws IOException { @@ -256,6 +259,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setSymmetricKey(secretKey); } + @Override protected final void handleAliasX509CertificateRequest(EncryptionKeyCallback callback, EncryptionKeyCallback.AliasX509CertificateRequest request) throws IOException { @@ -267,6 +271,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme // Certificate validation // + @Override protected final void handleCertificateValidationCallback(CertificateValidationCallback callback) { callback.setValidator(new KeyStoreCertificateValidator()); } @@ -275,6 +280,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme // Signing // + @Override protected final void handleDefaultPrivKeyCertRequest(SignatureKeyCallback callback, SignatureKeyCallback.DefaultPrivKeyCertRequest request) throws IOException { @@ -284,6 +290,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setX509Certificate(certificate); } + @Override protected final void handleDefaultX509CertificateRequest(EncryptionKeyCallback callback, EncryptionKeyCallback.DefaultX509CertificateRequest request) throws IOException { @@ -291,6 +298,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setX509Certificate(certificate); } + @Override protected final void handlePublicKeyBasedPrivKeyCertRequest(SignatureKeyCallback callback, SignatureKeyCallback.PublicKeyBasedPrivKeyCertRequest request) throws IOException { @@ -303,6 +311,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme // // Decryption // + @Override protected final void handlePublicKeyBasedPrivKeyRequest(DecryptionKeyCallback callback, DecryptionKeyCallback.PublicKeyBasedPrivKeyRequest request) throws IOException { @@ -310,6 +319,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setPrivateKey(key); } + @Override protected final void handlePublicKeyBasedRequest(EncryptionKeyCallback callback, EncryptionKeyCallback.PublicKeyBasedRequest request) throws IOException { @@ -317,6 +327,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setX509Certificate(certificate); } + @Override protected final void handlePublicKeyBasedRequest(SignatureVerificationKeyCallback callback, SignatureVerificationKeyCallback.PublicKeyBasedRequest request) throws IOException { @@ -324,6 +335,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setX509Certificate(certificate); } + @Override protected final void handleX509CertificateBasedRequest(DecryptionKeyCallback callback, DecryptionKeyCallback.X509CertificateBasedRequest request) throws IOException { @@ -331,6 +343,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setPrivateKey(privKey); } + @Override protected final void handleX509IssuerSerialBasedRequest(DecryptionKeyCallback callback, DecryptionKeyCallback.X509IssuerSerialBasedRequest request) throws IOException { @@ -338,6 +351,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setPrivateKey(key); } + @Override protected final void handleX509IssuerSerialBasedRequest(SignatureVerificationKeyCallback callback, SignatureVerificationKeyCallback.X509IssuerSerialBasedRequest request) throws IOException { @@ -345,6 +359,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme request.setX509Certificate(certificate); } + @Override protected final void handleX509SubjectKeyIdentifierBasedRequest(DecryptionKeyCallback callback, DecryptionKeyCallback.X509SubjectKeyIdentifierBasedRequest request) throws IOException { @@ -356,6 +371,7 @@ public class KeyStoreCallbackHandler extends CryptographyCallbackHandler impleme // Signature verification // + @Override protected final void handleX509SubjectKeyIdentifierBasedRequest(SignatureVerificationKeyCallback callback, SignatureVerificationKeyCallback.X509SubjectKeyIdentifierBasedRequest request) throws IOException { diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java index aff1df36..38eb6049 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/MockValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -49,6 +49,7 @@ public class MockValidationCallbackHandler extends AbstractCallbackHandler { isValid = valid; } + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof CertificateValidationCallback) { CertificateValidationCallback validationCallback = (CertificateValidationCallback) callback; diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java index ca2331f3..bff9c55f 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -54,6 +54,7 @@ public class SimplePasswordValidationCallbackHandler extends AbstractCallbackHan Assert.notNull(users, "users is required"); } + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof PasswordValidationCallback) { PasswordValidationCallback passwordCallback = (PasswordValidationCallback) callback; diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java index 8aa033ea..04e15f9e 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -57,6 +57,7 @@ public class SimpleUsernamePasswordCallbackHandler extends AbstractCallbackHandl Assert.hasLength(password, "password must be set"); } + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof UsernameCallback) { UsernameCallback usernameCallback = (UsernameCallback) callback; diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandler.java index 780a90ee..8400afa7 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -76,6 +76,7 @@ public class SpringCertificateValidationCallbackHandler extends AbstractCallback * @throws javax.security.auth.callback.UnsupportedCallbackException * when the callback is not supported */ + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof CertificateValidationCallback) { ((CertificateValidationCallback) callback).setValidator(new SpringSecurityCertificateValidator()); diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandler.java index 702cd77b..74dac8e6 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -81,6 +81,7 @@ public class SpringDigestPasswordValidationCallbackHandler extends AbstractCallb * @throws javax.security.auth.callback.UnsupportedCallbackException * when the callback is not supported */ + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof PasswordValidationCallback) { PasswordValidationCallback passwordCallback = (PasswordValidationCallback) callback; @@ -136,6 +137,7 @@ public class SpringDigestPasswordValidationCallbackHandler extends AbstractCallb this.user = user; } + @Override public boolean validate(PasswordValidationCallback.Request request) throws PasswordValidationCallback.PasswordValidationException { if (super.validate(request)) { diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandler.java index a70e4fe9..b676c9d2 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -77,6 +77,7 @@ public class SpringPlainTextPasswordValidationCallbackHandler extends AbstractCa * @throws javax.security.auth.callback.UnsupportedCallbackException * when the callback is not supported */ + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof PasswordValidationCallback) { PasswordValidationCallback validationCallback = (PasswordValidationCallback) callback; diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandler.java index d465a5b2..cefafa04 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ import org.springframework.ws.soap.security.callback.AbstractCallbackHandler; */ public class SpringUsernamePasswordCallbackHandler extends AbstractCallbackHandler { + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof UsernameCallback) { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/XwssCallbackHandlerChain.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/XwssCallbackHandlerChain.java index 63109f53..ecac5a52 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/XwssCallbackHandlerChain.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/XwssCallbackHandlerChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -41,6 +41,7 @@ public class XwssCallbackHandlerChain extends CallbackHandlerChain { super(callbackHandlers); } + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof CertificateValidationCallback) { handleCertificateValidationCallback((CertificateValidationCallback) callback); diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandler.java index 4f7f8643..3e7f60dc 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -75,6 +75,7 @@ public class AcegiCertificateValidationCallbackHandler extends AbstractCallbackH * * @throws UnsupportedCallbackException when the callback is not supported */ + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof CertificateValidationCallback) { ((CertificateValidationCallback) callback).setValidator(new AcegiCertificateValidator()); diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java index e75b1b96..1b43cf2d 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -82,6 +82,7 @@ public class AcegiDigestPasswordValidationCallbackHandler extends AbstractCallba * * @throws UnsupportedCallbackException when the callback is not supported */ + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof PasswordValidationCallback) { PasswordValidationCallback passwordCallback = (PasswordValidationCallback) callback; @@ -137,6 +138,7 @@ public class AcegiDigestPasswordValidationCallbackHandler extends AbstractCallba this.user = user; } + @Override public boolean validate(PasswordValidationCallback.Request request) throws PasswordValidationCallback.PasswordValidationException { if (super.validate(request)) { diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java index f8340ddf..a124ab3b 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -77,6 +77,7 @@ public class AcegiPlainTextPasswordValidationCallbackHandler extends AbstractCal * * @throws UnsupportedCallbackException when the callback is not supported */ + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof PasswordValidationCallback) { PasswordValidationCallback validationCallback = (PasswordValidationCallback) callback; diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiUsernamePasswordCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiUsernamePasswordCallbackHandler.java index 207ff610..b9667e8e 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiUsernamePasswordCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiUsernamePasswordCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -40,6 +40,7 @@ import org.springframework.ws.soap.security.callback.AbstractCallbackHandler; */ public class AcegiUsernamePasswordCallbackHandler extends AbstractCallbackHandler { + @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { if (callback instanceof UsernameCallback) { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java index 9e4c7dd4..3ff4b969 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -45,6 +45,7 @@ public class JaasCertificateValidationCallbackHandler extends AbstractJaasValida * * @throws UnsupportedCallbackException when the callback is not supported */ + @Override protected final void handleInternal(Callback callback) throws UnsupportedCallbackException { if (callback instanceof CertificateValidationCallback) { ((CertificateValidationCallback) callback).setValidator(new JaasCertificateValidator()); diff --git a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java index a0b03429..e0be9be7 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -46,6 +46,7 @@ public class JaasPlainTextPasswordValidationCallbackHandler extends AbstractJaas * * @throws UnsupportedCallbackException when the callback is not supported */ + @Override protected final void handleInternal(Callback callback) throws UnsupportedCallbackException { if (callback instanceof PasswordValidationCallback) { PasswordValidationCallback validationCallback = (PasswordValidationCallback) callback; @@ -71,6 +72,7 @@ public class JaasPlainTextPasswordValidationCallbackHandler extends AbstractJaas try { loginContext = new LoginContext(getLoginContextName(), new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) throws UnsupportedCallbackException { if (callback instanceof NameCallback) { ((NameCallback) callback).setName(username); diff --git a/security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java b/security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java index 33748b4e..71f691b9 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ public class CallbackHandlerChainTest extends TestCase { private Callback callback = new Callback() { }; + @Override protected void setUp() throws Exception { } diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jInterceptorTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jInterceptorTestCase.java index 101ef328..ca48588c 100755 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jInterceptorTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jInterceptorTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -30,11 +30,13 @@ public abstract class Wss4jInterceptorTestCase extends Wss4jTestCase { SoapMessage validatedRequest = loadSoap11Message("empty-soap.xml"); final Object validatedRequestMessage = getMessage(validatedRequest); Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor() { + @Override protected void secureMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecuritySecurementException { fail("secure not expected"); } + @Override protected void validateMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecurityValidationException { assertEquals("Invalid message", requestMessage, getMessage(soapMessage)); @@ -52,11 +54,13 @@ public abstract class Wss4jInterceptorTestCase extends Wss4jTestCase { Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor() { + @Override protected void secureMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecuritySecurementException { setMessage(soapMessage, securedResponseMessage); } + @Override protected void validateMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecurityValidationException { fail("validate not expected"); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorAcegiCallbackHandlerTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorAcegiCallbackHandlerTestCase.java index 2cac770f..6071b9e9 100755 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorAcegiCallbackHandlerTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorAcegiCallbackHandlerTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -43,12 +43,14 @@ public abstract class Wss4jMessageInterceptorAcegiCallbackHandlerTestCase extend private AuthenticationManager mock; + @Override protected void onSetup() throws Exception { control = MockControl.createControl(AuthenticationManager.class); mock = (AuthenticationManager) control.getMock(); users.setProperty("Bert", "Ernie,ROLE_TEST"); } + @Override protected void tearDown() throws Exception { control.verify(); SecurityContextHolder.clearContext(); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java index d457d33f..156afa70 100755 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorEncryptionTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ public abstract class Wss4jMessageInterceptorEncryptionTestCase extends Wss4jTes protected Wss4jSecurityInterceptor interceptor; + @Override protected void onSetup() throws Exception { interceptor = new Wss4jSecurityInterceptor(); interceptor.setValidationActions("Encrypt"); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorHeaderTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorHeaderTestCase.java index ce7a8c95..7b1038a0 100755 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorHeaderTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorHeaderTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -32,6 +32,7 @@ public abstract class Wss4jMessageInterceptorHeaderTestCase extends Wss4jTestCas private Wss4jSecurityInterceptor interceptor; + @Override protected void onSetup() throws Exception { Properties users = new Properties(); users.setProperty("Bert", "Ernie"); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSignTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSignTestCase.java index 946e2051..83834832 100755 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSignTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSignTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ public abstract class Wss4jMessageInterceptorSignTestCase extends Wss4jTestCase protected Wss4jSecurityInterceptor interceptor; + @Override protected void onSetup() throws Exception { interceptor = new Wss4jSecurityInterceptor(); interceptor.setValidationActions("Signature"); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSoapActionTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSoapActionTestCase.java index 9c387226..01747c5e 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSoapActionTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSoapActionTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public abstract class Wss4jMessageInterceptorSoapActionTestCase extends Wss4jTes private Wss4jSecurityInterceptor interceptor; + @Override protected void onSetup() throws Exception { users = new Properties(); users.setProperty("Bert", "Ernie"); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java index ff54f887..ddc5ab7d 100755 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -43,12 +43,14 @@ public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCa private AuthenticationManager mock; + @Override protected void onSetup() throws Exception { control = MockControl.createControl(AuthenticationManager.class); mock = (AuthenticationManager) control.getMock(); users.setProperty("Bert", "Ernie,ROLE_TEST"); } + @Override protected void tearDown() throws Exception { control.verify(); SecurityContextHolder.clearContext(); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java index d642da97..2df50008 100755 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -30,6 +30,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTestCase extends Wss4j private Properties users = new Properties(); + @Override protected void onSetup() throws Exception { users.setProperty("Bert", "Ernie"); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java index 29c88ce7..7f31d022 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorX509TestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -29,6 +29,7 @@ public abstract class Wss4jMessageInterceptorX509TestCase extends Wss4jTestCase protected Wss4jSecurityInterceptor interceptor; + @Override protected void onSetup() throws Exception { interceptor = new Wss4jSecurityInterceptor(); interceptor.setSecurementActions("Signature"); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jTestCase.java index 156e9a99..bde5c050 100755 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.soap.security.wss4j; import java.io.InputStream; @@ -58,6 +59,7 @@ public abstract class Wss4jTestCase extends TestCase { protected Jaxp13XPathTemplate xpathTemplate = new Jaxp13XPathTemplate(); + @Override protected final void setUp() throws Exception { if (!axiomTest && !saajTest) { throw new IllegalArgumentException("test class name must statrt with either Axiom or Saaj"); @@ -254,6 +256,7 @@ public abstract class Wss4jTestCase extends TestCase { protected MessageContext getSoap11MessageContext(final SoapMessage response) throws Exception { return new DefaultMessageContext(response, getSoap11MessageFactory()) { + @Override public WebServiceMessage getResponse() { return response; } @@ -262,6 +265,7 @@ public abstract class Wss4jTestCase extends TestCase { protected MessageContext getSoap12MessageContext(final SoapMessage response) throws Exception { return new DefaultMessageContext(response, getSoap12MessageFactory()) { + @Override public WebServiceMessage getResponse() { return response; } diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandlerTest.java index 261b5ae3..b052f9c0 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -30,6 +30,7 @@ public class KeyStoreCallbackHandlerTest extends TestCase { private WSPasswordCallback callback; + @Override protected void setUp() throws Exception { callbackHandler = new KeyStoreCallbackHandler(); callback = new WSPasswordCallback("secretkey", WSPasswordCallback.KEY_NAME); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandlerTest.java index c58fbd14..24191bb4 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -46,6 +46,7 @@ public class SpringDigestPasswordValidationCallbackHandlerTest extends TestCase private UserDetails user; + @Override protected void setUp() throws Exception { callbackHandler = new SpringDigestPasswordValidationCallbackHandler(); diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandlerTest.java index 44506518..1c259272 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/callback/acegi/AcegiDigestPasswordValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -45,6 +45,7 @@ public class AcegiDigestPasswordValidationCallbackHandlerTest extends TestCase { private UserDetails user; + @Override protected void setUp() throws Exception { callbackHandler = new AcegiDigestPasswordValidationCallbackHandler(); @@ -56,6 +57,7 @@ public class AcegiDigestPasswordValidationCallbackHandlerTest extends TestCase { callbackHandler.setUserDetailsService(userDetailsService); } + @Override protected void tearDown() throws Exception { control.reset(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBeanTest.java b/security/src/test/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBeanTest.java index 2ea4c820..c5a66598 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBeanTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -28,6 +28,7 @@ public class CryptoFactoryBeanTest extends TestCase { private CryptoFactoryBean factoryBean; + @Override protected void setUp() throws Exception { factoryBean = new CryptoFactoryBean(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorKeyStoreTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorKeyStoreTestCase.java index 3d757002..be9942c6 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorKeyStoreTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorKeyStoreTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -27,6 +27,7 @@ public abstract class AbstractXwssMessageInterceptorKeyStoreTestCase extends Abs protected PrivateKey privateKey; + @Override protected void onSetup() throws Exception { KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); InputStream is = null; diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorTestCase.java index ca408f4a..ff8581dc 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorTestCase.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/AbstractXwssMessageInterceptorTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -43,6 +43,7 @@ public abstract class AbstractXwssMessageInterceptorTestCase extends XMLTestCase private Map namespaces; + @Override protected final void setUp() throws Exception { interceptor = new XwsSecurityInterceptor(); messageFactory = MessageFactory.newInstance(); diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java index ee204b7c..143d3fbc 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -32,6 +32,7 @@ public class XwsSecurityInterceptorTest extends TestCase { private MessageFactory messageFactory; + @Override protected void setUp() throws Exception { messageFactory = MessageFactory.newInstance(); } @@ -41,11 +42,13 @@ public class XwsSecurityInterceptorTest extends TestCase { final SOAPMessage validatedRequest = messageFactory.createMessage(); XwsSecurityInterceptor interceptor = new XwsSecurityInterceptor() { + @Override protected void secureMessage(SoapMessage soapMessage, MessageContext messageContext) throws XwsSecuritySecurementException { fail("secure not expected"); } + @Override protected void validateMessage(SoapMessage message, MessageContext messageContext) throws WsSecurityValidationException { SaajSoapMessage saajSoapMessage = (SaajSoapMessage) message; @@ -64,12 +67,14 @@ public class XwsSecurityInterceptorTest extends TestCase { final SOAPMessage securedResponse = messageFactory.createMessage(); XwsSecurityInterceptor interceptor = new XwsSecurityInterceptor() { + @Override protected void secureMessage(SoapMessage message, MessageContext messageContext) throws XwsSecuritySecurementException { SaajSoapMessage saajSoapMessage = (SaajSoapMessage) message; saajSoapMessage.setSaajMessage(securedResponse); } + @Override protected void validateMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecurityValidationException { fail("validate not expected"); @@ -89,6 +94,7 @@ public class XwsSecurityInterceptorTest extends TestCase { final SOAPMessage securedRequest = messageFactory.createMessage(); XwsSecurityInterceptor interceptor = new XwsSecurityInterceptor() { + @Override protected void secureMessage(SoapMessage soapMessage, MessageContext messageContext) throws XwsSecuritySecurementException { SaajSoapMessage saajSoapMessage = (SaajSoapMessage) soapMessage; @@ -96,6 +102,7 @@ public class XwsSecurityInterceptorTest extends TestCase { saajSoapMessage.setSaajMessage(securedRequest); } + @Override protected void validateMessage(SoapMessage message, MessageContext messageContext) throws WsSecurityValidationException { fail("validate not expected"); @@ -112,11 +119,13 @@ public class XwsSecurityInterceptorTest extends TestCase { final SOAPMessage validatedResponse = messageFactory.createMessage(); XwsSecurityInterceptor interceptor = new XwsSecurityInterceptor() { + @Override protected void secureMessage(SoapMessage message, MessageContext messageContext) throws XwsSecuritySecurementException { fail("secure not expected"); } + @Override protected void validateMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecurityValidationException { SaajSoapMessage saajSoapMessage = (SaajSoapMessage) soapMessage; diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java index b1eafa0a..b46b4bdb 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -33,6 +33,7 @@ public class XwssMessageInterceptorEncryptTest extends AbstractXwssMessageInterc interceptor.setPolicyConfiguration(new ClassPathResource("encrypt-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof EncryptionKeyCallback) { EncryptionKeyCallback keyCallback = (EncryptionKeyCallback) callback; @@ -67,6 +68,7 @@ public class XwssMessageInterceptorEncryptTest extends AbstractXwssMessageInterc interceptor.setPolicyConfiguration(new ClassPathResource("encrypt-alias-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof EncryptionKeyCallback) { EncryptionKeyCallback keyCallback = (EncryptionKeyCallback) callback; @@ -101,6 +103,7 @@ public class XwssMessageInterceptorEncryptTest extends AbstractXwssMessageInterc interceptor.setPolicyConfiguration(new ClassPathResource("decrypt-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof DecryptionKeyCallback) { DecryptionKeyCallback keyCallback = (DecryptionKeyCallback) callback; diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorSignTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorSignTest.java index bd5fc9a6..71170e4d 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorSignTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorSignTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public class XwssMessageInterceptorSignTest extends AbstractXwssMessageIntercept interceptor.setPolicyConfiguration(new ClassPathResource("sign-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof SignatureKeyCallback) { SignatureKeyCallback keyCallback = (SignatureKeyCallback) callback; @@ -68,6 +69,7 @@ public class XwssMessageInterceptorSignTest extends AbstractXwssMessageIntercept interceptor.setPolicyConfiguration(new ClassPathResource("sign-alias-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof SignatureKeyCallback) { SignatureKeyCallback keyCallback = (SignatureKeyCallback) callback; @@ -103,6 +105,7 @@ public class XwssMessageInterceptorSignTest extends AbstractXwssMessageIntercept interceptor.setPolicyConfiguration(new ClassPathResource("requireSignature-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof CertificateValidationCallback) { CertificateValidationCallback validationCallback = (CertificateValidationCallback) callback; diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorUsernameTokenTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorUsernameTokenTest.java index c8f35ea1..659bf1b4 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorUsernameTokenTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorUsernameTokenTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -35,6 +35,7 @@ public class XwssMessageInterceptorUsernameTokenTest extends AbstractXwssMessage interceptor.setPolicyConfiguration(new ClassPathResource("usernameToken-digest-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof UsernameCallback) { ((UsernameCallback) callback).setUsername("Bert"); @@ -65,6 +66,7 @@ public class XwssMessageInterceptorUsernameTokenTest extends AbstractXwssMessage interceptor.setPolicyConfiguration(new ClassPathResource("usernameToken-plainText-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof UsernameCallback) { ((UsernameCallback) callback).setUsername("Bert"); @@ -96,6 +98,7 @@ public class XwssMessageInterceptorUsernameTokenTest extends AbstractXwssMessage .setPolicyConfiguration(new ClassPathResource("requireUsernameToken-plainText-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof PasswordValidationCallback) { PasswordValidationCallback validationCallback = (PasswordValidationCallback) callback; @@ -133,6 +136,7 @@ public class XwssMessageInterceptorUsernameTokenTest extends AbstractXwssMessage interceptor.setPolicyConfiguration(new ClassPathResource("requireUsernameToken-digest-config.xml", getClass())); CallbackHandler handler = new AbstractCallbackHandler() { + @Override protected void handleInternal(Callback callback) { if (callback instanceof PasswordValidationCallback) { PasswordValidationCallback validationCallback = (PasswordValidationCallback) callback; diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidatorTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidatorTest.java index e0a40606..3b21ddf2 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidatorTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/DefaultTimestampValidatorTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2005-2010 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.security.xwss.callback; import com.sun.xml.wss.impl.callback.TimestampValidationCallback; @@ -7,6 +23,7 @@ public class DefaultTimestampValidatorTest extends TestCase { private DefaultTimestampValidator validator; + @Override protected void setUp() throws Exception { validator = new DefaultTimestampValidator(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandlerTest.java index baef0e78..68448c3f 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/KeyStoreCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ public class KeyStoreCallbackHandlerTest extends TestCase { private KeyStoreCallbackHandler handler; + @Override protected void setUp() throws Exception { handler = new KeyStoreCallbackHandler(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandlerTest.java index 43cd16b7..2c8ab067 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimplePasswordValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -25,6 +25,7 @@ public class SimplePasswordValidationCallbackHandlerTest extends TestCase { private SimplePasswordValidationCallbackHandler handler; + @Override protected void setUp() throws Exception { handler = new SimplePasswordValidationCallbackHandler(); Properties users = new Properties(); diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandlerTest.java index 0cc1041c..bce61dc2 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SimpleUsernamePasswordCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -24,6 +24,7 @@ public class SimpleUsernamePasswordCallbackHandlerTest extends TestCase { private SimpleUsernamePasswordCallbackHandler handler; + @Override protected void setUp() throws Exception { handler = new SimpleUsernamePasswordCallbackHandler(); handler.setUsername("Bert"); diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandlerTest.java index 5e797622..2de86308 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringCertificateValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -45,6 +45,7 @@ public class SpringCertificateValidationCallbackHandlerTest extends TestCase { private CertificateValidationCallback callback; + @Override protected void setUp() throws Exception { callbackHandler = new SpringCertificateValidationCallbackHandler(); control = MockControl.createControl(AuthenticationManager.class); @@ -65,6 +66,7 @@ public class SpringCertificateValidationCallbackHandlerTest extends TestCase { callback = new CertificateValidationCallback(certificate); } + @Override protected void tearDown() throws Exception { SecurityContextHolder.clearContext(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java index d386920f..c21f4fda 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringDigestPasswordValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -43,6 +43,7 @@ public class SpringDigestPasswordValidationCallbackHandlerTest extends TestCase private PasswordValidationCallback callback; + @Override protected void setUp() throws Exception { callbackHandler = new SpringDigestPasswordValidationCallbackHandler(); control = MockControl.createControl(UserDetailsService.class); @@ -58,6 +59,7 @@ public class SpringDigestPasswordValidationCallbackHandlerTest extends TestCase callback = new PasswordValidationCallback(request); } + @Override protected void tearDown() throws Exception { SecurityContextHolder.clearContext(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandlerTest.java index d2b9bfc6..4f8a183e 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringPlainTextPasswordValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -43,6 +43,7 @@ public class SpringPlainTextPasswordValidationCallbackHandlerTest extends TestCa private String password; + @Override protected void setUp() throws Exception { callbackHandler = new SpringPlainTextPasswordValidationCallbackHandler(); control = MockControl.createControl(AuthenticationManager.class); @@ -55,6 +56,7 @@ public class SpringPlainTextPasswordValidationCallbackHandlerTest extends TestCa callback = new PasswordValidationCallback(request); } + @Override protected void tearDown() throws Exception { SecurityContextHolder.clearContext(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandlerTest.java index 8901ae0f..c669ac92 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/SpringUsernamePasswordCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -28,12 +28,14 @@ public class SpringUsernamePasswordCallbackHandlerTest extends TestCase { private SpringUsernamePasswordCallbackHandler handler; + @Override protected void setUp() throws Exception { handler = new SpringUsernamePasswordCallbackHandler(); Authentication authentication = new UsernamePasswordAuthenticationToken("Bert", "Ernie"); SecurityContextHolder.getContext().setAuthentication(authentication); } + @Override protected void tearDown() throws Exception { SecurityContextHolder.clearContext(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandlerTest.java index 586d9955..8bc73df3 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiCertificateValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -45,6 +45,7 @@ public class AcegiCertificateValidationCallbackHandlerTest extends TestCase { private CertificateValidationCallback callback; + @Override protected void setUp() throws Exception { callbackHandler = new AcegiCertificateValidationCallbackHandler(); control = MockControl.createControl(AuthenticationManager.class); @@ -65,6 +66,7 @@ public class AcegiCertificateValidationCallbackHandlerTest extends TestCase { callback = new CertificateValidationCallback(certificate); } + @Override protected void tearDown() throws Exception { SecurityContextHolder.clearContext(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandlerTest.java index ac2b56db..6f596675 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiDigestPasswordValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -43,6 +43,7 @@ public class AcegiDigestPasswordValidationCallbackHandlerTest extends TestCase { private PasswordValidationCallback callback; + @Override protected void setUp() throws Exception { callbackHandler = new AcegiDigestPasswordValidationCallbackHandler(); control = MockControl.createControl(UserDetailsService.class); @@ -58,6 +59,7 @@ public class AcegiDigestPasswordValidationCallbackHandlerTest extends TestCase { callback = new PasswordValidationCallback(request); } + @Override protected void tearDown() throws Exception { SecurityContextHolder.clearContext(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandlerTest.java index 33177cae..40b10896 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiPlainTextPasswordValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -43,6 +43,7 @@ public class AcegiPlainTextPasswordValidationCallbackHandlerTest extends TestCas private String password; + @Override protected void setUp() throws Exception { callbackHandler = new AcegiPlainTextPasswordValidationCallbackHandler(); control = MockControl.createControl(AuthenticationManager.class); @@ -55,6 +56,7 @@ public class AcegiPlainTextPasswordValidationCallbackHandlerTest extends TestCas callback = new PasswordValidationCallback(request); } + @Override protected void tearDown() throws Exception { SecurityContextHolder.clearContext(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiUsernamePasswordCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiUsernamePasswordCallbackHandlerTest.java index c6f0cc16..2952575b 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiUsernamePasswordCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/acegi/AcegiUsernamePasswordCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -27,12 +27,14 @@ public class AcegiUsernamePasswordCallbackHandlerTest extends TestCase { private AcegiUsernamePasswordCallbackHandler handler; + @Override protected void setUp() throws Exception { handler = new AcegiUsernamePasswordCallbackHandler(); Authentication authentication = new UsernamePasswordAuthenticationToken("Bert", "Ernie"); SecurityContextHolder.getContext().setAuthentication(authentication); } + @Override protected void tearDown() throws Exception { SecurityContextHolder.clearContext(); } diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandlerTest.java index acc308f5..e7e7d8e9 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasCertificateValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ public class JaasCertificateValidationCallbackHandlerTest extends TestCase { private CertificateValidationCallback callback; + @Override protected void setUp() throws Exception { System.setProperty("java.security.auth.login.config", getClass().getResource("jaas.config").toString()); callbackHandler = new JaasCertificateValidationCallbackHandler(); diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandlerTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandlerTest.java index c3da562f..e2b5282a 100644 --- a/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandlerTest.java +++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/callback/jaas/JaasPlainTextPasswordValidationCallbackHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -23,6 +23,7 @@ public class JaasPlainTextPasswordValidationCallbackHandlerTest extends TestCase private JaasPlainTextPasswordValidationCallbackHandler callbackHandler; + @Override protected void setUp() throws Exception { System.setProperty("java.security.auth.login.config", getClass().getResource("jaas.config").toString()); callbackHandler = new JaasPlainTextPasswordValidationCallbackHandler(); diff --git a/support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java b/support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java index a095fdcb..06a92601 100644 --- a/support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java +++ b/support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -92,15 +92,18 @@ public class HttpExchangeConnection extends AbstractReceiverConnection * Receiving request */ + @Override protected Iterator getRequestHeaderNames() throws IOException { return httpExchange.getRequestHeaders().keySet().iterator(); } + @Override protected Iterator getRequestHeaders(String name) throws IOException { List headers = httpExchange.getRequestHeaders().get(name); return headers != null ? headers.iterator() : Collections.EMPTY_LIST.iterator(); } + @Override protected InputStream getRequestInputStream() throws IOException { return httpExchange.getRequestBody(); } @@ -109,10 +112,12 @@ public class HttpExchangeConnection extends AbstractReceiverConnection * Sending response */ + @Override protected void addResponseHeader(String name, String value) throws IOException { httpExchange.getResponseHeaders().add(name, value); } + @Override protected OutputStream getResponseOutputStream() throws IOException { if (chunkedEncoding) { httpExchange.sendResponseHeaders(responseStatusCode, 0); @@ -126,6 +131,7 @@ public class HttpExchangeConnection extends AbstractReceiverConnection } } + @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { if (!chunkedEncoding) { byte[] buf = responseBuffer.toByteArray(); @@ -136,6 +142,7 @@ public class HttpExchangeConnection extends AbstractReceiverConnection responseBuffer = null; } + @Override public void onClose() throws IOException { if (responseStatusCode == HttpTransportConstants.STATUS_ACCEPTED || responseStatusCode == HttpTransportConstants.STATUS_NOT_FOUND) { diff --git a/support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java b/support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java index e5ba67ef..15bbb69b 100644 --- a/support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java +++ b/support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -124,6 +124,7 @@ public class HttpsUrlConnectionMessageSender extends HttpUrlConnectionMessageSen "Setting either 'keyManagers' or 'trustManagers' is required"); } + @Override protected void prepareConnection(HttpURLConnection connection) throws IOException { super.prepareConnection(connection); if (connection instanceof HttpsURLConnection) { diff --git a/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java b/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java index 81d452bb..a53be4cb 100644 --- a/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java +++ b/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ class BytesMessageInputStream extends InputStream { this.message = message; } + @Override public int read(byte b[]) throws IOException { try { return message.readBytes(b); @@ -48,6 +49,7 @@ class BytesMessageInputStream extends InputStream { } } + @Override public int read(byte b[], int off, int len) throws IOException { if (off == 0) { try { @@ -62,6 +64,7 @@ class BytesMessageInputStream extends InputStream { } } + @Override public int read() throws IOException { try { return message.readByte(); diff --git a/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java b/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java index fa8a4adf..f179683c 100644 --- a/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java +++ b/support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -38,6 +38,7 @@ class BytesMessageOutputStream extends OutputStream { this.message = message; } + @Override public void write(byte b[]) throws IOException { try { message.writeBytes(b); @@ -47,6 +48,7 @@ class BytesMessageOutputStream extends OutputStream { } } + @Override public void write(byte b[], int off, int len) throws IOException { try { message.writeBytes(b, off, len); @@ -56,6 +58,7 @@ class BytesMessageOutputStream extends OutputStream { } } + @Override public void write(int b) throws IOException { try { message.writeByte((byte) b); diff --git a/support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java b/support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java index 5740e67b..e226d997 100644 --- a/support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java +++ b/support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -136,6 +136,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { * Receiving */ + @Override protected Iterator getRequestHeaderNames() throws IOException { try { return JmsTransportUtils.getHeaderNames(requestMessage); @@ -145,6 +146,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { } } + @Override protected Iterator getRequestHeaders(String name) throws IOException { try { return JmsTransportUtils.getHeaders(requestMessage, name); @@ -154,6 +156,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { } } + @Override protected InputStream getRequestInputStream() throws IOException { if (requestMessage instanceof BytesMessage) { return new BytesMessageInputStream((BytesMessage) requestMessage); @@ -170,6 +173,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { * Sending */ + @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { try { if (requestMessage instanceof BytesMessage) { @@ -192,6 +196,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { } } + @Override protected void addResponseHeader(String name, String value) throws IOException { try { JmsTransportUtils.addHeader(responseMessage, name, value); @@ -201,6 +206,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { } } + @Override protected OutputStream getResponseOutputStream() throws IOException { if (responseMessage instanceof BytesMessage) { return new BytesMessageOutputStream((BytesMessage) responseMessage); @@ -213,6 +219,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { } } + @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { MessageProducer messageProducer = null; try { diff --git a/support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java b/support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java index 158683fe..3bc97d6c 100644 --- a/support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java +++ b/support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -177,6 +177,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { * Sending */ + @Override protected void addRequestHeader(String name, String value) throws IOException { try { JmsTransportUtils.addHeader(requestMessage, name, value); @@ -186,6 +187,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { } } + @Override protected OutputStream getRequestOutputStream() throws IOException { if (requestMessage instanceof BytesMessage) { return new BytesMessageOutputStream((BytesMessage) requestMessage); @@ -199,6 +201,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { } + @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { MessageProducer messageProducer = null; try { @@ -236,6 +239,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { * Receiving */ + @Override protected void onReceiveBeforeRead() throws IOException { MessageConsumer messageConsumer = null; try { @@ -280,10 +284,12 @@ public class JmsSenderConnection extends AbstractSenderConnection { } } + @Override protected boolean hasResponse() throws IOException { return responseMessage != null; } + @Override protected Iterator getResponseHeaderNames() throws IOException { try { return JmsTransportUtils.getHeaderNames(responseMessage); @@ -293,6 +299,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { } } + @Override protected Iterator getResponseHeaders(String name) throws IOException { try { return JmsTransportUtils.getHeaders(responseMessage, name); @@ -302,6 +309,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { } } + @Override protected InputStream getResponseInputStream() throws IOException { if (responseMessage instanceof BytesMessage) { return new BytesMessageInputStream((BytesMessage) responseMessage); @@ -316,6 +324,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { } + @Override protected void onClose() throws IOException { JmsUtils.closeSession(session); ConnectionFactoryUtils.releaseConnection(connection, connectionFactory, true); diff --git a/support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java b/support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java index bec30c0f..b7e8ee14 100644 --- a/support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java +++ b/support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -44,6 +44,7 @@ class TextMessageOutputStream extends FilterOutputStream { this.encoding = encoding; } + @Override public void flush() throws IOException { super.flush(); try { diff --git a/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageDrivenBean.java b/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageDrivenBean.java index 98276df9..fb8945cf 100644 --- a/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageDrivenBean.java +++ b/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageDrivenBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -90,6 +90,7 @@ public class WebServiceMessageDrivenBean extends AbstractJmsMessageDrivenBean { * @see #createMessageFactory() * @see #createMessageReceiver() */ + @Override protected void onEjbCreate() { try { connectionFactory = createConnectionFactory(); diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java b/support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java index 6721cded..34a410a0 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -131,6 +131,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver this.monitoringStrategy = monitoringStrategy; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(storeUri, "Property 'storeUri' is required"); Assert.notNull(transportUri, "Property 'transportUri' is required"); @@ -150,11 +151,13 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver super.afterPropertiesSet(); } + @Override protected void onActivate() throws MessagingException { openSession(); openFolder(); } + @Override protected void onStart() { if (logger.isInfoEnabled()) { logger.info("Starting mail receiver [" + MailTransportUtils.toPasswordProtectedString(storeUri) + "]"); @@ -162,6 +165,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver execute(new MonitoringRunnable()); } + @Override protected void onStop() { if (logger.isInfoEnabled()) { logger.info("Stopping mail receiver [" + MailTransportUtils.toPasswordProtectedString(storeUri) + "]"); @@ -169,6 +173,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver closeFolder(); } + @Override protected void onShutdown() { if (logger.isInfoEnabled()) { logger.info("Shutting down mail receiver [" + MailTransportUtils.toPasswordProtectedString(storeUri) + "]"); diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java b/support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java index fdde9bff..ca08ddcf 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -133,6 +133,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { * Receiving */ + @Override protected Iterator getRequestHeaderNames() throws IOException { try { List headers = new ArrayList(); @@ -148,6 +149,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { } } + @Override protected Iterator getRequestHeaders(String name) throws IOException { try { String[] headers = requestMessage.getHeader(name); @@ -158,6 +160,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { } } + @Override protected InputStream getRequestInputStream() throws IOException { try { return requestMessage.getInputStream(); @@ -167,6 +170,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { } } + @Override protected void addResponseHeader(String name, String value) throws IOException { try { responseMessage.addHeader(name, value); @@ -179,6 +183,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { } } + @Override protected OutputStream getResponseOutputStream() throws IOException { return responseBuffer; } @@ -187,6 +192,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { * Sending */ + @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { try { responseMessage = requestMessage.reply(false); @@ -199,6 +205,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { } } + @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { Transport transport = null; try { diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java b/support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java index c3e0c127..0107a1d6 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -144,6 +144,7 @@ public class MailSenderConnection extends AbstractSenderConnection { /* * Sending */ + @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { try { requestMessage = new MimeMessage(session); @@ -162,6 +163,7 @@ public class MailSenderConnection extends AbstractSenderConnection { } } + @Override protected void addRequestHeader(String name, String value) throws IOException { try { requestMessage.addHeader(name, value); @@ -174,10 +176,12 @@ public class MailSenderConnection extends AbstractSenderConnection { } } + @Override protected OutputStream getRequestOutputStream() throws IOException { return requestBuffer; } + @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { Transport transport = null; try { @@ -200,6 +204,7 @@ public class MailSenderConnection extends AbstractSenderConnection { * Receiving */ + @Override protected void onReceiveBeforeRead() throws IOException { try { String requestMessageId = requestMessage.getMessageID(); @@ -244,10 +249,12 @@ public class MailSenderConnection extends AbstractSenderConnection { } } + @Override protected boolean hasResponse() throws IOException { return responseMessage != null; } + @Override protected Iterator getResponseHeaderNames() throws IOException { try { List headers = new ArrayList(); @@ -263,6 +270,7 @@ public class MailSenderConnection extends AbstractSenderConnection { } } + @Override protected Iterator getResponseHeaders(String name) throws IOException { try { String[] headers = responseMessage.getHeader(name); @@ -274,6 +282,7 @@ public class MailSenderConnection extends AbstractSenderConnection { } } + @Override protected InputStream getResponseInputStream() throws IOException { try { return responseMessage.getDataHandler().getInputStream(); @@ -291,6 +300,7 @@ public class MailSenderConnection extends AbstractSenderConnection { return null; } + @Override public void onClose() throws IOException { MailTransportUtils.closeFolder(folder, deleteAfterReceive); MailTransportUtils.closeService(store); diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java b/support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java index 19021f51..d2d6bad6 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -40,6 +40,7 @@ public class ImapIdleMonitoringStrategy extends AbstractMonitoringStrategy { private MessageCountListener messageCountListener; + @Override protected void waitForNewMessages(Folder folder) throws MessagingException, InterruptedException { Assert.isInstanceOf(IMAPFolder.class, folder); IMAPFolder imapFolder = (IMAPFolder) folder; @@ -61,6 +62,7 @@ public class ImapIdleMonitoringStrategy extends AbstractMonitoringStrategy { private void createMessageCountListener() { messageCountListener = new MessageCountAdapter() { + @Override public void messagesAdded(MessageCountEvent e) { Message[] messages = e.getMessages(); for (int i = 0; i < messages.length; i++) { diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java b/support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java index 8bbbecd3..872102ac 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -44,6 +44,7 @@ public class PollingMonitoringStrategy extends AbstractMonitoringStrategy { this.pollingInterval = pollingInterval; } + @Override protected void waitForNewMessages(Folder folder) throws MessagingException, InterruptedException { Thread.sleep(pollingInterval); afterSleep(folder); diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java b/support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java index 47878e1f..3820a6ee 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -41,12 +41,14 @@ public class Pop3PollingMonitoringStrategy extends PollingMonitoringStrategy { super.setDeleteMessages(true); } + @Override public void setDeleteMessages(boolean deleteMessages) { } /** * Re-opens the folder, if it closed. */ + @Override protected void afterSleep(Folder folder) throws MessagingException { if (!folder.isOpen()) { folder.open(Folder.READ_WRITE); @@ -56,6 +58,7 @@ public class Pop3PollingMonitoringStrategy extends PollingMonitoringStrategy { /** * Simply returns {@link Folder#getMessages()}. */ + @Override protected Message[] searchForNewMessages(Folder folder) throws MessagingException { return folder.getMessages(); } @@ -67,6 +70,7 @@ public class Pop3PollingMonitoringStrategy extends PollingMonitoringStrategy { * @param messages the messages to delete * @throws MessagingException in case of JavaMail errors */ + @Override protected void deleteMessages(Folder folder, Message[] messages) throws MessagingException { super.deleteMessages(folder, messages); // expunge deleted mails, and make sure we've retrieved them before closing the folder diff --git a/support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java b/support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java index f3026e12..88681606 100644 --- a/support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java +++ b/support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -52,6 +52,7 @@ public abstract class AbstractAsyncStandaloneMessageReceiver extends AbstractSta this.beanName = beanName; } + @Override public void afterPropertiesSet() throws Exception { if (taskExecutor == null) { taskExecutor = createDefaultTaskExecutor(); diff --git a/support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java b/support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java index 8c612d18..9389f27a 100644 --- a/support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java +++ b/support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -61,6 +61,7 @@ public abstract class AbstractStandaloneMessageReceiver extends SimpleWebService } /** Calls {@link #activate()} when the BeanFactory initializes the receiver instance. */ + @Override public void afterPropertiesSet() throws Exception { activate(); } diff --git a/support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java b/support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java index d2488094..251f82a0 100644 --- a/support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java +++ b/support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -47,6 +47,7 @@ public abstract class SimpleWebServiceMessageReceiverObjectSupport extends WebSe this.messageReceiver = messageReceiver; } + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.notNull(getMessageReceiver(), "messageReceiver must not be null"); diff --git a/support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java b/support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java index fec7b8bd..dfabb7e2 100644 --- a/support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java +++ b/support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -32,10 +32,12 @@ public class WebServiceHttpHandlerIntegrationTest extends AbstractDependencyInje private HttpClient client; + @Override protected String[] getConfigLocations() { return new String[]{"classpath:org/springframework/ws/transport/http/httpserver-applicationContext.xml"}; } + @Override protected void onSetUp() throws Exception { client = new HttpClient(); } diff --git a/support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java b/support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java index 1561e404..6103b4e6 100644 --- a/support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java +++ b/support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -27,6 +27,7 @@ public class JmsIntegrationTest extends AbstractDependencyInjectionSpringContext private WebServiceTemplate webServiceTemplate; + @Override protected String[] getConfigLocations() { return new String[]{"classpath:org/springframework/ws/transport/jms/jms-applicationContext.xml"}; } @@ -35,6 +36,7 @@ public class JmsIntegrationTest extends AbstractDependencyInjectionSpringContext this.webServiceTemplate = webServiceTemplate; } + @Override protected void onTearDown() throws Exception { applicationContext.close(); setDirty(); diff --git a/support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java b/support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java index 8dc66e0a..50928fe8 100644 --- a/support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java +++ b/support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -46,10 +46,12 @@ public class JmsMessageSenderIntegrationTest extends AbstractDependencyInjection private static final String SOAP_ACTION = "\"http://springframework.org/DoIt\""; + @Override protected void onSetUp() throws Exception { messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); } + @Override protected String[] getConfigLocations() { return new String[]{"classpath:org/springframework/ws/transport/jms/jms-sender-applicationContext.xml"}; } diff --git a/support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java b/support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java index 621f6f71..6fd6f28e 100644 --- a/support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java +++ b/support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -63,6 +63,7 @@ public class WebServiceMessageListenerIntegrationTest extends AbstractDependency this.responseQueue = responseQueue; } + @Override protected String[] getConfigLocations() { return new String[]{"classpath:org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml"}; } diff --git a/support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java b/support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java index ff22b313..1d75b480 100644 --- a/support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java +++ b/support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -27,10 +27,12 @@ public class MailIntegrationTest extends AbstractDependencyInjectionSpringContex private WebServiceTemplate webServiceTemplate; + @Override protected String[] getConfigLocations() { return new String[]{"classpath:org/springframework/ws/transport/mail/mail-applicationContext.xml"}; } + @Override protected void onTearDown() throws Exception { Mailbox.clearAll(); } diff --git a/support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java b/support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java index 7148bd8b..96741e1d 100644 --- a/support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java +++ b/support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -36,6 +36,7 @@ public class MailMessageSenderIntegrationTest extends TestCase { private static final String SOAP_ACTION = "http://springframework.org/DoIt"; + @Override protected void setUp() throws Exception { messageSender = new MailMessageSender(); messageSender.setFrom("Spring-WS SOAP Client "); @@ -45,6 +46,7 @@ public class MailMessageSenderIntegrationTest extends TestCase { messageSender.afterPropertiesSet(); } + @Override protected void tearDown() throws Exception { Mailbox.clearAll(); } diff --git a/xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java b/xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java index b94b57c8..79553d3a 100644 --- a/xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java +++ b/xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -47,10 +47,12 @@ import org.springframework.util.StringUtils; */ public class QNameEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(QNameUtils.parseQNameString(text)); } + @Override public String getAsText() { Object value = getValue(); if (value == null || !(value instanceof QName)) { diff --git a/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java index d77dc495..89447e55 100644 --- a/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -53,6 +53,7 @@ public abstract class AbstractStaxXmlReader extends AbstractXmlReader { private Boolean isStandalone; + @Override public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException { if (NAMESPACES_FEATURE_NAME.equals(name)) { return namespacesFeature; @@ -73,6 +74,7 @@ public abstract class AbstractStaxXmlReader extends AbstractXmlReader { } } + @Override public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException { if (NAMESPACES_FEATURE_NAME.equals(name)) { this.namespacesFeature = value; diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java b/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java index 16f1bd79..edf2abec 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -77,14 +77,17 @@ public class StaxEventContentHandler extends AbstractStaxContentHandler { this.locator = locator; } + @Override protected void startDocumentInternal() throws XMLStreamException { consumeEvent(eventFactory.createStartDocument()); } + @Override protected void endDocumentInternal() throws XMLStreamException { consumeEvent(eventFactory.createEndDocument()); } + @Override protected void startElementInternal(QName name, Attributes atts, SimpleNamespaceContext namespaceContext) throws XMLStreamException { List attributes = getAttributes(atts); @@ -92,19 +95,23 @@ public class StaxEventContentHandler extends AbstractStaxContentHandler { consumeEvent(eventFactory.createStartElement(name, attributes.iterator(), namespaces.iterator())); } + @Override protected void endElementInternal(QName name, SimpleNamespaceContext namespaceContext) throws XMLStreamException { List namespaces = createNamespaces(namespaceContext); consumeEvent(eventFactory.createEndElement(name, namespaces.iterator())); } + @Override protected void charactersInternal(char[] ch, int start, int length) throws XMLStreamException { consumeEvent(eventFactory.createCharacters(new String(ch, start, length))); } + @Override protected void ignorableWhitespaceInternal(char[] ch, int start, int length) throws XMLStreamException { consumeEvent(eventFactory.createIgnorableSpace(new String(ch, start, length))); } + @Override protected void processingInstructionInternal(String target, String data) throws XMLStreamException { consumeEvent(eventFactory.createProcessingInstruction(target, data)); } @@ -146,6 +153,7 @@ public class StaxEventContentHandler extends AbstractStaxContentHandler { // No operation // + @Override protected void skippedEntityInternal(String name) throws XMLStreamException { } diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java index fa020b9b..e9acac1f 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -79,6 +79,7 @@ public class StaxEventXmlReader extends AbstractStaxXmlReader { this.reader = reader; } + @Override protected void parseInternal() throws SAXException, XMLStreamException { boolean documentStarted = false; boolean documentEnded = false; diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java b/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java index 7c491624..98966878 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -51,33 +51,41 @@ public class StaxStreamContentHandler extends AbstractStaxContentHandler { public void setDocumentLocator(Locator locator) { } + @Override protected void charactersInternal(char[] ch, int start, int length) throws XMLStreamException { streamWriter.writeCharacters(ch, start, length); } + @Override protected void endDocumentInternal() throws XMLStreamException { streamWriter.writeEndDocument(); } + @Override protected void endElementInternal(QName name, SimpleNamespaceContext namespaceContext) throws XMLStreamException { streamWriter.writeEndElement(); } + @Override protected void ignorableWhitespaceInternal(char[] ch, int start, int length) throws XMLStreamException { streamWriter.writeCharacters(ch, start, length); } + @Override protected void processingInstructionInternal(String target, String data) throws XMLStreamException { streamWriter.writeProcessingInstruction(target, data); } + @Override protected void skippedEntityInternal(String name) { } + @Override protected void startDocumentInternal() throws XMLStreamException { streamWriter.writeStartDocument(); } + @Override protected void startElementInternal(QName name, Attributes attributes, SimpleNamespaceContext namespaceContext) throws XMLStreamException { streamWriter.writeStartElement(QNameUtils.getPrefix(name), name.getLocalPart(), name.getNamespaceURI()); diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java index 33538204..119d49c5 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2005-2010 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. @@ -63,6 +63,7 @@ public class StaxStreamXmlReader extends AbstractStaxXmlReader { this.reader = reader; } + @Override protected void parseInternal() throws SAXException, XMLStreamException { boolean documentStarted = false; boolean documentEnded = false; diff --git a/xml/src/main/java/org/springframework/xml/transform/StaxResult.java b/xml/src/main/java/org/springframework/xml/transform/StaxResult.java index bc9140a1..94b21808 100644 --- a/xml/src/main/java/org/springframework/xml/transform/StaxResult.java +++ b/xml/src/main/java/org/springframework/xml/transform/StaxResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -111,6 +111,7 @@ public class StaxResult extends SAXResult { * * @throws UnsupportedOperationException always */ + @Override public void setHandler(ContentHandler handler) { throw new UnsupportedOperationException("setHandler is not supported"); } diff --git a/xml/src/main/java/org/springframework/xml/transform/StaxSource.java b/xml/src/main/java/org/springframework/xml/transform/StaxSource.java index 00c76d65..7c37b0b3 100644 --- a/xml/src/main/java/org/springframework/xml/transform/StaxSource.java +++ b/xml/src/main/java/org/springframework/xml/transform/StaxSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -105,6 +105,7 @@ public class StaxSource extends SAXSource { * * @throws UnsupportedOperationException always */ + @Override public void setInputSource(InputSource inputSource) { throw new UnsupportedOperationException("setInputSource is not supported"); } @@ -114,6 +115,7 @@ public class StaxSource extends SAXSource { * * @throws UnsupportedOperationException always */ + @Override public void setXMLReader(XMLReader reader) { throw new UnsupportedOperationException("setXMLReader is not supported"); } diff --git a/xml/src/main/java/org/springframework/xml/validation/Jaxp10ValidatorFactory.java b/xml/src/main/java/org/springframework/xml/validation/Jaxp10ValidatorFactory.java index 192cb6ce..3236f164 100644 --- a/xml/src/main/java/org/springframework/xml/validation/Jaxp10ValidatorFactory.java +++ b/xml/src/main/java/org/springframework/xml/validation/Jaxp10ValidatorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -164,13 +164,16 @@ abstract class Jaxp10ValidatorFactory { return (SAXParseException[]) errors.toArray(new SAXParseException[errors.size()]); } + @Override public void warning(SAXParseException ex) throws SAXException { } + @Override public void error(SAXParseException ex) throws SAXException { errors.add(ex); } + @Override public void fatalError(SAXParseException ex) throws SAXException { errors.add(ex); } diff --git a/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java b/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java index c50fea7e..1015a9db 100644 --- a/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java +++ b/xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -241,6 +241,7 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali private class ClasspathUriResolver extends DefaultURIResolver { + @Override public InputSource resolveEntity(String namespace, String schemaLocation, String baseUri) { if (resourceLoader != null) { Resource resource = resourceLoader.getResource(schemaLocation); diff --git a/xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java b/xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java index 86702371..ded8e101 100644 --- a/xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java +++ b/xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -50,6 +50,7 @@ public class DomContentHandlerTest extends XMLTestCase { private DocumentBuilder documentBuilder; + @Override protected void setUp() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); documentBuilderFactory.setNamespaceAware(true); diff --git a/xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java b/xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java index b5d962d9..9a1a398e 100644 --- a/xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java +++ b/xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -24,6 +24,7 @@ public class QNameEditorTest extends TestCase { private QNameEditor editor; + @Override protected void setUp() throws Exception { editor = new QNameEditor(); } diff --git a/xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java b/xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java index c6638e37..b88b77e8 100644 --- a/xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java +++ b/xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2005 the original author or authors. + * Copyright 2005-2010 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. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.xml.namespace; import java.util.Collections; @@ -26,6 +27,7 @@ public class SimpleNamespaceContextTest extends TestCase { private SimpleNamespaceContext context; + @Override protected void setUp() throws Exception { context = new SimpleNamespaceContext(); context.bindNamespaceUri("prefix", "namespaceURI"); diff --git a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java index 364ab77a..42d7173c 100644 --- a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java +++ b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -33,6 +33,7 @@ public abstract class AbstractStaxContentHandlerTestCase extends XMLTestCase { private XMLReader xmlReader; + @Override protected void setUp() throws Exception { xmlReader = XMLReaderFactory.createXMLReader(); } diff --git a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java index fb9e8eb9..f2c84307 100644 --- a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java +++ b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -51,6 +51,7 @@ public abstract class AbstractStaxXmlReaderTestCase extends TestCase { private ContentHandler contentHandler; + @Override protected void setUp() throws Exception { inputFactory = XMLInputFactory.newInstance(); standardReader = XMLReaderFactory.createXMLReader(); @@ -142,6 +143,7 @@ public abstract class AbstractStaxXmlReaderTestCase extends TestCase { /** Easymock ArgumentMatcher implementation that matches SAX arguments. */ protected static class SaxArgumentMatcher extends AbstractMatcher { + @Override public boolean matches(Object[] expected, Object[] actual) { if (expected == actual) { return true; @@ -169,6 +171,7 @@ public abstract class AbstractStaxXmlReaderTestCase extends TestCase { } } + @Override protected boolean argumentMatches(Object expected, Object actual) { if (expected instanceof char[]) { return Arrays.equals((char[]) expected, (char[]) actual); @@ -201,6 +204,7 @@ public abstract class AbstractStaxXmlReaderTestCase extends TestCase { } } + @Override public String toString(Object[] arguments) { if (arguments != null && arguments.length == 3 && arguments[0] instanceof char[] && arguments[1] instanceof Integer && arguments[2] instanceof Integer) { @@ -212,6 +216,7 @@ public abstract class AbstractStaxXmlReaderTestCase extends TestCase { } } + @Override protected String argumentToString(Object argument) { if (argument instanceof char[]) { char[] array = (char[]) argument; diff --git a/xml/src/test/java/org/springframework/xml/stream/StaxEventContentHandlerTest.java b/xml/src/test/java/org/springframework/xml/stream/StaxEventContentHandlerTest.java index 4590ed82..c1eae1a5 100644 --- a/xml/src/test/java/org/springframework/xml/stream/StaxEventContentHandlerTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/StaxEventContentHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ import javax.xml.stream.XMLStreamException; public class StaxEventContentHandlerTest extends AbstractStaxContentHandlerTestCase { + @Override protected AbstractStaxContentHandler createStaxContentHandler(Writer writer) throws XMLStreamException { XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); return new StaxEventContentHandler(outputFactory.createXMLEventWriter(writer)); diff --git a/xml/src/test/java/org/springframework/xml/stream/StaxEventXmlReaderTest.java b/xml/src/test/java/org/springframework/xml/stream/StaxEventXmlReaderTest.java index e02793e7..50b581ed 100644 --- a/xml/src/test/java/org/springframework/xml/stream/StaxEventXmlReaderTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/StaxEventXmlReaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ public class StaxEventXmlReaderTest extends AbstractStaxXmlReaderTestCase { public static final String CONTENT = ""; + @Override protected AbstractStaxXmlReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException { return new StaxEventXmlReader(inputFactory.createXMLEventReader(inputStream)); } diff --git a/xml/src/test/java/org/springframework/xml/stream/StaxStreamContentHandlerTest.java b/xml/src/test/java/org/springframework/xml/stream/StaxStreamContentHandlerTest.java index 8241613e..86375aed 100644 --- a/xml/src/test/java/org/springframework/xml/stream/StaxStreamContentHandlerTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/StaxStreamContentHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ import javax.xml.stream.XMLStreamException; public class StaxStreamContentHandlerTest extends AbstractStaxContentHandlerTestCase { + @Override protected AbstractStaxContentHandler createStaxContentHandler(Writer writer) throws XMLStreamException { XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); return new StaxStreamContentHandler(outputFactory.createXMLStreamWriter(writer)); diff --git a/xml/src/test/java/org/springframework/xml/stream/StaxStreamXmlReaderTest.java b/xml/src/test/java/org/springframework/xml/stream/StaxStreamXmlReaderTest.java index c8cb68f7..7651d774 100644 --- a/xml/src/test/java/org/springframework/xml/stream/StaxStreamXmlReaderTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/StaxStreamXmlReaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -32,6 +32,7 @@ public class StaxStreamXmlReaderTest extends AbstractStaxXmlReaderTestCase { public static final String CONTENT = ""; + @Override protected AbstractStaxXmlReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException { return new StaxStreamXmlReader(inputFactory.createXMLStreamReader(inputStream)); } diff --git a/xml/src/test/java/org/springframework/xml/stream/XmlEventStreamReaderTest.java b/xml/src/test/java/org/springframework/xml/stream/XmlEventStreamReaderTest.java index 72359399..7d45c377 100644 --- a/xml/src/test/java/org/springframework/xml/stream/XmlEventStreamReaderTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/XmlEventStreamReaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -33,6 +33,7 @@ public class XmlEventStreamReaderTest extends XMLTestCase { private XmlEventStreamReader streamReader; + @Override protected void setUp() throws Exception { XMLInputFactory inputFactory = XMLInputFactory.newInstance(); XMLEventReader eventReader = inputFactory.createXMLEventReader(new StringReader(XML)); diff --git a/xml/src/test/java/org/springframework/xml/transform/StaxResultTest.java b/xml/src/test/java/org/springframework/xml/transform/StaxResultTest.java index 18277468..f9bf01f0 100644 --- a/xml/src/test/java/org/springframework/xml/transform/StaxResultTest.java +++ b/xml/src/test/java/org/springframework/xml/transform/StaxResultTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public class StaxResultTest extends XMLTestCase { private XMLOutputFactory inputFactory; + @Override protected void setUp() throws Exception { TransformerFactory transformerFactory = TransformerFactory.newInstance(); transformer = transformerFactory.newTransformer(); diff --git a/xml/src/test/java/org/springframework/xml/transform/StaxSourceTest.java b/xml/src/test/java/org/springframework/xml/transform/StaxSourceTest.java index 7efd37bb..acff1b6b 100644 --- a/xml/src/test/java/org/springframework/xml/transform/StaxSourceTest.java +++ b/xml/src/test/java/org/springframework/xml/transform/StaxSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -34,6 +34,7 @@ public class StaxSourceTest extends XMLTestCase { private XMLInputFactory inputFactory; + @Override protected void setUp() throws Exception { TransformerFactory transformerFactory = TransformerFactory.newInstance(); transformer = transformerFactory.newTransformer(); diff --git a/xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java b/xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java index 3d0f81f2..4c72347c 100644 --- a/xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java +++ b/xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ public abstract class AbstractValidatorFactoryTestCase extends TestCase { private InputStream invalidInputStream; + @Override protected void setUp() throws Exception { Resource[] schemaResource = new Resource[]{new ClassPathResource("schema.xsd", AbstractValidatorFactoryTestCase.class)}; @@ -47,6 +48,7 @@ public abstract class AbstractValidatorFactoryTestCase extends TestCase { invalidInputStream = AbstractValidatorFactoryTestCase.class.getResourceAsStream("invalidDocument.xml"); } + @Override protected void tearDown() throws Exception { validInputStream.close(); invalidInputStream.close(); diff --git a/xml/src/test/java/org/springframework/xml/validation/Jaxp10ValidatorFactoryTest.java b/xml/src/test/java/org/springframework/xml/validation/Jaxp10ValidatorFactoryTest.java index 47620e26..754ccc65 100644 --- a/xml/src/test/java/org/springframework/xml/validation/Jaxp10ValidatorFactoryTest.java +++ b/xml/src/test/java/org/springframework/xml/validation/Jaxp10ValidatorFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ import org.springframework.core.io.Resource; public class Jaxp10ValidatorFactoryTest extends AbstractValidatorFactoryTestCase { + @Override protected XmlValidator createValidator(Resource[] schemaResources, String schemaLanguage) throws IOException { return Jaxp10ValidatorFactory.createValidator(schemaResources, schemaLanguage); } diff --git a/xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java b/xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java index 1358272c..e46b85d2 100644 --- a/xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java +++ b/xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ import org.springframework.core.io.Resource; public class Jaxp13ValidatorFactoryTest extends AbstractValidatorFactoryTestCase { + @Override protected XmlValidator createValidator(Resource[] schemaResources, String schemaLanguage) throws IOException { return Jaxp13ValidatorFactory.createValidator(schemaResources, schemaLanguage); } diff --git a/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java b/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java index d34d4cca..3903ddfa 100644 --- a/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java +++ b/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -60,10 +60,12 @@ public class XmlValidatorFactoryTest extends TestCase { private static class NonExistentResource extends AbstractResource { + @Override public Resource createRelative(String relativePath) throws IOException { throw new IOException(); } + @Override public boolean exists() { return false; } @@ -72,22 +74,27 @@ public class XmlValidatorFactoryTest extends TestCase { return null; } + @Override public File getFile() throws IOException { throw new IOException(); } + @Override public String getFilename() { return null; } + @Override public URL getURL() throws IOException { throw new IOException(); } + @Override public URI getURI() throws IOException { throw new IOException(); } + @Override public boolean isOpen() { return false; } @@ -96,6 +103,7 @@ public class XmlValidatorFactoryTest extends TestCase { throw new IOException(); } + @Override public boolean isReadable() { return false; } diff --git a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java b/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java index bc2049ce..e0a2e883 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java +++ b/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -39,6 +39,7 @@ public abstract class AbstractXPathExpressionFactoryTestCase extends TestCase { private Map namespaces = new HashMap(); + @Override protected void setUp() throws Exception { namespaces.put("prefix1", "namespace1"); namespaces.put("prefix2", "namespace2"); diff --git a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java b/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java index dea21574..79df9305 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java +++ b/xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -43,6 +43,7 @@ public abstract class AbstractXPathTemplateTestCase extends TestCase { private Source nonamespaces; + @Override protected final void setUp() throws Exception { template = createTemplate(); namespaces = new ResourceSource(new ClassPathResource("namespaces.xml", AbstractXPathTemplateTestCase.class)); diff --git a/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java b/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java index 6acab667..2a39c5e2 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java +++ b/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -23,18 +23,22 @@ import org.xml.sax.SAXException; public class JaxenXPathExpressionFactoryTest extends AbstractXPathExpressionFactoryTestCase { + @Override protected XPathExpression createXPathExpression(String expression) { return JaxenXPathExpressionFactory.createXPathExpression(expression); } + @Override protected XPathExpression createXPathExpression(String expression, Map namespaces) { return JaxenXPathExpressionFactory.createXPathExpression(expression, namespaces); } + @Override public void testEvaluateAsDoubleNoNamespaces() throws IOException, SAXException { // Currently not working on Jaxen 1.1 beta 8, hence the override here } + @Override public void testEvaluateAsDoubleNamespaces() throws IOException, SAXException { // Currently not working on Jaxen 1.1 beta 8, hence the override here } diff --git a/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java b/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java index 9b13636a..b87500fb 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java +++ b/xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -20,6 +20,7 @@ import java.util.Properties; public class JaxenXPathTemplateTest extends AbstractXPathTemplateTestCase { + @Override protected XPathOperations createTemplate() throws Exception { JaxenXPathTemplate template = new JaxenXPathTemplate(); Properties namespaces = new Properties(); diff --git a/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java b/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java index c1fd088a..791e57ce 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java +++ b/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -20,10 +20,12 @@ import java.util.Map; public class Jaxp13XPathExpressionFactoryTest extends AbstractXPathExpressionFactoryTestCase { + @Override protected XPathExpression createXPathExpression(String expression) { return Jaxp13XPathExpressionFactory.createXPathExpression(expression); } + @Override protected XPathExpression createXPathExpression(String expression, Map namespaces) { return Jaxp13XPathExpressionFactory.createXPathExpression(expression, namespaces); } diff --git a/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java b/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java index cea2f1b3..2888eb7d 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java +++ b/xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -20,6 +20,7 @@ import java.util.Properties; public class Jaxp13XPathTemplateTest extends AbstractXPathTemplateTestCase { + @Override protected XPathOperations createTemplate() throws Exception { Jaxp13XPathTemplate template = new Jaxp13XPathTemplate(); Properties namespaces = new Properties(); diff --git a/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java b/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java index ed61bdde..b783298d 100644 --- a/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java +++ b/xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -22,6 +22,7 @@ public class XPathExpressionFactoryBeanTest extends TestCase { private XPathExpressionFactoryBean factoryBean; + @Override protected void setUp() throws Exception { factoryBean = new XPathExpressionFactoryBean(); } diff --git a/xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java b/xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java index 65fc3e79..05571ce5 100644 --- a/xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java +++ b/xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2005-2010 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. @@ -37,6 +37,7 @@ public abstract class AbstractXsdSchemaTestCase extends XMLTestCase { protected Transformer transformer; + @Override protected final void setUp() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); documentBuilderFactory.setNamespaceAware(true); diff --git a/xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java b/xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java index 26e24e8c..7bd681d6 100644 --- a/xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java +++ b/xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -20,6 +20,7 @@ import org.springframework.core.io.Resource; public class SimpleXsdSchemaTest extends AbstractXsdSchemaTestCase { + @Override protected XsdSchema createSchema(Resource resource) throws Exception { SimpleXsdSchema schema = new SimpleXsdSchema(resource); schema.afterPropertiesSet(); diff --git a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java b/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java index 262c3d98..324d38b5 100644 --- a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java +++ b/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -41,6 +41,7 @@ public class CommonsXsdSchemaCollectionTest extends XMLTestCase { private DocumentBuilder documentBuilder; + @Override protected void setUp() throws Exception { collection = new CommonsXsdSchemaCollection(); TransformerFactory transformerFactory = TransformerFactory.newInstance(); diff --git a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java b/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java index e26b5d21..bf0d4127 100644 --- a/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java +++ b/xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2005-2010 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. @@ -31,6 +31,7 @@ import org.springframework.xml.xsd.XsdSchema; public class CommonsXsdSchemaTest extends AbstractXsdSchemaTestCase { + @Override protected XsdSchema createSchema(Resource resource) throws Exception { XmlSchemaCollection schemaCollection = new XmlSchemaCollection(); XmlSchema schema = schemaCollection.read(SaxUtils.createInputSource(resource), null);