From b70e2919065bf455e8dff9b2167ce2b469d9f09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 5 Mar 2025 10:28:13 +0100 Subject: [PATCH 01/10] Enable checkstyle This commit updates the Gradle build to run checkstyle against the main sources. Checks for tests, as well as certain rules, are disabled as a first step. See gh-1479 --- .../conventions/CheckstyleConventions.java | 59 +++++++++++++++++++ .../gradle/conventions/ConventionsPlugin.java | 7 ++- src/checkstyle/checkstyle-suppressions.xml | 9 +++ src/checkstyle/checkstyle.xml | 9 +++ 4 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/CheckstyleConventions.java create mode 100644 src/checkstyle/checkstyle-suppressions.xml create mode 100644 src/checkstyle/checkstyle.xml diff --git a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/CheckstyleConventions.java b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/CheckstyleConventions.java new file mode 100644 index 00000000..23949656 --- /dev/null +++ b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/CheckstyleConventions.java @@ -0,0 +1,59 @@ +/* + * Copyright 2005-2025 the original author 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 + * + * https://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.gradle.conventions; + +import io.spring.javaformat.gradle.SpringJavaFormatPlugin; +import org.gradle.api.Plugin; +import org.gradle.api.Project; +import org.gradle.api.artifacts.DependencySet; +import org.gradle.api.plugins.JavaPlugin; +import org.gradle.api.plugins.quality.Checkstyle; +import org.gradle.api.plugins.quality.CheckstyleExtension; +import org.gradle.api.plugins.quality.CheckstylePlugin; + +/** + * {@link Plugin} that applies conventions for checkstyle. + * + * @author Brian Clozel + * @author Stephane Nicoll + */ +public class CheckstyleConventions { + + /** + * Applies the Spring Java Format and Checkstyle plugins with the project conventions. + * @param project the current project + */ + public void apply(Project project) { + project.getPlugins().withType(JavaPlugin.class, (java) -> { + project.getPlugins().apply(CheckstylePlugin.class); + project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); + project.getTasks().named("checkstyleTest").configure(task -> task.setEnabled(false)); + CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); + checkstyle.setToolVersion("10.21.1"); + checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); + String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); + DependencySet checkstyleDependencies = project.getConfigurations() + .getByName("checkstyle") + .getDependencies(); + checkstyleDependencies.add( + project.getDependencies().create("com.puppycrawl.tools:checkstyle:" + checkstyle.getToolVersion())); + checkstyleDependencies + .add(project.getDependencies().create("io.spring.javaformat:spring-javaformat-checkstyle:" + version)); + }); + } + +} diff --git a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/ConventionsPlugin.java b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/ConventionsPlugin.java index 61bcb471..435ed0a4 100644 --- a/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/ConventionsPlugin.java +++ b/gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/ConventionsPlugin.java @@ -33,9 +33,10 @@ public class ConventionsPlugin implements Plugin { @Override public void apply(Project project) { project.setGroup("org.springframework.ws"); - project.getPlugins() - .withType(JavaBasePlugin.class) - .all((plugin) -> new JavaBasePluginConventions().apply(project)); + project.getPlugins().withType(JavaBasePlugin.class).all((plugin) -> { + new JavaBasePluginConventions().apply(project); + new CheckstyleConventions().apply(project); + }); project.getPlugins().withType(JavaPlugin.class).all((plugin) -> new JavaPluginConventions().apply(project)); project.getPlugins() .withType(MavenPublishPlugin.class) diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml new file mode 100644 index 00000000..4d199e80 --- /dev/null +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml new file mode 100644 index 00000000..791600ae --- /dev/null +++ b/src/checkstyle/checkstyle.xml @@ -0,0 +1,9 @@ + + + + + + + + From 60ec66ce7981c5a343b113b56f99d508386b258e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 7 Mar 2025 11:33:29 +0100 Subject: [PATCH 02/10] Add 'this.' for field access See gh-1479 --- .../ws/client/WebServiceFaultException.java | 4 +- .../ws/client/core/WebServiceTemplate.java | 52 ++-- .../support/WebServiceGatewaySupport.java | 38 +-- .../ws/client/support/WebServiceAccessor.java | 10 +- .../AbstractCachingDestinationProvider.java | 8 +- .../Wsdl11DestinationProvider.java | 26 +- .../AbstractValidatingInterceptor.java | 39 +-- .../WebServiceValidationException.java | 2 +- .../annotation/WsConfigurationSupport.java | 8 +- .../annotation/WsConfigurerComposite.java | 6 +- .../ws/context/AbstractMessageContext.java | 6 +- .../ws/context/DefaultMessageContext.java | 18 +- .../ws/mime/AbstractMimeMessage.java | 6 +- .../ws/pox/dom/DomPoxMessage.java | 16 +- .../ws/pox/dom/DomPoxMessageFactory.java | 14 +- .../ws/server/EndpointInvocationChain.java | 4 +- .../ws/server/MessageDispatcher.java | 64 ++--- .../AbstractDom4jPayloadEndpoint.java | 2 +- .../endpoint/AbstractDomPayloadEndpoint.java | 16 +- .../AbstractEndpointExceptionResolver.java | 8 +- .../endpoint/AbstractJDomPayloadEndpoint.java | 2 +- .../endpoint/AbstractLoggingInterceptor.java | 8 +- .../AbstractMarshallingPayloadEndpoint.java | 12 +- .../AbstractStaxEventPayloadEndpoint.java | 46 ++-- .../endpoint/AbstractStaxPayloadEndpoint.java | 12 +- .../AbstractStaxStreamPayloadEndpoint.java | 92 +++---- ...tValidatingMarshallingPayloadEndpoint.java | 4 +- .../endpoint/AbstractXomPayloadEndpoint.java | 14 +- .../ws/server/endpoint/MethodEndpoint.java | 14 +- .../adapter/DefaultMethodEndpointAdapter.java | 42 ++-- .../MarshallingMethodEndpointAdapter.java | 12 +- ...hParamAnnotationMethodEndpointAdapter.java | 8 +- .../MarshallingPayloadMethodProcessor.java | 12 +- .../method/SourcePayloadMethodProcessor.java | 6 +- .../StaxPayloadMethodArgumentResolver.java | 10 +- .../XPathParamMethodArgumentResolver.java | 10 +- .../method/dom/XomPayloadMethodProcessor.java | 2 +- .../AbstractJaxb2PayloadMethodProcessor.java | 68 ++--- .../AbstractValidatingInterceptor.java | 39 +-- .../DelegatingSmartEndpointInterceptor.java | 2 +- .../PayloadTransformingInterceptor.java | 30 +-- ...stractAnnotationMethodEndpointMapping.java | 4 +- .../mapping/AbstractEndpointMapping.java | 10 +- .../AbstractMapBasedEndpointMapping.java | 33 +-- .../AbstractMethodEndpointMapping.java | 14 +- .../mapping/SimpleMethodEndpointMapping.java | 10 +- .../endpoint/mapping/UriEndpointMapping.java | 2 +- .../mapping/XPathPayloadEndpointMapping.java | 16 +- .../jaxb/XmlRootElementEndpointMapping.java | 3 +- .../endpoint/support/PayloadRootUtils.java | 10 +- .../ws/soap/AbstractSoapMessage.java | 8 +- .../springframework/ws/soap/SoapVersion.java | 40 +-- .../addressing/client/ActionCallback.java | 20 +- .../addressing/core/EndpointReference.java | 12 +- .../core/MessageAddressingProperties.java | 18 +- .../server/AbstractActionEndpointMapping.java | 14 +- .../AbstractAddressingEndpointMapping.java | 28 +-- .../server/AddressingEndpointInterceptor.java | 26 +- .../server/SimpleActionEndpointMapping.java | 6 +- .../version/AbstractAddressingVersion.java | 44 ++-- .../soap/client/SoapFaultClientException.java | 8 +- .../soap/client/core/SoapActionCallback.java | 2 +- .../ws/soap/saaj/SaajAttachment.java | 10 +- .../ws/soap/saaj/SaajSoap11Body.java | 2 +- .../ws/soap/saaj/SaajSoapElement.java | 16 +- .../ws/soap/saaj/SaajSoapEnvelope.java | 18 +- .../ws/soap/saaj/SaajSoapFaultDetail.java | 6 +- .../ws/soap/saaj/SaajSoapHeader.java | 6 +- .../ws/soap/saaj/SaajSoapMessage.java | 40 +-- .../ws/soap/saaj/SaajSoapMessageFactory.java | 40 +-- .../soap/saaj/support/SaajContentHandler.java | 27 +- .../ws/soap/saaj/support/SaajXmlReader.java | 14 +- .../server/SoapEndpointInvocationChain.java | 4 +- .../ws/soap/server/SoapMessageDispatcher.java | 12 +- ...gValidatingMarshallingPayloadEndpoint.java | 14 +- ...tSoapFaultDefinitionExceptionResolver.java | 2 +- .../endpoint/SimpleSoapExceptionResolver.java | 2 +- .../server/endpoint/SoapFaultDefinition.java | 6 +- .../SoapFaultMappingExceptionResolver.java | 6 +- .../server/endpoint/annotation/FaultCode.java | 2 +- ...actFaultCreatingValidatingInterceptor.java | 10 +- ...yloadRootSmartSoapEndpointInterceptor.java | 7 +- .../SoapEnvelopeLoggingInterceptor.java | 2 +- .../DelegatingSoapEndpointMapping.java | 10 +- ...ActionAnnotationMethodEndpointMapping.java | 6 +- .../mapping/SoapActionEndpointMapping.java | 6 +- .../ws/support/DefaultStrategiesHelper.java | 4 +- .../ws/support/MarshallingUtils.java | 8 +- .../transport/AbstractReceiverConnection.java | 12 +- .../transport/AbstractSenderConnection.java | 12 +- .../AbstractWebServiceConnection.java | 26 +- .../ws/transport/TransportInputStream.java | 10 +- .../ws/transport/TransportOutputStream.java | 12 +- .../context/DefaultTransportContext.java | 4 +- .../http/AbstractHttpSenderConnection.java | 20 +- .../AbstractHttpWebServiceMessageSender.java | 2 +- .../http/ClientHttpRequestConnection.java | 28 +-- .../http/ClientHttpRequestMessageSender.java | 4 +- .../transport/http/CommonsHttpConnection.java | 40 +-- .../http/CommonsHttpMessageSender.java | 8 +- .../http/HttpComponents5ClientFactory.java | 16 +- .../http/HttpComponents5Connection.java | 38 +-- .../http/HttpComponents5MessageSender.java | 4 +- .../http/HttpComponentsConnection.java | 38 +-- .../http/HttpComponentsMessageSender.java | 6 +- .../transport/http/HttpServletConnection.java | 20 +- .../ws/transport/http/HttpUrlConnection.java | 30 +-- .../http/JdkHttpClientConnection.java | 30 +-- .../http/JdkHttpClientMessageSender.java | 6 +- .../LocationTransformerObjectSupport.java | 4 +- .../http/MessageDispatcherServlet.java | 97 ++++---- .../http/WsdlDefinitionHandlerAdapter.java | 18 +- .../http/XsdSchemaHandlerAdapter.java | 8 +- .../support/EnumerationIterator.java | 4 +- ...ebServiceMessageReceiverObjectSupport.java | 8 +- .../wsdl/wsdl11/DefaultWsdl11Definition.java | 56 ++--- .../wsdl11/ProviderBasedWsdl4jDefinition.java | 38 +-- .../wsdl/wsdl11/SimpleWsdl11Definition.java | 4 +- .../ws/wsdl/wsdl11/Wsdl4jDefinition.java | 16 +- .../provider/AbstractPortTypesProvider.java | 14 +- .../provider/DefaultConcretePartProvider.java | 24 +- .../InliningXsdSchemaTypesProvider.java | 4 +- .../wsdl/wsdl11/provider/Soap11Provider.java | 6 +- .../wsdl/wsdl11/provider/Soap12Provider.java | 6 +- .../ws/wsdl/wsdl11/provider/SoapProvider.java | 32 +-- .../provider/SuffixBasedMessagesProvider.java | 6 +- .../SuffixBasedPortTypesProvider.java | 6 +- .../AbstractWebServiceMessageFactoryTest.java | 4 +- .../ws/AbstractWebServiceMessageTest.java | 51 ++-- .../ws/MockWebServiceMessage.java | 38 +-- ...ap11WebServiceTemplateIntegrationTest.java | 69 +++--- ...ap12WebServiceTemplateIntegrationTest.java | 58 +++-- ...mPoxWebServiceTemplateIntegrationTest.java | 12 +- .../core/SimpleFaultMessageResolverTest.java | 5 +- .../ws/client/core/SimpleSaajServlet.java | 4 +- .../client/core/WebServiceTemplateTest.java | 226 ++++++++--------- .../Wsdl11DestinationProviderTest.java | 16 +- .../ClientInterceptorAdapterTest.java | 10 +- .../PayloadValidatingInterceptorTest.java | 101 ++++---- ...otationDrivenBeanDefinitionParserTest.java | 8 +- .../ws/config/DummyInterceptor.java | 4 +- .../ws/config/MyInterceptor.java | 2 +- .../WebServiceNamespaceHandlerTest.java | 4 +- .../WebServicesNamespaceHandlerTigerTest.java | 6 +- .../config/WsdlBeanDefinitionParserTest.java | 9 +- .../ws/context/DefaultMessageContextTest.java | 34 +-- .../ws/mime/AbstractMimeMessageTest.java | 26 +- .../ws/pox/dom/DomPoxMessageTest.java | 18 +- .../ws/server/MessageDispatcherTest.java | 232 +++++++++--------- .../endpoint/AbstractMessageEndpointTest.java | 12 +- .../endpoint/AbstractPayloadEndpointTest.java | 16 +- .../EndpointExceptionResolverTest.java | 8 +- .../MarshallingPayloadEndpointTest.java | 51 ++-- .../server/endpoint/MethodEndpointTest.java | 28 +-- .../DefaultMethodEndpointAdapterTest.java | 120 ++++----- ...cMarshallingMethodEndpointAdapterTest.java | 94 +++---- .../MarshallingMethodEndpointAdapterTest.java | 98 ++++---- .../adapter/MessageEndpointAdapterTest.java | 14 +- .../MessageMethodEndpointAdapterTest.java | 19 +- .../adapter/PayloadEndpointAdapterTest.java | 16 +- .../PayloadMethodEndpointAdapterTest.java | 33 +-- ...amAnnotationMethodEndpointAdapterTest.java | 38 +-- .../AbstractPayloadMethodProcessorTest.java | 26 +- ...MarshallingPayloadMethodProcessorTest.java | 94 +++---- ...sageContextMethodArgumentResolverTest.java | 8 +- ...StaxPayloadMethodArgumentResolverTest.java | 30 +-- .../XPathParamMethodArgumentResolverTest.java | 50 ++-- ...JaxbElementPayloadMethodProcessorTest.java | 22 +- ...RootElementPayloadMethodProcessorTest.java | 28 +-- .../PayloadTransformingInterceptorTest.java | 80 +++--- .../BridgedMethodRegistrationTest.java | 4 +- .../mapping/CgLibProxyRegistrationTest.java | 4 +- .../endpoint/mapping/EndpointMappingTest.java | 32 +-- .../mapping/JdkProxyRegistrationTest.java | 5 +- .../ws/server/endpoint/mapping/LogAspect.java | 4 +- .../MapBasedSoapEndpointMappingTest.java | 4 +- ...otAnnotationMethodEndpointMappingTest.java | 33 +-- .../PayloadRootQNameEndpointMappingTest.java | 6 +- .../SimpleMethodEndpointMappingTest.java | 18 +- .../mapping/UriEndpointMappingTest.java | 14 +- .../XPathPayloadEndpointMappingTest.java | 8 +- .../XmlRootElementEndpointMappingTest.java | 4 +- .../ws/soap/AbstractSoapBodyTest.java | 22 +- .../ws/soap/AbstractSoapElementTest.java | 14 +- .../ws/soap/AbstractSoapEnvelopeTest.java | 8 +- .../ws/soap/AbstractSoapHeaderTest.java | 44 ++-- .../soap/AbstractSoapMessageFactoryTest.java | 2 +- .../ws/soap/AbstractSoapMessageTest.java | 20 +- .../addressing/AbstractWsAddressingTest.java | 4 +- .../client/AbstractActionCallbackTest.java | 58 ++--- .../messageid/UuidMessageIdStrategyTest.java | 6 +- .../AbstractAddressingInterceptorTest.java | 80 +++--- .../server/AddressingInterceptor10Test.java | 10 +- ...tationActionMethodEndpointMappingTest.java | 24 +- .../SimpleActionEndpointMappingTest.java | 28 ++- .../core/SaajSoapActionCallbackTest.java | 24 +- .../saaj/SaajSoap11MessageFactoryTest.java | 4 +- .../ws/soap/saaj/SaajSoap11MessageTest.java | 24 +- .../ws/soap/saaj/SaajSoap12MessageTest.java | 28 +-- .../saaj/support/SaajContentHandlerTest.java | 18 +- .../ws/soap/saaj/support/SaajUtilsTest.java | 18 +- .../soap/saaj/support/SaajXmlReaderTest.java | 28 +-- .../server/SoapMessageDispatcherTest.java | 78 +++--- ...idatingMarshallingPayloadEndpointTest.java | 22 +- .../SimpleSoapExceptionResolverTest.java | 22 +- ...pFaultAnnotationExceptionResolverTest.java | 21 +- .../SoapFaultDefinitionEditorTest.java | 24 +- ...SoapFaultMappingExceptionResolverTest.java | 36 +-- ...aderElementMethodArgumentResolverTest.java | 33 +-- .../SoapMethodArgumentResolverTest.java | 26 +- ...dRootSmartSoapEndpointInterceptorTest.java | 34 +-- .../PayloadValidatingInterceptorTest.java | 146 +++++------ ...oapActionSmartEndpointInterceptorTest.java | 20 +- .../DelegatingSoapEndpointMappingTest.java | 17 +- ...onAnnotationMethodEndpointMappingTest.java | 26 +- .../SoapActionEndpointMappingTest.java | 14 +- .../soap/soap11/AbstractSoap11BodyTest.java | 42 ++-- .../soap11/AbstractSoap11EnvelopeTest.java | 4 +- .../soap/soap11/AbstractSoap11HeaderTest.java | 23 +- .../AbstractSoap11MessageFactoryTest.java | 20 +- .../soap11/AbstractSoap11MessageTest.java | 42 ++-- .../soap/soap12/AbstractSoap12BodyTest.java | 53 ++-- .../soap12/AbstractSoap12EnvelopeTest.java | 4 +- .../soap/soap12/AbstractSoap12HeaderTest.java | 37 +-- .../AbstractSoap12MessageFactoryTest.java | 12 +- .../soap12/AbstractSoap12MessageTest.java | 42 ++-- .../support/DefaultStrategiesHelperTest.java | 2 +- .../transport/MockTransportInputStream.java | 8 +- .../transport/MockTransportOutputStream.java | 6 +- ...ebServiceMessageSenderIntegrationTest.java | 84 +++---- .../http/HttpServletConnectionTest.java | 48 ++-- .../http/LastModifiedHelperTest.java | 16 +- ...ssageDispatcherServletIntegrationTest.java | 8 +- .../http/MessageDispatcherServletTest.java | 22 +- ...viceMessageReceiverHandlerAdapterTest.java | 110 +++++---- .../WsdlDefinitionHandlerAdapterTest.java | 184 +++++++------- .../http/XsdSchemaHandlerAdapterTest.java | 44 ++-- ...rviceMessageReceiverObjectSupportTest.java | 42 ++-- .../wsdl11/DefaultWsdl11DefinitionTest.java | 66 ++--- .../wsdl11/SimpleWsdl11DefinitionTest.java | 8 +- .../ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java | 8 +- .../provider/DefaultMessagesProviderTest.java | 30 +-- .../InliningXsdSchemaTypesProviderTest.java | 28 +-- .../wsdl11/provider/Soap11ProviderTest.java | 34 +-- .../wsdl11/provider/Soap12ProviderTest.java | 34 +-- .../wsdl11/provider/SoapProviderTest.java | 40 +-- .../SuffixBasedMessagesProviderTest.java | 30 +-- .../SuffixBasedPortTypesProviderTest.java | 26 +- .../AbstractWsSecurityInterceptor.java | 32 +-- .../security/WsSecurityFaultException.java | 6 +- .../callback/CallbackHandlerChain.java | 4 +- .../support/KeyManagersFactoryBean.java | 4 +- .../security/support/KeyStoreFactoryBean.java | 20 +- .../support/TrustManagersFactoryBean.java | 4 +- .../ws/soap/security/wss4j2/Wss4jHandler.java | 18 +- .../wss4j2/Wss4jSecurityInterceptor.java | 142 +++++------ .../callback/KeyStoreCallbackHandler.java | 20 +- ...mplePasswordValidationCallbackHandler.java | 4 +- ...rityPasswordValidationCallbackHandler.java | 16 +- .../UsernameTokenPrincipalCallback.java | 2 +- .../wss4j2/support/CryptoFactoryBean.java | 8 +- .../x509/X509AuthenticationProvider.java | 12 +- .../x509/X509AuthenticationToken.java | 4 +- .../x509/cache/EhCacheBasedX509UserCache.java | 8 +- .../x509/cache/SpringBasedX509UserCache.java | 8 +- .../DaoX509AuthoritiesPopulator.java | 8 +- ...ipValidationWsSecurityInterceptorTest.java | 14 +- .../callback/CallbackHandlerChainTest.java | 13 +- .../SaajWss4jMessageInterceptorSignTest.java | 50 ++-- ...jWss4jSecurityInterceptorDefaultsTest.java | 12 +- ...Wss4jMessageInterceptorEncryptionTest.java | 20 +- .../Wss4jMessageInterceptorHeaderTest.java | 40 +-- .../Wss4jMessageInterceptorSamlTest.java | 26 +- .../Wss4jMessageInterceptorSignTest.java | 38 +-- ...Wss4jMessageInterceptorSoapActionTest.java | 34 +-- ...ptorSpringSecurityCallbackHandlerTest.java | 10 +- .../Wss4jMessageInterceptorTimestampTest.java | 4 +- ...4jMessageInterceptorUsernameTokenTest.java | 4 +- .../Wss4jMessageInterceptorX509Test.java | 22 +- .../ws/soap/security/wss4j2/Wss4jTest.java | 40 +-- .../callback/KeyStoreCallbackHandlerTest.java | 12 +- ...PasswordValidationCallbackHandlerTest.java | 34 +-- .../wss4j2/support/CryptoFactoryBeanTest.java | 18 +- .../http/HttpExchangeConnection.java | 56 ++--- .../http/HttpsUrlConnectionMessageSender.java | 23 +- .../WebServiceMessageReceiverHttpHandler.java | 4 +- .../http/WsdlDefinitionHttpHandler.java | 6 +- .../jms/BytesMessageInputStream.java | 6 +- .../jms/BytesMessageOutputStream.java | 6 +- .../ws/transport/jms/JmsMessageReceiver.java | 4 +- .../ws/transport/jms/JmsMessageSender.java | 6 +- .../transport/jms/JmsReceiverConnection.java | 62 ++--- .../ws/transport/jms/JmsSenderConnection.java | 86 +++---- .../transport/jms/JmsTransportException.java | 6 +- .../jms/TextMessageOutputStream.java | 6 +- .../transport/mail/MailMessageReceiver.java | 72 +++--- .../ws/transport/mail/MailMessageSender.java | 14 +- .../mail/MailReceiverConnection.java | 40 +-- .../transport/mail/MailSenderConnection.java | 82 +++---- .../mail/MailTransportException.java | 6 +- .../monitor/AbstractMonitoringStrategy.java | 8 +- .../monitor/ImapIdleMonitoringStrategy.java | 8 +- .../monitor/PollingMonitoringStrategy.java | 2 +- ...bstractAsyncStandaloneMessageReceiver.java | 8 +- .../AbstractStandaloneMessageReceiver.java | 28 +-- ...ebServiceMessageReceiverObjectSupport.java | 2 +- .../transport/xmpp/MessageOutputStream.java | 6 +- .../transport/xmpp/XmppMessageReceiver.java | 37 +-- .../ws/transport/xmpp/XmppMessageSender.java | 6 +- .../xmpp/XmppReceiverConnection.java | 28 +-- .../transport/xmpp/XmppSenderConnection.java | 35 +-- .../support/XmppConnectionFactoryBean.java | 21 +- .../SimpleTestingMessageReceiver.java | 2 +- .../http/SimpleHttpServerFactoryBean.java | 6 +- .../WebServiceHttpHandlerIntegrationTest.java | 24 +- .../ws/transport/jms/JmsIntegrationTest.java | 4 +- .../jms/JmsMessageSenderIntegrationTest.java | 54 ++-- ...ServiceMessageListenerIntegrationTest.java | 14 +- .../transport/mail/MailIntegrationTest.java | 4 +- .../MailMessageSenderIntegrationTest.java | 33 +-- .../XmppConnectionFactoryBeanTest.java | 10 +- .../ws/test/client/ErrorResponseCreator.java | 2 +- .../test/client/ExceptionResponseCreator.java | 6 +- .../ws/test/client/MockSenderConnection.java | 28 +-- .../client/MockWebServiceMessageSender.java | 21 +- .../ws/test/client/MockWebServiceServer.java | 6 +- .../ws/test/client/ResponseCreators.java | 2 +- .../ws/test/client/UriMatcher.java | 2 +- .../WebServiceMessageMatcherAdapter.java | 2 +- .../XPathExpectationsHelperAdapter.java | 14 +- .../ws/test/server/MockWebServiceClient.java | 10 +- .../ws/test/server/RequestCreators.java | 2 +- .../test/server/SoapFaultResponseMatcher.java | 4 +- .../WebServiceMessageMatcherAdapter.java | 2 +- .../XPathExpectationsHelperAdapter.java | 14 +- .../ws/test/support/MockStrategiesHelper.java | 6 +- .../ws/test/support/SourceAssertionError.java | 10 +- .../creator/PayloadMessageCreator.java | 2 +- .../creator/SoapEnvelopeMessageCreator.java | 2 +- .../support/matcher/PayloadDiffMatcher.java | 4 +- .../matcher/SchemaValidatingMatcher.java | 4 +- .../matcher/SoapEnvelopeDiffMatcher.java | 4 +- .../support/matcher/SoapHeaderMatcher.java | 4 +- .../matcher/XPathExpectationsHelper.java | 30 +-- .../matcher/xmlunit2/PayloadDiffMatcher.java | 4 +- .../xmlunit2/SoapEnvelopeDiffMatcher.java | 4 +- .../MockWebServiceMessageSenderTest.java | 16 +- .../test/client/MockWebServiceServerTest.java | 105 ++++---- .../ws/test/client/ResponseCreatorsTest.java | 18 +- .../WebServiceMessageMatcherAdapterTest.java | 14 +- .../integration/ClientIntegrationTest.java | 8 +- .../integration/CustomerCountRequest.java | 2 +- .../integration/CustomerCountResponse.java | 2 +- .../WebServiceMessageMatcherAdapterTest.java | 14 +- .../integration/ServerIntegrationTest.java | 4 +- .../matcher/SchemaValidatingMatcherTest.java | 68 ++--- .../matcher/SoapHeaderMatcherTest.java | 12 +- .../xml/dom/DomContentHandler.java | 22 +- .../xml/namespace/SimpleNamespaceContext.java | 18 +- .../xml/sax/AbstractXmlReader.java | 14 +- .../xml/transform/StringSource.java | 4 +- .../xml/transform/TransformerHelper.java | 6 +- .../transform/TransformerObjectSupport.java | 10 +- .../validation/Jaxp13ValidatorFactory.java | 8 +- .../validation/Jaxp15ValidatorFactory.java | 8 +- .../xml/xpath/AbstractXPathTemplate.java | 4 +- .../xpath/JaxenXPathExpressionFactory.java | 37 +-- .../xpath/Jaxp13XPathExpressionFactory.java | 6 +- .../xml/xpath/Jaxp13XPathTemplate.java | 10 +- .../xml/xpath/XPathExpressionFactoryBean.java | 12 +- .../xml/xsd/SimpleXsdSchema.java | 26 +- .../xml/xsd/commons/CommonsXsdSchema.java | 16 +- .../commons/CommonsXsdSchemaCollection.java | 42 ++-- .../xml/dom/DomContentHandlerTest.java | 42 ++-- .../xml/namespace/QNameEditorTest.java | 10 +- .../namespace/SimpleNamespaceContextTest.java | 86 +++---- .../xml/transform/TransformerHelperTest.java | 6 +- .../AbstractValidatorFactoryTest.java | 42 ++-- .../AbstractXPathExpressionFactoryTest.java | 68 ++--- .../xml/xpath/AbstractXPathTemplateTest.java | 45 ++-- .../xpath/XPathExpressionFactoryBeanTest.java | 12 +- .../xml/xsd/AbstractXsdSchemaTest.java | 20 +- .../CommonsXsdSchemaCollectionTest.java | 73 +++--- 383 files changed, 4466 insertions(+), 4384 deletions(-) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceFaultException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceFaultException.java index 18c9c535..dcd14ed8 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceFaultException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/WebServiceFaultException.java @@ -32,7 +32,7 @@ public class WebServiceFaultException extends WebServiceClientException { /** Create a new instance of the {@code WebServiceFaultException} class. */ public WebServiceFaultException(String msg) { super(msg); - faultMessage = null; + this.faultMessage = null; } /** @@ -46,7 +46,7 @@ public class WebServiceFaultException extends WebServiceClientException { /** Returns the fault message. */ public FaultAwareWebServiceMessage getWebServiceMessage() { - return faultMessage; + return this.faultMessage; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java index c750c4f3..ce0145a4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java @@ -206,8 +206,8 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * Returns the default URI to be used on operations that do not have a URI parameter. */ public String getDefaultUri() { - if (destinationProvider != null) { - URI uri = destinationProvider.getDestination(); + if (this.destinationProvider != null) { + URI uri = this.destinationProvider.getDestination(); return uri != null ? uri.toString() : null; } else { @@ -229,7 +229,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * @see #sendAndReceive(WebServiceMessageCallback,WebServiceMessageCallback) */ public void setDefaultUri(final String uri) { - destinationProvider = new DestinationProvider() { + this.destinationProvider = new DestinationProvider() { public URI getDestination() { return URI.create(uri); @@ -242,7 +242,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * parameter. */ public DestinationProvider getDestinationProvider() { - return destinationProvider; + return this.destinationProvider; } /** @@ -265,7 +265,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService /** Returns the marshaller for this template. */ public Marshaller getMarshaller() { - return marshaller; + return this.marshaller; } /** Sets the marshaller for this template. */ @@ -275,7 +275,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService /** Returns the unmarshaller for this template. */ public Unmarshaller getUnmarshaller() { - return unmarshaller; + return this.unmarshaller; } /** Sets the unmarshaller for this template. */ @@ -285,7 +285,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService /** Returns the fault message resolver for this template. */ public FaultMessageResolver getFaultMessageResolver() { - return faultMessageResolver; + return this.faultMessageResolver; } /** @@ -347,7 +347,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * @return array of endpoint interceptors, or {@code null} if none */ public ClientInterceptor[] getInterceptors() { - return interceptors; + return this.interceptors; } /** @@ -613,10 +613,10 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService } // Apply handleRequest of registered interceptors boolean intercepted = false; - if (interceptors != null) { - for (int i = 0; i < interceptors.length; i++) { + if (this.interceptors != null) { + for (int i = 0; i < this.interceptors.length; i++) { interceptorIndex = i; - if (!interceptors[i].handleRequest(messageContext)) { + if (!this.interceptors[i].handleRequest(messageContext)) { intercepted = true; break; } @@ -687,9 +687,9 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * @throws IOException in case of I/O errors */ protected boolean hasError(WebServiceConnection connection, WebServiceMessage request) throws IOException { - if (checkConnectionForError && connection.hasError()) { + if (this.checkConnectionForError && connection.hasError()) { // could be a fault - if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) { + if (this.checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) { return !(faultConnection.hasFault() && request instanceof FaultAwareWebServiceMessage); } else { @@ -709,8 +709,8 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * if any */ protected Object handleError(WebServiceConnection connection, WebServiceMessage request) throws IOException { - if (logger.isDebugEnabled()) { - logger.debug("Received error for request [" + request + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Received error for request [" + request + "]"); } throw new WebServiceTransportException(connection.getErrorMessage()); } @@ -754,7 +754,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * @throws IOException in case of I/O errors */ protected boolean hasFault(WebServiceConnection connection, WebServiceMessage response) throws IOException { - if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) { + if (this.checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) { // check whether the connection has a fault (i.e. status code 500 in HTTP) if (!faultConnection.hasFault()) { return false; @@ -778,9 +778,9 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * @see ClientInterceptor#handleFault(MessageContext) */ private void triggerHandleResponse(int interceptorIndex, MessageContext messageContext) { - if (messageContext.hasResponse() && interceptors != null) { + if (messageContext.hasResponse() && this.interceptors != null) { for (int i = interceptorIndex; i >= 0; i--) { - if (!interceptors[i].handleResponse(messageContext)) { + if (!this.interceptors[i].handleResponse(messageContext)) { break; } } @@ -797,9 +797,9 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * @see ClientInterceptor#handleFault(MessageContext) */ private void triggerHandleFault(int interceptorIndex, MessageContext messageContext) { - if (messageContext.hasResponse() && interceptors != null) { + if (messageContext.hasResponse() && this.interceptors != null) { for (int i = interceptorIndex; i >= 0; i--) { - if (!interceptors[i].handleFault(messageContext)) { + if (!this.interceptors[i].handleFault(messageContext)) { break; } } @@ -818,9 +818,9 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService */ private void triggerAfterCompletion(int interceptorIndex, MessageContext messageContext, Exception ex) throws WebServiceClientException { - if (interceptors != null) { + if (this.interceptors != null) { for (int i = interceptorIndex; i >= 0; i--) { - interceptors[i].afterCompletion(messageContext, ex); + this.interceptors[i].afterCompletion(messageContext, ex); } } } @@ -836,8 +836,8 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * if any */ protected Object handleFault(WebServiceConnection connection, MessageContext messageContext) throws IOException { - if (logger.isDebugEnabled()) { - logger.debug("Received Fault message for request [" + messageContext.getRequest() + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Received Fault message for request [" + messageContext.getRequest() + "]"); } if (getFaultMessageResolver() != null) { getFaultMessageResolver().resolveFault(messageContext.getResponse()); @@ -862,7 +862,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService @Override public Boolean extractData(WebServiceMessage message) throws IOException, TransformerException { - callback.doWithMessage(message); + this.callback.doWithMessage(message); return Boolean.TRUE; } @@ -879,7 +879,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService @Override public T extractData(WebServiceMessage message) throws IOException, TransformerException { - return sourceExtractor.extractData(message.getPayloadSource()); + return this.sourceExtractor.extractData(message.getPayloadSource()); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java index 35055a8b..e4dc606e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java @@ -67,7 +67,7 @@ public abstract class WebServiceGatewaySupport implements InitializingBean { * default {@code WebServiceTemplate}. */ protected WebServiceGatewaySupport() { - webServiceTemplate = new WebServiceTemplate(); + this.webServiceTemplate = new WebServiceTemplate(); } /** @@ -76,57 +76,57 @@ public abstract class WebServiceGatewaySupport implements InitializingBean { * @param messageFactory the message factory to use */ protected WebServiceGatewaySupport(WebServiceMessageFactory messageFactory) { - webServiceTemplate = new WebServiceTemplate(messageFactory); + this.webServiceTemplate = new WebServiceTemplate(messageFactory); } /** Returns the {@code WebServiceMessageFactory} used by the gateway. */ public final WebServiceMessageFactory getMessageFactory() { - return webServiceTemplate.getMessageFactory(); + return this.webServiceTemplate.getMessageFactory(); } /** Set the {@code WebServiceMessageFactory} to be used by the gateway. */ public final void setMessageFactory(WebServiceMessageFactory messageFactory) { - webServiceTemplate.setMessageFactory(messageFactory); + this.webServiceTemplate.setMessageFactory(messageFactory); } /** Returns the default URI used by the gateway. */ public final String getDefaultUri() { - return webServiceTemplate.getDefaultUri(); + return this.webServiceTemplate.getDefaultUri(); } /** Sets the default URI used by the gateway. */ public final void setDefaultUri(String uri) { - webServiceTemplate.setDefaultUri(uri); + this.webServiceTemplate.setDefaultUri(uri); } /** Returns the destination provider used by the gateway. */ public final DestinationProvider getDestinationProvider() { - return webServiceTemplate.getDestinationProvider(); + return this.webServiceTemplate.getDestinationProvider(); } /** Set the destination provider URI used by the gateway. */ public final void setDestinationProvider(DestinationProvider destinationProvider) { - webServiceTemplate.setDestinationProvider(destinationProvider); + this.webServiceTemplate.setDestinationProvider(destinationProvider); } /** Sets a single {@code WebServiceMessageSender} to be used by the gateway. */ public final void setMessageSender(WebServiceMessageSender messageSender) { - webServiceTemplate.setMessageSender(messageSender); + this.webServiceTemplate.setMessageSender(messageSender); } /** Returns the {@code WebServiceMessageSender}s used by the gateway. */ public final WebServiceMessageSender[] getMessageSenders() { - return webServiceTemplate.getMessageSenders(); + return this.webServiceTemplate.getMessageSenders(); } /** Sets multiple {@code WebServiceMessageSender} to be used by the gateway. */ public final void setMessageSenders(WebServiceMessageSender[] messageSenders) { - webServiceTemplate.setMessageSenders(messageSenders); + this.webServiceTemplate.setMessageSenders(messageSenders); } /** Returns the {@code WebServiceTemplate} for the gateway. */ public final WebServiceTemplate getWebServiceTemplate() { - return webServiceTemplate; + return this.webServiceTemplate; } /** @@ -146,7 +146,7 @@ public abstract class WebServiceGatewaySupport implements InitializingBean { /** Returns the {@code Marshaller} used by the gateway. */ public final Marshaller getMarshaller() { - return webServiceTemplate.getMarshaller(); + return this.webServiceTemplate.getMarshaller(); } /** @@ -156,12 +156,12 @@ public abstract class WebServiceGatewaySupport implements InitializingBean { * @see WebServiceTemplate#marshalSendAndReceive */ public final void setMarshaller(Marshaller marshaller) { - webServiceTemplate.setMarshaller(marshaller); + this.webServiceTemplate.setMarshaller(marshaller); } /** Returns the {@code Unmarshaller} used by the gateway. */ public final Unmarshaller getUnmarshaller() { - return webServiceTemplate.getUnmarshaller(); + return this.webServiceTemplate.getUnmarshaller(); } /** @@ -171,22 +171,22 @@ public abstract class WebServiceGatewaySupport implements InitializingBean { * @see WebServiceTemplate#marshalSendAndReceive */ public final void setUnmarshaller(Unmarshaller unmarshaller) { - webServiceTemplate.setUnmarshaller(unmarshaller); + this.webServiceTemplate.setUnmarshaller(unmarshaller); } /** Returns the {@code ClientInterceptors} used by the template. */ public final ClientInterceptor[] getInterceptors() { - return webServiceTemplate.getInterceptors(); + return this.webServiceTemplate.getInterceptors(); } /** Sets the {@code ClientInterceptors} used by the gateway. */ public final void setInterceptors(ClientInterceptor[] interceptors) { - webServiceTemplate.setInterceptors(interceptors); + this.webServiceTemplate.setInterceptors(interceptors); } @Override public final void afterPropertiesSet() throws Exception { - webServiceTemplate.afterPropertiesSet(); + this.webServiceTemplate.afterPropertiesSet(); initGateway(); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java index 8bd959f5..8256d66f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java @@ -47,7 +47,7 @@ public abstract class WebServiceAccessor extends TransformerObjectSupport implem /** Returns the message factory used for creating messages. */ public WebServiceMessageFactory getMessageFactory() { - return messageFactory; + return this.messageFactory; } /** Sets the message factory used for creating messages. */ @@ -57,7 +57,7 @@ public abstract class WebServiceAccessor extends TransformerObjectSupport implem /** Returns the message senders used for sending messages. */ public WebServiceMessageSender[] getMessageSenders() { - return messageSenders; + return this.messageSenders; } /** @@ -69,7 +69,7 @@ public abstract class WebServiceAccessor extends TransformerObjectSupport implem */ public void setMessageSender(WebServiceMessageSender messageSender) { Assert.notNull(messageSender, "'messageSender' must not be null"); - messageSenders = new WebServiceMessageSender[] { messageSender }; + this.messageSenders = new WebServiceMessageSender[] { messageSender }; } /** @@ -109,9 +109,9 @@ public abstract class WebServiceAccessor extends TransformerObjectSupport implem for (WebServiceMessageSender messageSender : messageSenders) { if (messageSender.supports(uri)) { WebServiceConnection connection = messageSender.createConnection(uri); - if (logger.isDebugEnabled()) { + if (this.logger.isDebugEnabled()) { try { - logger.debug("Opening [" + connection + "] to [" + connection.getUri() + "]"); + this.logger.debug("Opening [" + connection + "] to [" + connection.getUri() + "]"); } catch (URISyntaxException e) { // ignore diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/AbstractCachingDestinationProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/AbstractCachingDestinationProvider.java index a54a149e..0de3d113 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/AbstractCachingDestinationProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/AbstractCachingDestinationProvider.java @@ -51,11 +51,11 @@ public abstract class AbstractCachingDestinationProvider implements DestinationP @Override public final URI getDestination() { - if (cache) { - if (cachedUri == null) { - cachedUri = lookupDestination(); + if (this.cache) { + if (this.cachedUri == null) { + this.cachedUri = lookupDestination(); } - return cachedUri; + return this.cachedUri; } else { return lookupDestination(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java index 7b8c0a14..4df1afae 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java @@ -67,12 +67,12 @@ public class Wsdl11DestinationProvider extends AbstractCachingDestinationProvide private Resource wsdlResource; public Wsdl11DestinationProvider() { - expressionNamespaces.put("wsdl", "http://schemas.xmlsoap.org/wsdl/"); - expressionNamespaces.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); - expressionNamespaces.put("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + this.expressionNamespaces.put("wsdl", "http://schemas.xmlsoap.org/wsdl/"); + this.expressionNamespaces.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); + this.expressionNamespaces.put("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); - locationXPathExpression = XPathExpressionFactory.createXPathExpression(DEFAULT_WSDL_LOCATION_EXPRESSION, - expressionNamespaces); + this.locationXPathExpression = XPathExpressionFactory.createXPathExpression(DEFAULT_WSDL_LOCATION_EXPRESSION, + this.expressionNamespaces); } /** @@ -115,7 +115,8 @@ public class Wsdl11DestinationProvider extends AbstractCachingDestinationProvide */ public void setLocationExpression(String expression) { Assert.hasText(expression, "'expression' must not be empty"); - locationXPathExpression = XPathExpressionFactory.createXPathExpression(expression, expressionNamespaces); + this.locationXPathExpression = XPathExpressionFactory.createXPathExpression(expression, + this.expressionNamespaces); } @Override @@ -123,19 +124,20 @@ public class Wsdl11DestinationProvider extends AbstractCachingDestinationProvide try { DOMResult result = new DOMResult(); Transformer transformer = transformerFactory.newTransformer(); - transformer.transform(new ResourceSource(wsdlResource), result); + transformer.transform(new ResourceSource(this.wsdlResource), result); Document definitionDocument = (Document) result.getNode(); - String location = locationXPathExpression.evaluateAsString(definitionDocument); - if (logger.isDebugEnabled()) { - logger.debug("Found location [" + location + "] in " + wsdlResource); + String location = this.locationXPathExpression.evaluateAsString(definitionDocument); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Found location [" + location + "] in " + this.wsdlResource); } return location != null ? URI.create(location) : null; } catch (IOException ex) { - throw new WebServiceIOException("Error extracting location from WSDL [" + wsdlResource + "]", ex); + throw new WebServiceIOException("Error extracting location from WSDL [" + this.wsdlResource + "]", ex); } catch (TransformerException ex) { - throw new WebServiceTransformerException("Error extracting location from WSDL [" + wsdlResource + "]", ex); + throw new WebServiceTransformerException("Error extracting location from WSDL [" + this.wsdlResource + "]", + ex); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java index 4d629bc7..40c6e868 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java @@ -65,7 +65,7 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup private XmlValidator validator; public String getSchemaLanguage() { - return schemaLanguage; + return this.schemaLanguage; } /** @@ -82,7 +82,7 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup * Returns the schema resources to use for validation. */ public Resource[] getSchemas() { - return schemas; + return this.schemas; } /** @@ -151,17 +151,18 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup @Override public void afterPropertiesSet() throws Exception { - if (validator == null && !ObjectUtils.isEmpty(schemas)) { - Assert.hasLength(schemaLanguage, "schemaLanguage is required"); - for (Resource schema : schemas) { + if (this.validator == null && !ObjectUtils.isEmpty(this.schemas)) { + Assert.hasLength(this.schemaLanguage, "schemaLanguage is required"); + for (Resource schema : this.schemas) { Assert.isTrue(schema.exists(), "schema [" + schema + "] does not exist"); } - if (logger.isInfoEnabled()) { - logger.info("Validating using " + StringUtils.arrayToCommaDelimitedString(schemas)); + if (this.logger.isInfoEnabled()) { + this.logger.info("Validating using " + StringUtils.arrayToCommaDelimitedString(this.schemas)); } - validator = XmlValidatorFactory.createValidator(schemas, schemaLanguage); + this.validator = XmlValidatorFactory.createValidator(this.schemas, this.schemaLanguage); } - Assert.notNull(validator, "Setting 'schema', 'schemas', 'xsdSchema', or 'xsdSchemaCollection' is required"); + Assert.notNull(this.validator, + "Setting 'schema', 'schemas', 'xsdSchema', or 'xsdSchemaCollection' is required"); } /** @@ -176,12 +177,12 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup */ @Override public boolean handleRequest(MessageContext messageContext) throws WebServiceClientException { - if (validateRequest) { + if (this.validateRequest) { Source requestSource = getValidationRequestSource(messageContext.getRequest()); if (requestSource != null) { SAXParseException[] errors; try { - errors = validator.validate(requestSource); + errors = this.validator.validate(requestSource); } catch (IOException e) { throw new WebServiceIOException("Could not validate response: " + e.getMessage(), e); @@ -189,8 +190,8 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup if (!ObjectUtils.isEmpty(errors)) { return handleRequestValidationErrors(messageContext, errors); } - else if (logger.isDebugEnabled()) { - logger.debug("Request message validated"); + else if (this.logger.isDebugEnabled()) { + this.logger.debug("Request message validated"); } } } @@ -209,7 +210,7 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup */ protected boolean handleRequestValidationErrors(MessageContext messageContext, SAXParseException[] errors) { for (SAXParseException error : errors) { - logger.error("XML validation error on request: " + error.getMessage()); + this.logger.error("XML validation error on request: " + error.getMessage()); } throw new WebServiceValidationException(errors); } @@ -226,12 +227,12 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup */ @Override public boolean handleResponse(MessageContext messageContext) throws WebServiceClientException { - if (validateResponse) { + if (this.validateResponse) { Source responseSource = getValidationResponseSource(messageContext.getResponse()); if (responseSource != null) { SAXParseException[] errors; try { - errors = validator.validate(responseSource); + errors = this.validator.validate(responseSource); } catch (IOException e) { throw new WebServiceIOException("Could not validate response: " + e.getMessage(), e); @@ -239,8 +240,8 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup if (!ObjectUtils.isEmpty(errors)) { return handleResponseValidationErrors(messageContext, errors); } - else if (logger.isDebugEnabled()) { - logger.debug("Response message validated"); + else if (this.logger.isDebugEnabled()) { + this.logger.debug("Response message validated"); } } } @@ -261,7 +262,7 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup protected boolean handleResponseValidationErrors(MessageContext messageContext, SAXParseException[] errors) throws WebServiceValidationException { for (SAXParseException error : errors) { - logger.warn("XML validation error on response: " + error.getMessage()); + this.logger.warn("XML validation error on response: " + error.getMessage()); } return false; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java index 1fd25958..5882c4ec 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java @@ -51,7 +51,7 @@ public class WebServiceValidationException extends WebServiceClientException { /** Returns the validation errors. */ public SAXParseException[] getValidationErrors() { - return validationErrors; + return this.validationErrors; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurationSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurationSupport.java index 1e8fec53..c34279ad 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurationSupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurationSupport.java @@ -123,11 +123,11 @@ public class WsConfigurationSupport { * {@link #addInterceptors(List)} instead. */ protected final EndpointInterceptor[] getInterceptors() { - if (interceptors == null) { - interceptors = new ArrayList<>(); - addInterceptors(interceptors); + if (this.interceptors == null) { + this.interceptors = new ArrayList<>(); + addInterceptors(this.interceptors); } - return interceptors.toArray(new EndpointInterceptor[0]); + return this.interceptors.toArray(new EndpointInterceptor[0]); } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurerComposite.java b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurerComposite.java index bd32ad52..dfaf5b88 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurerComposite.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurerComposite.java @@ -44,21 +44,21 @@ public class WsConfigurerComposite implements WsConfigurer { @Override public void addInterceptors(List interceptors) { - for (WsConfigurer delegate : delegates) { + for (WsConfigurer delegate : this.delegates) { delegate.addInterceptors(interceptors); } } @Override public void addArgumentResolvers(List argumentResolvers) { - for (WsConfigurer delegate : delegates) { + for (WsConfigurer delegate : this.delegates) { delegate.addArgumentResolvers(argumentResolvers); } } @Override public void addReturnValueHandlers(List returnValueHandlers) { - for (WsConfigurer delegate : delegates) { + for (WsConfigurer delegate : this.delegates) { delegate.addReturnValueHandlers(returnValueHandlers); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/context/AbstractMessageContext.java b/spring-ws-core/src/main/java/org/springframework/ws/context/AbstractMessageContext.java index 20710161..704c4c25 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/context/AbstractMessageContext.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/context/AbstractMessageContext.java @@ -61,10 +61,10 @@ public abstract class AbstractMessageContext implements MessageContext { } private Map getProperties() { - if (properties == null) { - properties = new HashMap<>(); + if (this.properties == null) { + this.properties = new HashMap<>(); } - return properties; + return this.properties; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/context/DefaultMessageContext.java b/spring-ws-core/src/main/java/org/springframework/ws/context/DefaultMessageContext.java index 2189648f..3c3dfab5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/context/DefaultMessageContext.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/context/DefaultMessageContext.java @@ -58,20 +58,20 @@ public class DefaultMessageContext extends AbstractMessageContext { @Override public WebServiceMessage getRequest() { - return request; + return this.request; } @Override public boolean hasResponse() { - return response != null; + return this.response != null; } @Override public WebServiceMessage getResponse() { - if (response == null) { - response = messageFactory.createWebServiceMessage(); + if (this.response == null) { + this.response = this.messageFactory.createWebServiceMessage(); } - return response; + return this.response; } @Override @@ -82,21 +82,21 @@ public class DefaultMessageContext extends AbstractMessageContext { @Override public void clearResponse() { - response = null; + this.response = null; } @Override public void readResponse(InputStream inputStream) throws IOException { checkForResponse(); - response = messageFactory.createWebServiceMessage(inputStream); + this.response = this.messageFactory.createWebServiceMessage(inputStream); } public WebServiceMessageFactory getMessageFactory() { - return messageFactory; + return this.messageFactory; } private void checkForResponse() throws IllegalStateException { - if (response != null) { + if (this.response != null) { throw new IllegalStateException("Response message already created"); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java index f26bdeb7..b41dd434 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java @@ -78,7 +78,7 @@ public abstract class AbstractMimeMessage implements MimeMessage { @Override public InputStream getInputStream() throws IOException { - return inputStreamSource.getInputStream(); + return this.inputStreamSource.getInputStream(); } @Override @@ -88,12 +88,12 @@ public abstract class AbstractMimeMessage implements MimeMessage { @Override public String getContentType() { - return contentType; + return this.contentType; } @Override public String getName() { - if (inputStreamSource instanceof Resource resource) { + if (this.inputStreamSource instanceof Resource resource) { return resource.getFilename(); } else { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java index dc359543..709bb873 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java @@ -67,21 +67,21 @@ public class DomPoxMessage implements PoxMessage { /** Returns the document underlying this message. */ public Document getDocument() { - return document; + return this.document; } @Override public Result getPayloadResult() { - NodeList children = document.getChildNodes(); + NodeList children = this.document.getChildNodes(); for (int i = 0; i < children.getLength(); i++) { - document.removeChild(children.item(i)); + this.document.removeChild(children.item(i)); } - return new DOMResult(document); + return new DOMResult(this.document); } @Override public Source getPayloadSource() { - return new DOMSource(document); + return new DOMSource(this.document); } public boolean hasFault() { @@ -94,7 +94,7 @@ public class DomPoxMessage implements PoxMessage { public String toString() { StringBuilder builder = new StringBuilder("DomPoxMessage "); - Element root = document.getDocumentElement(); + Element root = this.document.getDocumentElement(); if (root != null) { builder.append(' '); builder.append(QNameUtils.getQNameForNode(root)); @@ -106,9 +106,9 @@ public class DomPoxMessage implements PoxMessage { public void writeTo(OutputStream outputStream) throws IOException { try { if (outputStream instanceof TransportOutputStream transportOutputStream) { - transportOutputStream.addHeader(TransportConstants.HEADER_CONTENT_TYPE, contentType); + transportOutputStream.addHeader(TransportConstants.HEADER_CONTENT_TYPE, this.contentType); } - transformer.transform(getPayloadSource(), new StreamResult(outputStream)); + this.transformer.transform(getPayloadSource(), new StreamResult(outputStream)); } catch (TransformerException ex) { throw new DomPoxMessageException("Could write document: " + ex.getMessage(), ex); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java index d3333f85..66b5bc07 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java @@ -79,12 +79,12 @@ public class DomPoxMessageFactory extends TransformerObjectSupport implements We * {@code true}. */ public void setNamespaceAware(boolean namespaceAware) { - documentBuilderFactory.setNamespaceAware(namespaceAware); + this.documentBuilderFactory.setNamespaceAware(namespaceAware); } /** Set if the XML parser should validate the document. Default is {@code false}. */ public void setValidating(boolean validating) { - documentBuilderFactory.setValidating(validating); + this.documentBuilderFactory.setValidating(validating); } /** @@ -92,15 +92,15 @@ public class DomPoxMessageFactory extends TransformerObjectSupport implements We * {@code false}. */ public void setExpandEntityReferences(boolean expandEntityRef) { - documentBuilderFactory.setExpandEntityReferences(expandEntityRef); + this.documentBuilderFactory.setExpandEntityReferences(expandEntityRef); } @Override public DomPoxMessage createWebServiceMessage() { try { - DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + DocumentBuilder documentBuilder = this.documentBuilderFactory.newDocumentBuilder(); Document request = documentBuilder.newDocument(); - return new DomPoxMessage(request, createTransformer(), contentType); + return new DomPoxMessage(request, createTransformer(), this.contentType); } catch (ParserConfigurationException ex) { throw new DomPoxMessageException("Could not create message context", ex); @@ -113,9 +113,9 @@ public class DomPoxMessageFactory extends TransformerObjectSupport implements We @Override public DomPoxMessage createWebServiceMessage(InputStream inputStream) throws IOException { try { - DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + DocumentBuilder documentBuilder = this.documentBuilderFactory.newDocumentBuilder(); Document request = documentBuilder.parse(inputStream); - return new DomPoxMessage(request, createTransformer(), contentType); + return new DomPoxMessage(request, createTransformer(), this.contentType); } catch (ParserConfigurationException ex) { throw new DomPoxMessageException("Could not create message context", ex); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java index 4eb2c782..547663f2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java @@ -53,7 +53,7 @@ public class EndpointInvocationChain { * @return the endpoint object */ public Object getEndpoint() { - return endpoint; + return this.endpoint; } /** @@ -61,7 +61,7 @@ public class EndpointInvocationChain { * @return the array of interceptors */ public EndpointInterceptor[] getInterceptors() { - return interceptors; + return this.interceptors; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java b/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java index b02a3bcc..86b6e2fa 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java @@ -120,12 +120,12 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa /** Initializes a new instance of the {@code MessageDispatcher}. */ public MessageDispatcher() { - defaultStrategiesHelper = new DefaultStrategiesHelper(getClass()); + this.defaultStrategiesHelper = new DefaultStrategiesHelper(getClass()); } /** Returns the {@code EndpointAdapter}s to use by this {@code MessageDispatcher}. */ public List getEndpointAdapters() { - return endpointAdapters; + return this.endpointAdapters; } /** Sets the {@code EndpointAdapter}s to use by this {@code MessageDispatcher}. */ @@ -138,7 +138,7 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa * {@code MessageDispatcher}. */ public List getEndpointExceptionResolvers() { - return endpointExceptionResolvers; + return this.endpointExceptionResolvers; } /** @@ -151,7 +151,7 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa /** Returns the {@code EndpointMapping}s to use by this {@code MessageDispatcher}. */ public List getEndpointMappings() { - return endpointMappings; + return this.endpointMappings; } /** Sets the {@code EndpointMapping}s to use by this {@code MessageDispatcher}. */ @@ -199,7 +199,7 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa } } else if (sentMessageTracingLogger.isDebugEnabled()) { - sentMessageTracingLogger.debug("MessageDispatcher with name '" + beanName + sentMessageTracingLogger.debug("MessageDispatcher with name '" + this.beanName + "' sends no response for request [" + messageContext.getRequest() + "]"); } } @@ -281,14 +281,14 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa for (EndpointMapping endpointMapping : getEndpointMappings()) { EndpointInvocationChain endpoint = endpointMapping.getEndpoint(messageContext); if (endpoint != null) { - if (logger.isDebugEnabled()) { - logger.debug("Endpoint mapping [" + endpointMapping + "] maps request to endpoint [" + if (this.logger.isDebugEnabled()) { + this.logger.debug("Endpoint mapping [" + endpointMapping + "] maps request to endpoint [" + endpoint.getEndpoint() + "]"); } return endpoint; } - else if (logger.isDebugEnabled()) { - logger.debug("Endpoint mapping [" + endpointMapping + "] has no mapping for request"); + else if (this.logger.isDebugEnabled()) { + this.logger.debug("Endpoint mapping [" + endpointMapping + "] has no mapping for request"); } } return null; @@ -301,8 +301,8 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa */ protected EndpointAdapter getEndpointAdapter(Object endpoint) { for (EndpointAdapter endpointAdapter : getEndpointAdapters()) { - if (logger.isDebugEnabled()) { - logger.debug("Testing endpoint adapter [" + endpointAdapter + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Testing endpoint adapter [" + endpointAdapter + "]"); } if (endpointAdapter.supports(endpoint)) { return endpointAdapter; @@ -340,8 +340,8 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa if (!CollectionUtils.isEmpty(getEndpointExceptionResolvers())) { for (EndpointExceptionResolver resolver : getEndpointExceptionResolvers()) { if (resolver.resolveException(messageContext, endpoint, ex)) { - if (logger.isDebugEnabled()) { - logger.debug("Endpoint invocation resulted in exception - responding with Fault", ex); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Endpoint invocation resulted in exception - responding with Fault", ex); } return; } @@ -406,7 +406,7 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa interceptor.afterCompletion(messageContext, mappedEndpoint.getEndpoint(), ex); } catch (Throwable ex2) { - logger.error("EndpointInterceptor.afterCompletion threw exception", ex2); + this.logger.error("EndpointInterceptor.afterCompletion threw exception", ex2); } } } @@ -420,18 +420,18 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa * @see #setEndpointAdapters(java.util.List) */ private void initEndpointAdapters(ApplicationContext applicationContext) throws BeansException { - if (endpointAdapters == null) { + if (this.endpointAdapters == null) { Map matchingBeans = BeanFactoryUtils .beansOfTypeIncludingAncestors(applicationContext, EndpointAdapter.class, true, false); if (!matchingBeans.isEmpty()) { - endpointAdapters = new ArrayList<>(matchingBeans.values()); - endpointAdapters.sort(new OrderComparator()); + this.endpointAdapters = new ArrayList<>(matchingBeans.values()); + this.endpointAdapters.sort(new OrderComparator()); } else { - endpointAdapters = defaultStrategiesHelper.getDefaultStrategies(EndpointAdapter.class, + this.endpointAdapters = this.defaultStrategiesHelper.getDefaultStrategies(EndpointAdapter.class, applicationContext); - if (logger.isDebugEnabled()) { - logger.debug("No EndpointAdapters found, using defaults"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No EndpointAdapters found, using defaults"); } } } @@ -444,18 +444,18 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa * @see #setEndpointExceptionResolvers(java.util.List) */ private void initEndpointExceptionResolvers(ApplicationContext applicationContext) throws BeansException { - if (endpointExceptionResolvers == null) { + if (this.endpointExceptionResolvers == null) { Map matchingBeans = BeanFactoryUtils .beansOfTypeIncludingAncestors(applicationContext, EndpointExceptionResolver.class, true, false); if (!matchingBeans.isEmpty()) { - endpointExceptionResolvers = new ArrayList<>(matchingBeans.values()); - endpointExceptionResolvers.sort(new OrderComparator()); + this.endpointExceptionResolvers = new ArrayList<>(matchingBeans.values()); + this.endpointExceptionResolvers.sort(new OrderComparator()); } else { - endpointExceptionResolvers = defaultStrategiesHelper + this.endpointExceptionResolvers = this.defaultStrategiesHelper .getDefaultStrategies(EndpointExceptionResolver.class, applicationContext); - if (logger.isDebugEnabled()) { - logger.debug("No EndpointExceptionResolvers found, using defaults"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No EndpointExceptionResolvers found, using defaults"); } } } @@ -468,18 +468,18 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa * @see #setEndpointMappings(java.util.List) */ private void initEndpointMappings(ApplicationContext applicationContext) throws BeansException { - if (endpointMappings == null) { + if (this.endpointMappings == null) { Map matchingBeans = BeanFactoryUtils .beansOfTypeIncludingAncestors(applicationContext, EndpointMapping.class, true, false); if (!matchingBeans.isEmpty()) { - endpointMappings = new ArrayList<>(matchingBeans.values()); - endpointMappings.sort(new OrderComparator()); + this.endpointMappings = new ArrayList<>(matchingBeans.values()); + this.endpointMappings.sort(new OrderComparator()); } else { - endpointMappings = defaultStrategiesHelper.getDefaultStrategies(EndpointMapping.class, + this.endpointMappings = this.defaultStrategiesHelper.getDefaultStrategies(EndpointMapping.class, applicationContext); - if (logger.isDebugEnabled()) { - logger.debug("No EndpointMappings found, using defaults"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No EndpointMappings found, using defaults"); } } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java index 538e5840..7f43e653 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java @@ -89,7 +89,7 @@ public abstract class AbstractDom4jPayloadEndpoint extends TransformerObjectSupp if (source == null) { return null; } - if (!alwaysTransform && source instanceof DOMSource) { + if (!this.alwaysTransform && source instanceof DOMSource) { Node node = ((DOMSource) source).getNode(); if (node.getNodeType() == Node.DOCUMENT_NODE) { DOMReader domReader = new DOMReader(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java index 5ab66592..0a73582b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java @@ -77,7 +77,7 @@ public abstract class AbstractDomPayloadEndpoint extends TransformerObjectSuppor * {@code false}. */ public void setExpandEntityReferences(boolean expandEntityRef) { - documentBuilderFactory.setExpandEntityReferences(expandEntityRef); + this.documentBuilderFactory.setExpandEntityReferences(expandEntityRef); } /** @@ -92,10 +92,10 @@ public abstract class AbstractDomPayloadEndpoint extends TransformerObjectSuppor @Override public final Source invoke(Source request) throws Exception { - if (documentBuilderFactory == null) { - documentBuilderFactory = createDocumentBuilderFactory(); + if (this.documentBuilderFactory == null) { + this.documentBuilderFactory = createDocumentBuilderFactory(); } - DocumentBuilder documentBuilder = createDocumentBuilder(documentBuilderFactory); + DocumentBuilder documentBuilder = createDocumentBuilder(this.documentBuilderFactory); Element requestElement = getDocumentElement(request, documentBuilder); Document responseDocument = documentBuilder.newDocument(); Element responseElement = invokeInternal(requestElement, responseDocument); @@ -126,9 +126,9 @@ public abstract class AbstractDomPayloadEndpoint extends TransformerObjectSuppor */ protected DocumentBuilderFactory createDocumentBuilderFactory() throws ParserConfigurationException { DocumentBuilderFactory factory = DocumentBuilderFactoryUtils.newInstance(); - factory.setValidating(validating); - factory.setNamespaceAware(namespaceAware); - factory.setExpandEntityReferences(expandEntityReferences); + factory.setValidating(this.validating); + factory.setNamespaceAware(this.namespaceAware); + factory.setExpandEntityReferences(this.expandEntityReferences); return factory; } @@ -149,7 +149,7 @@ public abstract class AbstractDomPayloadEndpoint extends TransformerObjectSuppor if (source == null) { return null; } - if (!alwaysTransform && source instanceof DOMSource) { + if (!this.alwaysTransform && source instanceof DOMSource) { Node node = ((DOMSource) source).getNode(); if (node.getNodeType() == Node.ELEMENT_NODE) { return (Element) node; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java index 65aa8b43..05847184 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java @@ -85,7 +85,7 @@ public abstract class AbstractEndpointExceptionResolver implements EndpointExcep @Override public final int getOrder() { - return order; + return this.order; } /** @@ -96,12 +96,12 @@ public abstract class AbstractEndpointExceptionResolver implements EndpointExcep @Override public final boolean resolveException(MessageContext messageContext, Object endpoint, Exception ex) { Object mappedEndpoint = endpoint instanceof MethodEndpoint ? ((MethodEndpoint) endpoint).getBean() : endpoint; - if (mappedEndpoints != null && !mappedEndpoints.contains(mappedEndpoint)) { + if (this.mappedEndpoints != null && !this.mappedEndpoints.contains(mappedEndpoint)) { return false; } // Log exception, both at debug log level and at warn level, if desired. - if (logger.isDebugEnabled()) { - logger.debug("Resolving exception from endpoint [" + endpoint + "]: " + ex); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Resolving exception from endpoint [" + endpoint + "]: " + ex); } logException(ex, messageContext); return resolveExceptionInternal(messageContext, endpoint, ex); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java index b6794306..abb9292a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java @@ -79,7 +79,7 @@ public abstract class AbstractJDomPayloadEndpoint extends TransformerObjectSuppo if (source == null) { return null; } - if (!alwaysTransform && source instanceof DOMSource) { + if (!this.alwaysTransform && source instanceof DOMSource) { Node node = ((DOMSource) source).getNode(); DOMBuilder domBuilder = new DOMBuilder(); if (node.getNodeType() == Node.ELEMENT_NODE) { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java index ecdd809e..ca542579 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java @@ -85,7 +85,7 @@ public abstract class AbstractLoggingInterceptor extends TransformerObjectSuppor */ @Override public boolean handleRequest(MessageContext messageContext, Object endpoint) throws TransformerException { - if (logRequest && isLogEnabled()) { + if (this.logRequest && isLogEnabled()) { logMessageSource("Request: ", getSource(messageContext.getRequest())); } return true; @@ -100,7 +100,7 @@ public abstract class AbstractLoggingInterceptor extends TransformerObjectSuppor */ @Override public boolean handleResponse(MessageContext messageContext, Object endpoint) throws Exception { - if (logResponse && isLogEnabled()) { + if (this.logResponse && isLogEnabled()) { logMessageSource("Response: ", getSource(messageContext.getResponse())); } return true; @@ -124,7 +124,7 @@ public abstract class AbstractLoggingInterceptor extends TransformerObjectSuppor * this to change the level under which logging occurs. */ protected boolean isLogEnabled() { - return logger.isDebugEnabled(); + return this.logger.isDebugEnabled(); } private Transformer createNonIndentingTransformer() throws TransformerConfigurationException { @@ -162,7 +162,7 @@ public abstract class AbstractLoggingInterceptor extends TransformerObjectSuppor * @param message the message */ protected void logMessage(String message) { - logger.debug(message); + this.logger.debug(message); } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java index 3b73a135..8d0f14a8 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java @@ -104,7 +104,7 @@ public abstract class AbstractMarshallingPayloadEndpoint implements MessageEndpo /** Returns the marshaller used for transforming objects into XML. */ public Marshaller getMarshaller() { - return marshaller; + return this.marshaller; } /** Sets the marshaller used for transforming objects into XML. */ @@ -114,7 +114,7 @@ public abstract class AbstractMarshallingPayloadEndpoint implements MessageEndpo /** Returns the unmarshaller used for transforming XML into objects. */ public Unmarshaller getUnmarshaller() { - return unmarshaller; + return this.unmarshaller; } /** Sets the unmarshaller used for transforming XML into objects. */ @@ -145,8 +145,8 @@ public abstract class AbstractMarshallingPayloadEndpoint implements MessageEndpo Unmarshaller unmarshaller = getUnmarshaller(); Assert.notNull(unmarshaller, "No unmarshaller registered. Check configuration of endpoint."); Object requestObject = MarshallingUtils.unmarshal(unmarshaller, request); - if (logger.isDebugEnabled()) { - logger.debug("Unmarshalled payload request to [" + requestObject + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Unmarshalled payload request to [" + requestObject + "]"); } return requestObject; } @@ -169,8 +169,8 @@ public abstract class AbstractMarshallingPayloadEndpoint implements MessageEndpo private void marshalResponse(Object responseObject, WebServiceMessage response) throws IOException { Marshaller marshaller = getMarshaller(); Assert.notNull(marshaller, "No marshaller registered. Check configuration of endpoint."); - if (logger.isDebugEnabled()) { - logger.debug("Marshalling [" + responseObject + "] to response payload"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Marshalling [" + responseObject + "] to response payload"); } MarshallingUtils.marshal(marshaller, responseObject, response); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java index 0b9f1559..63325a14 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java @@ -76,10 +76,10 @@ public abstract class AbstractStaxEventPayloadEndpoint extends AbstractStaxPaylo /** Returns an {@code XMLEventFactory} to read XML from. */ private XMLEventFactory getEventFactory() { - if (eventFactory == null) { - eventFactory = createXmlEventFactory(); + if (this.eventFactory == null) { + this.eventFactory = createXmlEventFactory(); } - return eventFactory; + return this.eventFactory; } private XMLEventReader getEventReader(Source source) throws XMLStreamException, TransformerException { @@ -165,13 +165,13 @@ public abstract class AbstractStaxEventPayloadEndpoint extends AbstractStaxPaylo @Override public NamespaceContext getNamespaceContext() { - return eventWriter.getNamespaceContext(); + return this.eventWriter.getNamespaceContext(); } @Override public void setNamespaceContext(NamespaceContext context) throws XMLStreamException { createEventWriter(); - eventWriter.setNamespaceContext(context); + this.eventWriter.setNamespaceContext(context); } @Override @@ -185,15 +185,15 @@ public abstract class AbstractStaxEventPayloadEndpoint extends AbstractStaxPaylo @Override public void add(XMLEvent event) throws XMLStreamException { createEventWriter(); - eventWriter.add(event); + this.eventWriter.add(event); if (event.isEndDocument()) { - if (os != null) { - eventWriter.flush(); + if (this.os != null) { + this.eventWriter.flush(); // if we used an output stream cache, we have to transform it to the // response again try { - ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray()); - transform(new StreamSource(is), messageContext.getResponse().getPayloadResult()); + ByteArrayInputStream is = new ByteArrayInputStream(this.os.toByteArray()); + transform(new StreamSource(is), this.messageContext.getResponse().getPayloadResult()); } catch (TransformerException ex) { throw new XMLStreamException(ex); @@ -204,45 +204,45 @@ public abstract class AbstractStaxEventPayloadEndpoint extends AbstractStaxPaylo @Override public void close() throws XMLStreamException { - if (eventWriter != null) { - eventWriter.close(); + if (this.eventWriter != null) { + this.eventWriter.close(); } } @Override public void flush() throws XMLStreamException { - if (eventWriter != null) { - eventWriter.flush(); + if (this.eventWriter != null) { + this.eventWriter.flush(); } } @Override public String getPrefix(String uri) throws XMLStreamException { createEventWriter(); - return eventWriter.getPrefix(uri); + return this.eventWriter.getPrefix(uri); } @Override public void setDefaultNamespace(String uri) throws XMLStreamException { createEventWriter(); - eventWriter.setDefaultNamespace(uri); + this.eventWriter.setDefaultNamespace(uri); } @Override public void setPrefix(String prefix, String uri) throws XMLStreamException { createEventWriter(); - eventWriter.setPrefix(prefix, uri); + this.eventWriter.setPrefix(prefix, uri); } private void createEventWriter() throws XMLStreamException { - if (eventWriter == null) { - WebServiceMessage response = messageContext.getResponse(); - eventWriter = getEventWriter(response.getPayloadResult()); - if (eventWriter == null) { + if (this.eventWriter == null) { + WebServiceMessage response = this.messageContext.getResponse(); + this.eventWriter = getEventWriter(response.getPayloadResult()); + if (this.eventWriter == null) { // as a final resort, use a stream, and transform that at // endDocument() - os = new ByteArrayOutputStream(); - eventWriter = getOutputFactory().createXMLEventWriter(os); + this.os = new ByteArrayOutputStream(); + this.eventWriter = getOutputFactory().createXMLEventWriter(this.os); } } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java index 12a0c416..62692996 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java @@ -42,18 +42,18 @@ public abstract class AbstractStaxPayloadEndpoint extends TransformerObjectSuppo /** Returns an {@code XMLInputFactory} to read XML from. */ protected final XMLInputFactory getInputFactory() { - if (inputFactory == null) { - inputFactory = createXmlInputFactory(); + if (this.inputFactory == null) { + this.inputFactory = createXmlInputFactory(); } - return inputFactory; + return this.inputFactory; } /** Returns an {@code XMLOutputFactory} to write XML to. */ protected final XMLOutputFactory getOutputFactory() { - if (outputFactory == null) { - outputFactory = createXmlOutputFactory(); + if (this.outputFactory == null) { + this.outputFactory = createXmlOutputFactory(); } - return outputFactory; + return this.outputFactory; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java index c482f93e..21bc0e84 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java @@ -140,221 +140,221 @@ public abstract class AbstractStaxStreamPayloadEndpoint extends AbstractStaxPayl @Override public NamespaceContext getNamespaceContext() { - return streamWriter.getNamespaceContext(); + return this.streamWriter.getNamespaceContext(); } @Override public void setNamespaceContext(NamespaceContext context) throws XMLStreamException { createStreamWriter(); - streamWriter.setNamespaceContext(context); + this.streamWriter.setNamespaceContext(context); } @Override public void close() throws XMLStreamException { - if (streamWriter != null) { - streamWriter.close(); - if (os != null) { - streamWriter.flush(); + if (this.streamWriter != null) { + this.streamWriter.close(); + if (this.os != null) { + this.streamWriter.flush(); // if we used an output stream cache, we have to transform it to the // response again try { - ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray()); - transform(new StreamSource(is), messageContext.getResponse().getPayloadResult()); - os = null; + ByteArrayInputStream is = new ByteArrayInputStream(this.os.toByteArray()); + transform(new StreamSource(is), this.messageContext.getResponse().getPayloadResult()); + this.os = null; } catch (TransformerException ex) { throw new XMLStreamException(ex); } } - streamWriter = null; + this.streamWriter = null; } } @Override public void flush() throws XMLStreamException { - if (streamWriter != null) { - streamWriter.flush(); + if (this.streamWriter != null) { + this.streamWriter.flush(); } } @Override public String getPrefix(String uri) throws XMLStreamException { createStreamWriter(); - return streamWriter.getPrefix(uri); + return this.streamWriter.getPrefix(uri); } @Override public Object getProperty(String name) throws IllegalArgumentException { - return streamWriter.getProperty(name); + return this.streamWriter.getProperty(name); } @Override public void setDefaultNamespace(String uri) throws XMLStreamException { createStreamWriter(); - streamWriter.setDefaultNamespace(uri); + this.streamWriter.setDefaultNamespace(uri); } @Override public void setPrefix(String prefix, String uri) throws XMLStreamException { createStreamWriter(); - streamWriter.setPrefix(prefix, uri); + this.streamWriter.setPrefix(prefix, uri); } @Override public void writeAttribute(String localName, String value) throws XMLStreamException { createStreamWriter(); - streamWriter.writeAttribute(localName, value); + this.streamWriter.writeAttribute(localName, value); } @Override public void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException { createStreamWriter(); - streamWriter.writeAttribute(namespaceURI, localName, value); + this.streamWriter.writeAttribute(namespaceURI, localName, value); } @Override public void writeAttribute(String prefix, String namespaceURI, String localName, String value) throws XMLStreamException { createStreamWriter(); - streamWriter.writeAttribute(prefix, namespaceURI, localName, value); + this.streamWriter.writeAttribute(prefix, namespaceURI, localName, value); } @Override public void writeCData(String data) throws XMLStreamException { createStreamWriter(); - streamWriter.writeCData(data); + this.streamWriter.writeCData(data); } @Override public void writeCharacters(String text) throws XMLStreamException { createStreamWriter(); - streamWriter.writeCharacters(text); + this.streamWriter.writeCharacters(text); } @Override public void writeCharacters(char[] text, int start, int len) throws XMLStreamException { createStreamWriter(); - streamWriter.writeCharacters(text, start, len); + this.streamWriter.writeCharacters(text, start, len); } @Override public void writeComment(String data) throws XMLStreamException { createStreamWriter(); - streamWriter.writeComment(data); + this.streamWriter.writeComment(data); } @Override public void writeDTD(String dtd) throws XMLStreamException { createStreamWriter(); - streamWriter.writeDTD(dtd); + this.streamWriter.writeDTD(dtd); } @Override public void writeDefaultNamespace(String namespaceURI) throws XMLStreamException { createStreamWriter(); - streamWriter.writeDefaultNamespace(namespaceURI); + this.streamWriter.writeDefaultNamespace(namespaceURI); } @Override public void writeEmptyElement(String localName) throws XMLStreamException { createStreamWriter(); - streamWriter.writeEmptyElement(localName); + this.streamWriter.writeEmptyElement(localName); } @Override public void writeEmptyElement(String namespaceURI, String localName) throws XMLStreamException { createStreamWriter(); - streamWriter.writeEmptyElement(namespaceURI, localName); + this.streamWriter.writeEmptyElement(namespaceURI, localName); } @Override public void writeEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException { createStreamWriter(); - streamWriter.writeEmptyElement(prefix, localName, namespaceURI); + this.streamWriter.writeEmptyElement(prefix, localName, namespaceURI); } @Override public void writeEndDocument() throws XMLStreamException { createStreamWriter(); - streamWriter.writeEndDocument(); + this.streamWriter.writeEndDocument(); } @Override public void writeEndElement() throws XMLStreamException { createStreamWriter(); - streamWriter.writeEndElement(); + this.streamWriter.writeEndElement(); } @Override public void writeEntityRef(String name) throws XMLStreamException { createStreamWriter(); - streamWriter.writeEntityRef(name); + this.streamWriter.writeEntityRef(name); } @Override public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException { createStreamWriter(); - streamWriter.writeNamespace(prefix, namespaceURI); + this.streamWriter.writeNamespace(prefix, namespaceURI); } @Override public void writeProcessingInstruction(String target) throws XMLStreamException { createStreamWriter(); - streamWriter.writeProcessingInstruction(target); + this.streamWriter.writeProcessingInstruction(target); } @Override public void writeProcessingInstruction(String target, String data) throws XMLStreamException { createStreamWriter(); - streamWriter.writeProcessingInstruction(target, data); + this.streamWriter.writeProcessingInstruction(target, data); } @Override public void writeStartDocument() throws XMLStreamException { createStreamWriter(); - streamWriter.writeStartDocument(); + this.streamWriter.writeStartDocument(); } @Override public void writeStartDocument(String version) throws XMLStreamException { createStreamWriter(); - streamWriter.writeStartDocument(version); + this.streamWriter.writeStartDocument(version); } @Override public void writeStartDocument(String encoding, String version) throws XMLStreamException { createStreamWriter(); - streamWriter.writeStartDocument(encoding, version); + this.streamWriter.writeStartDocument(encoding, version); } @Override public void writeStartElement(String localName) throws XMLStreamException { createStreamWriter(); - streamWriter.writeStartElement(localName); + this.streamWriter.writeStartElement(localName); } @Override public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException { createStreamWriter(); - streamWriter.writeStartElement(namespaceURI, localName); + this.streamWriter.writeStartElement(namespaceURI, localName); } @Override public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException { createStreamWriter(); - streamWriter.writeStartElement(prefix, localName, namespaceURI); + this.streamWriter.writeStartElement(prefix, localName, namespaceURI); } private void createStreamWriter() throws XMLStreamException { - if (streamWriter == null) { - WebServiceMessage response = messageContext.getResponse(); - streamWriter = getStreamWriter(response.getPayloadResult()); - if (streamWriter == null) { + if (this.streamWriter == null) { + WebServiceMessage response = this.messageContext.getResponse(); + this.streamWriter = getStreamWriter(response.getPayloadResult()); + if (this.streamWriter == null) { // as a final resort, use a stream, and transform that at // endDocument() - os = new ByteArrayOutputStream(); - streamWriter = getOutputFactory().createXMLStreamWriter(os); + this.os = new ByteArrayOutputStream(); + this.streamWriter = getOutputFactory().createXMLStreamWriter(this.os); } } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java index 82ab631f..a97aa8e2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java @@ -43,7 +43,7 @@ public abstract class AbstractValidatingMarshallingPayloadEndpoint extends Abstr /** Return the name of the request object for validation error codes. */ public String getRequestName() { - return requestName; + return this.requestName; } /** Set the name of the request object user for validation errors. */ @@ -69,7 +69,7 @@ public abstract class AbstractValidatingMarshallingPayloadEndpoint extends Abstr /** Return the Validators for this controller. */ public Validator[] getValidators() { - return validators; + return this.validators; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java index 57cb457b..0e71ef69 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java @@ -123,11 +123,11 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor @Override public void domSource(Node node) { if (node.getNodeType() == Node.ELEMENT_NODE) { - element = DOMConverter.convert((org.w3c.dom.Element) node); + this.element = DOMConverter.convert((org.w3c.dom.Element) node); } else if (node.getNodeType() == Node.DOCUMENT_NODE) { Document document = DOMConverter.convert((org.w3c.dom.Document) node); - element = document.getRootElement(); + this.element = document.getRootElement(); } else { throw new IllegalArgumentException("DOMSource contains neither Document nor Element"); @@ -149,7 +149,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor throw new IllegalArgumentException( "InputSource in SAXSource contains neither byte stream nor character stream"); } - element = document.getRootElement(); + this.element = document.getRootElement(); } catch (ParsingException e) { throw new XomParsingException(e); @@ -164,7 +164,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor @Override public void staxSource(XMLStreamReader streamReader) throws XMLStreamException { Document document = StaxStreamConverter.convert(streamReader); - element = document.getRootElement(); + this.element = document.getRootElement(); } @Override @@ -172,7 +172,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor try { Builder builder = new Builder(); Document document = builder.build(inputStream); - element = document.getRootElement(); + this.element = document.getRootElement(); } catch (ParsingException ex) { throw new XomParsingException(ex); @@ -184,7 +184,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor try { Builder builder = new Builder(); Document document = builder.build(reader); - element = document.getRootElement(); + this.element = document.getRootElement(); } catch (ParsingException ex) { throw new XomParsingException(ex); @@ -196,7 +196,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor try { Builder builder = new Builder(); Document document = builder.build(systemId); - element = document.getRootElement(); + this.element = document.getRootElement(); } catch (ParsingException ex) { throw new XomParsingException(ex); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MethodEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MethodEndpoint.java index 3b2e8881..c3620557 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MethodEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MethodEndpoint.java @@ -89,11 +89,11 @@ public final class MethodEndpoint { /** Returns the object bean for this method endpoint. */ public Object getBean() { - if (beanFactory != null && bean instanceof String beanName) { - return beanFactory.getBean(beanName); + if (this.beanFactory != null && this.bean instanceof String beanName) { + return this.beanFactory.getBean(beanName); } else { - return bean; + return this.bean; } } @@ -114,7 +114,7 @@ public final class MethodEndpoint { /** Returns the method return type, as {@code MethodParameter}. */ public MethodParameter getReturnType() { - return new MethodParameter(method, -1); + return new MethodParameter(this.method, -1); } /** @@ -125,9 +125,9 @@ public final class MethodEndpoint { */ public Object invoke(Object... args) throws Exception { Object endpoint = getBean(); - ReflectionUtils.makeAccessible(method); + ReflectionUtils.makeAccessible(this.method); try { - return method.invoke(endpoint, args); + return this.method.invoke(endpoint, args); } catch (InvocationTargetException ex) { handleInvocationTargetException(ex); @@ -165,7 +165,7 @@ public final class MethodEndpoint { } public String toString() { - return method.toGenericString(); + return this.method.toGenericString(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java index 78613ffc..8a773df3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java @@ -80,7 +80,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter * Returns the list of {@code MethodArgumentResolver}s to use. */ public List getMethodArgumentResolvers() { - return methodArgumentResolvers; + return this.methodArgumentResolvers; } /** @@ -94,7 +94,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter * Returns the custom argument resolvers. */ public List getCustomMethodArgumentResolvers() { - return customMethodArgumentResolvers; + return this.customMethodArgumentResolvers; } /** @@ -110,7 +110,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter * Returns the list of {@code MethodReturnValueHandler}s to use. */ public List getMethodReturnValueHandlers() { - return methodReturnValueHandlers; + return this.methodReturnValueHandlers; } /** @@ -124,7 +124,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter * Returns the custom return value handlers. */ public List getCustomMethodReturnValueHandlers() { - return customMethodReturnValueHandlers; + return this.customMethodReturnValueHandlers; } /** @@ -157,7 +157,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter } private void initMethodArgumentResolvers() { - if (CollectionUtils.isEmpty(methodArgumentResolvers)) { + if (CollectionUtils.isEmpty(this.methodArgumentResolvers)) { List methodArgumentResolvers = new ArrayList<>(); methodArgumentResolvers.add(new DomPayloadMethodProcessor()); methodArgumentResolvers.add(new MessageContextMethodArgumentResolver()); @@ -181,8 +181,8 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter if (isPresent(XOM_CLASS_NAME)) { methodArgumentResolvers.add(new XomPayloadMethodProcessor()); } - if (logger.isDebugEnabled()) { - logger.debug("No MethodArgumentResolvers set, using defaults: " + methodArgumentResolvers); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No MethodArgumentResolvers set, using defaults: " + methodArgumentResolvers); } if (getCustomMethodArgumentResolvers() != null) { methodArgumentResolvers.addAll(getCustomMethodArgumentResolvers()); @@ -203,12 +203,12 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter methodArgumentResolvers.add(BeanUtils.instantiateClass(methodArgumentResolverClass)); } catch (ClassNotFoundException e) { - logger.warn("Could not find \"" + className + "\" on the classpath"); + this.logger.warn("Could not find \"" + className + "\" on the classpath"); } } private void initMethodReturnValueHandlers() { - if (CollectionUtils.isEmpty(methodReturnValueHandlers)) { + if (CollectionUtils.isEmpty(this.methodReturnValueHandlers)) { List methodReturnValueHandlers = new ArrayList<>(); methodReturnValueHandlers.add(new DomPayloadMethodProcessor()); methodReturnValueHandlers.add(new SourcePayloadMethodProcessor()); @@ -225,8 +225,8 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter if (isPresent(XOM_CLASS_NAME)) { methodReturnValueHandlers.add(new XomPayloadMethodProcessor()); } - if (logger.isDebugEnabled()) { - logger.debug("No MethodReturnValueHandlers set, using defaults: " + methodReturnValueHandlers); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No MethodReturnValueHandlers set, using defaults: " + methodReturnValueHandlers); } if (getCustomMethodReturnValueHandlers() != null) { methodReturnValueHandlers.addAll(getCustomMethodReturnValueHandlers()); @@ -248,9 +248,9 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter private boolean supportsParameters(MethodParameter[] methodParameters) { for (MethodParameter methodParameter : methodParameters) { boolean supported = false; - for (MethodArgumentResolver methodArgumentResolver : methodArgumentResolvers) { - if (logger.isTraceEnabled()) { - logger.trace("Testing if argument resolver [" + methodArgumentResolver + "] supports [" + for (MethodArgumentResolver methodArgumentResolver : this.methodArgumentResolvers) { + if (this.logger.isTraceEnabled()) { + this.logger.trace("Testing if argument resolver [" + methodArgumentResolver + "] supports [" + methodParameter.getGenericParameterType() + "]"); } if (methodArgumentResolver.supportsParameter(methodParameter)) { @@ -269,7 +269,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter if (Void.TYPE.equals(methodReturnType.getParameterType())) { return true; } - for (MethodReturnValueHandler methodReturnValueHandler : methodReturnValueHandlers) { + for (MethodReturnValueHandler methodReturnValueHandler : this.methodReturnValueHandlers) { if (methodReturnValueHandler.supportsReturnType(methodReturnType)) { return true; } @@ -281,14 +281,14 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter protected final void invokeInternal(MessageContext messageContext, MethodEndpoint methodEndpoint) throws Exception { Object[] args = getMethodArguments(messageContext, methodEndpoint); - if (logger.isTraceEnabled()) { - logger.trace("Invoking [" + methodEndpoint + "] with arguments " + Arrays.asList(args)); + if (this.logger.isTraceEnabled()) { + this.logger.trace("Invoking [" + methodEndpoint + "] with arguments " + Arrays.asList(args)); } Object returnValue = methodEndpoint.invoke(args); - if (logger.isTraceEnabled()) { - logger.trace("Method [" + methodEndpoint + "] returned [" + returnValue + "]"); + if (this.logger.isTraceEnabled()) { + this.logger.trace("Method [" + methodEndpoint + "] returned [" + returnValue + "]"); } Class returnType = methodEndpoint.getMethod().getReturnType(); @@ -313,7 +313,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter MethodParameter[] parameters = methodEndpoint.getMethodParameters(); Object[] args = new Object[parameters.length]; for (int i = 0; i < parameters.length; i++) { - for (MethodArgumentResolver methodArgumentResolver : methodArgumentResolvers) { + for (MethodArgumentResolver methodArgumentResolver : this.methodArgumentResolvers) { if (methodArgumentResolver.supportsParameter(parameters[i])) { args[i] = methodArgumentResolver.resolveArgument(messageContext, parameters[i]); break; @@ -337,7 +337,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter protected void handleMethodReturnValue(MessageContext messageContext, Object returnValue, MethodEndpoint methodEndpoint) throws Exception { MethodParameter returnType = methodEndpoint.getReturnType(); - for (MethodReturnValueHandler methodReturnValueHandler : methodReturnValueHandlers) { + for (MethodReturnValueHandler methodReturnValueHandler : this.methodReturnValueHandlers) { if (methodReturnValueHandler.supportsReturnType(returnType)) { methodReturnValueHandler.handleReturnValue(messageContext, returnType, returnValue); return; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java index 700f362a..3056c6de 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java @@ -111,7 +111,7 @@ public class MarshallingMethodEndpointAdapter extends AbstractMethodEndpointAdap /** Returns the marshaller used for transforming objects into XML. */ public Marshaller getMarshaller() { - return marshaller; + return this.marshaller; } /** Sets the marshaller used for transforming objects into XML. */ @@ -121,7 +121,7 @@ public class MarshallingMethodEndpointAdapter extends AbstractMethodEndpointAdap /** Returns the unmarshaller used for transforming XML into objects. */ public Unmarshaller getUnmarshaller() { - return unmarshaller; + return this.unmarshaller; } /** Sets the unmarshaller used for transforming XML into objects. */ @@ -148,15 +148,15 @@ public class MarshallingMethodEndpointAdapter extends AbstractMethodEndpointAdap private Object unmarshalRequest(WebServiceMessage request) throws IOException { Object requestObject = MarshallingUtils.unmarshal(getUnmarshaller(), request); - if (logger.isDebugEnabled()) { - logger.debug("Unmarshalled payload request to [" + requestObject + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Unmarshalled payload request to [" + requestObject + "]"); } return requestObject; } private void marshalResponse(Object responseObject, WebServiceMessage response) throws IOException { - if (logger.isDebugEnabled()) { - logger.debug("Marshalling [" + responseObject + "] to response payload"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Marshalling [" + responseObject + "] to response payload"); } MarshallingUtils.marshal(getMarshaller(), responseObject, response); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java index e5cf364a..7603c750 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java @@ -83,7 +83,7 @@ public class XPathParamAnnotationMethodEndpointAdapter extends AbstractMethodEnd @Override public void afterPropertiesSet() throws Exception { - xpathFactory = XPathFactory.newInstance(); + this.xpathFactory = XPathFactory.newInstance(); } /** @@ -166,10 +166,10 @@ public class XPathParamAnnotationMethodEndpointAdapter extends AbstractMethodEnd } private synchronized XPath createXPath() { - XPath xpath = xpathFactory.newXPath(); - if (namespaces != null) { + XPath xpath = this.xpathFactory.newXPath(); + if (this.namespaces != null) { SimpleNamespaceContext namespaceContext = new SimpleNamespaceContext(); - namespaceContext.setBindings(namespaces); + namespaceContext.setBindings(this.namespaces); xpath.setNamespaceContext(namespaceContext); } return xpath; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessor.java index 094c19c0..267823e3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessor.java @@ -84,7 +84,7 @@ public class MarshallingPayloadMethodProcessor extends AbstractPayloadMethodProc * Returns the marshaller used for transforming objects into XML. */ public Marshaller getMarshaller() { - return marshaller; + return this.marshaller; } /** @@ -98,7 +98,7 @@ public class MarshallingPayloadMethodProcessor extends AbstractPayloadMethodProc * Returns the unmarshaller used for transforming XML into objects. */ public Unmarshaller getUnmarshaller() { - return unmarshaller; + return this.unmarshaller; } /** @@ -129,8 +129,8 @@ public class MarshallingPayloadMethodProcessor extends AbstractPayloadMethodProc WebServiceMessage request = messageContext.getRequest(); Object argument = MarshallingUtils.unmarshal(unmarshaller, request); - if (logger.isDebugEnabled()) { - logger.debug("Unmarshalled payload request to [" + argument + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Unmarshalled payload request to [" + argument + "]"); } return argument; } @@ -158,8 +158,8 @@ public class MarshallingPayloadMethodProcessor extends AbstractPayloadMethodProc Marshaller marshaller = getMarshaller(); Assert.state(marshaller != null, "marshaller must not be null"); - if (logger.isDebugEnabled()) { - logger.debug("Marshalling [" + returnValue + "] to response payload"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Marshalling [" + returnValue + "] to response payload"); } WebServiceMessage response = messageContext.getResponse(); MarshallingUtils.marshal(marshaller, returnValue, response); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java index 90e7f17a..7a540a7b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java @@ -85,14 +85,14 @@ public class SourcePayloadMethodProcessor extends AbstractPayloadSourceMethodPro else if (JaxpVersion.isAtLeastJaxp14() && Jaxp14StaxHandler.isStaxSource(parameterType)) { XMLStreamReader streamReader; try { - streamReader = inputFactory.createXMLStreamReader(requestPayload); + streamReader = this.inputFactory.createXMLStreamReader(requestPayload); } catch (UnsupportedOperationException | XMLStreamException ignored) { streamReader = null; } if (streamReader == null) { ByteArrayInputStream bis = convertToByteArrayInputStream(requestPayload); - streamReader = inputFactory.createXMLStreamReader(bis); + streamReader = this.inputFactory.createXMLStreamReader(bis); } return Jaxp14StaxHandler.createStaxSource(streamReader, requestPayload.getSystemId()); } @@ -171,7 +171,7 @@ public class SourcePayloadMethodProcessor extends AbstractPayloadSourceMethodPro } public String getSystemId() { - return systemId; + return SystemIdStreamReaderDelegate.this.systemId; } }; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java index 6d8691c2..7b6f31a8 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java @@ -91,7 +91,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport } if (streamReader == null) { try { - streamReader = inputFactory.createXMLStreamReader(requestSource); + streamReader = this.inputFactory.createXMLStreamReader(requestSource); } catch (XMLStreamException | UnsupportedOperationException ex) { streamReader = null; @@ -100,7 +100,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport if (streamReader == null) { // as a final resort, transform the source to a stream, and read from that ByteArrayInputStream bis = convertToByteArrayInputStream(requestSource); - streamReader = inputFactory.createXMLStreamReader(bis); + streamReader = this.inputFactory.createXMLStreamReader(bis); } return streamReader; } @@ -113,7 +113,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport XMLStreamReader streamReader = StaxUtils.getXMLStreamReader(requestSource); if (streamReader != null) { try { - eventReader = inputFactory.createXMLEventReader(streamReader); + eventReader = this.inputFactory.createXMLEventReader(streamReader); } catch (XMLStreamException ex) { eventReader = null; @@ -124,7 +124,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport } if (eventReader == null) { try { - eventReader = inputFactory.createXMLEventReader(requestSource); + eventReader = this.inputFactory.createXMLEventReader(requestSource); } catch (XMLStreamException | UnsupportedOperationException ex) { eventReader = null; @@ -133,7 +133,7 @@ public class StaxPayloadMethodArgumentResolver extends TransformerObjectSupport if (eventReader == null) { // as a final resort, transform the source to a stream, and read from that ByteArrayInputStream bis = convertToByteArrayInputStream(requestSource); - eventReader = inputFactory.createXMLEventReader(bis); + eventReader = this.inputFactory.createXMLEventReader(bis); } return eventReader; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java index 722d5bb8..7d005ac3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java @@ -86,7 +86,7 @@ public class XPathParamMethodArgumentResolver implements MethodArgumentResolver return true; } else { - return conversionService.canConvert(String.class, parameterType); + return this.conversionService.canConvert(String.class, parameterType); } } @@ -107,7 +107,7 @@ public class XPathParamMethodArgumentResolver implements MethodArgumentResolver Element rootElement = getRootElement(messageContext.getRequest().getPayloadSource()); String expression = parameter.getParameterAnnotation(XPathParam.class).value(); Object result = xpath.evaluate(expression, rootElement, evaluationReturnType); - return useConversionService ? conversionService.convert(result, parameterType) : result; + return useConversionService ? this.conversionService.convert(result, parameterType) : result; } private QName getReturnType(Class parameterType) { @@ -132,14 +132,14 @@ public class XPathParamMethodArgumentResolver implements MethodArgumentResolver } private XPath createXPath() { - synchronized (xpathFactory) { - return xpathFactory.newXPath(); + synchronized (this.xpathFactory) { + return this.xpathFactory.newXPath(); } } private Element getRootElement(Source source) throws TransformerException { DOMResult domResult = new DOMResult(); - transformerHelper.transform(source, domResult); + this.transformerHelper.transform(source, domResult); Document document = (Document) domResult.getNode(); return document.getDocumentElement(); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java index 2c75d037..b022eba4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java @@ -89,7 +89,7 @@ public class XomPayloadMethodProcessor extends AbstractPayloadSourceMethodProces if (document == null) { document = new Document(returnedElement); } - DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + DocumentBuilder documentBuilder = this.documentBuilderFactory.newDocumentBuilder(); DOMImplementation domImplementation = documentBuilder.getDOMImplementation(); org.w3c.dom.Document w3cDocument = DOMConverter.convert(document, domImplementation); return new DOMSource(w3cDocument); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java index 161276cd..33190cac 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java @@ -102,8 +102,8 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa Assert.notNull(messageContext, "'messageContext' must not be null"); Assert.notNull(clazz, "'clazz' must not be null"); Assert.notNull(jaxbElement, "'jaxbElement' must not be null"); - if (logger.isDebugEnabled()) { - logger.debug("Marshalling [" + jaxbElement + "] to response payload"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Marshalling [" + jaxbElement + "] to response payload"); } WebServiceMessage response = messageContext.getResponse(); if (response instanceof StreamingWebServiceMessage streamingResponse) { @@ -139,8 +139,8 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa try { Jaxb2SourceCallback callback = new Jaxb2SourceCallback(clazz); TraxUtils.doWithSource(requestPayload, callback); - if (logger.isDebugEnabled()) { - logger.debug("Unmarshalled payload request to [" + callback.result + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Unmarshalled payload request to [" + callback.result + "]"); } return callback.result; } @@ -165,8 +165,8 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa try { JaxbElementSourceCallback callback = new JaxbElementSourceCallback<>(clazz); TraxUtils.doWithSource(requestPayload, callback); - if (logger.isDebugEnabled()) { - logger.debug("Unmarshalled payload request to [" + callback.result + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Unmarshalled payload request to [" + callback.result + "]"); } return callback.result; } @@ -223,10 +223,10 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa private JAXBContext getJaxbContext(Class clazz) throws JAXBException { Assert.notNull(clazz, "'clazz' must not be null"); - JAXBContext jaxbContext = jaxbContexts.get(clazz); + JAXBContext jaxbContext = this.jaxbContexts.get(clazz); if (jaxbContext == null) { jaxbContext = JAXBContext.newInstance(clazz); - jaxbContexts.putIfAbsent(clazz, jaxbContext); + this.jaxbContexts.putIfAbsent(clazz, jaxbContext); } return jaxbContext; } @@ -245,7 +245,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa @Override public void domSource(Node node) throws JAXBException { - result = unmarshaller.unmarshal(node); + this.result = this.unmarshaller.unmarshal(node); } @Override @@ -260,43 +260,43 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa // In this case, we need to use a ContentHandler to feed the SAX events // into // the unmarshaller. - UnmarshallerHandler handler = unmarshaller.getUnmarshallerHandler(); + UnmarshallerHandler handler = this.unmarshaller.getUnmarshallerHandler(); reader.setContentHandler(handler); reader.parse(inputSource); - result = handler.getResult(); + this.result = handler.getResult(); } else { // If a stream or system ID is set, we assume that the SAXSource is backed // by a SAX parser and we only pass the InputSource to the unmarshaller. // This effectively ignores the SAX parser and lets the unmarshaller take // care of the parsing (in a potentially more efficient way). - result = unmarshaller.unmarshal(inputSource); + this.result = this.unmarshaller.unmarshal(inputSource); } } @Override public void staxSource(XMLEventReader eventReader) throws JAXBException { - result = unmarshaller.unmarshal(eventReader); + this.result = this.unmarshaller.unmarshal(eventReader); } @Override public void staxSource(XMLStreamReader streamReader) throws JAXBException { - result = unmarshaller.unmarshal(streamReader); + this.result = this.unmarshaller.unmarshal(streamReader); } @Override public void streamSource(InputStream inputStream) throws IOException, JAXBException { - result = unmarshaller.unmarshal(inputStream); + this.result = this.unmarshaller.unmarshal(inputStream); } @Override public void streamSource(Reader reader) throws IOException, JAXBException { - result = unmarshaller.unmarshal(reader); + this.result = this.unmarshaller.unmarshal(reader); } @Override public void source(String systemId) throws Exception { - result = unmarshaller.unmarshal(new URL(systemId)); + this.result = this.unmarshaller.unmarshal(new URL(systemId)); } } @@ -316,37 +316,37 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa @Override public void domSource(Node node) throws JAXBException { - result = unmarshaller.unmarshal(node, declaredType); + this.result = this.unmarshaller.unmarshal(node, this.declaredType); } @Override public void saxSource(XMLReader reader, InputSource inputSource) throws JAXBException { - result = unmarshaller.unmarshal(new SAXSource(reader, inputSource), declaredType); + this.result = this.unmarshaller.unmarshal(new SAXSource(reader, inputSource), this.declaredType); } @Override public void staxSource(XMLEventReader eventReader) throws JAXBException { - result = unmarshaller.unmarshal(eventReader, declaredType); + this.result = this.unmarshaller.unmarshal(eventReader, this.declaredType); } @Override public void staxSource(XMLStreamReader streamReader) throws JAXBException { - result = unmarshaller.unmarshal(streamReader, declaredType); + this.result = this.unmarshaller.unmarshal(streamReader, this.declaredType); } @Override public void streamSource(InputStream inputStream) throws IOException, JAXBException { - result = unmarshaller.unmarshal(new StreamSource(inputStream), declaredType); + this.result = this.unmarshaller.unmarshal(new StreamSource(inputStream), this.declaredType); } @Override public void streamSource(Reader reader) throws IOException, JAXBException { - result = unmarshaller.unmarshal(new StreamSource(reader), declaredType); + this.result = this.unmarshaller.unmarshal(new StreamSource(reader), this.declaredType); } @Override public void source(String systemId) throws Exception { - result = unmarshaller.unmarshal(new StreamSource(systemId), declaredType); + this.result = this.unmarshaller.unmarshal(new StreamSource(systemId), this.declaredType); } } @@ -364,37 +364,37 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa @Override public void domResult(Node node) throws JAXBException { - marshaller.marshal(jaxbElement, node); + this.marshaller.marshal(this.jaxbElement, node); } @Override public void saxResult(ContentHandler contentHandler, LexicalHandler lexicalHandler) throws JAXBException { - marshaller.marshal(jaxbElement, contentHandler); + this.marshaller.marshal(this.jaxbElement, contentHandler); } @Override public void staxResult(XMLEventWriter eventWriter) throws JAXBException { - marshaller.marshal(jaxbElement, eventWriter); + this.marshaller.marshal(this.jaxbElement, eventWriter); } @Override public void staxResult(XMLStreamWriter streamWriter) throws JAXBException { - marshaller.marshal(jaxbElement, streamWriter); + this.marshaller.marshal(this.jaxbElement, streamWriter); } @Override public void streamResult(OutputStream outputStream) throws JAXBException { - marshaller.marshal(jaxbElement, outputStream); + this.marshaller.marshal(this.jaxbElement, outputStream); } @Override public void streamResult(Writer writer) throws JAXBException { - marshaller.marshal(jaxbElement, writer); + this.marshaller.marshal(this.jaxbElement, writer); } @Override public void result(String systemId) throws Exception { - marshaller.marshal(jaxbElement, new StreamResult(systemId)); + this.marshaller.marshal(this.jaxbElement, new StreamResult(systemId)); } } @@ -418,16 +418,16 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa @Override public QName getName() { - return name; + return this.name; } @Override public void writeTo(XMLStreamWriter streamWriter) throws XMLStreamException { try { - marshaller.marshal(jaxbElement, streamWriter); + this.marshaller.marshal(this.jaxbElement, streamWriter); } catch (JAXBException ex) { - throw new XMLStreamException("Could not marshal [" + jaxbElement + "]: " + ex.getMessage(), ex); + throw new XMLStreamException("Could not marshal [" + this.jaxbElement + "]: " + ex.getMessage(), ex); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java index 6f121fa2..bc51bc7e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java @@ -71,7 +71,7 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup private ValidationErrorHandler errorHandler; public String getSchemaLanguage() { - return schemaLanguage; + return this.schemaLanguage; } /** @@ -88,7 +88,7 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup * Returns the schema resources to use for validation. */ public Resource[] getSchemas() { - return schemas; + return this.schemas; } /** @@ -164,17 +164,18 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup @Override public void afterPropertiesSet() throws Exception { - if (validator == null && !ObjectUtils.isEmpty(schemas)) { - Assert.hasLength(schemaLanguage, "schemaLanguage is required"); - for (Resource schema : schemas) { + if (this.validator == null && !ObjectUtils.isEmpty(this.schemas)) { + Assert.hasLength(this.schemaLanguage, "schemaLanguage is required"); + for (Resource schema : this.schemas) { Assert.isTrue(schema.exists(), "schema [" + schema + "] does not exist"); } - if (logger.isInfoEnabled()) { - logger.info("Validating using " + StringUtils.arrayToCommaDelimitedString(schemas)); + if (this.logger.isInfoEnabled()) { + this.logger.info("Validating using " + StringUtils.arrayToCommaDelimitedString(this.schemas)); } - validator = XmlValidatorFactory.createValidator(schemas, schemaLanguage); + this.validator = XmlValidatorFactory.createValidator(this.schemas, this.schemaLanguage); } - Assert.notNull(validator, "Setting 'schema', 'schemas', 'xsdSchema', or 'xsdSchemaCollection' is required"); + Assert.notNull(this.validator, + "Setting 'schema', 'schemas', 'xsdSchema', or 'xsdSchemaCollection' is required"); } /** @@ -191,15 +192,15 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup @Override public boolean handleRequest(MessageContext messageContext, Object endpoint) throws IOException, SAXException, TransformerException { - if (validateRequest) { + if (this.validateRequest) { Source requestSource = getValidationRequestSource(messageContext.getRequest()); if (requestSource != null) { - SAXParseException[] errors = validator.validate(requestSource, errorHandler); + SAXParseException[] errors = this.validator.validate(requestSource, this.errorHandler); if (!ObjectUtils.isEmpty(errors)) { return handleRequestValidationErrors(messageContext, errors); } - else if (logger.isDebugEnabled()) { - logger.debug("Request message validated"); + else if (this.logger.isDebugEnabled()) { + this.logger.debug("Request message validated"); } } } @@ -218,7 +219,7 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup protected boolean handleRequestValidationErrors(MessageContext messageContext, SAXParseException[] errors) throws TransformerException { for (SAXParseException error : errors) { - logger.warn("XML validation error on request: " + error.getMessage()); + this.logger.warn("XML validation error on request: " + error.getMessage()); } return false; } @@ -235,15 +236,15 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup */ @Override public boolean handleResponse(MessageContext messageContext, Object endpoint) throws IOException, SAXException { - if (validateResponse) { + if (this.validateResponse) { Source responseSource = getValidationResponseSource(messageContext.getResponse()); if (responseSource != null) { - SAXParseException[] errors = validator.validate(responseSource, errorHandler); + SAXParseException[] errors = this.validator.validate(responseSource, this.errorHandler); if (!ObjectUtils.isEmpty(errors)) { return handleResponseValidationErrors(messageContext, errors); } - else if (logger.isDebugEnabled()) { - logger.debug("Response message validated"); + else if (this.logger.isDebugEnabled()) { + this.logger.debug("Response message validated"); } } } @@ -261,7 +262,7 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup */ protected boolean handleResponseValidationErrors(MessageContext messageContext, SAXParseException[] errors) { for (SAXParseException error : errors) { - logger.error("XML validation error on response: " + error.getMessage()); + this.logger.error("XML validation error on response: " + error.getMessage()); } return false; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/DelegatingSmartEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/DelegatingSmartEndpointInterceptor.java index b9c2d495..e1de2499 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/DelegatingSmartEndpointInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/DelegatingSmartEndpointInterceptor.java @@ -48,7 +48,7 @@ public class DelegatingSmartEndpointInterceptor implements SmartEndpointIntercep * @return the delegate */ public EndpointInterceptor getDelegate() { - return delegate; + return this.delegate; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java index 83235ad7..63d37f75 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java @@ -88,9 +88,9 @@ public class PayloadTransformingInterceptor extends TransformerObjectSupport */ @Override public boolean handleRequest(MessageContext messageContext, Object endpoint) throws Exception { - if (requestTemplates != null) { + if (this.requestTemplates != null) { WebServiceMessage request = messageContext.getRequest(); - Transformer transformer = requestTemplates.newTransformer(); + Transformer transformer = this.requestTemplates.newTransformer(); transformMessage(request, transformer); logger.debug("Request message transformed"); } @@ -106,9 +106,9 @@ public class PayloadTransformingInterceptor extends TransformerObjectSupport */ @Override public boolean handleResponse(MessageContext messageContext, Object endpoint) throws Exception { - if (responseTemplates != null) { + if (this.responseTemplates != null) { WebServiceMessage response = messageContext.getResponse(); - Transformer transformer = responseTemplates.newTransformer(); + Transformer transformer = this.responseTemplates.newTransformer(); transformMessage(response, transformer); logger.debug("Response message transformed"); } @@ -135,7 +135,7 @@ public class PayloadTransformingInterceptor extends TransformerObjectSupport @Override public void afterPropertiesSet() throws Exception { - if (requestXslt == null && responseXslt == null) { + if (this.requestXslt == null && this.responseXslt == null) { throw new IllegalArgumentException("Setting either 'requestXslt' or 'responseXslt' is required"); } TransformerFactory transformerFactory = getTransformerFactory(); @@ -143,21 +143,21 @@ public class PayloadTransformingInterceptor extends TransformerObjectSupport parserFactory.setNamespaceAware(true); XMLReader xmlReader = parserFactory.newSAXParser().getXMLReader(); xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); - if (requestXslt != null) { - Assert.isTrue(requestXslt.exists(), "requestXslt \"" + requestXslt + "\" does not exit"); + if (this.requestXslt != null) { + Assert.isTrue(this.requestXslt.exists(), "requestXslt \"" + this.requestXslt + "\" does not exit"); if (logger.isInfoEnabled()) { - logger.info("Transforming request using " + requestXslt); + logger.info("Transforming request using " + this.requestXslt); } - Source requestSource = new ResourceSource(xmlReader, requestXslt); - requestTemplates = transformerFactory.newTemplates(requestSource); + Source requestSource = new ResourceSource(xmlReader, this.requestXslt); + this.requestTemplates = transformerFactory.newTemplates(requestSource); } - if (responseXslt != null) { - Assert.isTrue(responseXslt.exists(), "responseXslt \"" + responseXslt + "\" does not exit"); + if (this.responseXslt != null) { + Assert.isTrue(this.responseXslt.exists(), "responseXslt \"" + this.responseXslt + "\" does not exit"); if (logger.isInfoEnabled()) { - logger.info("Transforming response using " + responseXslt); + logger.info("Transforming response using " + this.responseXslt); } - Source responseSource = new ResourceSource(xmlReader, responseXslt); - responseTemplates = transformerFactory.newTemplates(responseSource); + Source responseSource = new ResourceSource(xmlReader, this.responseXslt); + this.responseTemplates = transformerFactory.newTemplates(responseSource); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java index a84b1fb5..f53e59e7 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java @@ -60,8 +60,8 @@ public abstract class AbstractAnnotationMethodEndpointMapping extends Abstrac @Override protected void initApplicationContext() throws BeansException { super.initApplicationContext(); - if (logger.isDebugEnabled()) { - logger.debug("Looking for endpoints in application context: " + getApplicationContext()); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Looking for endpoints in application context: " + getApplicationContext()); } String[] beanNames = (this.detectEndpointsInAncestorContexts ? BeanFactoryUtils.beanNamesForTypeIncludingAncestors(getApplicationContext(), Object.class) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java index e58dade8..64b13f0e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java @@ -56,7 +56,7 @@ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport i * @return array of endpoint interceptors, or {@code null} if none */ public EndpointInterceptor[] getInterceptors() { - return interceptors; + return this.interceptors; } /** @@ -70,7 +70,7 @@ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport i @Override public final int getOrder() { - return order; + return this.order; } /** @@ -114,7 +114,7 @@ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport i public final EndpointInvocationChain getEndpoint(MessageContext messageContext) throws Exception { Object endpoint = getEndpointInternal(messageContext); if (endpoint == null) { - endpoint = defaultEndpoint; + endpoint = this.defaultEndpoint; } if (endpoint == null) { return null; @@ -132,7 +132,7 @@ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport i } if (this.smartInterceptors != null) { - for (SmartEndpointInterceptor smartInterceptor : smartInterceptors) { + for (SmartEndpointInterceptor smartInterceptor : this.smartInterceptors) { if (smartInterceptor.shouldIntercept(messageContext, endpoint)) { interceptors.add(smartInterceptor); } @@ -162,7 +162,7 @@ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport i * @return the default endpoint mapping, or null if none */ protected final Object getDefaultEndpoint() { - return defaultEndpoint; + return this.defaultEndpoint; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java index 4f045794..0ffe89e5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMapBasedEndpointMapping.java @@ -77,7 +77,7 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa * @throws IllegalArgumentException if the endpoint is invalid */ public final void setEndpointMap(Map endpointMap) { - temporaryEndpointMap.putAll(endpointMap); + this.temporaryEndpointMap.putAll(endpointMap); } /** @@ -87,7 +87,7 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa public void setMappings(Properties mappings) { for (Map.Entry entry : mappings.entrySet()) { if (entry.getKey() instanceof String) { - temporaryEndpointMap.put((String) entry.getKey(), entry.getValue()); + this.temporaryEndpointMap.put((String) entry.getKey(), entry.getValue()); } } } @@ -116,8 +116,8 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa if (!StringUtils.hasLength(key)) { return null; } - if (logger.isDebugEnabled()) { - logger.debug("Looking up endpoint for [" + key + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Looking up endpoint for [" + key + "]"); } return lookupEndpoint(key); } @@ -128,7 +128,7 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa * @return the associated endpoint instance, or {@code null} if not found */ protected Object lookupEndpoint(String key) { - return endpointMap.get(key); + return this.endpointMap.get(key); } /** @@ -139,20 +139,20 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa * registered */ protected void registerEndpoint(String key, Object endpoint) throws BeansException { - Object mappedEndpoint = endpointMap.get(key); + Object mappedEndpoint = this.endpointMap.get(key); if (mappedEndpoint != null) { throw new ApplicationContextException("Cannot map endpoint [" + endpoint + "] on registration key [" + key + "]: there's already endpoint [" + mappedEndpoint + "] mapped"); } - if (!lazyInitEndpoints && endpoint instanceof String endpointName) { + if (!this.lazyInitEndpoints && endpoint instanceof String endpointName) { endpoint = resolveStringEndpoint(endpointName); } if (endpoint == null) { throw new ApplicationContextException("Could not find endpoint for key [" + key + "]"); } - endpointMap.put(key, endpoint); - if (logger.isDebugEnabled()) { - logger.debug("Mapped key [" + key + "] onto endpoint [" + endpoint + "]"); + this.endpointMap.put(key, endpoint); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Mapped key [" + key + "] onto endpoint [" + endpoint + "]"); } } @@ -169,17 +169,18 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa @Override protected final void initApplicationContext() throws BeansException { super.initApplicationContext(); - for (String key : temporaryEndpointMap.keySet()) { - Object endpoint = temporaryEndpointMap.get(key); + for (String key : this.temporaryEndpointMap.keySet()) { + Object endpoint = this.temporaryEndpointMap.get(key); if (!validateLookupKey(key)) { throw new ApplicationContextException("Invalid key [" + key + "] for endpoint [" + endpoint + "]"); } registerEndpoint(key, endpoint); } - temporaryEndpointMap = null; - if (registerBeanNames) { - if (logger.isDebugEnabled()) { - logger.debug("Looking for endpoint mappings in application context: [" + getApplicationContext() + "]"); + this.temporaryEndpointMap = null; + if (this.registerBeanNames) { + if (this.logger.isDebugEnabled()) { + this.logger + .debug("Looking for endpoint mappings in application context: [" + getApplicationContext() + "]"); } String[] beanNames = getApplicationContext().getBeanDefinitionNames(); for (String beanName : beanNames) { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java index f98d4e64..9714bc8c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java @@ -63,8 +63,8 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointM if (key == null) { return null; } - if (logger.isDebugEnabled()) { - logger.debug("Looking up endpoint for [" + key + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Looking up endpoint for [" + key + "]"); } return lookupEndpoint(key); } @@ -81,7 +81,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointM * @return the associated endpoint instance, or {@code null} if not found */ protected MethodEndpoint lookupEndpoint(T key) { - return endpointMap.get(key); + return this.endpointMap.get(key); } /** @@ -91,7 +91,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointM * @throws BeansException if the endpoint could not be registered */ protected void registerEndpoint(T key, MethodEndpoint endpoint) throws BeansException { - Object mappedEndpoint = endpointMap.get(key); + Object mappedEndpoint = this.endpointMap.get(key); if (mappedEndpoint != null) { throw new ApplicationContextException("Cannot map endpoint [" + endpoint + "] on registration key [" + key + "]: there's already endpoint [" + mappedEndpoint + "] mapped"); @@ -99,9 +99,9 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointM if (endpoint == null) { throw new ApplicationContextException("Could not find endpoint for key [" + key + "]"); } - endpointMap.put(key, endpoint); - if (logger.isDebugEnabled()) { - logger.debug("Mapped [" + key + "] onto endpoint [" + endpoint + "]"); + this.endpointMap.put(key, endpoint); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Mapped [" + key + "] onto endpoint [" + endpoint + "]"); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java index 0a25dbb7..a3ad1553 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java @@ -70,7 +70,7 @@ public class SimpleMethodEndpointMapping extends AbstractMethodEndpointMapping getReferenceProperties() { - return referenceProperties; + return this.referenceProperties; } /** @@ -90,7 +90,7 @@ public final class EndpointReference implements Serializable { * objects. */ public List getReferenceParameters() { - return referenceParameters; + return this.referenceParameters; } public boolean equals(Object o) { @@ -98,17 +98,17 @@ public final class EndpointReference implements Serializable { return true; } if (o instanceof EndpointReference other) { - return address.equals(other.address); + return this.address.equals(other.address); } return false; } public int hashCode() { - return address.hashCode(); + return this.address.hashCode(); } public String toString() { - return address.toString(); + return this.address.toString(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java index 1acef9a3..f21b8134 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java @@ -103,47 +103,47 @@ public final class MessageAddressingProperties implements Serializable { /** Returns the value of the destination property. */ public URI getTo() { - return to; + return this.to; } /** Returns the value of the source endpoint property. */ public EndpointReference getFrom() { - return from; + return this.from; } /** Returns the value of the reply endpoint property. */ public EndpointReference getReplyTo() { - return replyTo; + return this.replyTo; } /** Returns the value of the fault endpoint property. */ public EndpointReference getFaultTo() { - return faultTo; + return this.faultTo; } /** Returns the value of the action property. */ public URI getAction() { - return action; + return this.action; } /** Returns the value of the message id property. */ public URI getMessageId() { - return messageId; + return this.messageId; } /** Returns the value of the relationship property. */ public URI getRelatesTo() { - return relatesTo; + return this.relatesTo; } /** Returns the endpoint properties. Returns an empty list of none are set. */ public List getReferenceProperties() { - return Collections.unmodifiableList(referenceProperties); + return Collections.unmodifiableList(this.referenceProperties); } /** Returns the endpoint parameters. Returns an empty list of none are set. */ public List getReferenceParameters() { - return Collections.unmodifiableList(referenceParameters); + return Collections.unmodifiableList(this.referenceParameters); } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java index 1e1ae6d6..7e6042c4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractActionEndpointMapping.java @@ -54,7 +54,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn /** Returns the suffix to add to request {@code Action}s for reply messages. */ public String getOutputActionSuffix() { - return outputActionSuffix; + return this.outputActionSuffix; } /** @@ -68,7 +68,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn /** Returns the suffix to add to request {@code Action}s for reply fault messages. */ public String getFaultActionSuffix() { - return faultActionSuffix; + return this.faultActionSuffix; } /** @@ -83,8 +83,8 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn @Override protected final Object getEndpointInternal(MessageAddressingProperties map) { URI action = map.getAction(); - if (logger.isDebugEnabled()) { - logger.debug("Looking up endpoint for action [" + action + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Looking up endpoint for action [" + action + "]"); } Object endpoint = lookupEndpoint(action); if (endpoint != null) { @@ -111,7 +111,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn * @return the associated endpoint instance, or {@code null} if not found */ protected Object lookupEndpoint(URI action) { - return endpointMap.get(action); + return this.endpointMap.get(action); } /** @@ -142,8 +142,8 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn } else { this.endpointMap.put(action, resolvedEndpoint); - if (logger.isDebugEnabled()) { - logger.debug("Mapped Action [" + action + "] onto endpoint [" + resolvedEndpoint + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Mapped Action [" + action + "] onto endpoint [" + resolvedEndpoint + "]"); } } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractAddressingEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractAddressingEndpointMapping.java index d068b328..d55ea3e1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractAddressingEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AbstractAddressingEndpointMapping.java @@ -117,13 +117,13 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec */ protected void initDefaultStrategies() { this.versions = new AddressingVersion[] { new Addressing200408(), new Addressing10() }; - messageIdStrategy = new UuidMessageIdStrategy(); + this.messageIdStrategy = new UuidMessageIdStrategy(); } @Override public final void setActorOrRole(String actorOrRole) { Assert.notNull(actorOrRole, "actorOrRole must not be null"); - actorsOrRoles = new String[] { actorOrRole }; + this.actorsOrRoles = new String[] { actorOrRole }; } @Override @@ -138,7 +138,7 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec } public ApplicationContext getApplicationContext() { - return applicationContext; + return this.applicationContext; } @Override @@ -148,7 +148,7 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec @Override public final int getOrder() { - return order; + return this.order; } /** @@ -193,7 +193,7 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec * Returns the message id strategy used for creating WS-Addressing MessageIds. */ public MessageIdStrategy getMessageIdStrategy() { - return messageIdStrategy; + return this.messageIdStrategy; } /** @@ -240,8 +240,8 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec @Override public void afterPropertiesSet() throws Exception { - if (logger.isInfoEnabled()) { - logger.info("Supporting " + Arrays.asList(versions)); + if (this.logger.isInfoEnabled()) { + this.logger.info("Supporting " + Arrays.asList(this.versions)); } if (getApplicationContext() != null) { Map smartInterceptors = BeanFactoryUtils @@ -256,10 +256,10 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec public final EndpointInvocationChain getEndpoint(MessageContext messageContext) throws TransformerException { Assert.isInstanceOf(SoapMessage.class, messageContext.getRequest()); SoapMessage request = (SoapMessage) messageContext.getRequest(); - for (AddressingVersion version : versions) { + for (AddressingVersion version : this.versions) { if (supports(version, request)) { - if (logger.isDebugEnabled()) { - logger.debug("Request [" + request + "] uses [" + version + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Request [" + request + "] uses [" + version + "]"); } MessageAddressingProperties requestMap = version.getMessageAddressingProperties(request); if (requestMap == null) { @@ -287,15 +287,15 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec WebServiceMessageSender[] messageSenders = getMessageSenders(endpoint); MessageIdStrategy messageIdStrategy = getMessageIdStrategy(endpoint); - List interceptors = new ArrayList<>(Arrays.asList(preInterceptors)); + List interceptors = new ArrayList<>(Arrays.asList(this.preInterceptors)); AddressingEndpointInterceptor addressingInterceptor = new AddressingEndpointInterceptor(version, messageIdStrategy, messageSenders, responseAction, faultAction); interceptors.add(addressingInterceptor); - interceptors.addAll(Arrays.asList(postInterceptors)); + interceptors.addAll(Arrays.asList(this.postInterceptors)); if (this.smartInterceptors != null) { - for (SmartEndpointInterceptor smartInterceptor : smartInterceptors) { + for (SmartEndpointInterceptor smartInterceptor : this.smartInterceptors) { if (smartInterceptor.shouldIntercept(messageContext, endpoint)) { interceptors.add(smartInterceptor); } @@ -303,7 +303,7 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec } return new SoapEndpointInvocationChain(endpoint, interceptors.toArray(new EndpointInterceptor[0]), - actorsOrRoles, isUltimateReceiver); + this.actorsOrRoles, this.isUltimateReceiver); } private boolean supports(AddressingVersion version, SoapMessage request) { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java index 7e68cdb8..485e2ba3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java @@ -71,13 +71,13 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { public final boolean handleRequest(MessageContext messageContext, Object endpoint) throws Exception { Assert.isInstanceOf(SoapMessage.class, messageContext.getRequest()); SoapMessage request = (SoapMessage) messageContext.getRequest(); - MessageAddressingProperties requestMap = version.getMessageAddressingProperties(request); - if (!version.hasRequiredProperties(requestMap)) { - version.addMessageAddressingHeaderRequiredFault((SoapMessage) messageContext.getResponse()); + MessageAddressingProperties requestMap = this.version.getMessageAddressingProperties(request); + if (!this.version.hasRequiredProperties(requestMap)) { + this.version.addMessageAddressingHeaderRequiredFault((SoapMessage) messageContext.getResponse()); return false; } - if (messageIdStrategy.isDuplicate(requestMap.getMessageId())) { - version.addInvalidAddressingHeaderFault((SoapMessage) messageContext.getResponse()); + if (this.messageIdStrategy.isDuplicate(requestMap.getMessageId())) { + this.version.addInvalidAddressingHeaderFault((SoapMessage) messageContext.getResponse()); return false; } return true; @@ -96,7 +96,7 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { private boolean handleResponseOrFault(MessageContext messageContext, boolean isFault) throws Exception { Assert.isInstanceOf(SoapMessage.class, messageContext.getRequest()); Assert.isInstanceOf(SoapMessage.class, messageContext.getResponse()); - MessageAddressingProperties requestMap = version + MessageAddressingProperties requestMap = this.version .getMessageAddressingProperties((SoapMessage) messageContext.getRequest()); EndpointReference replyEpr = !isFault ? requestMap.getReplyTo() : requestMap.getFaultTo(); if (handleNoneAddress(messageContext, replyEpr)) { @@ -104,9 +104,9 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { } SoapMessage reply = (SoapMessage) messageContext.getResponse(); URI replyMessageId = getMessageId(reply); - URI action = isFault ? faultAction : replyAction; + URI action = isFault ? this.faultAction : this.replyAction; MessageAddressingProperties replyMap = requestMap.getReplyProperties(replyEpr, action, replyMessageId); - version.addAddressingHeaders(reply, replyMap); + this.version.addAddressingHeaders(reply, replyMap); if (handleAnonymousAddress(messageContext, replyEpr)) { return true; } @@ -117,7 +117,7 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { } private boolean handleNoneAddress(MessageContext messageContext, EndpointReference replyEpr) { - if (replyEpr == null || version.hasNoneAddress(replyEpr)) { + if (replyEpr == null || this.version.hasNoneAddress(replyEpr)) { if (logger.isDebugEnabled()) { logger.debug("Request [" + messageContext.getRequest() + "] has [" + replyEpr + "] reply address; reply [" + messageContext.getResponse() + "] discarded"); @@ -129,7 +129,7 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { } private boolean handleAnonymousAddress(MessageContext messageContext, EndpointReference replyEpr) { - if (version.hasAnonymousAddress(replyEpr)) { + if (this.version.hasAnonymousAddress(replyEpr)) { if (logger.isDebugEnabled()) { logger.debug("Request [" + messageContext.getRequest() + "] has [" + replyEpr + "] reply address; sending in-band reply [" + messageContext.getResponse() + "]"); @@ -146,7 +146,7 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { } boolean supported = false; - for (WebServiceMessageSender messageSender : messageSenders) { + for (WebServiceMessageSender messageSender : this.messageSenders) { if (messageSender.supports(replyEpr.getAddress())) { supported = true; try (WebServiceConnection connection = messageSender.createConnection(replyEpr.getAddress())) { @@ -165,7 +165,7 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { } private URI getMessageId(SoapMessage response) { - URI responseMessageId = messageIdStrategy.newMessageId(response); + URI responseMessageId = this.messageIdStrategy.newMessageId(response); if (logger.isTraceEnabled()) { logger.trace("Generated reply MessageID [" + responseMessageId + "] for [" + response + "]"); } @@ -178,7 +178,7 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { @Override public boolean understands(SoapHeaderElement header) { - return version.understands(header); + return this.version.understands(header); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java index 83ecb2a6..3179be0a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java @@ -104,7 +104,7 @@ public class SimpleActionEndpointMapping extends AbstractActionEndpointMapping { @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); - registerEndpoints(actionMap); + registerEndpoints(this.actionMap); } /** @@ -116,7 +116,7 @@ public class SimpleActionEndpointMapping extends AbstractActionEndpointMapping { */ protected void registerEndpoints(Map actionMap) throws BeansException { if (actionMap.isEmpty()) { - logger.warn("Neither 'actionMap' nor 'mappings' set on SimpleActionEndpointMapping"); + this.logger.warn("Neither 'actionMap' nor 'mappings' set on SimpleActionEndpointMapping"); } else { for (Map.Entry entry : actionMap.entrySet()) { @@ -133,7 +133,7 @@ public class SimpleActionEndpointMapping extends AbstractActionEndpointMapping { @Override protected URI getEndpointAddress(Object endpoint) { - return address; + return this.address; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java index 9b1faa4d..56b29e79 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java @@ -87,24 +87,24 @@ public abstract class AbstractAddressingVersion extends TransformerObjectSupport protected AbstractAddressingVersion() { Map namespaces = new HashMap<>(); namespaces.put(getNamespacePrefix(), getNamespaceUri()); - toExpression = createNormalizedExpression(getToName(), namespaces); - actionExpression = createNormalizedExpression(getActionName(), namespaces); - messageIdExpression = createNormalizedExpression(getMessageIdName(), namespaces); - fromExpression = createExpression(getFromName(), namespaces); - replyToExpression = createExpression(getReplyToName(), namespaces); - faultToExpression = createExpression(getFaultToName(), namespaces); - addressExpression = createNormalizedExpression(getAddressName(), namespaces); + this.toExpression = createNormalizedExpression(getToName(), namespaces); + this.actionExpression = createNormalizedExpression(getActionName(), namespaces); + this.messageIdExpression = createNormalizedExpression(getMessageIdName(), namespaces); + this.fromExpression = createExpression(getFromName(), namespaces); + this.replyToExpression = createExpression(getReplyToName(), namespaces); + this.faultToExpression = createExpression(getFaultToName(), namespaces); + this.addressExpression = createNormalizedExpression(getAddressName(), namespaces); if (getReferencePropertiesName() != null) { - referencePropertiesExpression = createChildrenExpression(getReferencePropertiesName(), namespaces); + this.referencePropertiesExpression = createChildrenExpression(getReferencePropertiesName(), namespaces); } else { - referencePropertiesExpression = null; + this.referencePropertiesExpression = null; } if (getReferenceParametersName() != null) { - referenceParametersExpression = createChildrenExpression(getReferenceParametersName(), namespaces); + this.referenceParametersExpression = createChildrenExpression(getReferenceParametersName(), namespaces); } else { - referenceParametersExpression = null; + this.referenceParametersExpression = null; } } @@ -126,21 +126,21 @@ public abstract class AbstractAddressingVersion extends TransformerObjectSupport @Override public MessageAddressingProperties getMessageAddressingProperties(SoapMessage message) { Element headerElement = getSoapHeaderElement(message); - URI to = getUri(headerElement, toExpression); + URI to = getUri(headerElement, this.toExpression); if (to == null) { to = getDefaultTo(); } - EndpointReference from = getEndpointReference(fromExpression.evaluateAsNode(headerElement)); - EndpointReference replyTo = getEndpointReference(replyToExpression.evaluateAsNode(headerElement)); + EndpointReference from = getEndpointReference(this.fromExpression.evaluateAsNode(headerElement)); + EndpointReference replyTo = getEndpointReference(this.replyToExpression.evaluateAsNode(headerElement)); if (replyTo == null) { replyTo = getDefaultReplyTo(from); } - EndpointReference faultTo = getEndpointReference(faultToExpression.evaluateAsNode(headerElement)); + EndpointReference faultTo = getEndpointReference(this.faultToExpression.evaluateAsNode(headerElement)); if (faultTo == null) { faultTo = replyTo; } - URI action = getUri(headerElement, actionExpression); - URI messageId = getUri(headerElement, messageIdExpression); + URI action = getUri(headerElement, this.actionExpression); + URI messageId = getUri(headerElement, this.messageIdExpression); return new MessageAddressingProperties(to, from, replyTo, faultTo, action, messageId); } @@ -180,14 +180,14 @@ public abstract class AbstractAddressingVersion extends TransformerObjectSupport if (node == null) { return null; } - URI address = getUri(node, addressExpression); + URI address = getUri(node, this.addressExpression); if (address == null) { return null; } - List referenceProperties = referencePropertiesExpression != null - ? referencePropertiesExpression.evaluateAsNodeList(node) : Collections.emptyList(); - List referenceParameters = referenceParametersExpression != null - ? referenceParametersExpression.evaluateAsNodeList(node) : Collections.emptyList(); + List referenceProperties = this.referencePropertiesExpression != null + ? this.referencePropertiesExpression.evaluateAsNodeList(node) : Collections.emptyList(); + List referenceParameters = this.referenceParametersExpression != null + ? this.referenceParametersExpression.evaluateAsNodeList(node) : Collections.emptyList(); return new EndpointReference(address, referenceProperties, referenceParameters); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java index 12e6ccf1..a6b911b1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java @@ -41,17 +41,17 @@ public class SoapFaultClientException extends WebServiceFaultException { public SoapFaultClientException(SoapMessage faultMessage) { super(faultMessage); SoapBody body = faultMessage.getSoapBody(); - soapFault = body != null ? body.getFault() : null; + this.soapFault = body != null ? body.getFault() : null; } /** Returns the {@link SoapFault}. */ public SoapFault getSoapFault() { - return soapFault; + return this.soapFault; } /** Returns the fault code. */ public QName getFaultCode() { - return soapFault != null ? soapFault.getFaultCode() : null; + return this.soapFault != null ? this.soapFault.getFaultCode() : null; } /** @@ -61,7 +61,7 @@ public class SoapFaultClientException extends WebServiceFaultException { * Note that this message returns the same as {@link #getMessage()}. */ public String getFaultStringOrReason() { - return soapFault != null ? soapFault.getFaultStringOrReason() : null; + return this.soapFault != null ? this.soapFault.getFaultStringOrReason() : null; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java index 8b7e8fec..5d0e60db 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java @@ -54,7 +54,7 @@ public class SoapActionCallback implements WebServiceMessageCallback { public void doWithMessage(WebServiceMessage message) throws IOException { Assert.isInstanceOf(SoapMessage.class, message); SoapMessage soapMessage = (SoapMessage) message; - soapMessage.setSoapAction(soapAction); + soapMessage.setSoapAction(this.soapAction); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java index 2dbb7da5..6f82c1cd 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java @@ -44,18 +44,18 @@ class SaajAttachment implements Attachment { @Override public String getContentId() { - return saajAttachment.getContentId(); + return this.saajAttachment.getContentId(); } @Override public String getContentType() { - return saajAttachment.getContentType(); + return this.saajAttachment.getContentType(); } @Override public InputStream getInputStream() throws IOException { try { - return saajAttachment.getDataHandler().getInputStream(); + return this.saajAttachment.getDataHandler().getInputStream(); } catch (SOAPException ex) { throw new SaajAttachmentException(ex); @@ -65,7 +65,7 @@ class SaajAttachment implements Attachment { @Override public long getSize() { try { - return saajAttachment.getSize(); + return this.saajAttachment.getSize(); } catch (SOAPException ex) { throw new SaajAttachmentException(ex); @@ -75,7 +75,7 @@ class SaajAttachment implements Attachment { @Override public DataHandler getDataHandler() { try { - return saajAttachment.getDataHandler(); + return this.saajAttachment.getDataHandler(); } catch (SOAPException ex) { throw new SaajAttachmentException(ex); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java index b11b70d7..9220e0ce 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java @@ -57,7 +57,7 @@ class SaajSoap11Body extends SaajSoapBody implements Soap11Body { Assert.hasLength(faultString, "faultString cannot be empty"); Assert.hasLength(faultCode.getLocalPart(), "faultCode's localPart cannot be empty"); Assert.hasLength(faultCode.getNamespaceURI(), "faultCode's namespaceUri cannot be empty"); - if (!langAttributeOnSoap11FaultString) { + if (!this.langAttributeOnSoap11FaultString) { faultStringLocale = null; } try { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java index af1daa24..a85a5029 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java @@ -46,18 +46,18 @@ class SaajSoapElement implements SoapElement { @Override public Source getSource() { - return new DOMSource(element); + return new DOMSource(this.element); } @Override public QName getName() { - return element.getElementQName(); + return this.element.getElementQName(); } @Override public void addAttribute(QName name, String value) { try { - element.addAttribute(name, value); + this.element.addAttribute(name, value); } catch (SOAPException ex) { throw new SaajSoapElementException(ex); @@ -66,24 +66,24 @@ class SaajSoapElement implements SoapElement { @Override public void removeAttribute(QName name) { - element.removeAttribute(name); + this.element.removeAttribute(name); } @Override public String getAttributeValue(QName name) { - return element.getAttributeValue(name); + return this.element.getAttributeValue(name); } @Override @SuppressWarnings("unchecked") public Iterator getAllAttributes() { - return element.getAllAttributesAsQNames(); + return this.element.getAllAttributesAsQNames(); } @Override public void addNamespaceDeclaration(String prefix, String namespaceUri) { try { - element.addNamespaceDeclaration(prefix, namespaceUri); + this.element.addNamespaceDeclaration(prefix, namespaceUri); } catch (SOAPException ex) { throw new SaajSoapElementException(ex); @@ -91,7 +91,7 @@ class SaajSoapElement implements SoapElement { } protected final T getSaajElement() { - return element; + return this.element; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelope.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelope.java index d23e0f38..b09f9147 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelope.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelope.java @@ -48,7 +48,7 @@ class SaajSoapEnvelope extends SaajSoapElement implements SoapEnve @Override public SoapBody getBody() { - if (body == null) { + if (this.body == null) { try { SOAPBody saajBody = getSaajEnvelope().getBody(); if (saajBody == null) { @@ -57,43 +57,43 @@ class SaajSoapEnvelope extends SaajSoapElement implements SoapEnve if (saajBody.getElementQName() .getNamespaceURI() .equals(SoapVersion.SOAP_11.getEnvelopeNamespaceUri())) { - body = new SaajSoap11Body(saajBody, langAttributeOnSoap11FaultString); + this.body = new SaajSoap11Body(saajBody, this.langAttributeOnSoap11FaultString); } else { - body = new SaajSoap12Body(saajBody); + this.body = new SaajSoap12Body(saajBody); } } catch (SOAPException ex) { throw new SaajSoapBodyException(ex); } } - return body; + return this.body; } @Override public SoapHeader getHeader() { - if (header == null) { + if (this.header == null) { try { SOAPHeader saajHeader = getSaajEnvelope().getHeader(); if (saajHeader != null) { if (saajHeader.getElementQName() .getNamespaceURI() .equals(SoapVersion.SOAP_11.getEnvelopeNamespaceUri())) { - header = new SaajSoap11Header(saajHeader); + this.header = new SaajSoap11Header(saajHeader); } else { - header = new SaajSoap12Header(saajHeader); + this.header = new SaajSoap12Header(saajHeader); } } else { - header = null; + this.header = null; } } catch (SOAPException ex) { throw new SaajSoapHeaderException(ex); } } - return header; + return this.header; } protected SOAPEnvelope getSaajEnvelope() { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java index 04b9f36a..f55acc48 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java @@ -82,18 +82,18 @@ class SaajSoapFaultDetail extends SaajSoapElement implements S @Override public boolean hasNext() { - return iterator.hasNext(); + return this.iterator.hasNext(); } @Override public SoapFaultDetailElement next() { - DetailEntry saajDetailEntry = iterator.next(); + DetailEntry saajDetailEntry = this.iterator.next(); return new SaajSoapFaultDetailElement(saajDetailEntry); } @Override public void remove() { - iterator.remove(); + this.iterator.remove(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java index 874da796..6fa3adb8 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java @@ -108,12 +108,12 @@ abstract class SaajSoapHeader extends SaajSoapElement implements Soa @Override public boolean hasNext() { - return iterator.hasNext(); + return this.iterator.hasNext(); } @Override public SoapHeaderElement next() { - Node saajHeaderElement = iterator.next(); + Node saajHeaderElement = this.iterator.next(); if (saajHeaderElement instanceof SOAPHeaderElement) { return new SaajSoapHeaderElement((SOAPHeaderElement) saajHeaderElement); } @@ -124,7 +124,7 @@ abstract class SaajSoapHeader extends SaajSoapElement implements Soa @Override public void remove() { - iterator.remove(); + this.iterator.remove(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java index 1e76efdd..e273a9bf 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java @@ -110,7 +110,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { public SaajSoapMessage(SOAPMessage soapMessage, boolean langAttributeOnSoap11FaultString, MessageFactory messageFactory) { Assert.notNull(soapMessage, "soapMessage must not be null"); - saajMessage = soapMessage; + this.saajMessage = soapMessage; this.langAttributeOnSoap11FaultString = langAttributeOnSoap11FaultString; this.messageFactory = messageFactory; } @@ -119,7 +119,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { * Return the SAAJ {@code SOAPMessage} that this {@code SaajSoapMessage} is based on. */ public SOAPMessage getSaajMessage() { - return saajMessage; + return this.saajMessage; } /** @@ -127,22 +127,22 @@ public class SaajSoapMessage extends AbstractSoapMessage { */ public void setSaajMessage(SOAPMessage soapMessage) { Assert.notNull(soapMessage, "soapMessage must not be null"); - saajMessage = soapMessage; - envelope = null; + this.saajMessage = soapMessage; + this.envelope = null; } @Override public SoapEnvelope getEnvelope() { - if (envelope == null) { + if (this.envelope == null) { try { SOAPEnvelope saajEnvelope = getSaajMessage().getSOAPPart().getEnvelope(); - envelope = new SaajSoapEnvelope(saajEnvelope, langAttributeOnSoap11FaultString); + this.envelope = new SaajSoapEnvelope(saajEnvelope, this.langAttributeOnSoap11FaultString); } catch (SOAPException ex) { throw new SaajSoapEnvelopeException(ex); } } - return envelope; + return this.envelope; } @Override @@ -172,7 +172,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { else if (SoapVersion.SOAP_12 == getVersion()) { // force save of Content Type header try { - saajMessage.saveChanges(); + this.saajMessage.saveChanges(); } catch (SOAPException ex) { throw new SaajSoapMessageException("Could not save message", ex); @@ -191,14 +191,14 @@ public class SaajSoapMessage extends AbstractSoapMessage { @Override public Document getDocument() { - Assert.state(messageFactory != null, "Could find message factory to use"); + Assert.state(this.messageFactory != null, "Could find message factory to use"); // return saajSoapMessage.getSaajMessage().getSOAPPart(); // does not work, see // SWS-345 try { ByteArrayOutputStream bos = new ByteArrayOutputStream(); getSaajMessage().writeTo(bos); ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); - SOAPMessage saajMessage = messageFactory.createMessage(getSaajMessage().getMimeHeaders(), bis); + SOAPMessage saajMessage = this.messageFactory.createMessage(getSaajMessage().getMimeHeaders(), bis); setSaajMessage(saajMessage); return saajMessage.getSOAPPart(); } @@ -209,8 +209,8 @@ public class SaajSoapMessage extends AbstractSoapMessage { @Override public void setDocument(Document document) { - if (saajMessage.getSOAPPart() != document) { - Assert.state(messageFactory != null, "Could find message factory to use"); + if (this.saajMessage.getSOAPPart() != document) { + Assert.state(this.messageFactory != null, "Could find message factory to use"); try { DOMImplementation implementation = document.getImplementation(); Assert.isInstanceOf(DOMImplementationLS.class, implementation); @@ -225,7 +225,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); - this.saajMessage = messageFactory.createMessage(saajMessage.getMimeHeaders(), bis); + this.saajMessage = this.messageFactory.createMessage(this.saajMessage.getMimeHeaders(), bis); } catch (SOAPException | IOException ex) { @@ -275,7 +275,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { @Override public boolean isXopPackage() { - SOAPPart saajPart = saajMessage.getSOAPPart(); + SOAPPart saajPart = this.saajMessage.getSOAPPart(); String[] contentTypes = saajPart.getMimeHeader(TransportConstants.HEADER_CONTENT_TYPE); for (String contentType : contentTypes) { if (contentType.contains(CONTENT_TYPE_XOP)) { @@ -293,7 +293,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { } private void convertMessageToXop() { - MimeHeaders mimeHeaders = saajMessage.getMimeHeaders(); + MimeHeaders mimeHeaders = this.saajMessage.getMimeHeaders(); String[] oldContentTypes = mimeHeaders.getHeader(TransportConstants.HEADER_CONTENT_TYPE); String oldContentType = !ObjectUtils.isEmpty(oldContentTypes) ? oldContentTypes[0] : getVersion().getContentType(); @@ -302,7 +302,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { } private void convertPartToXop() { - SOAPPart saajPart = saajMessage.getSOAPPart(); + SOAPPart saajPart = this.saajMessage.getSOAPPart(); String[] oldContentTypes = saajPart.getMimeHeader(TransportConstants.HEADER_CONTENT_TYPE); String oldContentType = !ObjectUtils.isEmpty(oldContentTypes) ? oldContentTypes[0] : getVersion().getContentType(); @@ -346,7 +346,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { public String toString() { StringBuilder builder = new StringBuilder("SaajSoapMessage"); try { - SOAPEnvelope envelope = saajMessage.getSOAPPart().getEnvelope(); + SOAPEnvelope envelope = this.saajMessage.getSOAPPart().getEnvelope(); if (envelope != null) { SOAPBody body = envelope.getBody(); if (body != null) { @@ -374,18 +374,18 @@ public class SaajSoapMessage extends AbstractSoapMessage { @Override public boolean hasNext() { - return saajIterator.hasNext(); + return this.saajIterator.hasNext(); } @Override public Attachment next() { - AttachmentPart saajAttachment = saajIterator.next(); + AttachmentPart saajAttachment = this.saajIterator.next(); return new SaajAttachment(saajAttachment); } @Override public void remove() { - saajIterator.remove(); + this.saajIterator.remove(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java index ebc1bcf2..00f43d20 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java @@ -86,7 +86,7 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB /** Returns the SAAJ {@code MessageFactory} used. */ public MessageFactory getMessageFactory() { - return messageFactory; + return this.messageFactory; } /** Sets the SAAJ {@code MessageFactory}. */ @@ -120,10 +120,10 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB public void setSoapVersion(SoapVersion version) { if (SaajUtils.getSaajVersion() >= SaajUtils.SAAJ_13) { if (SoapVersion.SOAP_11 == version) { - messageFactoryProtocol = SOAPConstants.SOAP_1_1_PROTOCOL; + this.messageFactoryProtocol = SOAPConstants.SOAP_1_1_PROTOCOL; } else if (SoapVersion.SOAP_12 == version) { - messageFactoryProtocol = SOAPConstants.SOAP_1_2_PROTOCOL; + this.messageFactoryProtocol = SOAPConstants.SOAP_1_2_PROTOCOL; } else { throw new IllegalArgumentException( @@ -137,24 +137,24 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB @Override public void afterPropertiesSet() { - if (messageFactory == null) { + if (this.messageFactory == null) { try { if (SaajUtils.getSaajVersion() >= SaajUtils.SAAJ_13) { - if (!StringUtils.hasLength(messageFactoryProtocol)) { - messageFactoryProtocol = SOAPConstants.SOAP_1_1_PROTOCOL; + if (!StringUtils.hasLength(this.messageFactoryProtocol)) { + this.messageFactoryProtocol = SOAPConstants.SOAP_1_1_PROTOCOL; } if (logger.isInfoEnabled()) { - logger.info("Creating SAAJ 1.3 MessageFactory with " + messageFactoryProtocol); + logger.info("Creating SAAJ 1.3 MessageFactory with " + this.messageFactoryProtocol); } - messageFactory = MessageFactory.newInstance(messageFactoryProtocol); + this.messageFactory = MessageFactory.newInstance(this.messageFactoryProtocol); } else if (SaajUtils.getSaajVersion() == SaajUtils.SAAJ_12) { logger.info("Creating SAAJ 1.2 MessageFactory"); - messageFactory = MessageFactory.newInstance(); + this.messageFactory = MessageFactory.newInstance(); } else if (SaajUtils.getSaajVersion() == SaajUtils.SAAJ_11) { logger.info("Creating SAAJ 1.1 MessageFactory"); - messageFactory = MessageFactory.newInstance(); + this.messageFactory = MessageFactory.newInstance(); } else { throw new IllegalStateException( @@ -173,16 +173,16 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB } } if (logger.isDebugEnabled()) { - logger.debug("Using MessageFactory class [" + messageFactory.getClass().getName() + "]"); + logger.debug("Using MessageFactory class [" + this.messageFactory.getClass().getName() + "]"); } } @Override public SaajSoapMessage createWebServiceMessage() { try { - SOAPMessage saajMessage = messageFactory.createMessage(); + SOAPMessage saajMessage = this.messageFactory.createMessage(); postProcess(saajMessage); - return new SaajSoapMessage(saajMessage, langAttributeOnSoap11FaultString, messageFactory); + return new SaajSoapMessage(saajMessage, this.langAttributeOnSoap11FaultString, this.messageFactory); } catch (SOAPException ex) { throw new SoapMessageCreationException("Could not create empty message: " + ex.getMessage(), ex); @@ -194,10 +194,10 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB MimeHeaders mimeHeaders = parseMimeHeaders(inputStream); try { inputStream = checkForUtf8ByteOrderMark(inputStream); - SOAPMessage saajMessage = messageFactory.createMessage(mimeHeaders, inputStream); + SOAPMessage saajMessage = this.messageFactory.createMessage(mimeHeaders, inputStream); saajMessage.getSOAPPart().getEnvelope(); postProcess(saajMessage); - return new SaajSoapMessage(saajMessage, langAttributeOnSoap11FaultString, messageFactory); + return new SaajSoapMessage(saajMessage, this.langAttributeOnSoap11FaultString, this.messageFactory); } catch (SOAPException ex) { // SAAJ 1.3 RI has a issue with handling multipart XOP content types which @@ -209,9 +209,9 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB contentType = contentType.replace("startinfo", "start-info"); mimeHeaders.setHeader(TransportConstants.HEADER_CONTENT_TYPE, contentType); try { - SOAPMessage saajMessage = messageFactory.createMessage(mimeHeaders, inputStream); + SOAPMessage saajMessage = this.messageFactory.createMessage(mimeHeaders, inputStream); postProcess(saajMessage); - return new SaajSoapMessage(saajMessage, langAttributeOnSoap11FaultString); + return new SaajSoapMessage(saajMessage, this.langAttributeOnSoap11FaultString); } catch (SOAPException e) { // fall-through @@ -309,8 +309,8 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB * @see #setMessageProperties(java.util.Map) */ protected void postProcess(SOAPMessage soapMessage) throws SOAPException { - if (!CollectionUtils.isEmpty(messageProperties)) { - for (Map.Entry entry : messageProperties.entrySet()) { + if (!CollectionUtils.isEmpty(this.messageProperties)) { + for (Map.Entry entry : this.messageProperties.entrySet()) { soapMessage.setProperty(entry.getKey(), entry.getValue()); } } @@ -328,7 +328,7 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB builder.append(SaajUtils.getSaajVersionString()); if (SaajUtils.getSaajVersion() >= SaajUtils.SAAJ_13) { builder.append(','); - builder.append(messageFactoryProtocol); + builder.append(this.messageFactoryProtocol); } builder.append(']'); return builder.toString(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java index c919a4e4..4076e383 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java @@ -56,10 +56,10 @@ public class SaajContentHandler implements ContentHandler { public SaajContentHandler(SOAPElement element) { Assert.notNull(element, "element must not be null"); if (element instanceof SOAPEnvelope) { - envelope = (SOAPEnvelope) element; + this.envelope = (SOAPEnvelope) element; } else { - envelope = SaajUtils.getEnvelope(element); + this.envelope = SaajUtils.getEnvelope(element); } this.element = element; } @@ -68,7 +68,7 @@ public class SaajContentHandler implements ContentHandler { public void characters(char[] ch, int start, int length) throws SAXException { try { String text = new String(ch, start, length); - element.addTextNode(text); + this.element.addTextNode(text); } catch (SOAPException ex) { throw new SAXException(ex); @@ -79,23 +79,24 @@ public class SaajContentHandler implements ContentHandler { public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException { try { String childPrefix = getPrefix(qName); - SOAPElement child = element.addChildElement(localName, childPrefix, uri); + SOAPElement child = this.element.addChildElement(localName, childPrefix, uri); for (int i = 0; i < atts.getLength(); i++) { if (StringUtils.hasLength(atts.getLocalName(i))) { String attributePrefix = getPrefix(atts.getQName(i)); if (!"xmlns".equals(atts.getLocalName(i)) && !"xmlns".equals(attributePrefix)) { - Name attributeName = envelope.createName(atts.getLocalName(i), attributePrefix, atts.getURI(i)); + Name attributeName = this.envelope.createName(atts.getLocalName(i), attributePrefix, + atts.getURI(i)); child.addAttribute(attributeName, atts.getValue(i)); } } } - for (String namespacePrefix : namespaces.keySet()) { - String namespaceUri = namespaces.get(namespacePrefix); + for (String namespacePrefix : this.namespaces.keySet()) { + String namespaceUri = this.namespaces.get(namespacePrefix); if (!findParentNamespaceDeclaration(child, namespacePrefix, namespaceUri)) { child.addNamespaceDeclaration(namespacePrefix, namespaceUri); } } - element = child; + this.element = child; } catch (SOAPException ex) { throw new SAXException(ex); @@ -123,19 +124,19 @@ public class SaajContentHandler implements ContentHandler { @Override public void endElement(String uri, String localName, String qName) throws SAXException { - Assert.isTrue(localName.equals(element.getElementName().getLocalName()), "Invalid element on stack"); - Assert.isTrue(uri.equals(element.getElementName().getURI()), "Invalid element on stack"); - element = element.getParentElement(); + Assert.isTrue(localName.equals(this.element.getElementName().getLocalName()), "Invalid element on stack"); + Assert.isTrue(uri.equals(this.element.getElementName().getURI()), "Invalid element on stack"); + this.element = this.element.getParentElement(); } @Override public void startPrefixMapping(String prefix, String uri) throws SAXException { - namespaces.put(prefix, uri); + this.namespaces.put(prefix, uri); } @Override public void endPrefixMapping(String prefix) throws SAXException { - namespaces.remove(prefix); + this.namespaces.remove(prefix); } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java index 20d8b655..a91c2153 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java @@ -66,10 +66,10 @@ public class SaajXmlReader extends AbstractXmlReader { @Override public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException { if (NAMESPACES_FEATURE_NAME.equals(name)) { - return namespacesFeature; + return this.namespacesFeature; } else if (NAMESPACE_PREFIXES_FEATURE_NAME.equals(name)) { - return namespacePrefixesFeature; + return this.namespacePrefixesFeature; } else { return super.getFeature(name); @@ -119,7 +119,7 @@ public class SaajXmlReader extends AbstractXmlReader { if (getContentHandler() != null) { getContentHandler().startDocument(); } - handleNode(startNode); + handleNode(this.startNode); if (getContentHandler() != null) { getContentHandler().endDocument(); } @@ -137,7 +137,7 @@ public class SaajXmlReader extends AbstractXmlReader { private void handleElement(SOAPElement element) throws SAXException { Name elementName = element.getElementName(); if (getContentHandler() != null) { - if (namespacesFeature) { + if (this.namespacesFeature) { for (Iterator iterator = element.getNamespacePrefixes(); iterator.hasNext();) { String prefix = (String) iterator.next(); String namespaceUri = element.getNamespaceURI(prefix); @@ -155,7 +155,7 @@ public class SaajXmlReader extends AbstractXmlReader { handleNode(child); } if (getContentHandler() != null) { - if (namespacesFeature) { + if (this.namespacesFeature) { getContentHandler().endElement(elementName.getURI(), elementName.getLocalName(), elementName.getQualifiedName()); for (Iterator iterator = element.getNamespacePrefixes(); iterator.hasNext();) { @@ -182,14 +182,14 @@ public class SaajXmlReader extends AbstractXmlReader { for (Iterator iterator = element.getAllAttributes(); iterator.hasNext();) { Name attributeName = (Name) iterator.next(); String namespace = attributeName.getURI(); - if (namespace == null || !namespacesFeature) { + if (namespace == null || !this.namespacesFeature) { namespace = ""; } String attributeValue = element.getAttributeValue(attributeName); attributes.addAttribute(namespace, attributeName.getLocalName(), attributeName.getQualifiedName(), "CDATA", attributeValue); } - if (namespacePrefixesFeature) { + if (this.namespacePrefixesFeature) { for (Iterator iterator = element.getNamespacePrefixes(); iterator.hasNext();) { String prefix = (String) iterator.next(); String namespaceUri = element.getNamespaceURI(prefix); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java index 6f34c11c..d5f47dab 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java @@ -73,7 +73,7 @@ public class SoapEndpointInvocationChain extends EndpointInvocationChain { * @return a string array of URIs for SOAP actors/roles */ public String[] getActorsOrRoles() { - return actorsOrRoles; + return this.actorsOrRoles; } /** @@ -81,7 +81,7 @@ public class SoapEndpointInvocationChain extends EndpointInvocationChain { * is {@code true}. */ public boolean isUltimateReceiver() { - return isUltimateReceiver; + return this.isUltimateReceiver; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java index c2c977fe..db135d1d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java @@ -118,8 +118,8 @@ public class SoapMessageDispatcher extends MessageDispatcher { while (headerIterator.hasNext()) { SoapHeaderElement headerElement = headerIterator.next(); QName headerName = headerElement.getName(); - if (headerElement.getMustUnderstand() && logger.isDebugEnabled()) { - logger.debug("Handling MustUnderstand header " + headerName); + if (headerElement.getMustUnderstand() && this.logger.isDebugEnabled()) { + this.logger.debug("Handling MustUnderstand header " + headerName); } if (headerElement.getMustUnderstand() && !headerUnderstood(mappedEndpoint, headerElement)) { notUnderstoodHeaderNames.add(headerName); @@ -159,13 +159,13 @@ public class SoapMessageDispatcher extends MessageDispatcher { private void createMustUnderstandFault(SoapMessage soapResponse, List notUnderstoodHeaderNames, String[] actorsOrRoles) { - if (logger.isWarnEnabled()) { - logger.warn("Could not handle mustUnderstand headers: " + if (this.logger.isWarnEnabled()) { + this.logger.warn("Could not handle mustUnderstand headers: " + StringUtils.collectionToCommaDelimitedString(notUnderstoodHeaderNames) + ". Returning fault"); } SoapBody responseBody = soapResponse.getSoapBody(); - SoapFault fault = responseBody.addMustUnderstandFault(mustUnderstandFaultString, - mustUnderstandFaultStringLocale); + SoapFault fault = responseBody.addMustUnderstandFault(this.mustUnderstandFaultString, + this.mustUnderstandFaultStringLocale); if (!ObjectUtils.isEmpty(actorsOrRoles)) { fault.setFaultActorOrRole(actorsOrRoles[0]); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java index 290de1b0..e14fcf2b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractFaultCreatingValidatingMarshallingPayloadEndpoint.java @@ -86,7 +86,7 @@ public abstract class AbstractFaultCreatingValidatingMarshallingPayloadEndpoint * @see org.springframework.ws.soap.SoapFault#addFaultDetail() */ public boolean getAddValidationErrorDetail() { - return addValidationErrorDetail; + return this.addValidationErrorDetail; } /** @@ -104,7 +104,7 @@ public abstract class AbstractFaultCreatingValidatingMarshallingPayloadEndpoint * Returns the fault detail element name when validation errors occur on the request. */ public QName getDetailElementName() { - return detailElementName; + return this.detailElementName; } /** @@ -121,7 +121,7 @@ public abstract class AbstractFaultCreatingValidatingMarshallingPayloadEndpoint * occur on the request. */ public String getFaultStringOrReason() { - return faultStringOrReason; + return this.faultStringOrReason; } /** @@ -136,7 +136,7 @@ public abstract class AbstractFaultCreatingValidatingMarshallingPayloadEndpoint /** Returns the locale for SOAP fault reason and validation message resolution. */ public Locale getFaultLocale() { - return faultStringOrReasonLocale; + return this.faultStringOrReasonLocale; } /** @@ -167,8 +167,8 @@ public abstract class AbstractFaultCreatingValidatingMarshallingPayloadEndpoint @Override protected final boolean onValidationErrors(MessageContext messageContext, Object requestObject, Errors errors) { for (ObjectError objectError : errors.getAllErrors()) { - String msg = messageSource.getMessage(objectError, getFaultLocale()); - logger.warn("Validation error on request object[" + requestObject + "]: " + msg); + String msg = this.messageSource.getMessage(objectError, getFaultLocale()); + this.logger.warn("Validation error on request object[" + requestObject + "]: " + msg); } if (messageContext.getResponse() instanceof SoapMessage response) { SoapBody body = response.getSoapBody(); @@ -176,7 +176,7 @@ public abstract class AbstractFaultCreatingValidatingMarshallingPayloadEndpoint if (getAddValidationErrorDetail()) { SoapFaultDetail detail = fault.addFaultDetail(); for (ObjectError objectError : errors.getAllErrors()) { - String msg = messageSource.getMessage(objectError, getFaultLocale()); + String msg = this.messageSource.getMessage(objectError, getFaultLocale()); SoapFaultDetailElement detailElement = detail.addFaultDetailElement(getDetailElementName()); detailElement.addText(msg); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java index ccf9738f..6c74f806 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java @@ -67,7 +67,7 @@ public abstract class AbstractSoapFaultDefinitionExceptionResolver extends Abstr SoapFaultDefinition definition = getFaultDefinition(endpoint, ex); if (definition == null) { - definition = defaultFault; + definition = this.defaultFault; } if (definition == null) { return false; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java index d12c9993..c20416ce 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java @@ -46,7 +46,7 @@ public class SimpleSoapExceptionResolver extends AbstractEndpointExceptionResolv * Defaults to {@link Locale#ENGLISH}. */ public Locale getLocale() { - return locale; + return this.locale; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java index 154fe3f4..c35c4930 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java @@ -67,7 +67,7 @@ public class SoapFaultDefinition { /** Returns the fault code. */ public QName getFaultCode() { - return faultCode; + return this.faultCode; } /** Sets the fault code. */ @@ -80,7 +80,7 @@ public class SoapFaultDefinition { * message. */ public String getFaultStringOrReason() { - return faultStringOrReason; + return this.faultStringOrReason; } /** @@ -96,7 +96,7 @@ public class SoapFaultDefinition { * @see Locale#ENGLISH */ public Locale getLocale() { - return locale; + return this.locale; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java index 32ad4bd8..4663c8bb 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java @@ -49,17 +49,17 @@ public class SoapFaultMappingExceptionResolver extends AbstractSoapFaultDefiniti public void setExceptionMappings(Properties mappings) { for (Map.Entry entry : mappings.entrySet()) { if (entry.getKey() instanceof String && entry.getValue() instanceof String) { - exceptionMappings.put((String) entry.getKey(), (String) entry.getValue()); + this.exceptionMappings.put((String) entry.getKey(), (String) entry.getValue()); } } } @Override protected SoapFaultDefinition getFaultDefinition(Object endpoint, Exception ex) { - if (!CollectionUtils.isEmpty(exceptionMappings)) { + if (!CollectionUtils.isEmpty(this.exceptionMappings)) { String definitionText = null; int deepest = Integer.MAX_VALUE; - for (Map.Entry exceptionMapping : exceptionMappings.entrySet()) { + for (Map.Entry exceptionMapping : this.exceptionMappings.entrySet()) { int depth = getDepth(exceptionMapping.getKey(), ex); if (depth >= 0 && depth < deepest) { deepest = depth; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java index 0f6cfd66..e7b49427 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/FaultCode.java @@ -75,7 +75,7 @@ public enum FaultCode { } public QName value() { - return value; + return this.value; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java index 5ff34fed..d5389488 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java @@ -78,7 +78,7 @@ public abstract class AbstractFaultCreatingValidatingInterceptor extends Abstrac * @see org.springframework.ws.soap.SoapFault#addFaultDetail() */ public boolean getAddValidationErrorDetail() { - return addValidationErrorDetail; + return this.addValidationErrorDetail; } /** @@ -96,7 +96,7 @@ public abstract class AbstractFaultCreatingValidatingInterceptor extends Abstrac * Returns the fault detail element name when validation errors occur on the request. */ public QName getDetailElementName() { - return detailElementName; + return this.detailElementName; } /** @@ -113,7 +113,7 @@ public abstract class AbstractFaultCreatingValidatingInterceptor extends Abstrac * occur on the request. */ public String getFaultStringOrReason() { - return faultStringOrReason; + return this.faultStringOrReason; } /** @@ -131,7 +131,7 @@ public abstract class AbstractFaultCreatingValidatingInterceptor extends Abstrac * request. */ public Locale getFaultStringOrReasonLocale() { - return faultStringOrReasonLocale; + return this.faultStringOrReasonLocale; } /** @@ -159,7 +159,7 @@ public abstract class AbstractFaultCreatingValidatingInterceptor extends Abstrac protected boolean handleRequestValidationErrors(MessageContext messageContext, SAXParseException[] errors) throws TransformerException { for (SAXParseException error : errors) { - logger.warn("XML validation error on request: " + error.getMessage()); + this.logger.warn("XML validation error on request: " + error.getMessage()); } if (messageContext.getResponse() instanceof SoapMessage response) { SoapBody body = response.getSoapBody(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java index b768dd06..93d5b39f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java @@ -58,11 +58,12 @@ public class PayloadRootSmartSoapEndpointInterceptor extends DelegatingSmartSoap @Override protected boolean shouldIntercept(WebServiceMessage request, Object endpoint) { try { - QName payloadRootName = PayloadRootUtils.getPayloadRootQName(request.getPayloadSource(), transformerHelper); - if (payloadRootName == null || !namespaceUri.equals(payloadRootName.getNamespaceURI())) { + QName payloadRootName = PayloadRootUtils.getPayloadRootQName(request.getPayloadSource(), + this.transformerHelper); + if (payloadRootName == null || !this.namespaceUri.equals(payloadRootName.getNamespaceURI())) { return false; } - return !StringUtils.hasLength(localPart) || localPart.equals(payloadRootName.getLocalPart()); + return !StringUtils.hasLength(this.localPart) || this.localPart.equals(payloadRootName.getLocalPart()); } catch (TransformerException e) { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java index a0d65cb1..6ad06e72 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java @@ -48,7 +48,7 @@ public class SoapEnvelopeLoggingInterceptor extends AbstractLoggingInterceptor i @Override public boolean handleFault(MessageContext messageContext, Object endpoint) throws Exception { - if (logFault && isLogEnabled()) { + if (this.logFault && isLogEnabled()) { logMessageSource("Fault: ", getSource(messageContext.getResponse())); } return true; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java index a442ffd8..205e0bfd 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java @@ -58,7 +58,7 @@ public class DelegatingSoapEndpointMapping implements InitializingBean, SoapEndp @Override public final void setActorOrRole(String actorOrRole) { Assert.notNull(actorOrRole, "actorOrRole must not be null"); - actorsOrRoles = new String[] { actorOrRole }; + this.actorsOrRoles = new String[] { actorOrRole }; } @Override @@ -69,7 +69,7 @@ public class DelegatingSoapEndpointMapping implements InitializingBean, SoapEndp @Override public final void setUltimateReceiver(boolean ultimateReceiver) { - isUltimateReceiver = ultimateReceiver; + this.isUltimateReceiver = ultimateReceiver; } /** @@ -79,10 +79,10 @@ public class DelegatingSoapEndpointMapping implements InitializingBean, SoapEndp */ @Override public EndpointInvocationChain getEndpoint(MessageContext messageContext) throws Exception { - EndpointInvocationChain delegateChain = delegate.getEndpoint(messageContext); + EndpointInvocationChain delegateChain = this.delegate.getEndpoint(messageContext); if (delegateChain != null) { return new SoapEndpointInvocationChain(delegateChain.getEndpoint(), delegateChain.getInterceptors(), - actorsOrRoles, isUltimateReceiver); + this.actorsOrRoles, this.isUltimateReceiver); } else { return null; @@ -91,7 +91,7 @@ public class DelegatingSoapEndpointMapping implements InitializingBean, SoapEndp @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(delegate, "delegate is required"); + Assert.notNull(this.delegate, "delegate is required"); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java index b1e5eedf..4254e2c1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java @@ -62,7 +62,7 @@ public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotatio @Override public final void setActorOrRole(String actorOrRole) { Assert.notNull(actorOrRole, "actorOrRole must not be null"); - actorsOrRoles = new String[] { actorOrRole }; + this.actorsOrRoles = new String[] { actorOrRole }; } @Override @@ -73,7 +73,7 @@ public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotatio @Override public final void setUltimateReceiver(boolean ultimateReceiver) { - isUltimateReceiver = ultimateReceiver; + this.isUltimateReceiver = ultimateReceiver; } /** @@ -88,7 +88,7 @@ public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotatio @Override protected final EndpointInvocationChain createEndpointInvocationChain(MessageContext messageContext, Object endpoint, EndpointInterceptor[] interceptors) { - return new SoapEndpointInvocationChain(endpoint, interceptors, actorsOrRoles, isUltimateReceiver); + return new SoapEndpointInvocationChain(endpoint, interceptors, this.actorsOrRoles, this.isUltimateReceiver); } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java index a0ef6543..0113dc81 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMapping.java @@ -61,7 +61,7 @@ public class SoapActionEndpointMapping extends AbstractMapBasedEndpointMapping i @Override public final void setActorOrRole(String actorOrRole) { Assert.notNull(actorOrRole, "actorOrRole must not be null"); - actorsOrRoles = new String[] { actorOrRole }; + this.actorsOrRoles = new String[] { actorOrRole }; } @Override @@ -72,7 +72,7 @@ public class SoapActionEndpointMapping extends AbstractMapBasedEndpointMapping i @Override public final void setUltimateReceiver(boolean ultimateReceiver) { - isUltimateReceiver = ultimateReceiver; + this.isUltimateReceiver = ultimateReceiver; } /** @@ -87,7 +87,7 @@ public class SoapActionEndpointMapping extends AbstractMapBasedEndpointMapping i @Override protected final EndpointInvocationChain createEndpointInvocationChain(MessageContext messageContext, Object endpoint, EndpointInterceptor[] interceptors) { - return new SoapEndpointInvocationChain(endpoint, interceptors, actorsOrRoles, isUltimateReceiver); + return new SoapEndpointInvocationChain(endpoint, interceptors, this.actorsOrRoles, this.isUltimateReceiver); } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/support/DefaultStrategiesHelper.java b/spring-ws-core/src/main/java/org/springframework/ws/support/DefaultStrategiesHelper.java index 87ceeda9..27007644 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/support/DefaultStrategiesHelper.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/support/DefaultStrategiesHelper.java @@ -80,7 +80,7 @@ public class DefaultStrategiesHelper { */ public DefaultStrategiesHelper(Resource resource) throws IllegalStateException { try { - defaultStrategies = PropertiesLoaderUtils.loadProperties(resource); + this.defaultStrategies = PropertiesLoaderUtils.loadProperties(resource); } catch (IOException ex) { throw new IllegalStateException("Could not load '" + resource + "': " + ex.getMessage()); @@ -125,7 +125,7 @@ public class DefaultStrategiesHelper { throws BeanInitializationException { String key = strategyInterface.getName(); try { - String value = defaultStrategies.getProperty(key); + String value = this.defaultStrategies.getProperty(key); if (value == null) { return Collections.emptyList(); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java index ea192edf..f5c7ae32 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java @@ -96,22 +96,22 @@ public abstract class MarshallingUtils { @Override public boolean isXopPackage() { - return mimeMessage.isXopPackage(); + return this.mimeMessage.isXopPackage(); } @Override public boolean convertToXopPackage() { - return mimeMessage.convertToXopPackage(); + return this.mimeMessage.convertToXopPackage(); } @Override public void addAttachment(String contentId, DataHandler dataHandler) { - mimeMessage.addAttachment(contentId, dataHandler); + this.mimeMessage.addAttachment(contentId, dataHandler); } @Override public DataHandler getAttachment(String contentId) { - Attachment attachment = mimeMessage.getAttachment(contentId); + Attachment attachment = this.mimeMessage.getAttachment(contentId); return attachment != null ? attachment.getDataHandler() : null; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java index 07da5bf5..22dd9583 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java @@ -38,18 +38,18 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne @Override protected final TransportInputStream createTransportInputStream() throws IOException { - if (requestInputStream == null) { - requestInputStream = new RequestTransportInputStream(); + if (this.requestInputStream == null) { + this.requestInputStream = new RequestTransportInputStream(); } - return requestInputStream; + return this.requestInputStream; } @Override protected final TransportOutputStream createTransportOutputStream() throws IOException { - if (responseOutputStream == null) { - responseOutputStream = new ResponseTransportOutputStream(); + if (this.responseOutputStream == null) { + this.responseOutputStream = new ResponseTransportOutputStream(); } - return responseOutputStream; + return this.responseOutputStream; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java index aadd217e..31826aa1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractSenderConnection.java @@ -38,19 +38,19 @@ public abstract class AbstractSenderConnection extends AbstractWebServiceConnect @Override protected final TransportOutputStream createTransportOutputStream() throws IOException { - if (requestOutputStream == null) { - requestOutputStream = new RequestTransportOutputStream(); + if (this.requestOutputStream == null) { + this.requestOutputStream = new RequestTransportOutputStream(); } - return requestOutputStream; + return this.requestOutputStream; } @Override protected final TransportInputStream createTransportInputStream() throws IOException { if (hasResponse()) { - if (responseInputStream == null) { - responseInputStream = new ResponseTransportInputStream(); + if (this.responseInputStream == null) { + this.responseInputStream = new ResponseTransportInputStream(); } - return responseInputStream; + return this.responseInputStream; } else { return null; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractWebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractWebServiceConnection.java index 1bdfedd8..8d6a108c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractWebServiceConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractWebServiceConnection.java @@ -39,12 +39,12 @@ public abstract class AbstractWebServiceConnection implements WebServiceConnecti public final void send(WebServiceMessage message) throws IOException { checkClosed(); onSendBeforeWrite(message); - tos = createTransportOutputStream(); - if (tos == null) { + this.tos = createTransportOutputStream(); + if (this.tos == null) { return; } - message.writeTo(tos); - tos.flush(); + message.writeTo(this.tos); + this.tos.flush(); onSendAfterWrite(message); } @@ -82,11 +82,11 @@ public abstract class AbstractWebServiceConnection implements WebServiceConnecti public final WebServiceMessage receive(WebServiceMessageFactory messageFactory) throws IOException { checkClosed(); onReceiveBeforeRead(); - tis = createTransportInputStream(); - if (tis == null) { + this.tis = createTransportInputStream(); + if (this.tis == null) { return null; } - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = messageFactory.createWebServiceMessage(this.tis); onReceiveAfterRead(message); return message; } @@ -123,31 +123,31 @@ public abstract class AbstractWebServiceConnection implements WebServiceConnecti @Override public final void close() throws IOException { IOException ioex = null; - if (tis != null) { + if (this.tis != null) { try { - tis.close(); + this.tis.close(); } catch (IOException ex) { ioex = ex; } } - if (tos != null) { + if (this.tos != null) { try { - tos.close(); + this.tos.close(); } catch (IOException ex) { ioex = ex; } } onClose(); - closed = true; + this.closed = true; if (ioex != null) { throw ioex; } } private void checkClosed() { - if (closed) { + if (this.closed) { throw new IllegalStateException("Connection has been closed and cannot be reused."); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java index ab9490bb..7b08b683 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java @@ -40,16 +40,16 @@ public abstract class TransportInputStream extends InputStream { } private InputStream getInputStream() throws IOException { - if (inputStream == null) { - inputStream = createInputStream(); - Assert.notNull(inputStream, "inputStream must not be null"); + if (this.inputStream == null) { + this.inputStream = createInputStream(); + Assert.notNull(this.inputStream, "inputStream must not be null"); } - return inputStream; + return this.inputStream; } @Override public void close() throws IOException { - if (inputStream != null) { + if (this.inputStream != null) { getInputStream().close(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java index 202b38e3..61c4b398 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java @@ -38,23 +38,23 @@ public abstract class TransportOutputStream extends OutputStream { } private OutputStream getOutputStream() throws IOException { - if (outputStream == null) { - outputStream = createOutputStream(); - Assert.notNull(outputStream, "outputStream must not be null"); + if (this.outputStream == null) { + this.outputStream = createOutputStream(); + Assert.notNull(this.outputStream, "outputStream must not be null"); } - return outputStream; + return this.outputStream; } @Override public void close() throws IOException { - if (outputStream != null) { + if (this.outputStream != null) { getOutputStream().close(); } } @Override public void flush() throws IOException { - if (outputStream != null) { + if (this.outputStream != null) { getOutputStream().flush(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/context/DefaultTransportContext.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/DefaultTransportContext.java index 085e4705..b8246814 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/context/DefaultTransportContext.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/DefaultTransportContext.java @@ -39,11 +39,11 @@ public class DefaultTransportContext implements TransportContext { @Override public WebServiceConnection getConnection() { - return connection; + return this.connection; } public String toString() { - return connection.toString(); + return this.connection.toString(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java index 818a1693..53d9e864 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java @@ -79,30 +79,30 @@ public abstract class AbstractHttpSenderConnection extends AbstractSenderConnect || HttpTransportConstants.STATUS_NO_CONTENT == responseCode) { return false; } - if (hasResponse != null) { - return hasResponse; + if (this.hasResponse != null) { + return this.hasResponse; } long contentLength = getResponseContentLength(); if (contentLength < 0) { - rawResponseInputStream = new PushbackInputStream(getRawResponseInputStream()); - int b = rawResponseInputStream.read(); + this.rawResponseInputStream = new PushbackInputStream(getRawResponseInputStream()); + int b = this.rawResponseInputStream.read(); if (b == -1) { - hasResponse = Boolean.FALSE; + this.hasResponse = Boolean.FALSE; } else { - hasResponse = Boolean.TRUE; - rawResponseInputStream.unread(b); + this.hasResponse = Boolean.TRUE; + this.rawResponseInputStream.unread(b); } } else { - hasResponse = contentLength > 0; + this.hasResponse = contentLength > 0; } - return hasResponse; + return this.hasResponse; } @Override protected final InputStream getResponseInputStream() throws IOException { - InputStream inputStream = rawResponseInputStream; + InputStream inputStream = this.rawResponseInputStream; if (inputStream == null) { inputStream = getRawResponseInputStream(); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java index 1e6ff18d..a31daafc 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSender.java @@ -45,7 +45,7 @@ public abstract class AbstractHttpWebServiceMessageSender implements WebServiceM * {@code Accept-Encoding} header with {@code gzip} as value. */ public boolean isAcceptGzipEncoding() { - return acceptGzipEncoding; + return this.acceptGzipEncoding; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java index ab240afe..dec8f88c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java @@ -52,74 +52,74 @@ public class ClientHttpRequestConnection extends AbstractHttpSenderConnection { } public ClientHttpRequest getClientHttpRequest() { - return request; + return this.request; } public ClientHttpResponse getClientHttpResponse() { - return response; + return this.response; } // URI @Override public URI getUri() throws URISyntaxException { - return request.getURI(); + return this.request.getURI(); } // Sending request @Override public void addRequestHeader(String name, String value) throws IOException { - request.getHeaders().add(name, value); + this.request.getHeaders().add(name, value); } @Override protected OutputStream getRequestOutputStream() throws IOException { - return request.getBody(); + return this.request.getBody(); } @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { - response = request.execute(); + this.response = this.request.execute(); } // Receiving response @Override protected long getResponseContentLength() throws IOException { - return response.getHeaders().getContentLength(); + return this.response.getHeaders().getContentLength(); } @Override public Iterator getResponseHeaderNames() throws IOException { - return response.getHeaders().keySet().iterator(); + return this.response.getHeaders().keySet().iterator(); } @Override public Iterator getResponseHeaders(String name) throws IOException { - List headers = response.getHeaders().get(name); + List headers = this.response.getHeaders().get(name); return headers != null ? headers.iterator() : Collections.emptyIterator(); } @Override protected int getResponseCode() throws IOException { - return response.getStatusCode().value(); + return this.response.getStatusCode().value(); } @Override protected String getResponseMessage() throws IOException { - return response.getStatusText(); + return this.response.getStatusText(); } @Override protected InputStream getRawResponseInputStream() throws IOException { - return response.getBody(); + return this.response.getBody(); } @Override protected void onClose() throws IOException { - if (response != null) { - response.close(); + if (this.response != null) { + this.response.close(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSender.java index a73a5099..6ffc9f3a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSender.java @@ -47,7 +47,7 @@ public class ClientHttpRequestMessageSender extends AbstractHttpWebServiceMessag } public ClientHttpRequestFactory getRequestFactory() { - return requestFactory; + return this.requestFactory; } public void setRequestFactory(ClientHttpRequestFactory requestFactory) { @@ -57,7 +57,7 @@ public class ClientHttpRequestMessageSender extends AbstractHttpWebServiceMessag @Override public WebServiceConnection createConnection(URI uri) throws IOException { - ClientHttpRequest request = requestFactory.createRequest(uri, HttpMethod.POST); + ClientHttpRequest request = this.requestFactory.createRequest(uri, HttpMethod.POST); if (isAcceptGzipEncoding()) { request.getHeaders() .add(HttpTransportConstants.HEADER_ACCEPT_ENCODING, HttpTransportConstants.CONTENT_ENCODING_GZIP); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java index 5786a931..24b00be5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpConnection.java @@ -64,14 +64,14 @@ public class CommonsHttpConnection extends AbstractHttpSenderConnection { } public PostMethod getPostMethod() { - return postMethod; + return this.postMethod; } @Override public void onClose() throws IOException { - postMethod.releaseConnection(); - if (connectionManager != null) { - connectionManager.shutdown(); + this.postMethod.releaseConnection(); + if (this.connectionManager != null) { + this.connectionManager.shutdown(); } } @@ -82,7 +82,7 @@ public class CommonsHttpConnection extends AbstractHttpSenderConnection { @Override public URI getUri() throws URISyntaxException { try { - return new URI(postMethod.getURI().toString()); + return new URI(this.postMethod.getURI().toString()); } catch (URIException ex) { throw new URISyntaxException("", ex.getMessage()); @@ -95,34 +95,34 @@ public class CommonsHttpConnection extends AbstractHttpSenderConnection { @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { - requestBuffer = new ByteArrayOutputStream(); + this.requestBuffer = new ByteArrayOutputStream(); } @Override public void addRequestHeader(String name, String value) throws IOException { - postMethod.addRequestHeader(name, value); + this.postMethod.addRequestHeader(name, value); } @Override protected OutputStream getRequestOutputStream() throws IOException { - return requestBuffer; + return this.requestBuffer; } @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { - postMethod.setRequestEntity(new ByteArrayRequestEntity(requestBuffer.toByteArray())); - requestBuffer = null; + this.postMethod.setRequestEntity(new ByteArrayRequestEntity(this.requestBuffer.toByteArray())); + this.requestBuffer = null; try { - httpClient.executeMethod(postMethod); + this.httpClient.executeMethod(this.postMethod); } catch (IllegalStateException ex) { if ("Connection factory has been shutdown.".equals(ex.getMessage())) { // The application context has been closed, resulting in a connection // factory shutdown and an ISE. // Let's create a new connection factory for this connection only. - connectionManager = new MultiThreadedHttpConnectionManager(); - httpClient.setHttpConnectionManager(connectionManager); - httpClient.executeMethod(postMethod); + this.connectionManager = new MultiThreadedHttpConnectionManager(); + this.httpClient.setHttpConnectionManager(this.connectionManager); + this.httpClient.executeMethod(this.postMethod); } else { throw ex; @@ -136,27 +136,27 @@ public class CommonsHttpConnection extends AbstractHttpSenderConnection { @Override protected int getResponseCode() throws IOException { - return postMethod.getStatusCode(); + return this.postMethod.getStatusCode(); } @Override protected String getResponseMessage() throws IOException { - return postMethod.getStatusText(); + return this.postMethod.getStatusText(); } @Override protected long getResponseContentLength() throws IOException { - return postMethod.getResponseContentLength(); + return this.postMethod.getResponseContentLength(); } @Override protected InputStream getRawResponseInputStream() throws IOException { - return postMethod.getResponseBodyAsStream(); + return this.postMethod.getResponseBodyAsStream(); } @Override public Iterator getResponseHeaderNames() throws IOException { - Header[] headers = postMethod.getResponseHeaders(); + Header[] headers = this.postMethod.getResponseHeaders(); String[] names = new String[headers.length]; for (int i = 0; i < headers.length; i++) { names[i] = headers[i].getName(); @@ -166,7 +166,7 @@ public class CommonsHttpConnection extends AbstractHttpSenderConnection { @Override public Iterator getResponseHeaders(String name) throws IOException { - Header[] headers = postMethod.getResponseHeaders(name); + Header[] headers = this.postMethod.getResponseHeaders(name); String[] values = new String[headers.length]; for (int i = 0; i < headers.length; i++) { values[i] = headers[i].getValue(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java index e69c9e81..8ecd061b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java @@ -73,7 +73,7 @@ public class CommonsHttpMessageSender extends AbstractHttpWebServiceMessageSende * {@link HttpClient} that uses a default {@link MultiThreadedHttpConnectionManager}. */ public CommonsHttpMessageSender() { - httpClient = new HttpClient(new MultiThreadedHttpConnectionManager()); + this.httpClient = new HttpClient(new MultiThreadedHttpConnectionManager()); setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT_MILLISECONDS); setReadTimeout(DEFAULT_READ_TIMEOUT_MILLISECONDS); } @@ -90,7 +90,7 @@ public class CommonsHttpMessageSender extends AbstractHttpWebServiceMessageSende /** Returns the {@code HttpClient} used by this message sender. */ public HttpClient getHttpClient() { - return httpClient; + return this.httpClient; } /** Set the {@code HttpClient} used by this message sender. */ @@ -100,7 +100,7 @@ public class CommonsHttpMessageSender extends AbstractHttpWebServiceMessageSende /** Returns the credentials to be used. */ public Credentials getCredentials() { - return credentials; + return this.credentials; } /** @@ -201,7 +201,7 @@ public class CommonsHttpMessageSender extends AbstractHttpWebServiceMessageSende * By default, the {@link AuthScope#ANY} is returned. */ public AuthScope getAuthScope() { - return authScope != null ? authScope : AuthScope.ANY; + return this.authScope != null ? this.authScope : AuthScope.ANY; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java index 580d8ea0..4eac4273 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java @@ -162,7 +162,7 @@ public class HttpComponents5ClientFactory implements FactoryBean entry : maxConnectionsPerHost.entrySet()) { + for (Map.Entry entry : this.maxConnectionsPerHost.entrySet()) { URI uri = new URI(entry.getKey()); HttpHost host = new HttpHost(uri.getScheme(), uri.getHost(), getPort(uri)); @@ -215,25 +215,25 @@ public class HttpComponents5ClientFactory implements FactoryBean getResponseHeaderNames() throws IOException { - return Arrays.stream(httpResponse.getHeaders()) // + return Arrays.stream(this.httpResponse.getHeaders()) // .map(NameValuePair::getName) // .iterator(); } @@ -189,7 +189,7 @@ public class HttpComponents5Connection extends AbstractHttpSenderConnection { @Override public Iterator getResponseHeaders(String name) throws IOException { - return Arrays.stream(httpResponse.getHeaders(name)) // + return Arrays.stream(this.httpResponse.getHeaders(name)) // .map(NameValuePair::getValue) // .iterator(); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5MessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5MessageSender.java index 8c748174..9def612e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5MessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5MessageSender.java @@ -122,7 +122,7 @@ public class HttpComponents5MessageSender extends AbstractHttpWebServiceMessageS * Returns the {@code HttpClient} used by this message sender. */ public HttpClient getHttpClient() { - return httpClient; + return this.httpClient; } /** @@ -184,7 +184,7 @@ public class HttpComponents5MessageSender extends AbstractHttpWebServiceMessageS public void afterPropertiesSet() throws Exception { if (this.clientFactory != null) { - this.httpClient = clientFactory.getObject(); + this.httpClient = this.clientFactory.getObject(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsConnection.java index b4bc3493..454fd5e3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsConnection.java @@ -69,17 +69,17 @@ public class HttpComponentsConnection extends AbstractHttpSenderConnection { } public HttpPost getHttpPost() { - return httpPost; + return this.httpPost; } public HttpResponse getHttpResponse() { - return httpResponse; + return this.httpResponse; } @Override public void onClose() throws IOException { - if (httpResponse != null && httpResponse.getEntity() != null) { - EntityUtils.consume(httpResponse.getEntity()); + if (this.httpResponse != null && this.httpResponse.getEntity() != null) { + EntityUtils.consume(this.httpResponse.getEntity()); } } @@ -88,7 +88,7 @@ public class HttpComponentsConnection extends AbstractHttpSenderConnection { */ @Override public URI getUri() throws URISyntaxException { - return new URI(httpPost.getURI().toString()); + return new URI(this.httpPost.getURI().toString()); } /* @@ -97,28 +97,28 @@ public class HttpComponentsConnection extends AbstractHttpSenderConnection { @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { - requestBuffer = new ByteArrayOutputStream(); + this.requestBuffer = new ByteArrayOutputStream(); } @Override public void addRequestHeader(String name, String value) throws IOException { - httpPost.addHeader(name, value); + this.httpPost.addHeader(name, value); } @Override protected OutputStream getRequestOutputStream() throws IOException { - return requestBuffer; + return this.requestBuffer; } @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { - httpPost.setEntity(new ByteArrayEntity(requestBuffer.toByteArray())); - requestBuffer = null; - if (httpContext != null) { - httpResponse = httpClient.execute(httpPost, httpContext); + this.httpPost.setEntity(new ByteArrayEntity(this.requestBuffer.toByteArray())); + this.requestBuffer = null; + if (this.httpContext != null) { + this.httpResponse = this.httpClient.execute(this.httpPost, this.httpContext); } else { - httpResponse = httpClient.execute(httpPost); + this.httpResponse = this.httpClient.execute(this.httpPost); } } @@ -128,17 +128,17 @@ public class HttpComponentsConnection extends AbstractHttpSenderConnection { @Override protected int getResponseCode() throws IOException { - return httpResponse.getStatusLine().getStatusCode(); + return this.httpResponse.getStatusLine().getStatusCode(); } @Override protected String getResponseMessage() throws IOException { - return httpResponse.getStatusLine().getReasonPhrase(); + return this.httpResponse.getStatusLine().getReasonPhrase(); } @Override protected long getResponseContentLength() throws IOException { - HttpEntity entity = httpResponse.getEntity(); + HttpEntity entity = this.httpResponse.getEntity(); if (entity != null) { return entity.getContentLength(); } @@ -147,7 +147,7 @@ public class HttpComponentsConnection extends AbstractHttpSenderConnection { @Override protected InputStream getRawResponseInputStream() throws IOException { - HttpEntity entity = httpResponse.getEntity(); + HttpEntity entity = this.httpResponse.getEntity(); if (entity != null) { return entity.getContent(); } @@ -156,7 +156,7 @@ public class HttpComponentsConnection extends AbstractHttpSenderConnection { @Override public Iterator getResponseHeaderNames() throws IOException { - Header[] headers = httpResponse.getAllHeaders(); + Header[] headers = this.httpResponse.getAllHeaders(); String[] names = new String[headers.length]; for (int i = 0; i < headers.length; i++) { names[i] = headers[i].getName(); @@ -166,7 +166,7 @@ public class HttpComponentsConnection extends AbstractHttpSenderConnection { @Override public Iterator getResponseHeaders(String name) throws IOException { - Header[] headers = httpResponse.getHeaders(name); + Header[] headers = this.httpResponse.getHeaders(name); String[] values = new String[headers.length]; for (int i = 0; i < headers.length; i++) { values[i] = headers[i].getValue(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java index 76b4c070..ca820735 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java @@ -113,7 +113,7 @@ public class HttpComponentsMessageSender extends AbstractHttpWebServiceMessageSe * Returns the {@code HttpClient} used by this message sender. */ public HttpClient getHttpClient() { - return httpClient; + return this.httpClient; } /** @@ -225,9 +225,9 @@ public class HttpComponentsMessageSender extends AbstractHttpWebServiceMessageSe @Override public void afterPropertiesSet() throws Exception { - if (credentials != null && getHttpClient() instanceof org.apache.http.impl.client.DefaultHttpClient) { + if (this.credentials != null && getHttpClient() instanceof org.apache.http.impl.client.DefaultHttpClient) { ((org.apache.http.impl.client.DefaultHttpClient) getHttpClient()).getCredentialsProvider() - .setCredentials(authScope, credentials); + .setCredentials(this.authScope, this.credentials); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java index 152925f8..ce0aeb39 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpServletConnection.java @@ -63,18 +63,18 @@ public class HttpServletConnection extends AbstractReceiverConnection /** Returns the {@code HttpServletRequest} for this connection. */ public HttpServletRequest getHttpServletRequest() { - return httpServletRequest; + return this.httpServletRequest; } /** Returns the {@code HttpServletResponse} for this connection. */ public HttpServletResponse getHttpServletResponse() { - return httpServletResponse; + return this.httpServletResponse; } @Override public void endpointNotFound() { getHttpServletResponse().setStatus(HttpTransportConstants.STATUS_NOT_FOUND); - statusCodeSet = true; + this.statusCodeSet = true; } /* @@ -97,9 +97,9 @@ public class HttpServletConnection extends AbstractReceiverConnection @Override public URI getUri() throws URISyntaxException { - return new URI(httpServletRequest.getScheme(), null, httpServletRequest.getServerName(), - httpServletRequest.getServerPort(), httpServletRequest.getRequestURI(), - httpServletRequest.getQueryString(), null); + return new URI(this.httpServletRequest.getScheme(), null, this.httpServletRequest.getServerName(), + this.httpServletRequest.getServerPort(), this.httpServletRequest.getRequestURI(), + this.httpServletRequest.getQueryString(), null); } /* @@ -137,12 +137,12 @@ public class HttpServletConnection extends AbstractReceiverConnection @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { - statusCodeSet = true; + this.statusCodeSet = true; } @Override public void onClose() throws IOException { - if (!statusCodeSet) { + if (!this.statusCodeSet) { getHttpServletResponse().setStatus(HttpTransportConstants.STATUS_ACCEPTED); } } @@ -165,7 +165,7 @@ public class HttpServletConnection extends AbstractReceiverConnection else { getHttpServletResponse().setStatus(HttpTransportConstants.STATUS_OK); } - statusCodeSet = true; + this.statusCodeSet = true; } @Override @@ -181,7 +181,7 @@ public class HttpServletConnection extends AbstractReceiverConnection else { getHttpServletResponse().setStatus(HttpTransportConstants.STATUS_OK); } - statusCodeSet = true; + this.statusCodeSet = true; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java index e9853f77..8cbdc396 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnection.java @@ -59,12 +59,12 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { } public HttpURLConnection getConnection() { - return connection; + return this.connection; } @Override public void onClose() { - connection.disconnect(); + this.connection.disconnect(); } /* @@ -73,7 +73,7 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { @Override public URI getUri() throws URISyntaxException { - return new URI(StringUtils.replace(connection.getURL().toString(), " ", "%20")); + return new URI(StringUtils.replace(this.connection.getURL().toString(), " ", "%20")); } /* @@ -82,17 +82,17 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { @Override public void addRequestHeader(String name, String value) throws IOException { - connection.addRequestProperty(name, value); + this.connection.addRequestProperty(name, value); } @Override protected OutputStream getRequestOutputStream() throws IOException { - return connection.getOutputStream(); + return this.connection.getOutputStream(); } @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { - connection.connect(); + this.connection.connect(); } /* @@ -101,7 +101,7 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { @Override protected long getResponseContentLength() throws IOException { - return connection.getContentLength(); + return this.connection.getContentLength(); } @Override @@ -110,7 +110,7 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { // Header field 0 is the status line, so we start at 1 int i = 1; while (true) { - String headerName = connection.getHeaderFieldKey(i); + String headerName = this.connection.getHeaderFieldKey(i); if (!StringUtils.hasLength(headerName)) { break; } @@ -124,9 +124,9 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { public Iterator getResponseHeaders(String name) throws IOException { Map> headersListMappedByLowerCaseName = new HashMap<>(); - for (String key : connection.getHeaderFields().keySet()) { + for (String key : this.connection.getHeaderFields().keySet()) { if (key != null) { - headersListMappedByLowerCaseName.put(key.toLowerCase(), connection.getHeaderFields().get(key)); + headersListMappedByLowerCaseName.put(key.toLowerCase(), this.connection.getHeaderFields().get(key)); } } @@ -142,21 +142,21 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { @Override protected int getResponseCode() throws IOException { - return connection.getResponseCode(); + return this.connection.getResponseCode(); } @Override protected String getResponseMessage() throws IOException { - return connection.getResponseMessage(); + return this.connection.getResponseMessage(); } @Override protected InputStream getRawResponseInputStream() throws IOException { - if (connection.getResponseCode() / 100 != 2) { - return connection.getErrorStream(); + if (this.connection.getResponseCode() / 100 != 2) { + return this.connection.getErrorStream(); } else { - return connection.getInputStream(); + return this.connection.getInputStream(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java index d1290a8f..4944256c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java @@ -81,17 +81,17 @@ public class JdkHttpClientConnection extends AbstractHttpSenderConnection { @Override protected OutputStream getRequestOutputStream() throws IOException { - return requestBuffer; + return this.requestBuffer; } @Override public Iterator getResponseHeaderNames() throws IOException { - return response.headers().map().keySet().iterator(); + return this.response.headers().map().keySet().iterator(); } @Override public Iterator getResponseHeaders(String name) throws IOException { - return response.headers().allValues(name).iterator(); + return this.response.headers().allValues(name).iterator(); } @Override @@ -102,17 +102,17 @@ public class JdkHttpClientConnection extends AbstractHttpSenderConnection { return; } - requestBuilder.header(name, value); + this.requestBuilder.header(name, value); } @Override public URI getUri() throws URISyntaxException { - return uri; + return this.uri; } @Override protected int getResponseCode() throws IOException { - return response != null ? response.statusCode() : 0; + return this.response != null ? this.response.statusCode() : 0; } @Override @@ -128,9 +128,9 @@ public class JdkHttpClientConnection extends AbstractHttpSenderConnection { @Override protected long getResponseContentLength() throws IOException { - if (response != null) { + if (this.response != null) { - return response.headers() // + return this.response.headers() // .firstValueAsLong(HttpTransportConstants.HEADER_CONTENT_LENGTH) // .orElse(-1); } @@ -140,23 +140,23 @@ public class JdkHttpClientConnection extends AbstractHttpSenderConnection { @Override protected InputStream getRawResponseInputStream() throws IOException { - return response.body(); + return this.response.body(); } @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { - requestBuffer = new ByteArrayOutputStream(); + this.requestBuffer = new ByteArrayOutputStream(); } @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { - byte[] body = requestBuffer.toByteArray(); + byte[] body = this.requestBuffer.toByteArray(); - request = requestBuilder.POST(BodyPublishers.ofByteArray(body)).build(); + this.request = this.requestBuilder.POST(BodyPublishers.ofByteArray(body)).build(); try { - response = httpClient.send(request, BodyHandlers.ofInputStream()); + this.response = this.httpClient.send(this.request, BodyHandlers.ofInputStream()); } catch (InterruptedException ex) { Thread.currentThread().interrupt(); @@ -167,8 +167,8 @@ public class JdkHttpClientConnection extends AbstractHttpSenderConnection { @Override protected void onClose() throws IOException { - if (response != null) { - response.body().close(); + if (this.response != null) { + this.response.body().close(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java index 7bc6aeb8..7a30f554 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java @@ -73,7 +73,7 @@ public class JdkHttpClientMessageSender extends AbstractHttpWebServiceMessageSen @Override public WebServiceConnection createConnection(URI uri) throws IOException { - JdkHttpClientConnection connection = new JdkHttpClientConnection(httpClient, uri, requestTimeout); + JdkHttpClientConnection connection = new JdkHttpClientConnection(this.httpClient, uri, this.requestTimeout); if (isAcceptGzipEncoding()) { connection.addRequestHeader(HttpTransportConstants.HEADER_ACCEPT_ENCODING, @@ -86,8 +86,8 @@ public class JdkHttpClientMessageSender extends AbstractHttpWebServiceMessageSen @Override public void afterPropertiesSet() throws Exception { - if (httpClient == null) { - httpClient = HttpClient.newBuilder().connectTimeout(connectionTimeout).build(); + if (this.httpClient == null) { + this.httpClient = HttpClient.newBuilder().connectTimeout(this.connectionTimeout).build(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java index f79de2da..d8b7bb2e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java @@ -60,8 +60,8 @@ public abstract class LocationTransformerObjectSupport extends TransformerObject if (locationNode instanceof Attr location) { if (StringUtils.hasLength(location.getValue())) { String newLocation = transformLocation(location.getValue(), request); - if (logger.isDebugEnabled()) { - logger.debug("Transforming [" + location.getValue() + "] to [" + newLocation + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Transforming [" + location.getValue() + "] to [" + newLocation + "]"); } location.setValue(newLocation); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java index a1ff1999..8038d2f3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java @@ -194,12 +194,12 @@ public class MessageDispatcherServlet extends FrameworkServlet { */ public MessageDispatcherServlet(WebApplicationContext webApplicationContext) { super(webApplicationContext); - defaultStrategiesHelper = new DefaultStrategiesHelper(MessageDispatcherServlet.class); + this.defaultStrategiesHelper = new DefaultStrategiesHelper(MessageDispatcherServlet.class); } /** Returns the bean name used to lookup a {@link WebServiceMessageFactory}. */ public String getMessageFactoryBeanName() { - return messageFactoryBeanName; + return this.messageFactoryBeanName; } /** @@ -212,7 +212,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { /** Returns the bean name used to lookup a {@link WebServiceMessageReceiver}. */ public String getMessageReceiverBeanName() { - return messageReceiverBeanName; + return this.messageReceiverBeanName; } /** @@ -228,7 +228,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { * using the request URI of the incoming {@link HttpServletRequest}. */ public boolean isTransformWsdlLocations() { - return transformWsdlLocations; + return this.transformWsdlLocations; } /** @@ -244,7 +244,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { * the request URI of the incoming {@link HttpServletRequest}. */ public boolean isTransformSchemaLocations() { - return transformSchemaLocations; + return this.transformSchemaLocations; } /** @@ -260,7 +260,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { * {@link WebServiceMessageReceiverHandlerAdapter}. */ public String getMessageReceiverHandlerAdapterBeanName() { - return messageReceiverHandlerAdapterBeanName; + return this.messageReceiverHandlerAdapterBeanName; } /** @@ -274,7 +274,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { /** Returns the bean name used to lookup a {@link WsdlDefinitionHandlerAdapter}. */ public String getWsdlDefinitionHandlerAdapterBeanName() { - return wsdlDefinitionHandlerAdapterBeanName; + return this.wsdlDefinitionHandlerAdapterBeanName; } /** @@ -287,7 +287,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { /** Returns the bean name used to lookup a {@link XsdSchemaHandlerAdapter}. */ public String getXsdSchemaHandlerAdapterBeanName() { - return xsdSchemaHandlerAdapterBeanName; + return this.xsdSchemaHandlerAdapterBeanName; } /** @@ -303,15 +303,15 @@ public class MessageDispatcherServlet extends FrameworkServlet { throws Exception { WsdlDefinition definition = getWsdlDefinition(httpServletRequest); if (definition != null) { - wsdlDefinitionHandlerAdapter.handle(httpServletRequest, httpServletResponse, definition); + this.wsdlDefinitionHandlerAdapter.handle(httpServletRequest, httpServletResponse, definition); return; } XsdSchema schema = getXsdSchema(httpServletRequest); if (schema != null) { - xsdSchemaHandlerAdapter.handle(httpServletRequest, httpServletResponse, schema); + this.xsdSchemaHandlerAdapter.handle(httpServletRequest, httpServletResponse, schema); return; } - messageReceiverHandlerAdapter.handle(httpServletRequest, httpServletResponse, messageReceiver); + this.messageReceiverHandlerAdapter.handle(httpServletRequest, httpServletResponse, this.messageReceiver); } /** @@ -327,18 +327,18 @@ public class MessageDispatcherServlet extends FrameworkServlet { protected long getLastModified(HttpServletRequest httpServletRequest) { WsdlDefinition definition = getWsdlDefinition(httpServletRequest); if (definition != null) { - return wsdlDefinitionHandlerAdapter.getLastModified(httpServletRequest, definition); + return this.wsdlDefinitionHandlerAdapter.getLastModified(httpServletRequest, definition); } XsdSchema schema = getXsdSchema(httpServletRequest); if (schema != null) { - return xsdSchemaHandlerAdapter.getLastModified(httpServletRequest, schema); + return this.xsdSchemaHandlerAdapter.getLastModified(httpServletRequest, schema); } - return messageReceiverHandlerAdapter.getLastModified(httpServletRequest, messageReceiver); + return this.messageReceiverHandlerAdapter.getLastModified(httpServletRequest, this.messageReceiver); } /** Returns the {@link WebServiceMessageReceiver} used by this servlet. */ protected WebServiceMessageReceiver getMessageReceiver() { - return messageReceiver; + return this.messageReceiver; } /** @@ -355,7 +355,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { if (HttpTransportConstants.METHOD_GET.equals(request.getMethod()) && request.getRequestURI().endsWith(WSDL_SUFFIX_NAME)) { String fileName = WebUtils.extractFilenameFromUrlPath(request.getRequestURI()); - return wsdlDefinitions.get(fileName); + return this.wsdlDefinitions.get(fileName); } else { return null; @@ -376,7 +376,7 @@ public class MessageDispatcherServlet extends FrameworkServlet { if (HttpTransportConstants.METHOD_GET.equals(request.getMethod()) && request.getRequestURI().endsWith(XSD_SUFFIX_NAME)) { String fileName = WebUtils.extractFilenameFromUrlPath(request.getRequestURI()); - return xsdSchemas.get(fileName); + return this.xsdSchemas.get(fileName); } else { return null; @@ -400,14 +400,14 @@ public class MessageDispatcherServlet extends FrameworkServlet { private void initMessageReceiverHandlerAdapter(ApplicationContext context) { try { try { - messageReceiverHandlerAdapter = context.getBean(getMessageReceiverHandlerAdapterBeanName(), + this.messageReceiverHandlerAdapter = context.getBean(getMessageReceiverHandlerAdapterBeanName(), WebServiceMessageReceiverHandlerAdapter.class); } catch (NoSuchBeanDefinitionException ignored) { - messageReceiverHandlerAdapter = new WebServiceMessageReceiverHandlerAdapter(); + this.messageReceiverHandlerAdapter = new WebServiceMessageReceiverHandlerAdapter(); } initWebServiceMessageFactory(context); - messageReceiverHandlerAdapter.afterPropertiesSet(); + this.messageReceiverHandlerAdapter.afterPropertiesSet(); } catch (Exception ex) { throw new BeanInitializationException("Could not initialize WebServiceMessageReceiverHandlerAdapter", ex); @@ -420,27 +420,28 @@ public class MessageDispatcherServlet extends FrameworkServlet { messageFactory = context.getBean(getMessageFactoryBeanName(), WebServiceMessageFactory.class); } catch (NoSuchBeanDefinitionException ignored) { - messageFactory = defaultStrategiesHelper.getDefaultStrategy(WebServiceMessageFactory.class, context); - if (logger.isDebugEnabled()) { - logger.debug("No WebServiceMessageFactory found in servlet '" + getServletName() + "': using default"); + messageFactory = this.defaultStrategiesHelper.getDefaultStrategy(WebServiceMessageFactory.class, context); + if (this.logger.isDebugEnabled()) { + this.logger + .debug("No WebServiceMessageFactory found in servlet '" + getServletName() + "': using default"); } } - messageReceiverHandlerAdapter.setMessageFactory(messageFactory); + this.messageReceiverHandlerAdapter.setMessageFactory(messageFactory); } private void initWsdlDefinitionHandlerAdapter(ApplicationContext context) { try { try { - wsdlDefinitionHandlerAdapter = context.getBean(getWsdlDefinitionHandlerAdapterBeanName(), + this.wsdlDefinitionHandlerAdapter = context.getBean(getWsdlDefinitionHandlerAdapterBeanName(), WsdlDefinitionHandlerAdapter.class); } catch (NoSuchBeanDefinitionException ignored) { - wsdlDefinitionHandlerAdapter = new WsdlDefinitionHandlerAdapter(); + this.wsdlDefinitionHandlerAdapter = new WsdlDefinitionHandlerAdapter(); } - wsdlDefinitionHandlerAdapter.setTransformLocations(isTransformWsdlLocations()); - wsdlDefinitionHandlerAdapter.setTransformSchemaLocations(isTransformSchemaLocations()); - wsdlDefinitionHandlerAdapter.afterPropertiesSet(); + this.wsdlDefinitionHandlerAdapter.setTransformLocations(isTransformWsdlLocations()); + this.wsdlDefinitionHandlerAdapter.setTransformSchemaLocations(isTransformSchemaLocations()); + this.wsdlDefinitionHandlerAdapter.afterPropertiesSet(); } catch (Exception ex) { throw new BeanInitializationException("Could not initialize WsdlDefinitionHandlerAdapter", ex); @@ -450,15 +451,15 @@ public class MessageDispatcherServlet extends FrameworkServlet { private void initXsdSchemaHandlerAdapter(ApplicationContext context) { try { try { - xsdSchemaHandlerAdapter = context.getBean(getXsdSchemaHandlerAdapterBeanName(), + this.xsdSchemaHandlerAdapter = context.getBean(getXsdSchemaHandlerAdapterBeanName(), XsdSchemaHandlerAdapter.class); } catch (NoSuchBeanDefinitionException ignored) { - xsdSchemaHandlerAdapter = new XsdSchemaHandlerAdapter(); + this.xsdSchemaHandlerAdapter = new XsdSchemaHandlerAdapter(); } - xsdSchemaHandlerAdapter.setTransformSchemaLocations(isTransformSchemaLocations()); - xsdSchemaHandlerAdapter.afterPropertiesSet(); + this.xsdSchemaHandlerAdapter.setTransformSchemaLocations(isTransformSchemaLocations()); + this.xsdSchemaHandlerAdapter.afterPropertiesSet(); } catch (Exception ex) { throw new BeanInitializationException("Could not initialize XsdSchemaHandlerAdapter", ex); @@ -467,37 +468,39 @@ public class MessageDispatcherServlet extends FrameworkServlet { private void initMessageReceiver(ApplicationContext context) { try { - messageReceiver = context.getBean(getMessageReceiverBeanName(), WebServiceMessageReceiver.class); + this.messageReceiver = context.getBean(getMessageReceiverBeanName(), WebServiceMessageReceiver.class); } catch (NoSuchBeanDefinitionException ex) { - messageReceiver = defaultStrategiesHelper.getDefaultStrategy(WebServiceMessageReceiver.class, context); - if (messageReceiver instanceof BeanNameAware) { - ((BeanNameAware) messageReceiver).setBeanName(getServletName()); + this.messageReceiver = this.defaultStrategiesHelper.getDefaultStrategy(WebServiceMessageReceiver.class, + context); + if (this.messageReceiver instanceof BeanNameAware) { + ((BeanNameAware) this.messageReceiver).setBeanName(getServletName()); } - if (logger.isDebugEnabled()) { - logger.debug("No MessageDispatcher found in servlet '" + getServletName() + "': using default"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No MessageDispatcher found in servlet '" + getServletName() + "': using default"); } } } private void initWsdlDefinitions(ApplicationContext context) { - wsdlDefinitions = BeanFactoryUtils.beansOfTypeIncludingAncestors(context, WsdlDefinition.class, true, false); - if (logger.isDebugEnabled()) { - for (Map.Entry entry : wsdlDefinitions.entrySet()) { + this.wsdlDefinitions = BeanFactoryUtils.beansOfTypeIncludingAncestors(context, WsdlDefinition.class, true, + false); + if (this.logger.isDebugEnabled()) { + for (Map.Entry entry : this.wsdlDefinitions.entrySet()) { String beanName = entry.getKey(); WsdlDefinition definition = entry.getValue(); - logger.debug("Published [" + definition + "] as " + beanName + WSDL_SUFFIX_NAME); + this.logger.debug("Published [" + definition + "] as " + beanName + WSDL_SUFFIX_NAME); } } } private void initXsdSchemas(ApplicationContext context) { - xsdSchemas = BeanFactoryUtils.beansOfTypeIncludingAncestors(context, XsdSchema.class, true, false); - if (logger.isDebugEnabled()) { - for (Map.Entry entry : xsdSchemas.entrySet()) { + this.xsdSchemas = BeanFactoryUtils.beansOfTypeIncludingAncestors(context, XsdSchema.class, true, false); + if (this.logger.isDebugEnabled()) { + for (Map.Entry entry : this.xsdSchemas.entrySet()) { String beanName = entry.getKey(); XsdSchema schema = entry.getValue(); - logger.debug("Published [" + schema + "] as " + beanName + XSD_SUFFIX_NAME); + this.logger.debug("Published [" + schema + "] as " + beanName + XSD_SUFFIX_NAME); } } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java index 256db539..8ff977f9 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java @@ -155,14 +155,14 @@ public class WsdlDefinitionHandlerAdapter extends LocationTransformerObjectSuppo Transformer transformer = createTransformer(); Source definitionSource = definition.getSource(); - if (transformLocations || transformSchemaLocations) { + if (this.transformLocations || this.transformSchemaLocations) { DOMResult domResult = new DOMResult(); transformer.transform(definitionSource, domResult); Document definitionDocument = (Document) domResult.getNode(); - if (transformLocations) { + if (this.transformLocations) { transformLocations(definitionDocument, request); } - if (transformSchemaLocations) { + if (this.transformSchemaLocations) { transformSchemaLocations(definitionDocument, request); } definitionSource = new DOMSource(definitionDocument); @@ -185,10 +185,10 @@ public class WsdlDefinitionHandlerAdapter extends LocationTransformerObjectSuppo @Override public void afterPropertiesSet() throws Exception { - locationXPathExpression = XPathExpressionFactory.createXPathExpression(locationExpression, - expressionNamespaces); - schemaLocationXPathExpression = XPathExpressionFactory.createXPathExpression(schemaLocationExpression, - expressionNamespaces); + this.locationXPathExpression = XPathExpressionFactory.createXPathExpression(this.locationExpression, + this.expressionNamespaces); + this.schemaLocationXPathExpression = XPathExpressionFactory.createXPathExpression(this.schemaLocationExpression, + this.expressionNamespaces); } /** @@ -203,7 +203,7 @@ public class WsdlDefinitionHandlerAdapter extends LocationTransformerObjectSuppo * @see #transformLocation(String,jakarta.servlet.http.HttpServletRequest) */ protected void transformLocations(Document definitionDocument, HttpServletRequest request) throws Exception { - transformLocations(locationXPathExpression, definitionDocument, request); + transformLocations(this.locationXPathExpression, definitionDocument, request); } /** @@ -219,7 +219,7 @@ public class WsdlDefinitionHandlerAdapter extends LocationTransformerObjectSuppo * @see #transformLocation(String,jakarta.servlet.http.HttpServletRequest) */ protected void transformSchemaLocations(Document definitionDocument, HttpServletRequest request) throws Exception { - transformLocations(schemaLocationXPathExpression, definitionDocument, request); + transformLocations(this.schemaLocationXPathExpression, definitionDocument, request); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java index 6387d6d8..dcae2dea 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java @@ -101,7 +101,7 @@ public class XsdSchemaHandlerAdapter extends LocationTransformerObjectSupport Transformer transformer = createTransformer(); Source schemaSource = getSchemaSource((XsdSchema) handler); - if (transformSchemaLocations) { + if (this.transformSchemaLocations) { DOMResult domResult = new DOMResult(); transformer.transform(schemaSource, domResult); Document schemaDocument = (Document) domResult.getNode(); @@ -126,8 +126,8 @@ public class XsdSchemaHandlerAdapter extends LocationTransformerObjectSupport @Override public void afterPropertiesSet() throws Exception { - schemaLocationXPathExpression = XPathExpressionFactory.createXPathExpression(schemaLocationExpression, - expressionNamespaces); + this.schemaLocationXPathExpression = XPathExpressionFactory.createXPathExpression(this.schemaLocationExpression, + this.expressionNamespaces); } /** @@ -155,7 +155,7 @@ public class XsdSchemaHandlerAdapter extends LocationTransformerObjectSupport * @see #transformLocation(String, jakarta.servlet.http.HttpServletRequest) */ protected void transformSchemaLocations(Document definitionDocument, HttpServletRequest request) throws Exception { - transformLocations(schemaLocationXPathExpression, definitionDocument, request); + transformLocations(this.schemaLocationXPathExpression, definitionDocument, request); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java index 6bbe4b5c..f57d84eb 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java @@ -35,12 +35,12 @@ public class EnumerationIterator implements Iterator { @Override public boolean hasNext() { - return enumeration.hasMoreElements(); + return this.enumeration.hasMoreElements(); } @Override public T next() { - return enumeration.nextElement(); + return this.enumeration.nextElement(); } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java index 99146b4a..41327b53 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java @@ -55,7 +55,7 @@ public abstract class WebServiceMessageReceiverObjectSupport implements Initiali /** Returns the {@code WebServiceMessageFactory}. */ public WebServiceMessageFactory getMessageFactory() { - return messageFactory; + return this.messageFactory; } /** Sets the {@code WebServiceMessageFactory}. */ @@ -65,7 +65,7 @@ public abstract class WebServiceMessageReceiverObjectSupport implements Initiali @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(messageFactory, "messageFactory is required"); + Assert.notNull(this.messageFactory, "messageFactory is required"); } /** @@ -127,9 +127,9 @@ public abstract class WebServiceMessageReceiverObjectSupport implements Initiali } private void logUri(WebServiceConnection connection) { - if (logger.isDebugEnabled()) { + if (this.logger.isDebugEnabled()) { try { - logger.debug("Accepting incoming [" + connection + "] at [" + connection.getUri() + "]"); + this.logger.debug("Accepting incoming [" + connection + "] at [" + connection.getUri() + "]"); } catch (URISyntaxException e) { // ignore diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java index 4b3a1271..d711c2a0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java @@ -67,11 +67,11 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe /** Creates a new instance of the {@link DefaultWsdl11Definition}. */ public DefaultWsdl11Definition() { - delegate.setTypesProvider(typesProvider); - delegate.setMessagesProvider(messagesProvider); - delegate.setPortTypesProvider(portTypesProvider); - delegate.setBindingsProvider(soapProvider); - delegate.setServicesProvider(soapProvider); + this.delegate.setTypesProvider(this.typesProvider); + this.delegate.setMessagesProvider(this.messagesProvider); + this.delegate.setPortTypesProvider(this.portTypesProvider); + this.delegate.setBindingsProvider(this.soapProvider); + this.delegate.setServicesProvider(this.soapProvider); } /** @@ -80,7 +80,7 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe * Defaults to the target namespace of the defined schema. */ public void setTargetNamespace(String targetNamespace) { - delegate.setTargetNamespace(targetNamespace); + this.delegate.setTargetNamespace(targetNamespace); } /** @@ -88,7 +88,7 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe * {@link #setSchemaCollection(XsdSchemaCollection) schemaCollection} must be set. */ public void setSchema(XsdSchema schema) { - typesProvider.setSchema(schema); + this.typesProvider.setSchema(schema); } /** @@ -96,30 +96,30 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe * {@link #setSchema(XsdSchema) schema} must be set. */ public void setSchemaCollection(XsdSchemaCollection schemaCollection) { - typesProvider.setSchemaCollection(schemaCollection); + this.typesProvider.setSchemaCollection(schemaCollection); } /** Sets the port type name used for this definition. Required. */ public void setPortTypeName(String portTypeName) { - portTypesProvider.setPortTypeName(portTypeName); + this.portTypesProvider.setPortTypeName(portTypeName); } /** Sets the suffix used to detect request elements in the schema. */ public void setRequestSuffix(String requestSuffix) { - portTypesProvider.setRequestSuffix(requestSuffix); - messagesProvider.setRequestSuffix(requestSuffix); + this.portTypesProvider.setRequestSuffix(requestSuffix); + this.messagesProvider.setRequestSuffix(requestSuffix); } /** Sets the suffix used to detect response elements in the schema. */ public void setResponseSuffix(String responseSuffix) { - portTypesProvider.setResponseSuffix(responseSuffix); - messagesProvider.setResponseSuffix(responseSuffix); + this.portTypesProvider.setResponseSuffix(responseSuffix); + this.messagesProvider.setResponseSuffix(responseSuffix); } /** Sets the suffix used to detect fault elements in the schema. */ public void setFaultSuffix(String faultSuffix) { - portTypesProvider.setFaultSuffix(faultSuffix); - messagesProvider.setFaultSuffix(faultSuffix); + this.portTypesProvider.setFaultSuffix(faultSuffix); + this.messagesProvider.setFaultSuffix(faultSuffix); } /** @@ -128,7 +128,7 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe * Defaults to {@code true}. */ public void setCreateSoap11Binding(boolean createSoap11Binding) { - soapProvider.setCreateSoap11Binding(createSoap11Binding); + this.soapProvider.setCreateSoap11Binding(createSoap11Binding); } /** @@ -137,7 +137,7 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe * Defaults to {@code false}. */ public void setCreateSoap12Binding(boolean createSoap12Binding) { - soapProvider.setCreateSoap12Binding(createSoap12Binding); + this.soapProvider.setCreateSoap12Binding(createSoap12Binding); } /** @@ -148,19 +148,19 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe * @param soapActions the soap */ public void setSoapActions(Properties soapActions) { - soapProvider.setSoapActions(soapActions); + this.soapProvider.setSoapActions(soapActions); } /** * Sets the value used for the binding transport attribute value. Defaults to HTTP. */ public void setTransportUri(String transportUri) { - soapProvider.setTransportUri(transportUri); + this.soapProvider.setTransportUri(transportUri); } /** Sets the value used for the SOAP Address location attribute value. */ public void setLocationUri(String locationUri) { - soapProvider.setLocationUri(locationUri); + this.soapProvider.setLocationUri(locationUri); } /** @@ -169,26 +169,26 @@ public class DefaultWsdl11Definition implements Wsdl11Definition, InitializingBe * Defaults to the port type name, with the suffix {@code Service} appended to it. */ public void setServiceName(String serviceName) { - soapProvider.setServiceName(serviceName); + this.soapProvider.setServiceName(serviceName); this.serviceName = serviceName; } @Override public void afterPropertiesSet() throws Exception { - if (!StringUtils.hasText(delegate.getTargetNamespace()) && typesProvider.getSchemaCollection() != null - && typesProvider.getSchemaCollection().getXsdSchemas().length > 0) { - XsdSchema schema = typesProvider.getSchemaCollection().getXsdSchemas()[0]; + if (!StringUtils.hasText(this.delegate.getTargetNamespace()) && this.typesProvider.getSchemaCollection() != null + && this.typesProvider.getSchemaCollection().getXsdSchemas().length > 0) { + XsdSchema schema = this.typesProvider.getSchemaCollection().getXsdSchemas()[0]; setTargetNamespace(schema.getTargetNamespace()); } - if (!StringUtils.hasText(serviceName) && StringUtils.hasText(portTypesProvider.getPortTypeName())) { - soapProvider.setServiceName(portTypesProvider.getPortTypeName() + "Service"); + if (!StringUtils.hasText(this.serviceName) && StringUtils.hasText(this.portTypesProvider.getPortTypeName())) { + this.soapProvider.setServiceName(this.portTypesProvider.getPortTypeName() + "Service"); } - delegate.afterPropertiesSet(); + this.delegate.afterPropertiesSet(); } @Override public Source getSource() { - return delegate.getSource(); + return this.delegate.getSource(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java index 9c79d21f..5d9a8c0d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java @@ -83,7 +83,7 @@ public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements I * @return the import provider; or {@code null} */ public ImportsProvider getImportsProvider() { - return importsProvider; + return this.importsProvider; } /** @@ -103,7 +103,7 @@ public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements I * @return the types provider; or {@code null} */ public TypesProvider getTypesProvider() { - return typesProvider; + return this.typesProvider; } /** @@ -124,7 +124,7 @@ public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements I * @return the messages provider; or {@code null} */ public MessagesProvider getMessagesProvider() { - return messagesProvider; + return this.messagesProvider; } /** @@ -146,7 +146,7 @@ public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements I * @return the port types provider; or {@code null} */ public PortTypesProvider getPortTypesProvider() { - return portTypesProvider; + return this.portTypesProvider; } /** @@ -168,7 +168,7 @@ public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements I * @return the binding provider; or {@code null} */ public BindingsProvider getBindingsProvider() { - return bindingsProvider; + return this.bindingsProvider; } /** @@ -190,7 +190,7 @@ public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements I * @return the services provider; or {@code null} */ public ServicesProvider getServicesProvider() { - return servicesProvider; + return this.servicesProvider; } /** @@ -210,7 +210,7 @@ public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements I * @see javax.wsdl.Definition#getTargetNamespace() */ public String getTargetNamespace() { - return targetNamespace; + return this.targetNamespace; } /** @@ -229,23 +229,23 @@ public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements I Definition definition = wsdlFactory.newDefinition(); definition.setTargetNamespace(getTargetNamespace()); definition.addNamespace(TARGET_NAMESPACE_PREFIX, getTargetNamespace()); - if (importsProvider != null) { - importsProvider.addImports(definition); + if (this.importsProvider != null) { + this.importsProvider.addImports(definition); } - if (typesProvider != null) { - typesProvider.addTypes(definition); + if (this.typesProvider != null) { + this.typesProvider.addTypes(definition); } - if (messagesProvider != null) { - messagesProvider.addMessages(definition); + if (this.messagesProvider != null) { + this.messagesProvider.addMessages(definition); } - if (portTypesProvider != null) { - portTypesProvider.addPortTypes(definition); + if (this.portTypesProvider != null) { + this.portTypesProvider.addPortTypes(definition); } - if (bindingsProvider != null) { - bindingsProvider.addBindings(definition); + if (this.bindingsProvider != null) { + this.bindingsProvider.addBindings(definition); } - if (servicesProvider != null) { - servicesProvider.addServices(definition); + if (this.servicesProvider != null) { + this.servicesProvider.addServices(definition); } setDefinition(definition); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java index b0e0dfc1..fe34d912 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11Definition.java @@ -77,7 +77,7 @@ public class SimpleWsdl11Definition implements Wsdl11Definition, InitializingBea parserFactory.setNamespaceAware(true); XMLReader xmlReader = parserFactory.newSAXParser().getXMLReader(); xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); - return new ResourceSource(xmlReader, wsdlResource); + return new ResourceSource(xmlReader, this.wsdlResource); } catch (SAXException | ParserConfigurationException ex) { throw new WsdlDefinitionException("Could not create XMLReader", ex); @@ -97,7 +97,7 @@ public class SimpleWsdl11Definition implements Wsdl11Definition, InitializingBea } public String toString() { - return "SimpleWsdl11Definition " + wsdlResource; + return "SimpleWsdl11Definition " + this.wsdlResource; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java index 453df942..9b7a3f23 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java @@ -64,26 +64,26 @@ public class Wsdl4jDefinition implements Wsdl11Definition { /** Returns the WSDL4J {@code Definition}. */ public Definition getDefinition() { - synchronized (monitor) { - return definition; + synchronized (this.monitor) { + return this.definition; } } /** Set the WSDL4J {@code Definition}. */ public void setDefinition(Definition definition) { - synchronized (monitor) { + synchronized (this.monitor) { this.definition = definition; } } @Override public Source getSource() { - synchronized (monitor) { - Assert.notNull(definition, "definition must not be null"); + synchronized (this.monitor) { + Assert.notNull(this.definition, "definition must not be null"); try { WSDLFactory wsdlFactory = WSDLFactory.newInstance(); WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter(); - Document document = wsdlWriter.getDocument(definition); + Document document = wsdlWriter.getDocument(this.definition); return new DOMSource(document); } catch (WSDLException ex) { @@ -94,9 +94,9 @@ public class Wsdl4jDefinition implements Wsdl11Definition { public String toString() { StringBuilder builder = new StringBuilder("Wsdl4jDefinition"); - if (definition != null && StringUtils.hasLength(definition.getTargetNamespace())) { + if (this.definition != null && StringUtils.hasLength(this.definition.getTargetNamespace())) { builder.append('{'); - builder.append(definition.getTargetNamespace()); + builder.append(this.definition.getTargetNamespace()); builder.append('}'); } return builder.toString(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java index 39e4ecf4..38a2758c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/AbstractPortTypesProvider.java @@ -52,7 +52,7 @@ public abstract class AbstractPortTypesProvider implements PortTypesProvider { /** Returns the port type name used for this definition. */ public String getPortTypeName() { - return portTypeName; + return this.portTypeName; } /** Sets the port type name used for this definition. Required. */ @@ -89,8 +89,8 @@ public abstract class AbstractPortTypesProvider implements PortTypesProvider { protected void populatePortType(Definition definition, PortType portType) throws WSDLException { QName portTypeName = new QName(definition.getTargetNamespace(), getPortTypeName()); - if (logger.isDebugEnabled()) { - logger.debug("Creating port type [" + portTypeName + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Creating port type [" + portTypeName + "]"); } portType.setQName(portTypeName); } @@ -107,8 +107,8 @@ public abstract class AbstractPortTypesProvider implements PortTypesProvider { } } - if (operations.isEmpty() && logger.isWarnEnabled()) { - logger.warn("No operations were created, make sure the WSDL contains messages"); + if (operations.isEmpty() && this.logger.isWarnEnabled()) { + this.logger.warn("No operations were created, make sure the WSDL contains messages"); } for (String operationName : operations.keySet()) { @@ -138,8 +138,8 @@ public abstract class AbstractPortTypesProvider implements PortTypesProvider { } operation.setStyle(getOperationType(operation)); operation.setUndefined(false); - if (logger.isDebugEnabled()) { - logger + if (this.logger.isDebugEnabled()) { + this.logger .debug("Adding operation [" + operation.getName() + "] to port type [" + portType.getQName() + "]"); } portType.addOperation(operation); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java index 08a14ea4..82f90585 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultConcretePartProvider.java @@ -61,7 +61,7 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr /** Returns the service name. */ public String getServiceName() { - return serviceName; + return this.serviceName; } /** Sets the service name. */ @@ -73,7 +73,7 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr /** Returns the suffix to append to the port type name to obtain the binding name. */ public String getBindingSuffix() { - return bindingSuffix; + return this.bindingSuffix; } /** Sets the suffix to append to the port type name to obtain the binding name. */ @@ -115,8 +115,8 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr } } - if (definition.getBindings().isEmpty() && logger.isWarnEnabled()) { - logger.warn("No bindings were created, make sure the WSDL contains port types"); + if (definition.getBindings().isEmpty() && this.logger.isWarnEnabled()) { + this.logger.warn("No bindings were created, make sure the WSDL contains port types"); } } @@ -138,8 +138,8 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr QName bindingName = new QName(portTypeName.getNamespaceURI(), portTypeName.getLocalPart() + getBindingSuffix()); - if (logger.isDebugEnabled()) { - logger.debug("Creating binding [" + bindingName + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Creating binding [" + bindingName + "]"); } binding.setQName(bindingName); } @@ -304,8 +304,8 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr if (StringUtils.hasText(definition.getTargetNamespace()) && StringUtils.hasText(getServiceName())) { QName serviceName = new QName(definition.getTargetNamespace(), getServiceName()); - if (logger.isDebugEnabled()) { - logger.debug("Creating service [" + serviceName + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Creating service [" + serviceName + "]"); } service.setQName(serviceName); } @@ -328,15 +328,15 @@ public class DefaultConcretePartProvider implements BindingsProvider, ServicesPr } populatePort(definition, port); if (StringUtils.hasText(port.getName())) { - if (logger.isDebugEnabled()) { - logger.debug("Adding port [" + port.getName() + "] to service [" + service.getQName() + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Adding port [" + port.getName() + "] to service [" + service.getQName() + "]"); } service.addPort(port); } } - if (service.getPorts().isEmpty() && logger.isWarnEnabled()) { - logger.warn("No ports were created, make sure the WSDL contains bindings"); + if (service.getPorts().isEmpty() && this.logger.isWarnEnabled()) { + this.logger.warn("No ports were created, make sure the WSDL contains bindings"); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java index 1115d777..2ea73ff9 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java @@ -71,7 +71,7 @@ public class InliningXsdSchemaTypesProvider extends TransformerObjectSupport imp /** Returns the XSD schema collection to inline. */ public XsdSchemaCollection getSchemaCollection() { - return schemaCollection; + return this.schemaCollection; } /** @@ -86,7 +86,7 @@ public class InliningXsdSchemaTypesProvider extends TransformerObjectSupport imp public void addTypes(Definition definition) throws WSDLException { Assert.notNull(getSchemaCollection(), "setting 'schema' or 'schemaCollection' is required"); Types types = definition.createTypes(); - XsdSchema[] schemas = schemaCollection.getXsdSchemas(); + XsdSchema[] schemas = this.schemaCollection.getXsdSchemas(); for (int i = 0; i < schemas.length; i++) { if (logger.isDebugEnabled()) { logger.debug("Inlining " + schemas[i]); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java index d18b586b..4452d529 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11Provider.java @@ -86,7 +86,7 @@ public class Soap11Provider extends DefaultConcretePartProvider { * @return the soap actions */ public Properties getSoapActions() { - return soapActions; + return this.soapActions; } /** @@ -108,7 +108,7 @@ public class Soap11Provider extends DefaultConcretePartProvider { * @return the binding transport value */ public String getTransportUri() { - return transportUri; + return this.transportUri; } /** @@ -124,7 +124,7 @@ public class Soap11Provider extends DefaultConcretePartProvider { /** Returns the value used for the SOAP Address location attribute value. */ public String getLocationUri() { - return locationUri; + return this.locationUri; } /** Sets the value used for the SOAP Address location attribute value. */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java index 9b57ed5a..113d5857 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12Provider.java @@ -85,7 +85,7 @@ public class Soap12Provider extends DefaultConcretePartProvider { * @return the soap actions */ public Properties getSoapActions() { - return soapActions; + return this.soapActions; } /** @@ -107,7 +107,7 @@ public class Soap12Provider extends DefaultConcretePartProvider { * @return the binding transport value */ public String getTransportUri() { - return transportUri; + return this.transportUri; } /** @@ -123,7 +123,7 @@ public class Soap12Provider extends DefaultConcretePartProvider { /** Returns the value used for the SOAP Address location attribute value. */ public String getLocationUri() { - return locationUri; + return this.locationUri; } /** Sets the value used for the SOAP Address location attribute value. */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java index c8c81d96..0fdb65c1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProvider.java @@ -75,47 +75,47 @@ public class SoapProvider implements BindingsProvider, ServicesProvider { * @param soapActions the soap */ public void setSoapActions(Properties soapActions) { - soap11BindingProvider.setSoapActions(soapActions); - soap12BindingProvider.setSoapActions(soapActions); + this.soap11BindingProvider.setSoapActions(soapActions); + this.soap12BindingProvider.setSoapActions(soapActions); } /** * Sets the value used for the binding transport attribute value. Defaults to HTTP. */ public void setTransportUri(String transportUri) { - soap11BindingProvider.setTransportUri(transportUri); - soap12BindingProvider.setTransportUri(transportUri); + this.soap11BindingProvider.setTransportUri(transportUri); + this.soap12BindingProvider.setTransportUri(transportUri); } /** Sets the value used for the SOAP Address location attribute value. */ public void setLocationUri(String locationUri) { - soap11BindingProvider.setLocationUri(locationUri); - soap12BindingProvider.setLocationUri(locationUri); + this.soap11BindingProvider.setLocationUri(locationUri); + this.soap12BindingProvider.setLocationUri(locationUri); } /** Sets the service name. */ public void setServiceName(String serviceName) { - soap11BindingProvider.setServiceName(serviceName); - soap12BindingProvider.setServiceName(serviceName); + this.soap11BindingProvider.setServiceName(serviceName); + this.soap12BindingProvider.setServiceName(serviceName); } @Override public void addBindings(Definition definition) throws WSDLException { - if (createSoap11Binding) { - soap11BindingProvider.addBindings(definition); + if (this.createSoap11Binding) { + this.soap11BindingProvider.addBindings(definition); } - if (createSoap12Binding) { - soap12BindingProvider.addBindings(definition); + if (this.createSoap12Binding) { + this.soap12BindingProvider.addBindings(definition); } } @Override public void addServices(Definition definition) throws WSDLException { - if (createSoap11Binding) { - soap11BindingProvider.addServices(definition); + if (this.createSoap11Binding) { + this.soap11BindingProvider.addServices(definition); } - if (createSoap12Binding) { - soap12BindingProvider.addServices(definition); + if (this.createSoap12Binding) { + this.soap12BindingProvider.addServices(definition); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java index 151c540f..fd338a89 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProvider.java @@ -48,7 +48,7 @@ public class SuffixBasedMessagesProvider extends DefaultMessagesProvider { * @see #DEFAULT_REQUEST_SUFFIX */ public String getRequestSuffix() { - return requestSuffix; + return this.requestSuffix; } /** @@ -65,7 +65,7 @@ public class SuffixBasedMessagesProvider extends DefaultMessagesProvider { * @see #DEFAULT_RESPONSE_SUFFIX */ public String getResponseSuffix() { - return responseSuffix; + return this.responseSuffix; } /** @@ -82,7 +82,7 @@ public class SuffixBasedMessagesProvider extends DefaultMessagesProvider { * @see #DEFAULT_FAULT_SUFFIX */ public String getFaultSuffix() { - return faultSuffix; + return this.faultSuffix; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java index bdff0c25..8d71b88f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProvider.java @@ -48,7 +48,7 @@ public class SuffixBasedPortTypesProvider extends AbstractPortTypesProvider { * @see #DEFAULT_REQUEST_SUFFIX */ public String getRequestSuffix() { - return requestSuffix; + return this.requestSuffix; } /** @@ -65,7 +65,7 @@ public class SuffixBasedPortTypesProvider extends AbstractPortTypesProvider { * @see #DEFAULT_RESPONSE_SUFFIX */ public String getResponseSuffix() { - return responseSuffix; + return this.responseSuffix; } /** @@ -82,7 +82,7 @@ public class SuffixBasedPortTypesProvider extends AbstractPortTypesProvider { * @see #DEFAULT_FAULT_SUFFIX */ public String getFaultSuffix() { - return faultSuffix; + return this.faultSuffix; } /** diff --git a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTest.java index bd65fa15..6991de08 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTest.java @@ -27,13 +27,13 @@ public abstract class AbstractWebServiceMessageFactoryTest { @BeforeEach public final void setUp() throws Exception { - messageFactory = createMessageFactory(); + this.messageFactory = createMessageFactory(); } @Test public void testCreateEmptyMessage() { - WebServiceMessage message = messageFactory.createWebServiceMessage(); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(); assertThat(message).isNotNull(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java index 3e5508b7..90038819 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java @@ -73,7 +73,8 @@ public abstract class AbstractWebServiceMessageTest { private String getExpectedString() throws IOException { StringWriter expectedWriter = new StringWriter(); - FileCopyUtils.copy(new InputStreamReader(payload.getInputStream(), StandardCharsets.UTF_8), expectedWriter); + FileCopyUtils.copy(new InputStreamReader(this.payload.getInputStream(), StandardCharsets.UTF_8), + expectedWriter); return expectedWriter.toString(); } @@ -81,9 +82,9 @@ public abstract class AbstractWebServiceMessageTest { public final void setUp() throws Exception { TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); - transformer = transformerFactory.newTransformer(); - webServiceMessage = createWebServiceMessage(); - payload = new ClassPathResource("payload.xml", AbstractWebServiceMessageTest.class); + this.transformer = transformerFactory.newTransformer(); + this.webServiceMessage = createWebServiceMessage(); + this.payload = new ClassPathResource("payload.xml", AbstractWebServiceMessageTest.class); } @Test @@ -92,12 +93,12 @@ public abstract class AbstractWebServiceMessageTest { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); - Document payloadDocument = documentBuilder.parse(SaxUtils.createInputSource(payload)); + Document payloadDocument = documentBuilder.parse(SaxUtils.createInputSource(this.payload)); DOMSource domSource = new DOMSource(payloadDocument); - transformer.transform(domSource, webServiceMessage.getPayloadResult()); + this.transformer.transform(domSource, this.webServiceMessage.getPayloadResult()); Document resultDocument = documentBuilder.newDocument(); DOMResult domResult = new DOMResult(resultDocument); - transformer.transform(webServiceMessage.getPayloadSource(), domResult); + this.transformer.transform(this.webServiceMessage.getPayloadSource(), domResult); assertThat(resultDocument).and(payloadDocument).ignoreWhitespace().areIdentical(); @@ -108,14 +109,14 @@ public abstract class AbstractWebServiceMessageTest { public void testEventReaderPayload() throws Exception { XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); - XMLEventReader eventReader = inputFactory.createXMLEventReader(payload.getInputStream()); + XMLEventReader eventReader = inputFactory.createXMLEventReader(this.payload.getInputStream()); Source staxSource = StaxUtils.createCustomStaxSource(eventReader); - transformer.transform(staxSource, webServiceMessage.getPayloadResult()); + this.transformer.transform(staxSource, this.webServiceMessage.getPayloadResult()); StringWriter stringWriter = new StringWriter(); XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(stringWriter); Result staxResult = StaxUtils.createCustomStaxResult(eventWriter); - transformer.transform(webServiceMessage.getPayloadSource(), staxResult); + this.transformer.transform(this.webServiceMessage.getPayloadSource(), staxResult); eventWriter.flush(); assertThat(stringWriter.toString()).and(getExpectedString()).ignoreWhitespace().areIdentical(); @@ -126,12 +127,12 @@ public abstract class AbstractWebServiceMessageTest { @Test public void testReaderPayload() throws Exception { - Reader reader = new InputStreamReader(payload.getInputStream(), StandardCharsets.UTF_8); - StreamSource streamSource = new StreamSource(reader, payload.getURL().toString()); - transformer.transform(streamSource, webServiceMessage.getPayloadResult()); + Reader reader = new InputStreamReader(this.payload.getInputStream(), StandardCharsets.UTF_8); + StreamSource streamSource = new StreamSource(reader, this.payload.getURL().toString()); + this.transformer.transform(streamSource, this.webServiceMessage.getPayloadResult()); StringWriter resultWriter = new StringWriter(); StreamResult streamResult = new StreamResult(resultWriter); - transformer.transform(webServiceMessage.getPayloadSource(), streamResult); + this.transformer.transform(this.webServiceMessage.getPayloadSource(), streamResult); assertThat(resultWriter.toString()).and(getExpectedString()).ignoreWhitespace().areIdentical(); } @@ -139,10 +140,10 @@ public abstract class AbstractWebServiceMessageTest { @Test public void testSaxPayload() throws Exception { - SAXSource saxSource = new SAXSource(SaxUtils.createInputSource(payload)); - transformer.transform(saxSource, webServiceMessage.getPayloadResult()); + SAXSource saxSource = new SAXSource(SaxUtils.createInputSource(this.payload)); + this.transformer.transform(saxSource, this.webServiceMessage.getPayloadResult()); StringResult stringResult = new StringResult(); - transformer.transform(webServiceMessage.getPayloadSource(), stringResult); + this.transformer.transform(this.webServiceMessage.getPayloadSource(), stringResult); assertThat(stringResult.toString()).and(getExpectedString()).ignoreWhitespace().areIdentical(); @@ -152,13 +153,13 @@ public abstract class AbstractWebServiceMessageTest { @Test public void testStreamPayload() throws Exception { - StreamSource streamSource = new StreamSource(payload.getInputStream(), payload.getURL().toString()); - transformer.transform(streamSource, webServiceMessage.getPayloadResult()); + StreamSource streamSource = new StreamSource(this.payload.getInputStream(), this.payload.getURL().toString()); + this.transformer.transform(streamSource, this.webServiceMessage.getPayloadResult()); ByteArrayOutputStream resultStream = new ByteArrayOutputStream(); StreamResult streamResult = new StreamResult(resultStream); - transformer.transform(webServiceMessage.getPayloadSource(), streamResult); + this.transformer.transform(this.webServiceMessage.getPayloadSource(), streamResult); ByteArrayOutputStream expectedStream = new ByteArrayOutputStream(); - FileCopyUtils.copy(payload.getInputStream(), expectedStream); + FileCopyUtils.copy(this.payload.getInputStream(), expectedStream); assertThat(resultStream.toString(StandardCharsets.UTF_8)).and(expectedStream.toString(StandardCharsets.UTF_8)) .ignoreWhitespace() @@ -171,14 +172,14 @@ public abstract class AbstractWebServiceMessageTest { public void testStreamReaderPayload() throws Exception { XMLInputFactory inputFactory = XMLInputFactoryUtils.newInstance(); - XMLStreamReader streamReader = inputFactory.createXMLStreamReader(payload.getInputStream()); + XMLStreamReader streamReader = inputFactory.createXMLStreamReader(this.payload.getInputStream()); Source staxSource = StaxUtils.createCustomStaxSource(streamReader); - transformer.transform(staxSource, webServiceMessage.getPayloadResult()); + this.transformer.transform(staxSource, this.webServiceMessage.getPayloadResult()); StringWriter stringWriter = new StringWriter(); XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(stringWriter); Result staxResult = StaxUtils.createCustomStaxResult(streamWriter); - transformer.transform(webServiceMessage.getPayloadSource(), staxResult); + this.transformer.transform(this.webServiceMessage.getPayloadSource(), staxResult); streamWriter.flush(); assertThat(stringWriter.toString()).and(getExpectedString()).ignoreWhitespace().areIdentical(); @@ -192,7 +193,7 @@ public abstract class AbstractWebServiceMessageTest { XMLReader xmlReader = parserFactory.newSAXParser().getXMLReader(); xmlReader.setContentHandler(new DefaultHandler()); ByteArrayOutputStream os = new ByteArrayOutputStream(); - webServiceMessage.writeTo(os); + this.webServiceMessage.writeTo(os); ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray()); xmlReader.parse(new InputSource(is)); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java b/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java index 493b47da..7ef5a4df 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java @@ -64,7 +64,7 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); Transformer transformer = transformerFactory.newTransformer(); - content = new StringBuilder(); + this.content = new StringBuilder(); transformer.transform(source, getPayloadResult()); } @@ -84,7 +84,7 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { } public String getPayloadAsString() { - return content != null ? content.toString() : null; + return this.content != null ? this.content.toString() : null; } public void setPayload(InputStreamSource inputStreamSource) throws IOException { @@ -93,7 +93,7 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { try (InputStream is = inputStreamSource.getInputStream()) { Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8); - content.replace(0, content.length(), FileCopyUtils.copyToString(reader)); + this.content.replace(0, this.content.length(), FileCopyUtils.copyToString(reader)); } } @@ -105,8 +105,8 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { private void checkContent() { - if (content == null) { - content = new StringBuilder(); + if (this.content == null) { + this.content = new StringBuilder(); } } @@ -114,18 +114,18 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { public Result getPayloadResult() { checkContent(); - content.setLength(0); + this.content.setLength(0); return new StreamResult(new StringBufferWriter()); } @Override public Source getPayloadSource() { - return content != null ? new StringSource(content.toString()) : null; + return this.content != null ? new StringSource(this.content.toString()) : null; } @Override public boolean hasFault() { - return fault; + return this.fault; } public void setFault(boolean fault) { @@ -134,7 +134,7 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { @Override public QName getFaultCode() { - return faultCode; + return this.faultCode; } public void setFaultCode(QName faultCode) { @@ -143,7 +143,7 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { @Override public String getFaultReason() { - return faultReason; + return this.faultReason; } public void setFaultReason(String faultReason) { @@ -153,9 +153,9 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { @Override public void writeTo(OutputStream outputStream) { - if (content != null) { + if (this.content != null) { PrintWriter writer = new PrintWriter(outputStream); - writer.write(content.toString()); + writer.write(this.content.toString()); } } @@ -163,8 +163,8 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { StringBuilder builder = new StringBuilder("MockWebServiceMessage {"); - if (content != null) { - builder.append(content); + if (this.content != null) { + builder.append(this.content); } builder.append('}'); @@ -174,22 +174,22 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { private class StringBufferWriter extends Writer { private StringBufferWriter() { - super(content); + super(MockWebServiceMessage.this.content); } @Override public void write(String str) { - content.append(str); + MockWebServiceMessage.this.content.append(str); } @Override public void write(int c) { - content.append((char) c); + MockWebServiceMessage.this.content.append((char) c); } @Override public void write(String str, int off, int len) { - content.append(str, off, off + len); + MockWebServiceMessage.this.content.append(str, off, off + len); } @Override @@ -210,7 +210,7 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { return; } - content.append(cbuf, off, len); + MockWebServiceMessage.this.content.append(cbuf, off, len); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java index bba509c5..a9c89eb9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java @@ -126,8 +126,8 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { @BeforeEach public void createWebServiceTemplate() throws Exception { - template = new WebServiceTemplate(createMessageFactory()); - template.setMessageSender(new HttpComponentsMessageSender()); + this.template = new WebServiceTemplate(createMessageFactory()); + this.template.setMessageSender(new HttpComponentsMessageSender()); } public abstract SoapMessageFactory createMessageFactory() throws Exception; @@ -135,21 +135,21 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { @Test public void sendSourceAndReceiveToResult() { - logger.info(">>> Test case"); + this.logger.info(">>> Test case"); StringResult result = new StringResult(); - boolean b = template.sendSourceAndReceiveToResult(baseUrl + "/soap/echo", new StringSource(messagePayload), - result); + boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/echo", + new StringSource(this.messagePayload), result); assertThat(b).isTrue(); - XmlAssert.assertThat(result.toString()).and(messagePayload).ignoreWhitespace().areIdentical(); + XmlAssert.assertThat(result.toString()).and(this.messagePayload).ignoreWhitespace().areIdentical(); } @Test public void sendSourceAndReceiveToResultNoResponse() { - boolean b = template.sendSourceAndReceiveToResult(baseUrl + "/soap/noResponse", - new StringSource(messagePayload), new StringResult()); + boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/noResponse", + new StringSource(this.messagePayload), new StringResult()); assertThat(b).isFalse(); } @@ -167,7 +167,9 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { assertThat(requestObject).isEqualTo(graph); try { - transformer.transform(new StringSource(messagePayload), result); + transformer.transform( + new StringSource(AbstractSoap11WebServiceTemplateIntegrationTest.this.messagePayload), + result); } catch (TransformerException e) { throw new RuntimeException(e); @@ -199,9 +201,9 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { } }; - template.setMarshaller(marshaller); - template.setUnmarshaller(unmarshaller); - Object result = template.marshalSendAndReceive(baseUrl + "/soap/echo", requestObject); + this.template.setMarshaller(marshaller); + this.template.setUnmarshaller(unmarshaller); + Object result = this.template.marshalSendAndReceive(baseUrl + "/soap/echo", requestObject); assertThat(result).isEqualTo(responseObject); } @@ -219,7 +221,9 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { assertThat(requestObject).isEqualTo(graph); try { - transformer.transform(new StringSource(messagePayload), result); + transformer.transform( + new StringSource(AbstractSoap11WebServiceTemplateIntegrationTest.this.messagePayload), + result); } catch (TransformerException e) { throw new RuntimeException(e); @@ -234,8 +238,8 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { } }; - template.setMarshaller(marshaller); - Object result = template.marshalSendAndReceive(baseUrl + "/soap/noResponse", requestObject); + this.template.setMarshaller(marshaller); + Object result = this.template.marshalSendAndReceive(baseUrl + "/soap/noResponse", requestObject); assertThat(result).isNull(); } @@ -244,8 +248,8 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { public void notFound() { assertThatExceptionOfType(WebServiceTransportException.class) - .isThrownBy(() -> template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound", - new StringSource(messagePayload), new StringResult())); + .isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound", + new StringSource(this.messagePayload), new StringResult())); } @Test @@ -253,25 +257,26 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { Result result = new StringResult(); - assertThatExceptionOfType(SoapFaultClientException.class).isThrownBy(() -> template - .sendSourceAndReceiveToResult(baseUrl + "/soap/fault", new StringSource(messagePayload), result)); + assertThatExceptionOfType(SoapFaultClientException.class).isThrownBy(() -> this.template + .sendSourceAndReceiveToResult(baseUrl + "/soap/fault", new StringSource(this.messagePayload), result)); } @Test public void faultNonCompliant() { Result result = new StringResult(); - template.setCheckConnectionForFault(false); - template.setCheckConnectionForError(false); + this.template.setCheckConnectionForFault(false); + this.template.setCheckConnectionForError(false); - assertThatExceptionOfType(SoapFaultClientException.class).isThrownBy(() -> template - .sendSourceAndReceiveToResult(baseUrl + "/soap/badRequestFault", new StringSource(messagePayload), result)); + assertThatExceptionOfType(SoapFaultClientException.class) + .isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/badRequestFault", + new StringSource(this.messagePayload), result)); } @Test public void attachment() { - template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(messagePayload), + this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(this.messagePayload), message -> { SoapMessage soapMessage = (SoapMessage) message; @@ -293,7 +298,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { - resp.sendError(sc); + resp.sendError(this.sc); } } @@ -316,7 +321,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { super.init(servletConfig); try { - messageFactory = MessageFactory.newInstance(); + this.messageFactory = MessageFactory.newInstance(); } catch (SOAPException ex) { throw new ServletException("Unable to create message factory" + ex.getMessage()); @@ -328,18 +333,18 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { try { MimeHeaders headers = getHeaders(req); - SOAPMessage request = messageFactory.createMessage(headers, req.getInputStream()); + SOAPMessage request = this.messageFactory.createMessage(headers, req.getInputStream()); SOAPMessage reply = onMessage(request); - if (sc != -1) { - resp.setStatus(sc); + if (this.sc != -1) { + resp.setStatus(this.sc); } if (reply != null) { reply.saveChanges(); - if (sc == -1) { + if (this.sc == -1) { resp.setStatus(!reply.getSOAPBody().hasFault() ? HttpServletResponse.SC_OK : HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } @@ -347,7 +352,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { putHeaders(reply.getMimeHeaders(), resp); reply.writeTo(resp.getOutputStream()); } - else if (sc == -1) { + else if (this.sc == -1) { resp.setStatus(HttpServletResponse.SC_ACCEPTED); } } @@ -416,7 +421,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { @Override protected SOAPMessage onMessage(SOAPMessage message) throws SOAPException { - SOAPMessage response = messageFactory.createMessage(); + SOAPMessage response = this.messageFactory.createMessage(); SOAPBody body = response.getSOAPBody(); body.addFault(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Server"), "Server fault"); return response; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java index a6216737..c3171218 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java @@ -134,8 +134,8 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { @BeforeEach public void createWebServiceTemplate() throws Exception { - template = new WebServiceTemplate(createMessageFactory()); - template.setMessageSender(new HttpComponentsMessageSender()); + this.template = new WebServiceTemplate(createMessageFactory()); + this.template.setMessageSender(new HttpComponentsMessageSender()); } public abstract SoapMessageFactory createMessageFactory() throws Exception; @@ -144,18 +144,18 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { public void sendSourceAndReceiveToResult() { StringResult result = new StringResult(); - boolean b = template.sendSourceAndReceiveToResult(baseUrl + "/soap/echo", new StringSource(messagePayload), - result); + boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/echo", + new StringSource(this.messagePayload), result); assertThat(b).isTrue(); - XmlAssert.assertThat(result.toString()).and(messagePayload).ignoreWhitespace().areIdentical(); + XmlAssert.assertThat(result.toString()).and(this.messagePayload).ignoreWhitespace().areIdentical(); } @Test public void sendSourceAndReceiveToResultNoResponse() { - boolean b = template.sendSourceAndReceiveToResult(baseUrl + "/soap/noResponse", - new StringSource(messagePayload), new StringResult()); + boolean b = this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/noResponse", + new StringSource(this.messagePayload), new StringResult()); assertThat(b).isFalse(); } @@ -172,7 +172,9 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { assertThat(requestObject).isEqualTo(graph); try { - transformer.transform(new StringSource(messagePayload), result); + transformer.transform( + new StringSource(AbstractSoap12WebServiceTemplateIntegrationTest.this.messagePayload), + result); } catch (TransformerException e) { throw new RuntimeException(e); @@ -204,9 +206,9 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { } }; - template.setMarshaller(marshaller); - template.setUnmarshaller(unmarshaller); - Object result = template.marshalSendAndReceive(baseUrl + "/soap/echo", requestObject); + this.template.setMarshaller(marshaller); + this.template.setUnmarshaller(unmarshaller); + Object result = this.template.marshalSendAndReceive(baseUrl + "/soap/echo", requestObject); assertThat(result).isEqualTo(responseObject); } @@ -224,7 +226,9 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { assertThat(requestObject).isEqualTo(graph); try { - transformer.transform(new StringSource(messagePayload), result); + transformer.transform( + new StringSource(AbstractSoap12WebServiceTemplateIntegrationTest.this.messagePayload), + result); } catch (TransformerException e) { throw new RuntimeException(e); @@ -239,8 +243,8 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { } }; - template.setMarshaller(marshaller); - Object result = template.marshalSendAndReceive(baseUrl + "/soap/noResponse", requestObject); + this.template.setMarshaller(marshaller); + Object result = this.template.marshalSendAndReceive(baseUrl + "/soap/noResponse", requestObject); assertThat(result).isNull(); } @@ -249,8 +253,8 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { public void notFound() { assertThatExceptionOfType(WebServiceTransportException.class) - .isThrownBy(() -> template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound", - new StringSource(messagePayload), new StringResult())); + .isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/errors/notfound", + new StringSource(this.messagePayload), new StringResult())); } @Test @@ -258,8 +262,9 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { Result result = new StringResult(); - assertThatExceptionOfType(SoapFaultClientException.class).isThrownBy(() -> template - .sendSourceAndReceiveToResult(baseUrl + "/soap/receiverFault", new StringSource(messagePayload), result)); + assertThatExceptionOfType(SoapFaultClientException.class) + .isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/receiverFault", + new StringSource(this.messagePayload), result)); } @Test @@ -267,14 +272,15 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { Result result = new StringResult(); - assertThatExceptionOfType(SoapFaultClientException.class).isThrownBy(() -> template - .sendSourceAndReceiveToResult(baseUrl + "/soap/senderFault", new StringSource(messagePayload), result)); + assertThatExceptionOfType(SoapFaultClientException.class) + .isThrownBy(() -> this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/senderFault", + new StringSource(this.messagePayload), result)); } @Test public void attachment() { - template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(messagePayload), + this.template.sendSourceAndReceiveToResult(baseUrl + "/soap/attachment", new StringSource(this.messagePayload), message -> { SoapMessage soapMessage = (SoapMessage) message; @@ -296,7 +302,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { - resp.sendError(sc); + resp.sendError(this.sc); } } @@ -313,7 +319,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { super.init(servletConfig); try { - messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); + this.messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); } catch (SOAPException ex) { throw new ServletException("Unable to create message factory" + ex.getMessage()); @@ -325,7 +331,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { try { MimeHeaders headers = getHeaders(req); - SOAPMessage request = messageFactory.createMessage(headers, req.getInputStream()); + SOAPMessage request = this.messageFactory.createMessage(headers, req.getInputStream()); SOAPMessage reply = onMessage(request); if (reply != null) { @@ -415,7 +421,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { @Override protected SOAPMessage onMessage(SOAPMessage message) throws SOAPException { - SOAPMessage response = messageFactory.createMessage(); + SOAPMessage response = this.messageFactory.createMessage(); SOAPBody body = response.getSOAPBody(); body.addFault(SOAPConstants.SOAP_RECEIVER_FAULT, "Receiver Fault"); return response; @@ -429,7 +435,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { @Override protected SOAPMessage onMessage(SOAPMessage message) throws SOAPException { - SOAPMessage response = messageFactory.createMessage(); + SOAPMessage response = this.messageFactory.createMessage(); SOAPBody body = response.getSOAPBody(); body.addFault(SOAPConstants.SOAP_SENDER_FAULT, "Sender Fault"); return response; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java index 305eb237..cd19bb99 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java @@ -119,7 +119,7 @@ public class DomPoxWebServiceTemplateIntegrationTest { @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { - resp.sendError(sc); + resp.sendError(this.sc); } } @@ -136,18 +136,18 @@ public class DomPoxWebServiceTemplateIntegrationTest { public void init(ServletConfig servletConfig) throws ServletException { super.init(servletConfig); - documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); - documentBuilderFactory.setNamespaceAware(true); - transformerFactory = TransformerFactoryUtils.newInstance(); + this.documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); + this.documentBuilderFactory.setNamespaceAware(true); + this.transformerFactory = TransformerFactoryUtils.newInstance(); } @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException { try { - DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); + DocumentBuilder documentBuilder = this.documentBuilderFactory.newDocumentBuilder(); Document message = documentBuilder.parse(req.getInputStream()); - Transformer transformer = transformerFactory.newTransformer(); + Transformer transformer = this.transformerFactory.newTransformer(); transformer.transform(new DOMSource(message), new StreamResult(resp.getOutputStream())); } catch (Exception ex) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java index b1ad1891..88386db1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java @@ -34,7 +34,7 @@ public class SimpleFaultMessageResolverTest { @BeforeEach public void setUp() { - resolver = new SimpleFaultMessageResolver(); + this.resolver = new SimpleFaultMessageResolver(); } @Test @@ -46,7 +46,8 @@ public class SimpleFaultMessageResolverTest { replay(messageMock); - assertThatExceptionOfType(WebServiceFaultException.class).isThrownBy(() -> resolver.resolveFault(messageMock)) + assertThatExceptionOfType(WebServiceFaultException.class) + .isThrownBy(() -> this.resolver.resolveFault(messageMock)) .withMessage(message); verify(messageMock); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java index dbf68f0b..162e6b5b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleSaajServlet.java @@ -50,7 +50,7 @@ public class SimpleSaajServlet extends HttpServlet { super.init(servletConfig); try { - msgFactory = MessageFactory.newInstance(); + this.msgFactory = MessageFactory.newInstance(); } catch (SOAPException ex) { throw new ServletException("Unable to create message factory" + ex.getMessage()); @@ -91,7 +91,7 @@ public class SimpleSaajServlet extends HttpServlet { try { MimeHeaders headers = getHeaders(req); - SOAPMessage request = msgFactory.createMessage(headers, req.getInputStream()); + SOAPMessage request = this.msgFactory.createMessage(headers, req.getInputStream()); SOAPMessage reply = onMessage(request); if (reply != null) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java index 585a8eb9..5707ea50 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java @@ -61,16 +61,16 @@ public class WebServiceTemplateTest { @BeforeEach public void setUp() throws Exception { - messageFactory = new MockWebServiceMessageFactory(); - template = new WebServiceTemplate(messageFactory); - connectionMock = mock(FaultAwareWebServiceConnection.class); + this.messageFactory = new MockWebServiceMessageFactory(); + this.template = new WebServiceTemplate(this.messageFactory); + this.connectionMock = mock(FaultAwareWebServiceConnection.class); final URI expectedUri = new URI("http://www.springframework.org/spring-ws"); - when(connectionMock.getUri()).thenReturn(expectedUri); - template.setMessageSender(new WebServiceMessageSender() { + when(this.connectionMock.getUri()).thenReturn(expectedUri); + this.template.setMessageSender(new WebServiceMessageSender() { @Override public WebServiceConnection createConnection(URI uri) { - return connectionMock; + return WebServiceTemplateTest.this.connectionMock; } @Override @@ -81,26 +81,26 @@ public class WebServiceTemplateTest { } }); - template.setDefaultUri(expectedUri.toString()); + this.template.setDefaultUri(expectedUri.toString()); } @Test public void testMarshalAndSendNoMarshallerSet() throws Exception { - connectionMock.close(); + this.connectionMock.close(); - template.setMarshaller(null); + this.template.setMarshaller(null); - assertThatIllegalStateException().isThrownBy(() -> template.marshalSendAndReceive(new Object())); + assertThatIllegalStateException().isThrownBy(() -> this.template.marshalSendAndReceive(new Object())); } @Test public void testMarshalAndSendNoUnmarshallerSet() throws Exception { - connectionMock.close(); + this.connectionMock.close(); - template.setUnmarshaller(null); - assertThatIllegalStateException().isThrownBy(() -> template.marshalSendAndReceive(new Object())); + this.template.setUnmarshaller(null); + assertThatIllegalStateException().isThrownBy(() -> this.template.marshalSendAndReceive(new Object())); } @Test @@ -113,13 +113,13 @@ public class WebServiceTemplateTest { Object extracted = new Object(); when(extractorMock.extractData(isA(WebServiceMessage.class))).thenReturn(extracted); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(new MockWebServiceMessage("")); - when(connectionMock.hasFault()).thenReturn(false); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(new MockWebServiceMessage("")); + when(this.connectionMock.hasFault()).thenReturn(false); + this.connectionMock.close(); - Object result = template.sendAndReceive(requestCallback, extractorMock); + Object result = this.template.sendAndReceive(requestCallback, extractorMock); assertThat(result).isEqualTo(extracted); } @@ -129,12 +129,12 @@ public class WebServiceTemplateTest { WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(null); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(null); + this.connectionMock.close(); - Object result = template.sendAndReceive(null, extractorMock); + Object result = this.template.sendAndReceive(null, extractorMock); assertThat(result).isNull(); } @@ -145,19 +145,19 @@ public class WebServiceTemplateTest { WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class); FaultMessageResolver faultMessageResolverMock = mock(FaultMessageResolver.class); - template.setFaultMessageResolver(faultMessageResolverMock); + this.template.setFaultMessageResolver(faultMessageResolverMock); faultMessageResolverMock.resolveFault(isA(WebServiceMessage.class)); MockWebServiceMessage response = new MockWebServiceMessage(""); response.setFault(true); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.hasFault()).thenReturn(true); - when(connectionMock.receive(messageFactory)).thenReturn(response); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.hasFault()).thenReturn(true); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(response); + this.connectionMock.close(); - Object result = template.sendAndReceive(null, extractorMock); + Object result = this.template.sendAndReceive(null, extractorMock); assertThat(result).isNull(); } @@ -167,17 +167,17 @@ public class WebServiceTemplateTest { WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class); - template.setFaultMessageResolver(null); + this.template.setFaultMessageResolver(null); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(true); - when(connectionMock.hasFault()).thenReturn(false); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(true); + when(this.connectionMock.hasFault()).thenReturn(false); String errorMessage = "errorMessage"; - when(connectionMock.getErrorMessage()).thenReturn(errorMessage); - connectionMock.close(); + when(this.connectionMock.getErrorMessage()).thenReturn(errorMessage); + this.connectionMock.close(); assertThatExceptionOfType(WebServiceTransportException.class) - .isThrownBy(() -> template.sendAndReceive(null, extractorMock)) + .isThrownBy(() -> this.template.sendAndReceive(null, extractorMock)) .withMessage(errorMessage); } @@ -188,13 +188,13 @@ public class WebServiceTemplateTest { Object extracted = new Object(); when(extractorMock.extractData(isA(Source.class))).thenReturn(extracted); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(new MockWebServiceMessage("")); - when(connectionMock.hasFault()).thenReturn(false); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(new MockWebServiceMessage("")); + when(this.connectionMock.hasFault()).thenReturn(false); + this.connectionMock.close(); - Object result = template.sendSourceAndReceive(new StringSource(""), extractorMock); + Object result = this.template.sendSourceAndReceive(new StringSource(""), extractorMock); assertThat(result).isEqualTo(extracted); } @@ -204,12 +204,12 @@ public class WebServiceTemplateTest { SourceExtractor extractorMock = mock(SourceExtractor.class); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(null); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(null); + this.connectionMock.close(); - Object result = template.sendSourceAndReceive(new StringSource(""), extractorMock); + Object result = this.template.sendSourceAndReceive(new StringSource(""), extractorMock); assertThat(result).isNull(); } @@ -217,14 +217,14 @@ public class WebServiceTemplateTest { @Test public void testSendAndReceiveResultResponse() throws Exception { - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(new MockWebServiceMessage("")); - when(connectionMock.hasFault()).thenReturn(false); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(new MockWebServiceMessage("")); + when(this.connectionMock.hasFault()).thenReturn(false); + this.connectionMock.close(); StringResult result = new StringResult(); - boolean b = template.sendSourceAndReceiveToResult(new StringSource(""), result); + boolean b = this.template.sendSourceAndReceiveToResult(new StringSource(""), result); assertThat(b).isTrue(); } @@ -232,13 +232,13 @@ public class WebServiceTemplateTest { @Test public void testSendAndReceiveResultNoResponse() throws Exception { - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(null); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(null); + this.connectionMock.close(); StringResult result = new StringResult(); - boolean b = template.sendSourceAndReceiveToResult(new StringSource(""), result); + boolean b = this.template.sendSourceAndReceiveToResult(new StringSource(""), result); assertThat(b).isFalse(); } @@ -246,16 +246,16 @@ public class WebServiceTemplateTest { @Test public void testSendAndReceiveResultNoResponsePayload() throws Exception { - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); WebServiceMessage response = mock(WebServiceMessage.class); - when(connectionMock.receive(messageFactory)).thenReturn(response); - when(connectionMock.hasFault()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(response); + when(this.connectionMock.hasFault()).thenReturn(false); when(response.getPayloadSource()).thenReturn(null); - connectionMock.close(); + this.connectionMock.close(); StringResult result = new StringResult(); - boolean b = template.sendSourceAndReceiveToResult(new StringSource(""), result); + boolean b = this.template.sendSourceAndReceiveToResult(new StringSource(""), result); assertThat(b).isTrue(); } @@ -264,21 +264,21 @@ public class WebServiceTemplateTest { public void testSendAndReceiveMarshalResponse() throws Exception { Marshaller marshallerMock = mock(Marshaller.class); - template.setMarshaller(marshallerMock); + this.template.setMarshaller(marshallerMock); marshallerMock.marshal(isA(Object.class), isA(Result.class)); Unmarshaller unmarshallerMock = mock(Unmarshaller.class); - template.setUnmarshaller(unmarshallerMock); + this.template.setUnmarshaller(unmarshallerMock); Object unmarshalled = new Object(); when(unmarshallerMock.unmarshal(isA(Source.class))).thenReturn(unmarshalled); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(new MockWebServiceMessage("")); - when(connectionMock.hasFault()).thenReturn(false); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(new MockWebServiceMessage("")); + when(this.connectionMock.hasFault()).thenReturn(false); + this.connectionMock.close(); - Object result = template.marshalSendAndReceive(new Object()); + Object result = this.template.marshalSendAndReceive(new Object()); assertThat(result).isEqualTo(unmarshalled); } @@ -287,15 +287,15 @@ public class WebServiceTemplateTest { public void testSendAndReceiveMarshalNoResponse() throws Exception { Marshaller marshallerMock = mock(Marshaller.class); - template.setMarshaller(marshallerMock); + this.template.setMarshaller(marshallerMock); marshallerMock.marshal(isA(Object.class), isA(Result.class)); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(null); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(null); + this.connectionMock.close(); - Object result = template.marshalSendAndReceive(new Object()); + Object result = this.template.marshalSendAndReceive(new Object()); assertThat(result).isNull(); } @@ -304,11 +304,11 @@ public class WebServiceTemplateTest { public void testSendAndReceiveCustomUri() throws Exception { final URI customUri = new URI("http://www.springframework.org/spring-ws/custom"); - template.setMessageSender(new WebServiceMessageSender() { + this.template.setMessageSender(new WebServiceMessageSender() { @Override public WebServiceConnection createConnection(URI uri) { - return connectionMock; + return WebServiceTemplateTest.this.connectionMock; } @Override @@ -325,13 +325,13 @@ public class WebServiceTemplateTest { Object extracted = new Object(); when(extractorMock.extractData(isA(WebServiceMessage.class))).thenReturn(extracted); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(new MockWebServiceMessage("")); - when(connectionMock.hasFault()).thenReturn(false); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(new MockWebServiceMessage("")); + when(this.connectionMock.hasFault()).thenReturn(false); + this.connectionMock.close(); - Object result = template.sendAndReceive(customUri.toString(), requestCallback, extractorMock); + Object result = this.template.sendAndReceive(customUri.toString(), requestCallback, extractorMock); assertThat(result).isEqualTo(extracted); } @@ -341,7 +341,7 @@ public class WebServiceTemplateTest { ClientInterceptor interceptorMock1 = mock(ClientInterceptor.class); ClientInterceptor interceptorMock2 = mock(ClientInterceptor.class); - template.setInterceptors(new ClientInterceptor[] { interceptorMock1, interceptorMock2 }); + this.template.setInterceptors(new ClientInterceptor[] { interceptorMock1, interceptorMock2 }); when(interceptorMock1.handleRequest(isA(MessageContext.class))).thenReturn(true); when(interceptorMock2.handleRequest(isA(MessageContext.class))).thenReturn(true); when(interceptorMock2.handleResponse(isA(MessageContext.class))).thenReturn(true); @@ -356,13 +356,13 @@ public class WebServiceTemplateTest { Object extracted = new Object(); when(extractorMock.extractData(isA(WebServiceMessage.class))).thenReturn(extracted); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(new MockWebServiceMessage("")); - when(connectionMock.hasFault()).thenReturn(false); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(new MockWebServiceMessage("")); + when(this.connectionMock.hasFault()).thenReturn(false); + this.connectionMock.close(); - Object result = template.sendAndReceive(requestCallback, extractorMock); + Object result = this.template.sendAndReceive(requestCallback, extractorMock); assertThat(result).isEqualTo(extracted); } @@ -370,11 +370,11 @@ public class WebServiceTemplateTest { @Test public void testInterceptorsInterceptedNoResponse() throws Exception { - MessageContext messageContext = new DefaultMessageContext(messageFactory); + MessageContext messageContext = new DefaultMessageContext(this.messageFactory); ClientInterceptor interceptorMock1 = mock(ClientInterceptor.class); ClientInterceptor interceptorMock2 = mock(ClientInterceptor.class); - template.setInterceptors(new ClientInterceptor[] { interceptorMock1, interceptorMock2 }); + this.template.setInterceptors(new ClientInterceptor[] { interceptorMock1, interceptorMock2 }); when(interceptorMock1.handleRequest(isA(MessageContext.class))).thenReturn(false); interceptorMock1.afterCompletion(isA(MessageContext.class), isNull()); @@ -383,7 +383,8 @@ public class WebServiceTemplateTest { WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class); - Object result = template.doSendAndReceive(messageContext, connectionMock, requestCallback, extractorMock); + Object result = this.template.doSendAndReceive(messageContext, this.connectionMock, requestCallback, + extractorMock); assertThat(result).isNull(); } @@ -391,13 +392,13 @@ public class WebServiceTemplateTest { @Test public void testInterceptorsInterceptedCreateResponse() throws Exception { - MessageContext messageContext = new DefaultMessageContext(messageFactory); + MessageContext messageContext = new DefaultMessageContext(this.messageFactory); // force creation of response messageContext.getResponse(); ClientInterceptor interceptorMock1 = mock(ClientInterceptor.class); ClientInterceptor interceptorMock2 = mock(ClientInterceptor.class); - template.setInterceptors(new ClientInterceptor[] { interceptorMock1, interceptorMock2 }); + this.template.setInterceptors(new ClientInterceptor[] { interceptorMock1, interceptorMock2 }); when(interceptorMock1.handleRequest(isA(MessageContext.class))).thenReturn(false); when(interceptorMock1.handleResponse(isA(MessageContext.class))).thenReturn(true); interceptorMock1.afterCompletion(isA(MessageContext.class), isNull()); @@ -409,9 +410,10 @@ public class WebServiceTemplateTest { Object extracted = new Object(); when(extractorMock.extractData(messageContext.getResponse())).thenReturn(extracted); - when(connectionMock.hasFault()).thenReturn(false); + when(this.connectionMock.hasFault()).thenReturn(false); - Object result = template.doSendAndReceive(messageContext, connectionMock, requestCallback, extractorMock); + Object result = this.template.doSendAndReceive(messageContext, this.connectionMock, requestCallback, + extractorMock); assertThat(result).isEqualTo(extracted); } @@ -420,15 +422,15 @@ public class WebServiceTemplateTest { public void testDestinationResolver() throws Exception { DestinationProvider providerMock = mock(DestinationProvider.class); - template.setDestinationProvider(providerMock); + this.template.setDestinationProvider(providerMock); final URI providerUri = new URI("http://www.springframework.org/spring-ws/destinationProvider"); when(providerMock.getDestination()).thenReturn(providerUri); - template.setMessageSender(new WebServiceMessageSender() { + this.template.setMessageSender(new WebServiceMessageSender() { @Override public WebServiceConnection createConnection(URI uri) { - return connectionMock; + return WebServiceTemplateTest.this.connectionMock; } @Override @@ -441,15 +443,15 @@ public class WebServiceTemplateTest { WebServiceMessageExtractor extractorMock = mock(WebServiceMessageExtractor.class); - reset(connectionMock); + reset(this.connectionMock); - connectionMock.send(isA(WebServiceMessage.class)); - when(connectionMock.hasError()).thenReturn(false); - when(connectionMock.receive(messageFactory)).thenReturn(null); - when(connectionMock.getUri()).thenReturn(new URI("http://example.com")); - connectionMock.close(); + this.connectionMock.send(isA(WebServiceMessage.class)); + when(this.connectionMock.hasError()).thenReturn(false); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(null); + when(this.connectionMock.getUri()).thenReturn(new URI("http://example.com")); + this.connectionMock.close(); - Object result = template.sendAndReceive(null, extractorMock); + Object result = this.template.sendAndReceive(null, extractorMock); assertThat(result).isNull(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java index b02f1a1f..dac502d9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java @@ -33,16 +33,16 @@ public class Wsdl11DestinationProviderTest { @BeforeEach public void setUp() { - provider = new Wsdl11DestinationProvider(); + this.provider = new Wsdl11DestinationProvider(); } @Test public void testSimple() throws URISyntaxException { Resource wsdl = new ClassPathResource("simple.wsdl", getClass()); - provider.setWsdl(wsdl); + this.provider.setWsdl(wsdl); - URI result = provider.getDestination(); + URI result = this.provider.getDestination(); assertThat(result).isEqualTo(new URI("http://example.com/myService")); } @@ -50,20 +50,20 @@ public class Wsdl11DestinationProviderTest { @Test public void testComplex() throws URISyntaxException { Resource wsdl = new ClassPathResource("complex.wsdl", getClass()); - provider.setWsdl(wsdl); + this.provider.setWsdl(wsdl); - URI result = provider.getDestination(); + URI result = this.provider.getDestination(); assertThat(result).isEqualTo(new URI("http://example.com/soap11")); } @Test public void testCustomExpression() throws URISyntaxException { - provider.setLocationExpression("/wsdl:definitions/wsdl:service/wsdl:port/soap12:address/@location"); + this.provider.setLocationExpression("/wsdl:definitions/wsdl:service/wsdl:port/soap12:address/@location"); Resource wsdl = new ClassPathResource("complex.wsdl", getClass()); - provider.setWsdl(wsdl); + this.provider.setWsdl(wsdl); - URI result = provider.getDestination(); + URI result = this.provider.getDestination(); assertThat(result).isEqualTo(new URI("http://example.com/soap12")); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java index 955ab117..1afa3742 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java @@ -68,33 +68,33 @@ public class ClientInterceptorAdapterTest { } public List getBits() { - return bits; + return this.bits; } @Override public boolean handleRequest(MessageContext messageContext) throws WebServiceClientException { - bits.add("handled request"); + this.bits.add("handled request"); return false; } @Override public boolean handleResponse(MessageContext messageContext) throws WebServiceClientException { - bits.add("handled response"); + this.bits.add("handled response"); return false; } @Override public boolean handleFault(MessageContext messageContext) throws WebServiceClientException { - bits.add("handled fault"); + this.bits.add("handled fault"); return false; } @Override public void afterCompletion(MessageContext messageContext, Exception ex) throws WebServiceClientException { - bits.add("handled afterCompletion"); + this.bits.add("handled afterCompletion"); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java index cbbee22e..ab7ef8f6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java @@ -72,26 +72,27 @@ public class PayloadValidatingInterceptorTest { @BeforeEach public void setUp() throws Exception { - interceptor = new PayloadValidatingInterceptor(); - interceptor.setSchema(new ClassPathResource(SCHEMA, getClass())); - interceptor.setValidateRequest(true); - interceptor.setValidateResponse(true); - interceptor.afterPropertiesSet(); + this.interceptor = new PayloadValidatingInterceptor(); + this.interceptor.setSchema(new ClassPathResource(SCHEMA, getClass())); + this.interceptor.setValidateRequest(true); + this.interceptor.setValidateResponse(true); + this.interceptor.afterPropertiesSet(); - soap11Factory = new SaajSoapMessageFactory(MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL)); + this.soap11Factory = new SaajSoapMessageFactory(MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL)); - transformer = TransformerFactoryUtils.newInstance().newTransformer(); + this.transformer = TransformerFactoryUtils.newInstance().newTransformer(); } @Test public void testHandleInvalidRequest() throws Exception { - SoapMessage invalidMessage = soap11Factory.createWebServiceMessage(); + SoapMessage invalidMessage = this.soap11Factory.createWebServiceMessage(); InputStream inputStream = getClass().getResourceAsStream(INVALID_MESSAGE); - transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); - context = new DefaultMessageContext(invalidMessage, soap11Factory); + this.transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); + this.context = new DefaultMessageContext(invalidMessage, this.soap11Factory); - assertThatExceptionOfType(WebServiceClientException.class).isThrownBy(() -> interceptor.handleRequest(context)) + assertThatExceptionOfType(WebServiceClientException.class) + .isThrownBy(() -> this.interceptor.handleRequest(this.context)) .withMessageContaining("XML validation error on response"); } @@ -100,9 +101,10 @@ public class PayloadValidatingInterceptorTest { MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(INVALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - assertThatExceptionOfType(WebServiceClientException.class).isThrownBy(() -> interceptor.handleRequest(context)) + assertThatExceptionOfType(WebServiceClientException.class) + .isThrownBy(() -> this.interceptor.handleRequest(this.context)) .withMessageContaining("XML validation error on response"); } @@ -111,22 +113,22 @@ public class PayloadValidatingInterceptorTest { MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + boolean result = this.interceptor.handleRequest(this.context); assertThat(result).isTrue(); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); } @Test public void testHandleInvalidResponse() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); response.setPayload(new ClassPathResource(INVALID_MESSAGE, getClass())); - boolean result = interceptor.handleResponse(context); + boolean result = this.interceptor.handleResponse(this.context); assertThat(result).isFalse(); } @@ -135,10 +137,10 @@ public class PayloadValidatingInterceptorTest { public void testHandleValidResponse() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); response.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); - boolean result = interceptor.handleResponse(context); + boolean result = this.interceptor.handleResponse(this.context); assertThat(result).isTrue(); } @@ -161,13 +163,13 @@ public class PayloadValidatingInterceptorTest { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage saajMessage = SaajUtils.loadMessage(new ClassPathResource(VALID_SOAP_MESSAGE, getClass()), messageFactory); - context = new DefaultMessageContext(new SaajSoapMessage(saajMessage), + this.context = new DefaultMessageContext(new SaajSoapMessage(saajMessage), new SaajSoapMessageFactory(messageFactory)); - boolean result = interceptor.handleRequest(context); + boolean result = interceptor.handleRequest(this.context); assertThat(result).isTrue(); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); } finally { // Reset the property @@ -181,50 +183,51 @@ public class PayloadValidatingInterceptorTest { assertThatIllegalArgumentException().isThrownBy(() -> { - interceptor.setSchema(new ClassPathResource("invalid")); - interceptor.afterPropertiesSet(); + this.interceptor.setSchema(new ClassPathResource("invalid")); + this.interceptor.afterPropertiesSet(); }); } @Test public void testHandlerInvalidRequestMultipleSchemas() throws Exception { - interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), + this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(new ClassPathResource(INVALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - assertThatExceptionOfType(WebServiceClientException.class).isThrownBy(() -> interceptor.handleRequest(context)) + assertThatExceptionOfType(WebServiceClientException.class) + .isThrownBy(() -> this.interceptor.handleRequest(this.context)) .withMessageContaining("XML validation error on response"); } @Test public void testHandleValidRequestMultipleSchemas() throws Exception { - interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), + this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(new ClassPathResource(VALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context); + boolean result = this.interceptor.handleRequest(this.context); assertThat(result).isTrue(); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); } @Test public void testHandleInvalidResponseMultipleSchemas() throws Exception { - interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), + this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); response.setPayload(new ClassPathResource(INVALID_MESSAGE, getClass())); - boolean result = interceptor.handleResponse(context); + boolean result = this.interceptor.handleResponse(this.context); assertThat(result).isFalse(); } @@ -232,14 +235,14 @@ public class PayloadValidatingInterceptorTest { @Test public void testHandleValidResponseMultipleSchemas() throws Exception { - interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), + this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); response.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); - boolean result = interceptor.handleResponse(context); + boolean result = this.interceptor.handleResponse(this.context); assertThat(result).isTrue(); } @@ -256,11 +259,11 @@ public class PayloadValidatingInterceptorTest { interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + boolean result = interceptor.handleRequest(this.context); assertThat(result).isTrue(); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java index d97ee876..c9bd3524 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java @@ -59,14 +59,14 @@ public class AnnotationDrivenBeanDefinitionParserTest { @BeforeEach public void setUp() { - applicationContext = new ClassPathXmlApplicationContext("annotationDrivenBeanDefinitionParserTest.xml", + this.applicationContext = new ClassPathXmlApplicationContext("annotationDrivenBeanDefinitionParserTest.xml", getClass()); } @Test public void endpointMappings() { - Map result = applicationContext.getBeansOfType(EndpointMapping.class); + Map result = this.applicationContext.getBeansOfType(EndpointMapping.class); assertThat(result).hasSize(3); assertThat(result.values()).hasAtLeastOneElementOfType(PayloadRootAnnotationMethodEndpointMapping.class); @@ -77,7 +77,7 @@ public class AnnotationDrivenBeanDefinitionParserTest { @Test public void endpointAdapters() { - Map result = applicationContext.getBeansOfType(EndpointAdapter.class); + Map result = this.applicationContext.getBeansOfType(EndpointAdapter.class); assertThat(result).hasSize(1); @@ -106,7 +106,7 @@ public class AnnotationDrivenBeanDefinitionParserTest { @Test public void endpointExceptionResolver() { - Map result = applicationContext + Map result = this.applicationContext .getBeansOfType(EndpointExceptionResolver.class); assertThat(result).hasSize(2); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/DummyInterceptor.java b/spring-ws-core/src/test/java/org/springframework/ws/config/DummyInterceptor.java index e8ce7ae5..9f292fe3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/DummyInterceptor.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/DummyInterceptor.java @@ -32,11 +32,11 @@ public class DummyInterceptor implements EndpointInterceptor { } public DummyInterceptorDependency getPropertyDependency() { - return propertyDependency; + return this.propertyDependency; } public DummyInterceptorDependency getAutowiredDependency() { - return autowiredDependency; + return this.autowiredDependency; } @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/MyInterceptor.java b/spring-ws-core/src/test/java/org/springframework/ws/config/MyInterceptor.java index 32dce4ff..433527a6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/MyInterceptor.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/MyInterceptor.java @@ -27,7 +27,7 @@ public class MyInterceptor implements EndpointInterceptor { private int order; public int getOrder() { - return order; + return this.order; } public void setOrder(int order) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java index 1851e3ed..aa5d79e0 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java @@ -34,13 +34,13 @@ public class WebServiceNamespaceHandlerTest { @BeforeEach public void setUp() throws Exception { - applicationContext = new ClassPathXmlApplicationContext("webServiceNamespaceHandlerTest.xml", getClass()); + this.applicationContext = new ClassPathXmlApplicationContext("webServiceNamespaceHandlerTest.xml", getClass()); } @Test public void testMarshallingMethods() throws Exception { - Map result = applicationContext + Map result = this.applicationContext .getBeansOfType(MarshallingMethodEndpointAdapter.class); assertThat(result).isNotEmpty(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java index a8c97bf9..c55536e5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java @@ -35,14 +35,14 @@ public class WebServicesNamespaceHandlerTigerTest { @BeforeEach public void setUp() { - applicationContext = new ClassPathXmlApplicationContext("webServicesNamespaceHandlerTest-tiger.xml", + this.applicationContext = new ClassPathXmlApplicationContext("webServicesNamespaceHandlerTest-tiger.xml", getClass()); } @Test public void testMarshallingEndpoints() { - Map result = applicationContext + Map result = this.applicationContext .getBeansOfType(GenericMarshallingMethodEndpointAdapter.class); assertThat(result).isNotEmpty(); @@ -51,7 +51,7 @@ public class WebServicesNamespaceHandlerTigerTest { @Test public void testXpathEndpoints() { - Map result = applicationContext + Map result = this.applicationContext .getBeansOfType(XPathParamAnnotationMethodEndpointAdapter.class); assertThat(result).isNotEmpty(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java index fce41209..7a20fb74 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java @@ -38,13 +38,14 @@ public class WsdlBeanDefinitionParserTest { @BeforeEach public void setUp() { - applicationContext = new ClassPathXmlApplicationContext("wsdlBeanDefinitionParserTest.xml", getClass()); + this.applicationContext = new ClassPathXmlApplicationContext("wsdlBeanDefinitionParserTest.xml", getClass()); } @Test public void staticWsdl() { - Map result = applicationContext.getBeansOfType(SimpleWsdl11Definition.class); + Map result = this.applicationContext + .getBeansOfType(SimpleWsdl11Definition.class); assertThat(result).isNotEmpty(); @@ -56,11 +57,11 @@ public class WsdlBeanDefinitionParserTest { @Test public void dynamicWsdl() { - Map result = applicationContext.getBeansOfType(DefaultWsdl11Definition.class); + Map result = this.applicationContext.getBeansOfType(DefaultWsdl11Definition.class); assertThat(result).isNotEmpty(); - result = applicationContext.getBeansOfType(CommonsXsdSchemaCollection.class); + result = this.applicationContext.getBeansOfType(CommonsXsdSchemaCollection.class); assertThat(result).isNotEmpty(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java b/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java index cfc850a4..d739899d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java @@ -40,50 +40,50 @@ public class DefaultMessageContextTest { @BeforeEach public void setUp() { - factoryMock = createMock(WebServiceMessageFactory.class); - request = new MockWebServiceMessage(); - context = new DefaultMessageContext(request, factoryMock); + this.factoryMock = createMock(WebServiceMessageFactory.class); + this.request = new MockWebServiceMessage(); + this.context = new DefaultMessageContext(this.request, this.factoryMock); } @Test public void testRequest() { - assertThat(context.getRequest()).isEqualTo(request); + assertThat(this.context.getRequest()).isEqualTo(this.request); } @Test public void testResponse() { WebServiceMessage response = new MockWebServiceMessage(); - expect(factoryMock.createWebServiceMessage()).andReturn(response); - replay(factoryMock); + expect(this.factoryMock.createWebServiceMessage()).andReturn(response); + replay(this.factoryMock); - WebServiceMessage result = context.getResponse(); + WebServiceMessage result = this.context.getResponse(); assertThat(result).isEqualTo(response); - verify(factoryMock); + verify(this.factoryMock); } @Test public void testProperties() { - assertThat(context.getPropertyNames()).hasSize(0); + assertThat(this.context.getPropertyNames()).hasSize(0); String name = "name"; - assertThat(context.containsProperty(name)).isFalse(); + assertThat(this.context.containsProperty(name)).isFalse(); String value = "value"; - context.setProperty(name, value); + this.context.setProperty(name, value); - assertThat(context.containsProperty(name)).isTrue(); - assertThat(context.getPropertyNames()).containsExactly(name); - assertThat(context.getProperty(name)).isEqualTo(value); + assertThat(this.context.containsProperty(name)).isTrue(); + assertThat(this.context.getPropertyNames()).containsExactly(name); + assertThat(this.context.getProperty(name)).isEqualTo(value); - context.removeProperty(name); + this.context.removeProperty(name); - assertThat(context.containsProperty(name)).isFalse(); - assertThat(context.getPropertyNames()).isEmpty(); + assertThat(this.context.containsProperty(name)).isFalse(); + assertThat(this.context.getPropertyNames()).isEmpty(); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java index 18defb0f..47b516ad 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java @@ -42,11 +42,11 @@ public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageT @Override protected final WebServiceMessage createWebServiceMessage() throws Exception { - mimeMessage = createMimeMessage(); - picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTest.class); - contentId = "spring-ws"; - contentType = "image/png"; - return mimeMessage; + this.mimeMessage = createMimeMessage(); + this.picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTest.class); + this.contentId = "spring-ws"; + this.contentType = "image/png"; + return this.mimeMessage; } protected abstract MimeMessage createMimeMessage() throws Exception; @@ -54,7 +54,7 @@ public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageT @Test public void testEmptyMessage() { - Iterator iterator = mimeMessage.getAttachments(); + Iterator iterator = this.mimeMessage.getAttachments(); assertThat(iterator.hasNext()).isFalse(); } @@ -62,15 +62,15 @@ public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageT @Test public void testAddAttachment() throws Exception { - Attachment attachment = mimeMessage.addAttachment(contentId, picture, contentType); + Attachment attachment = this.mimeMessage.addAttachment(this.contentId, this.picture, this.contentType); testAttachment(attachment); } @Test public void testGetAttachment() throws Exception { - mimeMessage.addAttachment(contentId, picture, contentType); - Attachment attachment = mimeMessage.getAttachment(contentId); + this.mimeMessage.addAttachment(this.contentId, this.picture, this.contentType); + Attachment attachment = this.mimeMessage.getAttachment(this.contentId); assertThat(attachment).isNotNull(); @@ -80,8 +80,8 @@ public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageT @Test public void testGetAttachments() throws Exception { - mimeMessage.addAttachment(contentId, picture, contentType); - Iterator iterator = mimeMessage.getAttachments(); + this.mimeMessage.addAttachment(this.contentId, this.picture, this.contentType); + Iterator iterator = this.mimeMessage.getAttachments(); assertThat(iterator).isNotNull(); assertThat(iterator.hasNext()).isTrue(); @@ -94,8 +94,8 @@ public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageT private void testAttachment(Attachment attachment) throws IOException { - assertThat(attachment.getContentId()).isEqualTo(contentId); - assertThat(attachment.getContentType()).isEqualTo(contentType); + assertThat(attachment.getContentId()).isEqualTo(this.contentId); + assertThat(attachment.getContentType()).isEqualTo(this.contentType); assertThat(attachment.getSize()).isNotEqualTo(0); byte[] contents = FileCopyUtils.copyToByteArray(attachment.getInputStream()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java index 2ef85263..342e6795 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java @@ -48,8 +48,8 @@ public class DomPoxMessageTest { DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); Document document = documentBuilder.newDocument(); TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); - transformer = transformerFactory.newTransformer(); - message = new DomPoxMessage(document, transformer, DomPoxMessageFactory.DEFAULT_CONTENT_TYPE); + this.transformer = transformerFactory.newTransformer(); + this.message = new DomPoxMessage(document, this.transformer, DomPoxMessageFactory.DEFAULT_CONTENT_TYPE); } @Test @@ -57,9 +57,9 @@ public class DomPoxMessageTest { String content = "" + ""; StringSource source = new StringSource(content); - transformer.transform(source, message.getPayloadResult()); + this.transformer.transform(source, this.message.getPayloadResult()); StringResult stringResult = new StringResult(); - transformer.transform(message.getPayloadSource(), stringResult); + this.transformer.transform(this.message.getPayloadSource(), stringResult); assertThat(stringResult.toString()).and(content).ignoreWhitespace().areIdentical(); } @@ -68,10 +68,10 @@ public class DomPoxMessageTest { public void testGetPayloadResultTwice() throws Exception { String content = ""; - transformer.transform(new StringSource(content), message.getPayloadResult()); - transformer.transform(new StringSource(content), message.getPayloadResult()); + this.transformer.transform(new StringSource(content), this.message.getPayloadResult()); + this.transformer.transform(new StringSource(content), this.message.getPayloadResult()); StringResult stringResult = new StringResult(); - transformer.transform(message.getPayloadSource(), stringResult); + this.transformer.transform(this.message.getPayloadSource(), stringResult); assertThat(stringResult.toString()).and(content).ignoreWhitespace().areIdentical(); } @@ -81,9 +81,9 @@ public class DomPoxMessageTest { String content = "" + ""; StringSource source = new StringSource(content); - transformer.transform(source, message.getPayloadResult()); + this.transformer.transform(source, this.message.getPayloadResult()); ByteArrayOutputStream os = new ByteArrayOutputStream(); - message.writeTo(os); + this.message.writeTo(os); assertThat(os.toString(StandardCharsets.UTF_8)).and(content).ignoreWhitespace().areIdentical(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java index 9474e13f..39ee9058 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java @@ -52,26 +52,26 @@ public class MessageDispatcherTest { @BeforeEach public void setUp() { - dispatcher = new MessageDispatcher(); - factoryMock = createMock(WebServiceMessageFactory.class); - messageContext = new DefaultMessageContext(new MockWebServiceMessage(), factoryMock); + this.dispatcher = new MessageDispatcher(); + this.factoryMock = createMock(WebServiceMessageFactory.class); + this.messageContext = new DefaultMessageContext(new MockWebServiceMessage(), this.factoryMock); } @Test public void testGetEndpoint() throws Exception { EndpointMapping mappingMock = createMock(EndpointMapping.class); - dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); + this.dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); EndpointInvocationChain chain = new EndpointInvocationChain(new Object()); - expect(mappingMock.getEndpoint(messageContext)).andReturn(chain); + expect(mappingMock.getEndpoint(this.messageContext)).andReturn(chain); - replay(mappingMock, factoryMock); + replay(mappingMock, this.factoryMock); - EndpointInvocationChain result = dispatcher.getEndpoint(messageContext); + EndpointInvocationChain result = this.dispatcher.getEndpoint(this.messageContext); - verify(mappingMock, factoryMock); + verify(mappingMock, this.factoryMock); assertThat(result).isEqualTo(chain); } @@ -80,16 +80,16 @@ public class MessageDispatcherTest { public void testGetEndpointAdapterSupportedEndpoint() { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); - dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); + this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); Object endpoint = new Object(); expect(adapterMock.supports(endpoint)).andReturn(true); - replay(adapterMock, factoryMock); + replay(adapterMock, this.factoryMock); - EndpointAdapter result = dispatcher.getEndpointAdapter(endpoint); + EndpointAdapter result = this.dispatcher.getEndpointAdapter(endpoint); - verify(adapterMock, factoryMock); + verify(adapterMock, this.factoryMock); assertThat(result).isEqualTo(adapterMock); } @@ -98,16 +98,16 @@ public class MessageDispatcherTest { public void testGetEndpointAdapterUnsupportedEndpoint() { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); - dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); + this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); Object endpoint = new Object(); expect(adapterMock.supports(endpoint)).andReturn(false); - replay(adapterMock, factoryMock); + replay(adapterMock, this.factoryMock); - assertThatIllegalStateException().isThrownBy(() -> dispatcher.getEndpointAdapter(endpoint)); + assertThatIllegalStateException().isThrownBy(() -> this.dispatcher.getEndpointAdapter(endpoint)); - verify(adapterMock, factoryMock); + verify(adapterMock, this.factoryMock); } @Test @@ -119,11 +119,11 @@ public class MessageDispatcherTest { throw ex; }; - dispatcher.setEndpointMappings(Collections.singletonList(endpointMapping)); + this.dispatcher.setEndpointMappings(Collections.singletonList(endpointMapping)); EndpointExceptionResolver resolver = (givenMessageContext, givenEndpoint, givenException) -> { - assertThat(givenMessageContext).isEqualTo(messageContext); + assertThat(givenMessageContext).isEqualTo(this.messageContext); assertThat(givenEndpoint).isNull(); assertThat(givenException).isEqualTo(ex); @@ -131,275 +131,276 @@ public class MessageDispatcherTest { return true; }; - dispatcher.setEndpointExceptionResolvers(Collections.singletonList(resolver)); - expect(factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); + this.dispatcher.setEndpointExceptionResolvers(Collections.singletonList(resolver)); + expect(this.factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); - replay(factoryMock); + replay(this.factoryMock); - dispatcher.dispatch(messageContext); + this.dispatcher.dispatch(this.messageContext); - assertThat(messageContext.getResponse()).isNotNull(); + assertThat(this.messageContext.getResponse()).isNotNull(); - verify(factoryMock); + verify(this.factoryMock); } @Test public void testProcessUnsupportedEndpointException() { EndpointExceptionResolver resolverMock = createMock(EndpointExceptionResolver.class); - dispatcher.setEndpointExceptionResolvers(Collections.singletonList(resolverMock)); + this.dispatcher.setEndpointExceptionResolvers(Collections.singletonList(resolverMock)); Object endpoint = new Object(); Exception ex = new Exception(); - expect(resolverMock.resolveException(messageContext, endpoint, ex)).andReturn(false); + expect(resolverMock.resolveException(this.messageContext, endpoint, ex)).andReturn(false); - replay(factoryMock, resolverMock); + replay(this.factoryMock, resolverMock); try { - dispatcher.processEndpointException(messageContext, endpoint, ex); + this.dispatcher.processEndpointException(this.messageContext, endpoint, ex); } catch (Exception result) { assertThat(result).isEqualTo(ex); } - verify(factoryMock, resolverMock); + verify(this.factoryMock, resolverMock); } @Test public void testNormalFlow() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); - dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); + this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); Object endpoint = new Object(); expect(adapterMock.supports(endpoint)).andReturn(true); EndpointMapping mappingMock = createMock(EndpointMapping.class); - dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); + this.dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); EndpointInterceptor interceptorMock1 = createStrictMock("interceptor1", EndpointInterceptor.class); EndpointInterceptor interceptorMock2 = createStrictMock("interceptor2", EndpointInterceptor.class); - expect(interceptorMock1.handleRequest(messageContext, endpoint)).andReturn(true); - expect(interceptorMock2.handleRequest(messageContext, endpoint)).andReturn(true); + expect(interceptorMock1.handleRequest(this.messageContext, endpoint)).andReturn(true); + expect(interceptorMock2.handleRequest(this.messageContext, endpoint)).andReturn(true); - adapterMock.invoke(messageContext, endpoint); + adapterMock.invoke(this.messageContext, endpoint); - expect(interceptorMock2.handleResponse(messageContext, endpoint)).andReturn(true); - expect(interceptorMock1.handleResponse(messageContext, endpoint)).andReturn(true); + expect(interceptorMock2.handleResponse(this.messageContext, endpoint)).andReturn(true); + expect(interceptorMock1.handleResponse(this.messageContext, endpoint)).andReturn(true); - interceptorMock2.afterCompletion(messageContext, endpoint, null); - interceptorMock1.afterCompletion(messageContext, endpoint, null); + interceptorMock2.afterCompletion(this.messageContext, endpoint, null); + interceptorMock1.afterCompletion(this.messageContext, endpoint, null); EndpointInvocationChain chain = new EndpointInvocationChain(endpoint, new EndpointInterceptor[] { interceptorMock1, interceptorMock2 }); - expect(mappingMock.getEndpoint(messageContext)).andReturn(chain); - expect(factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); + expect(mappingMock.getEndpoint(this.messageContext)).andReturn(chain); + expect(this.factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); - replay(mappingMock, interceptorMock1, interceptorMock2, adapterMock, factoryMock); + replay(mappingMock, interceptorMock1, interceptorMock2, adapterMock, this.factoryMock); // response required for interceptor invocation - messageContext.getResponse(); - dispatcher.dispatch(messageContext); + this.messageContext.getResponse(); + this.dispatcher.dispatch(this.messageContext); - verify(mappingMock, interceptorMock1, interceptorMock2, adapterMock, factoryMock); + verify(mappingMock, interceptorMock1, interceptorMock2, adapterMock, this.factoryMock); } @Test public void testFlowNoResponse() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); - dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); + this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); Object endpoint = new Object(); expect(adapterMock.supports(endpoint)).andReturn(true); EndpointMapping mappingMock = createMock(EndpointMapping.class); - dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); + this.dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); EndpointInterceptor interceptorMock1 = createStrictMock("interceptor1", EndpointInterceptor.class); EndpointInterceptor interceptorMock2 = createStrictMock("interceptor2", EndpointInterceptor.class); EndpointInvocationChain chain = new EndpointInvocationChain(endpoint, new EndpointInterceptor[] { interceptorMock1, interceptorMock2 }); - expect(mappingMock.getEndpoint(messageContext)).andReturn(chain); + expect(mappingMock.getEndpoint(this.messageContext)).andReturn(chain); - expect(interceptorMock1.handleRequest(messageContext, endpoint)).andReturn(true); - expect(interceptorMock2.handleRequest(messageContext, endpoint)).andReturn(true); - interceptorMock2.afterCompletion(messageContext, endpoint, null); - interceptorMock1.afterCompletion(messageContext, endpoint, null); + expect(interceptorMock1.handleRequest(this.messageContext, endpoint)).andReturn(true); + expect(interceptorMock2.handleRequest(this.messageContext, endpoint)).andReturn(true); + interceptorMock2.afterCompletion(this.messageContext, endpoint, null); + interceptorMock1.afterCompletion(this.messageContext, endpoint, null); - adapterMock.invoke(messageContext, endpoint); + adapterMock.invoke(this.messageContext, endpoint); - replay(mappingMock, interceptorMock1, interceptorMock2, adapterMock, factoryMock); + replay(mappingMock, interceptorMock1, interceptorMock2, adapterMock, this.factoryMock); - dispatcher.dispatch(messageContext); + this.dispatcher.dispatch(this.messageContext); - verify(mappingMock, interceptorMock1, interceptorMock2, adapterMock, factoryMock); + verify(mappingMock, interceptorMock1, interceptorMock2, adapterMock, this.factoryMock); } @Test public void testInterceptedRequestFlow() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); - dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); + this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); EndpointMapping mappingMock = createMock(EndpointMapping.class); - dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); + this.dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); EndpointInterceptor interceptorMock1 = createStrictMock("interceptor1", EndpointInterceptor.class); EndpointInterceptor interceptorMock2 = createStrictMock("interceptor2", EndpointInterceptor.class); Object endpoint = new Object(); - expect(interceptorMock1.handleRequest(messageContext, endpoint)).andReturn(false); - expect(interceptorMock1.handleResponse(messageContext, endpoint)).andReturn(true); - interceptorMock1.afterCompletion(messageContext, endpoint, null); + expect(interceptorMock1.handleRequest(this.messageContext, endpoint)).andReturn(false); + expect(interceptorMock1.handleResponse(this.messageContext, endpoint)).andReturn(true); + interceptorMock1.afterCompletion(this.messageContext, endpoint, null); EndpointInvocationChain chain = new EndpointInvocationChain(endpoint, new EndpointInterceptor[] { interceptorMock1, interceptorMock2 }); - expect(mappingMock.getEndpoint(messageContext)).andReturn(chain); - expect(factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); + expect(mappingMock.getEndpoint(this.messageContext)).andReturn(chain); + expect(this.factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); - replay(mappingMock, interceptorMock1, interceptorMock2, adapterMock, factoryMock); + replay(mappingMock, interceptorMock1, interceptorMock2, adapterMock, this.factoryMock); // response required for interceptor invocation - messageContext.getResponse(); + this.messageContext.getResponse(); - dispatcher.dispatch(messageContext); + this.dispatcher.dispatch(this.messageContext); - verify(mappingMock, interceptorMock1, interceptorMock2, adapterMock, factoryMock); + verify(mappingMock, interceptorMock1, interceptorMock2, adapterMock, this.factoryMock); } @Test public void testInterceptedResponseFlow() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); - dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); + this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); EndpointMapping mappingMock = createMock(EndpointMapping.class); - dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); + this.dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); EndpointInterceptor interceptorMock1 = createStrictMock("interceptor1", EndpointInterceptor.class); EndpointInterceptor interceptorMock2 = createStrictMock("interceptor2", EndpointInterceptor.class); Object endpoint = new Object(); - expect(interceptorMock1.handleRequest(messageContext, endpoint)).andReturn(true); - expect(interceptorMock2.handleRequest(messageContext, endpoint)).andReturn(false); - expect(interceptorMock2.handleResponse(messageContext, endpoint)).andReturn(false); - interceptorMock1.afterCompletion(messageContext, endpoint, null); - interceptorMock2.afterCompletion(messageContext, endpoint, null); + expect(interceptorMock1.handleRequest(this.messageContext, endpoint)).andReturn(true); + expect(interceptorMock2.handleRequest(this.messageContext, endpoint)).andReturn(false); + expect(interceptorMock2.handleResponse(this.messageContext, endpoint)).andReturn(false); + interceptorMock1.afterCompletion(this.messageContext, endpoint, null); + interceptorMock2.afterCompletion(this.messageContext, endpoint, null); EndpointInvocationChain chain = new EndpointInvocationChain(endpoint, new EndpointInterceptor[] { interceptorMock1, interceptorMock2 }); - expect(mappingMock.getEndpoint(messageContext)).andReturn(chain); - expect(factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); + expect(mappingMock.getEndpoint(this.messageContext)).andReturn(chain); + expect(this.factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); - replay(mappingMock, interceptorMock1, interceptorMock2, adapterMock, factoryMock); + replay(mappingMock, interceptorMock1, interceptorMock2, adapterMock, this.factoryMock); // response required for interceptor invocation - messageContext.getResponse(); + this.messageContext.getResponse(); - dispatcher.dispatch(messageContext); + this.dispatcher.dispatch(this.messageContext); - verify(mappingMock, interceptorMock1, interceptorMock2, adapterMock, factoryMock); + verify(mappingMock, interceptorMock1, interceptorMock2, adapterMock, this.factoryMock); } @Test public void testResolveExceptionsWithInterceptors() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); - dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); + this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); Object endpoint = new Object(); expect(adapterMock.supports(endpoint)).andReturn(true); EndpointMapping mappingMock = createMock(EndpointMapping.class); - dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); + this.dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); EndpointExceptionResolver resolverMock = createMock(EndpointExceptionResolver.class); - dispatcher.setEndpointExceptionResolvers(Collections.singletonList(resolverMock)); + this.dispatcher.setEndpointExceptionResolvers(Collections.singletonList(resolverMock)); EndpointInterceptor interceptorMock = createStrictMock("interceptor1", EndpointInterceptor.class); - expect(interceptorMock.handleRequest(messageContext, endpoint)).andReturn(true); + expect(interceptorMock.handleRequest(this.messageContext, endpoint)).andReturn(true); - adapterMock.invoke(messageContext, endpoint); + adapterMock.invoke(this.messageContext, endpoint); RuntimeException exception = new RuntimeException(); expectLastCall().andThrow(exception); - expect(resolverMock.resolveException(messageContext, endpoint, exception)).andReturn(true); + expect(resolverMock.resolveException(this.messageContext, endpoint, exception)).andReturn(true); - expect(interceptorMock.handleResponse(messageContext, endpoint)).andReturn(true); + expect(interceptorMock.handleResponse(this.messageContext, endpoint)).andReturn(true); - interceptorMock.afterCompletion(messageContext, endpoint, null); + interceptorMock.afterCompletion(this.messageContext, endpoint, null); EndpointInvocationChain chain = new EndpointInvocationChain(endpoint, new EndpointInterceptor[] { interceptorMock }); - expect(mappingMock.getEndpoint(messageContext)).andReturn(chain); - expect(factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); + expect(mappingMock.getEndpoint(this.messageContext)).andReturn(chain); + expect(this.factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); - replay(mappingMock, interceptorMock, adapterMock, factoryMock, resolverMock); + replay(mappingMock, interceptorMock, adapterMock, this.factoryMock, resolverMock); // response required for interceptor invocation - messageContext.getResponse(); + this.messageContext.getResponse(); try { - dispatcher.dispatch(messageContext); + this.dispatcher.dispatch(this.messageContext); } catch (RuntimeException ex) { } - verify(mappingMock, interceptorMock, adapterMock, factoryMock, resolverMock); + verify(mappingMock, interceptorMock, adapterMock, this.factoryMock, resolverMock); } @Test public void testFaultFlow() throws Exception { EndpointAdapter adapterMock = createMock(EndpointAdapter.class); - dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); + this.dispatcher.setEndpointAdapters(Collections.singletonList(adapterMock)); Object endpoint = new Object(); expect(adapterMock.supports(endpoint)).andReturn(true); EndpointMapping mappingMock = createMock(EndpointMapping.class); - dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); + this.dispatcher.setEndpointMappings(Collections.singletonList(mappingMock)); EndpointInterceptor interceptorMock = createStrictMock(EndpointInterceptor.class); - expect(interceptorMock.handleRequest(messageContext, endpoint)).andReturn(true); - adapterMock.invoke(messageContext, endpoint); - expect(interceptorMock.handleFault(messageContext, endpoint)).andReturn(true); - interceptorMock.afterCompletion(messageContext, endpoint, null); + expect(interceptorMock.handleRequest(this.messageContext, endpoint)).andReturn(true); + adapterMock.invoke(this.messageContext, endpoint); + expect(interceptorMock.handleFault(this.messageContext, endpoint)).andReturn(true); + interceptorMock.afterCompletion(this.messageContext, endpoint, null); EndpointInvocationChain chain = new EndpointInvocationChain(endpoint, new EndpointInterceptor[] { interceptorMock }); - expect(mappingMock.getEndpoint(messageContext)).andReturn(chain); + expect(mappingMock.getEndpoint(this.messageContext)).andReturn(chain); MockWebServiceMessage response = new MockWebServiceMessage(); response.setFault(true); - expect(factoryMock.createWebServiceMessage()).andReturn(response); + expect(this.factoryMock.createWebServiceMessage()).andReturn(response); - replay(mappingMock, interceptorMock, adapterMock, factoryMock); + replay(mappingMock, interceptorMock, adapterMock, this.factoryMock); // response required for interceptor invocation - messageContext.getResponse(); - dispatcher.dispatch(messageContext); + this.messageContext.getResponse(); + this.dispatcher.dispatch(this.messageContext); - verify(mappingMock, interceptorMock, adapterMock, factoryMock); + verify(mappingMock, interceptorMock, adapterMock, this.factoryMock); } @Test public void testNoEndpointFound() { - dispatcher.setEndpointMappings(Collections.emptyList()); + this.dispatcher.setEndpointMappings(Collections.emptyList()); - assertThatExceptionOfType(NoEndpointFoundException.class).isThrownBy(() -> dispatcher.receive(messageContext)); + assertThatExceptionOfType(NoEndpointFoundException.class) + .isThrownBy(() -> this.dispatcher.receive(this.messageContext)); } @Test @@ -411,23 +412,24 @@ public class MessageDispatcherTest { applicationContext.registerSingleton("adapter", PayloadEndpointAdapter.class); applicationContext.registerSingleton("resolver", SimpleSoapExceptionResolver.class); - dispatcher.setApplicationContext(applicationContext); + this.dispatcher.setApplicationContext(applicationContext); - assertThat(dispatcher.getEndpointMappings()).hasSize(1); - assertThat(dispatcher.getEndpointMappings()).hasOnlyElementsOfType(PayloadRootQNameEndpointMapping.class); + assertThat(this.dispatcher.getEndpointMappings()).hasSize(1); + assertThat(this.dispatcher.getEndpointMappings()).hasOnlyElementsOfType(PayloadRootQNameEndpointMapping.class); - assertThat(dispatcher.getEndpointAdapters()).hasSize(1); - assertThat(dispatcher.getEndpointAdapters()).hasOnlyElementsOfTypes(PayloadEndpointAdapter.class); + assertThat(this.dispatcher.getEndpointAdapters()).hasSize(1); + assertThat(this.dispatcher.getEndpointAdapters()).hasOnlyElementsOfTypes(PayloadEndpointAdapter.class); - assertThat(dispatcher.getEndpointExceptionResolvers()).hasSize(1); - assertThat(dispatcher.getEndpointExceptionResolvers()).hasOnlyElementsOfType(SimpleSoapExceptionResolver.class); + assertThat(this.dispatcher.getEndpointExceptionResolvers()).hasSize(1); + assertThat(this.dispatcher.getEndpointExceptionResolvers()) + .hasOnlyElementsOfType(SimpleSoapExceptionResolver.class); } @Test public void testDefaultStrategies() { StaticApplicationContext applicationContext = new StaticApplicationContext(); - dispatcher.setApplicationContext(applicationContext); + this.dispatcher.setApplicationContext(applicationContext); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTest.java index d2d733fe..8a5478f5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTest.java @@ -36,18 +36,18 @@ public abstract class AbstractMessageEndpointTest extends AbstractEndpointTest { @BeforeEach public void createEndpoint() throws Exception { - endpoint = createResponseEndpoint(); + this.endpoint = createResponseEndpoint(); } @Test public void testNoResponse() throws Exception { - endpoint = createNoResponseEndpoint(); + this.endpoint = createNoResponseEndpoint(); StringSource requestSource = new StringSource(REQUEST); MessageContext context = new DefaultMessageContext(new MockWebServiceMessage(requestSource), new MockWebServiceMessageFactory()); - endpoint.invoke(context); + this.endpoint.invoke(context); assertThat(context.hasResponse()).isFalse(); } @@ -55,11 +55,11 @@ public abstract class AbstractMessageEndpointTest extends AbstractEndpointTest { @Test public void testNoRequestPayload() throws Exception { - endpoint = createNoRequestPayloadEndpoint(); + this.endpoint = createNoRequestPayloadEndpoint(); MessageContext context = new DefaultMessageContext(new MockWebServiceMessage((StringBuilder) null), new MockWebServiceMessageFactory()); - endpoint.invoke(context); + this.endpoint.invoke(context); assertThat(context.hasResponse()).isFalse(); } @@ -69,7 +69,7 @@ public abstract class AbstractMessageEndpointTest extends AbstractEndpointTest { MessageContext context = new DefaultMessageContext(new MockWebServiceMessage(requestSource), new MockWebServiceMessageFactory()); - endpoint.invoke(context); + this.endpoint.invoke(context); assertThat(context.hasResponse()).isTrue(); XmlAssert.assertThat(((MockWebServiceMessage) context.getResponse()).getPayloadAsString()) diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTest.java index c664e5b3..5350c4c6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTest.java @@ -38,16 +38,16 @@ public abstract class AbstractPayloadEndpointTest extends AbstractEndpointTest { @BeforeEach public void createEndpoint() throws Exception { - endpoint = createResponseEndpoint(); - transformer = TransformerFactoryUtils.newInstance().newTransformer(); + this.endpoint = createResponseEndpoint(); + this.transformer = TransformerFactoryUtils.newInstance().newTransformer(); } @Test public void testNoResponse() throws Exception { - endpoint = createNoResponseEndpoint(); + this.endpoint = createNoResponseEndpoint(); StringSource requestSource = new StringSource(REQUEST); - Source resultSource = endpoint.invoke(requestSource); + Source resultSource = this.endpoint.invoke(requestSource); assertThat(resultSource).isNull(); } @@ -55,8 +55,8 @@ public abstract class AbstractPayloadEndpointTest extends AbstractEndpointTest { @Test public void testNoRequest() throws Exception { - endpoint = createNoRequestEndpoint(); - Source resultSource = endpoint.invoke(null); + this.endpoint = createNoRequestEndpoint(); + Source resultSource = this.endpoint.invoke(null); assertThat(resultSource).isNull(); } @@ -64,12 +64,12 @@ public abstract class AbstractPayloadEndpointTest extends AbstractEndpointTest { @Override protected final void testSource(Source requestSource) throws Exception { - Source responseSource = endpoint.invoke(requestSource); + Source responseSource = this.endpoint.invoke(requestSource); assertThat(responseSource).isNotNull(); StringResult result = new StringResult(); - transformer.transform(responseSource, result); + this.transformer.transform(responseSource, result); XmlAssert.assertThat(result.toString()).and(RESPONSE).ignoreWhitespace().areSimilar(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java index 21768ab4..3c62eb94 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java @@ -40,7 +40,7 @@ public class EndpointExceptionResolverTest { @BeforeEach public void setUp() throws Exception { - exceptionResolver = new AbstractEndpointExceptionResolver() { + this.exceptionResolver = new AbstractEndpointExceptionResolver() { @Override protected boolean resolveExceptionInternal(MessageContext messageContext, Object endpoint, Exception ex) { @@ -48,14 +48,14 @@ public class EndpointExceptionResolverTest { } }; - exceptionResolver.setMappedEndpoints(Collections.singleton(this)); - methodEndpoint = new MethodEndpoint(this, getClass().getMethod("emptyMethod")); + this.exceptionResolver.setMappedEndpoints(Collections.singleton(this)); + this.methodEndpoint = new MethodEndpoint(this, getClass().getMethod("emptyMethod")); } @Test public void testMatchMethodEndpoint() { - boolean matched = exceptionResolver.resolveException(null, methodEndpoint, null); + boolean matched = this.exceptionResolver.resolveException(null, this.methodEndpoint, null); assertThat(matched).isTrue(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java index 63e27f2a..88b9235b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java @@ -67,9 +67,9 @@ public class MarshallingPayloadEndpointTest { public void setUp() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(""); - transformer = TransformerFactoryUtils.newInstance().newTransformer(); - factoryMock = createMock(WebServiceMessageFactory.class); - context = new DefaultMessageContext(request, factoryMock); + this.transformer = TransformerFactoryUtils.newInstance().newTransformer(); + this.factoryMock = createMock(WebServiceMessageFactory.class); + this.context = new DefaultMessageContext(request, this.factoryMock); } @Test @@ -82,7 +82,7 @@ public class MarshallingPayloadEndpointTest { try { StringWriter writer = new StringWriter(); - transformer.transform(source, new StreamResult(writer)); + MarshallingPayloadEndpointTest.this.transformer.transform(source, new StreamResult(writer)); XmlAssert.assertThat(writer.toString()).and("").ignoreWhitespace().areIdentical(); @@ -104,7 +104,8 @@ public class MarshallingPayloadEndpointTest { assertThat(graph).isEqualTo("result"); try { - transformer.transform(new StreamSource(new StringReader("")), result); + MarshallingPayloadEndpointTest.this.transformer + .transform(new StreamSource(new StringReader("")), result); } catch (TransformerException e) { fail(e.getMessage()); @@ -126,17 +127,17 @@ public class MarshallingPayloadEndpointTest { endpoint.setUnmarshaller(unmarshaller); endpoint.afterPropertiesSet(); - expect(factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); + expect(this.factoryMock.createWebServiceMessage()).andReturn(new MockWebServiceMessage()); - replay(factoryMock); + replay(this.factoryMock); - endpoint.invoke(context); - MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); + endpoint.invoke(this.context); + MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); assertThat(response).isNotNull(); XmlAssert.assertThat(response.getPayloadAsString()).and("").ignoreWhitespace().areIdentical(); - verify(factoryMock); + verify(this.factoryMock); } @Test @@ -149,7 +150,7 @@ public class MarshallingPayloadEndpointTest { try { StringWriter writer = new StringWriter(); - transformer.transform(source, new StreamResult(writer)); + MarshallingPayloadEndpointTest.this.transformer.transform(source, new StreamResult(writer)); XmlAssert.assertThat(writer.toString()).and("").ignoreWhitespace().areIdentical(); @@ -183,19 +184,19 @@ public class MarshallingPayloadEndpointTest { endpoint.setMarshaller(marshaller); endpoint.setUnmarshaller(unmarshaller); endpoint.afterPropertiesSet(); - replay(factoryMock); - endpoint.invoke(context); + replay(this.factoryMock); + endpoint.invoke(this.context); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); - verify(factoryMock); + verify(this.factoryMock); } @Test public void testInvokeNoRequest() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage((StringBuilder) null); - context = new DefaultMessageContext(request, factoryMock); + this.context = new DefaultMessageContext(request, this.factoryMock); AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { @@ -210,12 +211,12 @@ public class MarshallingPayloadEndpointTest { endpoint.setMarshaller(new SimpleMarshaller()); endpoint.setUnmarshaller(new SimpleMarshaller()); endpoint.afterPropertiesSet(); - replay(factoryMock); - endpoint.invoke(context); + replay(this.factoryMock); + endpoint.invoke(this.context); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); - verify(factoryMock); + verify(this.factoryMock); } @Test @@ -227,13 +228,13 @@ public class MarshallingPayloadEndpointTest { MimeMessage response = createMock("response", MimeMessage.class); Source requestSource = new StringSource(""); expect(request.getPayloadSource()).andReturn(requestSource); - expect(factoryMock.createWebServiceMessage()).andReturn(response); + expect(this.factoryMock.createWebServiceMessage()).andReturn(response); expect(unmarshaller.unmarshal(eq(requestSource), isA(MimeContainer.class))).andReturn(42L); Result responseResult = new StringResult(); expect(response.getPayloadResult()).andReturn(responseResult); marshaller.marshal(eq("result"), eq(responseResult), isA(MimeContainer.class)); - replay(factoryMock, unmarshaller, marshaller, request, response); + replay(this.factoryMock, unmarshaller, marshaller, request, response); AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { @@ -249,12 +250,12 @@ public class MarshallingPayloadEndpointTest { endpoint.setUnmarshaller(unmarshaller); endpoint.afterPropertiesSet(); - context = new DefaultMessageContext(request, factoryMock); - endpoint.invoke(context); + this.context = new DefaultMessageContext(request, this.factoryMock); + endpoint.invoke(this.context); assertThat(response).isNotNull(); - verify(factoryMock, unmarshaller, marshaller, request, response); + verify(this.factoryMock, unmarshaller, marshaller, request, response); } private static class SimpleMarshaller implements Marshaller, Unmarshaller { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java index 93906cef..6e98463c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java @@ -34,58 +34,58 @@ public class MethodEndpointTest { @BeforeEach public void setUp() throws Exception { - myMethodInvoked = false; - method = getClass().getMethod("myMethod", String.class); - endpoint = new MethodEndpoint(this, method); + this.myMethodInvoked = false; + this.method = getClass().getMethod("myMethod", String.class); + this.endpoint = new MethodEndpoint(this, this.method); } @Test public void testGetters() { - assertThat(endpoint.getBean()).isEqualTo(this); - assertThat(endpoint.getMethod()).isEqualTo(method); + assertThat(this.endpoint.getBean()).isEqualTo(this); + assertThat(this.endpoint.getMethod()).isEqualTo(this.method); } @Test public void testInvoke() throws Exception { - assertThat(myMethodInvoked).isFalse(); + assertThat(this.myMethodInvoked).isFalse(); - endpoint.invoke("arg"); + this.endpoint.invoke("arg"); - assertThat(myMethodInvoked).isTrue(); + assertThat(this.myMethodInvoked).isTrue(); } @Test public void testEquals() throws Exception { - assertThat(endpoint).isEqualTo(new MethodEndpoint(this, method)); + assertThat(this.endpoint).isEqualTo(new MethodEndpoint(this, this.method)); Method otherMethod = getClass().getMethod("testEquals"); - assertThat(new MethodEndpoint(this, otherMethod).equals(endpoint)).isFalse(); + assertThat(new MethodEndpoint(this, otherMethod).equals(this.endpoint)).isFalse(); } @Test public void testHashCode() throws Exception { - assertThat(endpoint.hashCode()).isEqualTo(new MethodEndpoint(this, method).hashCode()); + assertThat(this.endpoint.hashCode()).isEqualTo(new MethodEndpoint(this, this.method).hashCode()); Method otherMethod = getClass().getMethod("testEquals"); - assertThat(new MethodEndpoint(this, otherMethod).hashCode() == endpoint.hashCode()).isFalse(); + assertThat(new MethodEndpoint(this, otherMethod).hashCode() == this.endpoint.hashCode()).isFalse(); } @Test public void testToString() { - assertThat(endpoint.toString()).isNotNull(); + assertThat(this.endpoint.toString()).isNotNull(); } public void myMethod(String arg) { assertThat(arg).isEqualTo("arg"); - myMethodInvoked = true; + this.myMethodInvoked = true; } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java index 4af56c87..4383bab5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java @@ -68,73 +68,73 @@ public class DefaultMethodEndpointAdapterTest { @BeforeEach public void setUp() throws Exception { - adapter = new DefaultMethodEndpointAdapter(); - argumentResolver1 = createMock("stringResolver", MethodArgumentResolver.class); - argumentResolver2 = createMock("intResolver", MethodArgumentResolver.class); - returnValueHandler = createMock(MethodReturnValueHandler.class); - adapter.setMethodArgumentResolvers(Arrays.asList(argumentResolver1, argumentResolver2)); - adapter.setMethodReturnValueHandlers(Collections.singletonList(returnValueHandler)); - supportedEndpoint = new MethodEndpoint(this, "supported", String.class, Integer.class); - nullReturnValue = new MethodEndpoint(this, "nullReturnValue", String.class); - unsupportedEndpoint = new MethodEndpoint(this, "unsupported", String.class); - exceptionEndpoint = new MethodEndpoint(this, "exception", String.class); + this.adapter = new DefaultMethodEndpointAdapter(); + this.argumentResolver1 = createMock("stringResolver", MethodArgumentResolver.class); + this.argumentResolver2 = createMock("intResolver", MethodArgumentResolver.class); + this.returnValueHandler = createMock(MethodReturnValueHandler.class); + this.adapter.setMethodArgumentResolvers(Arrays.asList(this.argumentResolver1, this.argumentResolver2)); + this.adapter.setMethodReturnValueHandlers(Collections.singletonList(this.returnValueHandler)); + this.supportedEndpoint = new MethodEndpoint(this, "supported", String.class, Integer.class); + this.nullReturnValue = new MethodEndpoint(this, "nullReturnValue", String.class); + this.unsupportedEndpoint = new MethodEndpoint(this, "unsupported", String.class); + this.exceptionEndpoint = new MethodEndpoint(this, "exception", String.class); } @Test public void initDefaultStrategies() throws Exception { - adapter = new DefaultMethodEndpointAdapter(); - adapter.setBeanClassLoader(DefaultMethodEndpointAdapterTest.class.getClassLoader()); - adapter.afterPropertiesSet(); + this.adapter = new DefaultMethodEndpointAdapter(); + this.adapter.setBeanClassLoader(DefaultMethodEndpointAdapterTest.class.getClassLoader()); + this.adapter.afterPropertiesSet(); - assertThat(adapter.getMethodArgumentResolvers()).isNotEmpty(); - assertThat(adapter.getMethodReturnValueHandlers()).isNotEmpty(); + assertThat(this.adapter.getMethodArgumentResolvers()).isNotEmpty(); + assertThat(this.adapter.getMethodReturnValueHandlers()).isNotEmpty(); } @Test public void supportsSupported() { - expect(argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); - expect(argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(false); - expect(argumentResolver2.supportsParameter(isA(MethodParameter.class))).andReturn(true); - expect(returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(true); + expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); + expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(false); + expect(this.argumentResolver2.supportsParameter(isA(MethodParameter.class))).andReturn(true); + expect(this.returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(true); - replay(argumentResolver1, argumentResolver2, returnValueHandler); + replay(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); - boolean result = adapter.supports(supportedEndpoint); + boolean result = this.adapter.supports(this.supportedEndpoint); assertThat(result).isTrue(); - verify(argumentResolver1, argumentResolver2, returnValueHandler); + verify(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); } @Test public void supportsUnsupportedParameter() { - expect(argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(false); - expect(argumentResolver2.supportsParameter(isA(MethodParameter.class))).andReturn(false); + expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(false); + expect(this.argumentResolver2.supportsParameter(isA(MethodParameter.class))).andReturn(false); - replay(argumentResolver1, argumentResolver2, returnValueHandler); + replay(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); - boolean result = adapter.supports(unsupportedEndpoint); + boolean result = this.adapter.supports(this.unsupportedEndpoint); assertThat(result).isFalse(); - verify(argumentResolver1, argumentResolver2, returnValueHandler); + verify(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); } @Test public void supportsUnsupportedReturnType() { - expect(argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); - expect(returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(false); + expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); + expect(this.returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(false); - replay(argumentResolver1, argumentResolver2, returnValueHandler); + replay(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); - boolean result = adapter.supports(unsupportedEndpoint); + boolean result = this.adapter.supports(this.unsupportedEndpoint); assertThat(result).isFalse(); - verify(argumentResolver1, argumentResolver2, returnValueHandler); + verify(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); } @Test @@ -145,24 +145,24 @@ public class DefaultMethodEndpointAdapterTest { String value = "Foo"; // arg 0 - expect(argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); - expect(argumentResolver1.resolveArgument(eq(messageContext), isA(MethodParameter.class))).andReturn(value); + expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); + expect(this.argumentResolver1.resolveArgument(eq(messageContext), isA(MethodParameter.class))).andReturn(value); // arg 1 - expect(argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(false); - expect(argumentResolver2.supportsParameter(isA(MethodParameter.class))).andReturn(true); - expect(argumentResolver2.resolveArgument(eq(messageContext), isA(MethodParameter.class))).andReturn(42); + expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(false); + expect(this.argumentResolver2.supportsParameter(isA(MethodParameter.class))).andReturn(true); + expect(this.argumentResolver2.resolveArgument(eq(messageContext), isA(MethodParameter.class))).andReturn(42); - expect(returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(true); - returnValueHandler.handleReturnValue(eq(messageContext), isA(MethodParameter.class), eq(value)); + expect(this.returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(true); + this.returnValueHandler.handleReturnValue(eq(messageContext), isA(MethodParameter.class), eq(value)); - replay(argumentResolver1, argumentResolver2, returnValueHandler); + replay(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); - adapter.invoke(messageContext, supportedEndpoint); + this.adapter.invoke(messageContext, this.supportedEndpoint); - assertThat(supportedArgument).isEqualTo(value); + assertThat(this.supportedArgument).isEqualTo(value); - verify(argumentResolver1, argumentResolver2, returnValueHandler); + verify(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); } @Test @@ -173,19 +173,19 @@ public class DefaultMethodEndpointAdapterTest { String value = "Foo"; - expect(argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); - expect(argumentResolver1.resolveArgument(eq(messageContext), isA(MethodParameter.class))).andReturn(value); + expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); + expect(this.argumentResolver1.resolveArgument(eq(messageContext), isA(MethodParameter.class))).andReturn(value); - expect(returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(true); - returnValueHandler.handleReturnValue(eq(messageContext), isA(MethodParameter.class), isNull()); + expect(this.returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(true); + this.returnValueHandler.handleReturnValue(eq(messageContext), isA(MethodParameter.class), isNull()); - replay(argumentResolver1, argumentResolver2, returnValueHandler); + replay(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); - adapter.invoke(messageContext, nullReturnValue); + this.adapter.invoke(messageContext, this.nullReturnValue); - assertThat(supportedArgument).isEqualTo(value); + assertThat(this.supportedArgument).isEqualTo(value); - verify(argumentResolver1, argumentResolver2, returnValueHandler); + verify(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); } @Test @@ -196,34 +196,34 @@ public class DefaultMethodEndpointAdapterTest { String value = "Foo"; - expect(argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); - expect(argumentResolver1.resolveArgument(eq(messageContext), isA(MethodParameter.class))).andReturn(value); + expect(this.argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(true); + expect(this.argumentResolver1.resolveArgument(eq(messageContext), isA(MethodParameter.class))).andReturn(value); - replay(argumentResolver1, argumentResolver2, returnValueHandler); + replay(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); try { - adapter.invoke(messageContext, exceptionEndpoint); + this.adapter.invoke(messageContext, this.exceptionEndpoint); fail("IOException expected"); } catch (IOException expected) { // expected } - assertThat(supportedArgument).isEqualTo(value); + assertThat(this.supportedArgument).isEqualTo(value); - verify(argumentResolver1, argumentResolver2, returnValueHandler); + verify(this.argumentResolver1, this.argumentResolver2, this.returnValueHandler); } public String supported(String s, Integer i) { - supportedArgument = s; + this.supportedArgument = s; return s; } public String nullReturnValue(String s) { - supportedArgument = s; + this.supportedArgument = s; return null; } @@ -233,7 +233,7 @@ public class DefaultMethodEndpointAdapterTest { public String exception(String s) throws IOException { - supportedArgument = s; + this.supportedArgument = s; throw new IOException(s); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java index 8631a189..9ce544e7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java @@ -57,12 +57,12 @@ public class GenericMarshallingMethodEndpointAdapterTest { @BeforeEach public void setUp() throws Exception { - adapter = new GenericMarshallingMethodEndpointAdapter(); - marshallerMock = createMock(GenericMarshaller.class); - adapter.setMarshaller(marshallerMock); - unmarshallerMock = createMock(GenericUnmarshaller.class); - adapter.setUnmarshaller(unmarshallerMock); - adapter.afterPropertiesSet(); + this.adapter = new GenericMarshallingMethodEndpointAdapter(); + this.marshallerMock = createMock(GenericMarshaller.class); + this.adapter.setMarshaller(this.marshallerMock); + this.unmarshallerMock = createMock(GenericUnmarshaller.class); + this.adapter.setUnmarshaller(this.unmarshallerMock); + this.adapter.afterPropertiesSet(); } @Test @@ -75,17 +75,17 @@ public class GenericMarshallingMethodEndpointAdapterTest { Method noResponse = getClass().getMethod("noResponse", MyGenericType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); - expect(unmarshallerMock.unmarshal(isA(Source.class))).andReturn(new MyGenericType()); + expect(this.unmarshallerMock.unmarshal(isA(Source.class))).andReturn(new MyGenericType()); - replay(marshallerMock, unmarshallerMock, messageMock, factoryMock); + replay(this.marshallerMock, this.unmarshallerMock, messageMock, factoryMock); - assertThat(noResponseInvoked).isFalse(); + assertThat(this.noResponseInvoked).isFalse(); - adapter.invoke(messageContext, methodEndpoint); + this.adapter.invoke(messageContext, methodEndpoint); - assertThat(noResponseInvoked).isTrue(); + assertThat(this.noResponseInvoked).isTrue(); - verify(marshallerMock, unmarshallerMock, messageMock, factoryMock); + verify(this.marshallerMock, this.unmarshallerMock, messageMock, factoryMock); } @Test @@ -99,15 +99,15 @@ public class GenericMarshallingMethodEndpointAdapterTest { Method noResponse = getClass().getMethod("noResponse", MyGenericType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); - replay(marshallerMock, unmarshallerMock, messageMock, factoryMock); + replay(this.marshallerMock, this.unmarshallerMock, messageMock, factoryMock); - assertThat(noResponseInvoked).isFalse(); + assertThat(this.noResponseInvoked).isFalse(); - adapter.invoke(messageContext, methodEndpoint); + this.adapter.invoke(messageContext, methodEndpoint); - assertThat(noResponseInvoked).isTrue(); + assertThat(this.noResponseInvoked).isTrue(); - verify(marshallerMock, unmarshallerMock, messageMock, factoryMock); + verify(this.marshallerMock, this.unmarshallerMock, messageMock, factoryMock); } @Test @@ -123,18 +123,18 @@ public class GenericMarshallingMethodEndpointAdapterTest { Method response = getClass().getMethod("response", MyGenericType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, response); - expect(unmarshallerMock.unmarshal(isA(Source.class))).andReturn(new MyGenericType()); - marshallerMock.marshal(isA(MyGenericType.class), isA(Result.class)); + expect(this.unmarshallerMock.unmarshal(isA(Source.class))).andReturn(new MyGenericType()); + this.marshallerMock.marshal(isA(MyGenericType.class), isA(Result.class)); - replay(marshallerMock, unmarshallerMock, requestMock, responseMock, factoryMock); + replay(this.marshallerMock, this.unmarshallerMock, requestMock, responseMock, factoryMock); - assertThat(responseInvoked).isFalse(); + assertThat(this.responseInvoked).isFalse(); - adapter.invoke(messageContext, methodEndpoint); + this.adapter.invoke(messageContext, methodEndpoint); - assertThat(responseInvoked).isTrue(); + assertThat(this.responseInvoked).isTrue(); - verify(marshallerMock, unmarshallerMock, requestMock, responseMock, factoryMock); + verify(this.marshallerMock, this.unmarshallerMock, requestMock, responseMock, factoryMock); } @Test @@ -142,13 +142,13 @@ public class GenericMarshallingMethodEndpointAdapterTest { Method noResponse = getClass().getMethod("noResponse", MyGenericType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); - expect(unmarshallerMock.supports(noResponse.getGenericParameterTypes()[0])).andReturn(true); + expect(this.unmarshallerMock.supports(noResponse.getGenericParameterTypes()[0])).andReturn(true); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); + assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test @@ -157,14 +157,14 @@ public class GenericMarshallingMethodEndpointAdapterTest { Method response = getClass().getMethod("response", MyGenericType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, response); - expect(unmarshallerMock.supports(response.getGenericParameterTypes()[0])).andReturn(true); - expect(marshallerMock.supports(response.getGenericReturnType())).andReturn(true); + expect(this.unmarshallerMock.supports(response.getGenericParameterTypes()[0])).andReturn(true); + expect(this.marshallerMock.supports(response.getGenericReturnType())).andReturn(true); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); + assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test @@ -172,48 +172,48 @@ public class GenericMarshallingMethodEndpointAdapterTest { Method unsupported = getClass().getMethod("unsupportedMultipleParams", String.class, String.class); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); + assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); - expect(unmarshallerMock.supports(unsupported.getGenericParameterTypes()[0])).andReturn(false); - expect(marshallerMock.supports(unsupported.getGenericReturnType())).andReturn(true); + expect(this.unmarshallerMock.supports(unsupported.getGenericParameterTypes()[0])).andReturn(false); + expect(this.marshallerMock.supports(unsupported.getGenericReturnType())).andReturn(true); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); + assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test public void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); - expect(marshallerMock.supports(unsupported.getGenericReturnType())).andReturn(false); + expect(this.marshallerMock.supports(unsupported.getGenericReturnType())).andReturn(false); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); + assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } public void noResponse(MyGenericType type) { - noResponseInvoked = true; + this.noResponseInvoked = true; } public MyGenericType response(MyGenericType type) { - responseInvoked = true; + this.responseInvoked = true; return type; } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java index 1db81766..ab22d852 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java @@ -57,14 +57,14 @@ public class MarshallingMethodEndpointAdapterTest { @BeforeEach public void setUp() throws Exception { - adapter = new MarshallingMethodEndpointAdapter(); - marshallerMock = createMock(Marshaller.class); - adapter.setMarshaller(marshallerMock); - unmarshallerMock = createMock(Unmarshaller.class); - adapter.setUnmarshaller(unmarshallerMock); - adapter.afterPropertiesSet(); + this.adapter = new MarshallingMethodEndpointAdapter(); + this.marshallerMock = createMock(Marshaller.class); + this.adapter.setMarshaller(this.marshallerMock); + this.unmarshallerMock = createMock(Unmarshaller.class); + this.adapter.setUnmarshaller(this.unmarshallerMock); + this.adapter.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(""); - messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + this.messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); } @Test @@ -72,35 +72,35 @@ public class MarshallingMethodEndpointAdapterTest { Method noResponse = getClass().getMethod("noResponse", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); - expect(unmarshallerMock.unmarshal(isA(Source.class))).andReturn(new MyType()); + expect(this.unmarshallerMock.unmarshal(isA(Source.class))).andReturn(new MyType()); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(noResponseInvoked).isFalse(); + assertThat(this.noResponseInvoked).isFalse(); - adapter.invoke(messageContext, methodEndpoint); + this.adapter.invoke(this.messageContext, methodEndpoint); - assertThat(noResponseInvoked).isTrue(); + assertThat(this.noResponseInvoked).isTrue(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test public void testNoRequestPayload() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); - messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + this.messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); Method noResponse = getClass().getMethod("noResponse", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(noResponseInvoked).isFalse(); + assertThat(this.noResponseInvoked).isFalse(); - adapter.invoke(messageContext, methodEndpoint); - assertThat(noResponseInvoked).isTrue(); + this.adapter.invoke(this.messageContext, methodEndpoint); + assertThat(this.noResponseInvoked).isTrue(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test @@ -108,18 +108,18 @@ public class MarshallingMethodEndpointAdapterTest { Method response = getClass().getMethod("response", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, response); - expect(unmarshallerMock.unmarshal(isA(Source.class))).andReturn(new MyType()); - marshallerMock.marshal(isA(MyType.class), isA(Result.class)); + expect(this.unmarshallerMock.unmarshal(isA(Source.class))).andReturn(new MyType()); + this.marshallerMock.marshal(isA(MyType.class), isA(Result.class)); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(responseInvoked).isFalse(); + assertThat(this.responseInvoked).isFalse(); - adapter.invoke(messageContext, methodEndpoint); + this.adapter.invoke(this.messageContext, methodEndpoint); - assertThat(responseInvoked).isTrue(); + assertThat(this.responseInvoked).isTrue(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test @@ -127,13 +127,13 @@ public class MarshallingMethodEndpointAdapterTest { Method noResponse = getClass().getMethod("noResponse", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); - expect(unmarshallerMock.supports(MyType.class)).andReturn(true); + expect(this.unmarshallerMock.supports(MyType.class)).andReturn(true); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); + assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test @@ -141,14 +141,14 @@ public class MarshallingMethodEndpointAdapterTest { Method response = getClass().getMethod("response", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, response); - expect(unmarshallerMock.supports(MyType.class)).andReturn(true); - expect(marshallerMock.supports(MyType.class)).andReturn(true); + expect(this.unmarshallerMock.supports(MyType.class)).andReturn(true); + expect(this.marshallerMock.supports(MyType.class)).andReturn(true); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); + assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test @@ -156,48 +156,48 @@ public class MarshallingMethodEndpointAdapterTest { Method unsupported = getClass().getMethod("unsupportedMultipleParams", String.class, String.class); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); + assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); - expect(unmarshallerMock.supports(String.class)).andReturn(false); - expect(marshallerMock.supports(String.class)).andReturn(true); + expect(this.unmarshallerMock.supports(String.class)).andReturn(false); + expect(this.marshallerMock.supports(String.class)).andReturn(true); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); + assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } @Test public void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); - expect(marshallerMock.supports(String.class)).andReturn(false); + expect(this.marshallerMock.supports(String.class)).andReturn(false); - replay(marshallerMock, unmarshallerMock); + replay(this.marshallerMock, this.unmarshallerMock); - assertThat(adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); + assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, unsupported))).isFalse(); - verify(marshallerMock, unmarshallerMock); + verify(this.marshallerMock, this.unmarshallerMock); } public void noResponse(MyType type) { - noResponseInvoked = true; + this.noResponseInvoked = true; } public MyType response(MyType type) { - responseInvoked = true; + this.responseInvoked = true; return new MyType(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java index d6e5dcd0..6269b36e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java @@ -37,13 +37,13 @@ public class MessageEndpointAdapterTest { @BeforeEach public void setUp() { - adapter = new MessageEndpointAdapter(); - endpointMock = createMock(MessageEndpoint.class); + this.adapter = new MessageEndpointAdapter(); + this.endpointMock = createMock(MessageEndpoint.class); } @Test public void testSupports() { - assertThat(adapter.supports(endpointMock)).isTrue(); + assertThat(this.adapter.supports(this.endpointMock)).isTrue(); } @Test @@ -51,13 +51,13 @@ public class MessageEndpointAdapterTest { MessageContext context = new DefaultMessageContext(new MockWebServiceMessageFactory()); - endpointMock.invoke(context); + this.endpointMock.invoke(context); - replay(endpointMock); + replay(this.endpointMock); - adapter.invoke(context, endpointMock); + this.adapter.invoke(context, this.endpointMock); - verify(endpointMock); + verify(this.endpointMock); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java index 5dafe77c..31c241c4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java @@ -37,21 +37,21 @@ public class MessageMethodEndpointAdapterTest { @BeforeEach public void setUp() { - adapter = new MessageMethodEndpointAdapter(); - messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); + this.adapter = new MessageMethodEndpointAdapter(); + this.messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @Test public void testSupported() throws NoSuchMethodException { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "supported", MessageContext.class); - assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); + assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); } @Test public void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { - assertThat(adapter.supportsInternal( + assertThat(this.adapter.supportsInternal( new MethodEndpoint(this, "unsupportedMultipleParams", MessageContext.class, MessageContext.class))) .isFalse(); } @@ -59,7 +59,8 @@ public class MessageMethodEndpointAdapterTest { @Test public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { - assertThat(adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", String.class))).isFalse(); + assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", String.class))) + .isFalse(); } @Test @@ -67,15 +68,15 @@ public class MessageMethodEndpointAdapterTest { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "supported", MessageContext.class); - assertThat(supportedInvoked).isFalse(); + assertThat(this.supportedInvoked).isFalse(); - adapter.invoke(messageContext, methodEndpoint); + this.adapter.invoke(this.messageContext, methodEndpoint); - assertThat(supportedInvoked).isTrue(); + assertThat(this.supportedInvoked).isTrue(); } public void supported(MessageContext context) { - supportedInvoked = true; + this.supportedInvoked = true; } public void unsupportedMultipleParams(MessageContext s1, MessageContext s2) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java index 5b18611b..bffa7427 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java @@ -51,13 +51,13 @@ public class PayloadEndpointAdapterTest { @BeforeEach public void setUp() { - adapter = new PayloadEndpointAdapter(); - endpointMock = createMock(PayloadEndpoint.class); + this.adapter = new PayloadEndpointAdapter(); + this.endpointMock = createMock(PayloadEndpoint.class); } @Test public void testSupports() { - assertThat(adapter.supports(endpointMock)).isTrue(); + assertThat(this.adapter.supports(this.endpointMock)).isTrue(); } @Test @@ -77,7 +77,7 @@ public class PayloadEndpointAdapterTest { endpoint.invoke(request.getPayloadSource()); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - adapter.invoke(messageContext, endpoint); + this.adapter.invoke(messageContext, endpoint); MockWebServiceMessage response = (MockWebServiceMessage) messageContext.getResponse(); @@ -90,13 +90,13 @@ public class PayloadEndpointAdapterTest { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - expect(endpointMock.invoke(isA(Source.class))).andReturn(null); + expect(this.endpointMock.invoke(isA(Source.class))).andReturn(null); - replay(endpointMock); + replay(this.endpointMock); - adapter.invoke(messageContext, endpointMock); + this.adapter.invoke(messageContext, this.endpointMock); - verify(endpointMock); + verify(this.endpointMock); assertThat(messageContext.hasResponse()).isFalse(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java index ac6d3578..14243a08 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java @@ -46,28 +46,28 @@ public class PayloadMethodEndpointAdapterTest { @BeforeEach public void setUp() { - adapter = new PayloadMethodEndpointAdapter(); - messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); + this.adapter = new PayloadMethodEndpointAdapter(); + this.messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @Test public void testSupportedNoResponse() throws NoSuchMethodException { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "noResponse", DOMSource.class); - assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); + assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); } @Test public void testSupportedResponse() throws NoSuchMethodException { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "response", StreamSource.class); - assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); + assertThat(this.adapter.supportsInternal(methodEndpoint)).isTrue(); } @Test public void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { - assertThat(adapter + assertThat(this.adapter .supportsInternal(new MethodEndpoint(this, "unsupportedMultipleParams", Source.class, Source.class))) .isFalse(); } @@ -75,14 +75,15 @@ public class PayloadMethodEndpointAdapterTest { @Test public void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { - assertThat(adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongReturnType", Source.class))) + assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongReturnType", Source.class))) .isFalse(); } @Test public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { - assertThat(adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", String.class))).isFalse(); + assertThat(this.adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", String.class))) + .isFalse(); } @Test @@ -90,34 +91,34 @@ public class PayloadMethodEndpointAdapterTest { MethodEndpoint methodEndpoint = new MethodEndpoint(this, "noResponse", DOMSource.class); - assertThat(noResponseInvoked).isFalse(); + assertThat(this.noResponseInvoked).isFalse(); - adapter.invoke(messageContext, methodEndpoint); + this.adapter.invoke(this.messageContext, methodEndpoint); - assertThat(noResponseInvoked).isTrue(); + assertThat(this.noResponseInvoked).isTrue(); } @Test public void testResponse() throws Exception { WebServiceMessage request = new MockWebServiceMessage(""); - messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + this.messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); MethodEndpoint methodEndpoint = new MethodEndpoint(this, "response", StreamSource.class); - assertThat(responseInvoked).isFalse(); + assertThat(this.responseInvoked).isFalse(); - adapter.invoke(messageContext, methodEndpoint); + this.adapter.invoke(this.messageContext, methodEndpoint); - assertThat(responseInvoked).isTrue(); + assertThat(this.responseInvoked).isTrue(); } public void noResponse(DOMSource request) { - noResponseInvoked = true; + this.noResponseInvoked = true; } public Source response(StreamSource request) { - responseInvoked = true; + this.responseInvoked = true; return request; } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java index 5e670d3e..0fc110e0 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java @@ -64,8 +64,8 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { @BeforeEach public void setUp() throws Exception { - adapter = new XPathParamAnnotationMethodEndpointAdapter(); - adapter.afterPropertiesSet(); + this.adapter = new XPathParamAnnotationMethodEndpointAdapter(); + this.adapter.afterPropertiesSet(); } @Test @@ -73,21 +73,21 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidParamType", Integer.TYPE); - assertThat(adapter.supports(endpoint)).isFalse(); + assertThat(this.adapter.supports(endpoint)).isFalse(); } @Test public void testUnsupportedInvalidReturnType() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidReturnType", String.class); - assertThat(adapter.supports(endpoint)).isFalse(); + assertThat(this.adapter.supports(endpoint)).isFalse(); } @Test public void testUnsupportedInvalidParams() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidParams", String.class, String.class); - assertThat(adapter.supports(endpoint)).isFalse(); + assertThat(this.adapter.supports(endpoint)).isFalse(); } @Test @@ -95,28 +95,28 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { MethodEndpoint endpoint = new MethodEndpoint(this, "supportedTypes", Boolean.TYPE, Double.TYPE, Node.class, NodeList.class, String.class); - assertThat(adapter.supports(endpoint)).isTrue(); + assertThat(this.adapter.supports(endpoint)).isTrue(); } @Test public void testSupportsStringSource() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "supportedStringSource", String.class); - assertThat(adapter.supports(endpoint)).isTrue(); + assertThat(this.adapter.supports(endpoint)).isTrue(); } @Test public void testSupportsSource() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "supportedSource", String.class); - assertThat(adapter.supports(endpoint)).isTrue(); + assertThat(this.adapter.supports(endpoint)).isTrue(); } @Test public void testSupportsVoid() throws NoSuchMethodException { MethodEndpoint endpoint = new MethodEndpoint(this, "supportedVoid", String.class); - assertThat(adapter.supports(endpoint)).isTrue(); + assertThat(this.adapter.supports(endpoint)).isTrue(); } @Test @@ -130,9 +130,9 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { MessageContext messageContext = new DefaultMessageContext(messageMock, factoryMock); MethodEndpoint endpoint = new MethodEndpoint(this, "supportedTypes", Boolean.TYPE, Double.TYPE, Node.class, NodeList.class, String.class); - adapter.invoke(messageContext, endpoint); + this.adapter.invoke(messageContext, endpoint); - assertThat(supportedTypesInvoked).isTrue(); + assertThat(this.supportedTypesInvoked).isTrue(); verify(messageMock, factoryMock); } @@ -150,9 +150,9 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { MessageContext messageContext = new DefaultMessageContext(requestMock, factoryMock); MethodEndpoint endpoint = new MethodEndpoint(this, "supportedSource", String.class); - adapter.invoke(messageContext, endpoint); + this.adapter.invoke(messageContext, endpoint); - assertThat(supportedSourceInvoked).isTrue(); + assertThat(this.supportedSourceInvoked).isTrue(); verify(requestMock, responseMock, factoryMock); } @@ -186,13 +186,13 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { Map namespaces = new HashMap<>(); namespaces.put("root", rootNamespace); namespaces.put("child", childNamespace); - adapter.setNamespaces(namespaces); + this.adapter.setNamespaces(namespaces); MessageContext messageContext = new DefaultMessageContext(requestMock, factoryMock); MethodEndpoint endpoint = new MethodEndpoint(this, "namespaces", Node.class); - adapter.invoke(messageContext, endpoint); + this.adapter.invoke(messageContext, endpoint); - assertThat(namespacesInvoked).isTrue(); + assertThat(this.namespacesInvoked).isTrue(); } public void supportedVoid(@XPathParam("/") String param1) { @@ -200,7 +200,7 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { public Source supportedSource(@XPathParam("/") String param1) { - supportedSourceInvoked = true; + this.supportedSourceInvoked = true; return new StringSource(""); } @@ -212,7 +212,7 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { @XPathParam("/root/child/number") double param2, @XPathParam("/root/child") Node param3, @XPathParam("/root/*") NodeList param4, @XPathParam("/root/child/text") String param5) { - supportedTypesInvoked = true; + this.supportedTypesInvoked = true; assertThat(param1).isTrue(); assertThat(param2).isEqualTo(42D); @@ -235,7 +235,7 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { public void namespaces(@XPathParam(".") Node param) { - namespacesInvoked = true; + this.namespacesInvoked = true; assertThat(param.getLocalName()).isEqualTo("child"); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTest.java index d96a60f7..639d9dfc 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTest.java @@ -39,9 +39,9 @@ public abstract class AbstractPayloadMethodProcessorTest extends AbstractMethodA @BeforeEach public final void setUp() throws NoSuchMethodException { - processor = createProcessor(); - supportedParameters = createSupportedParameters(); - supportedReturnTypes = createSupportedReturnTypes(); + this.processor = createProcessor(); + this.supportedParameters = createSupportedParameters(); + this.supportedReturnTypes = createSupportedReturnTypes(); } protected abstract AbstractPayloadSourceMethodProcessor createProcessor(); @@ -53,27 +53,27 @@ public abstract class AbstractPayloadMethodProcessorTest extends AbstractMethodA @Test public void supportsParameter() throws NoSuchMethodException { - for (MethodParameter supportedParameter : supportedParameters) { - assertThat(processor.supportsParameter(supportedParameter)).isTrue(); + for (MethodParameter supportedParameter : this.supportedParameters) { + assertThat(this.processor.supportsParameter(supportedParameter)).isTrue(); } MethodParameter unsupportedParameter = new MethodParameter(getClass().getMethod("unsupported", String.class), 0); - assertThat(processor.supportsParameter(unsupportedParameter)).isFalse(); + assertThat(this.processor.supportsParameter(unsupportedParameter)).isFalse(); } @Test public void supportsReturnType() throws NoSuchMethodException { - for (MethodParameter supportedReturnType : supportedReturnTypes) { - assertThat(processor.supportsReturnType(supportedReturnType)).isTrue(); + for (MethodParameter supportedReturnType : this.supportedReturnTypes) { + assertThat(this.processor.supportsReturnType(supportedReturnType)).isTrue(); } MethodParameter unsupportedReturnType = new MethodParameter(getClass().getMethod("unsupported", String.class), -1); - assertThat(processor.supportsReturnType(unsupportedReturnType)).isFalse(); + assertThat(this.processor.supportsReturnType(unsupportedReturnType)).isFalse(); } @Test @@ -98,9 +98,9 @@ public abstract class AbstractPayloadMethodProcessorTest extends AbstractMethodA private void testResolveArgument(MessageContext messageContext) throws Exception { - for (MethodParameter supportedParameter : supportedParameters) { + for (MethodParameter supportedParameter : this.supportedParameters) { - Object argument = processor.resolveArgument(messageContext, supportedParameter); + Object argument = this.processor.resolveArgument(messageContext, supportedParameter); assertThat(supportedParameter.getParameterType().isInstance(argument)).isTrue(); testArgument(argument, supportedParameter); @@ -132,10 +132,10 @@ public abstract class AbstractPayloadMethodProcessorTest extends AbstractMethodA private void testHandleReturnValue(MessageContext messageContext) throws Exception { - for (MethodParameter supportedReturnType : supportedReturnTypes) { + for (MethodParameter supportedReturnType : this.supportedReturnTypes) { Object returnValue = getReturnValue(supportedReturnType); - processor.handleReturnValue(messageContext, supportedReturnType, returnValue); + this.processor.handleReturnValue(messageContext, supportedReturnType, returnValue); assertThat(messageContext.hasResponse()).isTrue(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java index af52cca8..cf6a890e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java @@ -55,85 +55,85 @@ public class MarshallingPayloadMethodProcessorTest extends AbstractMethodArgumen @BeforeEach public void setUp() throws Exception { - marshaller = createMock("marshaller", GenericMarshaller.class); - unmarshaller = createMock("unmarshaller", GenericUnmarshaller.class); - processor = new MarshallingPayloadMethodProcessor(marshaller, unmarshaller); - supportedParameter = new MethodParameter(getClass().getMethod("method", MyObject.class), 0); - supportedReturnType = new MethodParameter(getClass().getMethod("method", MyObject.class), -1); + this.marshaller = createMock("marshaller", GenericMarshaller.class); + this.unmarshaller = createMock("unmarshaller", GenericUnmarshaller.class); + this.processor = new MarshallingPayloadMethodProcessor(this.marshaller, this.unmarshaller); + this.supportedParameter = new MethodParameter(getClass().getMethod("method", MyObject.class), 0); + this.supportedReturnType = new MethodParameter(getClass().getMethod("method", MyObject.class), -1); } @Test public void supportsParameterSupported() { - expect(unmarshaller.supports(isA(Type.class))).andReturn(true); + expect(this.unmarshaller.supports(isA(Type.class))).andReturn(true); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); - assertThat(processor.supportsParameter(supportedParameter)).isTrue(); + assertThat(this.processor.supportsParameter(this.supportedParameter)).isTrue(); - verify(marshaller, unmarshaller); + verify(this.marshaller, this.unmarshaller); } @Test public void supportsParameterUnsupported() { - expect(unmarshaller.supports(isA(Type.class))).andReturn(false); + expect(this.unmarshaller.supports(isA(Type.class))).andReturn(false); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); - assertThat(processor.supportsParameter(supportedParameter)).isFalse(); + assertThat(this.processor.supportsParameter(this.supportedParameter)).isFalse(); - verify(marshaller, unmarshaller); + verify(this.marshaller, this.unmarshaller); } @Test public void supportsParameterNoUnmarshallerSupported() { - processor = new MarshallingPayloadMethodProcessor(); - processor.setMarshaller(marshaller); + this.processor = new MarshallingPayloadMethodProcessor(); + this.processor.setMarshaller(this.marshaller); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); - assertThat(processor.supportsParameter(supportedParameter)).isFalse(); + assertThat(this.processor.supportsParameter(this.supportedParameter)).isFalse(); - verify(marshaller, unmarshaller); + verify(this.marshaller, this.unmarshaller); } @Test public void supportsReturnTypeSupported() { - expect(marshaller.supports(isA(Type.class))).andReturn(true); + expect(this.marshaller.supports(isA(Type.class))).andReturn(true); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); - assertThat(processor.supportsReturnType(supportedReturnType)).isTrue(); + assertThat(this.processor.supportsReturnType(this.supportedReturnType)).isTrue(); - verify(marshaller, unmarshaller); + verify(this.marshaller, this.unmarshaller); } @Test public void supportsReturnTypeUnsupported() { - expect(marshaller.supports(isA(Type.class))).andReturn(false); + expect(this.marshaller.supports(isA(Type.class))).andReturn(false); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); - assertThat(processor.supportsReturnType(supportedReturnType)).isFalse(); + assertThat(this.processor.supportsReturnType(this.supportedReturnType)).isFalse(); - verify(marshaller, unmarshaller); + verify(this.marshaller, this.unmarshaller); } @Test public void supportsReturnTypeNoMarshaller() { - processor = new MarshallingPayloadMethodProcessor(); - processor.setUnmarshaller(unmarshaller); + this.processor = new MarshallingPayloadMethodProcessor(); + this.processor.setUnmarshaller(this.unmarshaller); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); - assertThat(processor.supportsReturnType(supportedReturnType)).isFalse(); + assertThat(this.processor.supportsReturnType(this.supportedReturnType)).isFalse(); - verify(marshaller, unmarshaller); + verify(this.marshaller, this.unmarshaller); } @Test @@ -141,16 +141,16 @@ public class MarshallingPayloadMethodProcessorTest extends AbstractMethodArgumen MyObject expected = new MyObject(); - expect(unmarshaller.unmarshal(isA(Source.class))).andReturn(expected); + expect(this.unmarshaller.unmarshal(isA(Source.class))).andReturn(expected); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); MessageContext messageContext = createMockMessageContext(); - Object result = processor.resolveArgument(messageContext, supportedParameter); + Object result = this.processor.resolveArgument(messageContext, this.supportedParameter); assertThat(result).isEqualTo(expected); - verify(marshaller, unmarshaller); + verify(this.marshaller, this.unmarshaller); } @Test @@ -158,14 +158,14 @@ public class MarshallingPayloadMethodProcessorTest extends AbstractMethodArgumen assertThatIllegalStateException().isThrownBy(() -> { - processor = new MarshallingPayloadMethodProcessor(); - processor.setMarshaller(marshaller); + this.processor = new MarshallingPayloadMethodProcessor(); + this.processor.setMarshaller(this.marshaller); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); MessageContext messageContext = createMockMessageContext(); - processor.resolveArgument(messageContext, supportedParameter); + this.processor.resolveArgument(messageContext, this.supportedParameter); }); } @@ -174,14 +174,14 @@ public class MarshallingPayloadMethodProcessorTest extends AbstractMethodArgumen MyObject returnValue = new MyObject(); - marshaller.marshal(eq(returnValue), isA(Result.class)); + this.marshaller.marshal(eq(returnValue), isA(Result.class)); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); MessageContext messageContext = createMockMessageContext(); - processor.handleReturnValue(messageContext, supportedReturnType, returnValue); + this.processor.handleReturnValue(messageContext, this.supportedReturnType, returnValue); - verify(marshaller, unmarshaller); + verify(this.marshaller, this.unmarshaller); } @Test @@ -189,15 +189,15 @@ public class MarshallingPayloadMethodProcessorTest extends AbstractMethodArgumen assertThatIllegalStateException().isThrownBy(() -> { - processor = new MarshallingPayloadMethodProcessor(); - processor.setUnmarshaller(unmarshaller); + this.processor = new MarshallingPayloadMethodProcessor(); + this.processor.setUnmarshaller(this.unmarshaller); MyObject returnValue = new MyObject(); - replay(marshaller, unmarshaller); + replay(this.marshaller, this.unmarshaller); MessageContext messageContext = createMockMessageContext(); - processor.handleReturnValue(messageContext, supportedReturnType, returnValue); + this.processor.handleReturnValue(messageContext, this.supportedReturnType, returnValue); }); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java index d794cbe9..13f166c5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java @@ -35,13 +35,13 @@ public class MessageContextMethodArgumentResolverTest { @BeforeEach public void setUp() throws NoSuchMethodException { - resolver = new MessageContextMethodArgumentResolver(); - supported = new MethodParameter(getClass().getMethod("supported", MessageContext.class), 0); + this.resolver = new MessageContextMethodArgumentResolver(); + this.supported = new MethodParameter(getClass().getMethod("supported", MessageContext.class), 0); } @Test public void supportsParameter() { - assertThat(resolver.supportsParameter(supported)).isTrue(); + assertThat(this.resolver.supportsParameter(this.supported)).isTrue(); } @Test @@ -49,7 +49,7 @@ public class MessageContextMethodArgumentResolverTest { MessageContext messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); - MessageContext result = resolver.resolveArgument(messageContext, supported); + MessageContext result = this.resolver.resolveArgument(messageContext, this.supported); assertThat(result).isSameAs(messageContext); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java index 235c4807..f71f468a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java @@ -49,18 +49,18 @@ public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumen @BeforeEach public void setUp() throws Exception { - resolver = new StaxPayloadMethodArgumentResolver(); - streamParameter = new MethodParameter(getClass().getMethod("streamReader", XMLStreamReader.class), 0); - eventParameter = new MethodParameter(getClass().getMethod("eventReader", XMLEventReader.class), 0); - invalidParameter = new MethodParameter(getClass().getMethod("invalid", XMLStreamReader.class), 0); + this.resolver = new StaxPayloadMethodArgumentResolver(); + this.streamParameter = new MethodParameter(getClass().getMethod("streamReader", XMLStreamReader.class), 0); + this.eventParameter = new MethodParameter(getClass().getMethod("eventReader", XMLEventReader.class), 0); + this.invalidParameter = new MethodParameter(getClass().getMethod("invalid", XMLStreamReader.class), 0); } @Test public void supportsParameter() { - assertThat(resolver.supportsParameter(streamParameter)).isTrue(); - assertThat(resolver.supportsParameter(eventParameter)).isTrue(); - assertThat(resolver.supportsParameter(invalidParameter)).isFalse(); + assertThat(this.resolver.supportsParameter(this.streamParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.eventParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.invalidParameter)).isFalse(); } @Test @@ -68,7 +68,7 @@ public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumen MessageContext messageContext = createSaajMessageContext(); - Object result = resolver.resolveArgument(messageContext, streamParameter); + Object result = this.resolver.resolveArgument(messageContext, this.streamParameter); testStreamReader(result); } @@ -78,7 +78,7 @@ public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumen MessageContext messageContext = createCachingAxiomMessageContext(); - Object result = resolver.resolveArgument(messageContext, streamParameter); + Object result = this.resolver.resolveArgument(messageContext, this.streamParameter); testStreamReader(result); } @@ -88,7 +88,7 @@ public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumen MessageContext messageContext = createNonCachingAxiomMessageContext(); - Object result = resolver.resolveArgument(messageContext, streamParameter); + Object result = this.resolver.resolveArgument(messageContext, this.streamParameter); testStreamReader(result); } @@ -98,7 +98,7 @@ public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumen MessageContext messageContext = createMockMessageContext(); - Object result = resolver.resolveArgument(messageContext, streamParameter); + Object result = this.resolver.resolveArgument(messageContext, this.streamParameter); testStreamReader(result); } @@ -108,7 +108,7 @@ public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumen MessageContext messageContext = createSaajMessageContext(); - Object result = resolver.resolveArgument(messageContext, eventParameter); + Object result = this.resolver.resolveArgument(messageContext, this.eventParameter); testEventReader(result); } @@ -118,7 +118,7 @@ public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumen MessageContext messageContext = createCachingAxiomMessageContext(); - Object result = resolver.resolveArgument(messageContext, eventParameter); + Object result = this.resolver.resolveArgument(messageContext, this.eventParameter); testEventReader(result); } @@ -128,7 +128,7 @@ public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumen MessageContext messageContext = createNonCachingAxiomMessageContext(); - Object result = resolver.resolveArgument(messageContext, eventParameter); + Object result = this.resolver.resolveArgument(messageContext, this.eventParameter); testEventReader(result); } @@ -138,7 +138,7 @@ public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumen MessageContext messageContext = createMockMessageContext(); - Object result = resolver.resolveArgument(messageContext, eventParameter); + Object result = this.resolver.resolveArgument(messageContext, this.eventParameter); testEventReader(result); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java index 9a2c715c..a755fbff 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java @@ -62,30 +62,30 @@ public class XPathParamMethodArgumentResolverTest { @BeforeEach public void setUp() throws Exception { - resolver = new XPathParamMethodArgumentResolver(); + this.resolver = new XPathParamMethodArgumentResolver(); Method supportedTypes = getClass().getMethod("supportedTypes", Boolean.TYPE, Double.TYPE, Node.class, NodeList.class, String.class); - booleanParameter = new MethodParameter(supportedTypes, 0); - doubleParameter = new MethodParameter(supportedTypes, 1); - nodeParameter = new MethodParameter(supportedTypes, 2); - nodeListParameter = new MethodParameter(supportedTypes, 3); - stringParameter = new MethodParameter(supportedTypes, 4); - convertedParameter = new MethodParameter(getClass().getMethod("convertedType", Integer.TYPE), 0); - unsupportedParameter = new MethodParameter(getClass().getMethod("unsupported", String.class), 0); - namespaceMethodParameter = new MethodParameter(getClass().getMethod("namespacesMethod", String.class), 0); - namespaceClassParameter = new MethodParameter(getClass().getMethod("namespacesClass", String.class), 0); + this.booleanParameter = new MethodParameter(supportedTypes, 0); + this.doubleParameter = new MethodParameter(supportedTypes, 1); + this.nodeParameter = new MethodParameter(supportedTypes, 2); + this.nodeListParameter = new MethodParameter(supportedTypes, 3); + this.stringParameter = new MethodParameter(supportedTypes, 4); + this.convertedParameter = new MethodParameter(getClass().getMethod("convertedType", Integer.TYPE), 0); + this.unsupportedParameter = new MethodParameter(getClass().getMethod("unsupported", String.class), 0); + this.namespaceMethodParameter = new MethodParameter(getClass().getMethod("namespacesMethod", String.class), 0); + this.namespaceClassParameter = new MethodParameter(getClass().getMethod("namespacesClass", String.class), 0); } @Test public void supportsParameter() { - assertThat(resolver.supportsParameter(booleanParameter)).isTrue(); - assertThat(resolver.supportsParameter(doubleParameter)).isTrue(); - assertThat(resolver.supportsParameter(nodeParameter)).isTrue(); - assertThat(resolver.supportsParameter(nodeListParameter)).isTrue(); - assertThat(resolver.supportsParameter(stringParameter)).isTrue(); - assertThat(resolver.supportsParameter(convertedParameter)).isTrue(); - assertThat(resolver.supportsParameter(unsupportedParameter)).isFalse(); + assertThat(this.resolver.supportsParameter(this.booleanParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.doubleParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.nodeParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.nodeListParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.stringParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.convertedParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.unsupportedParameter)).isFalse(); } @Test @@ -94,7 +94,7 @@ public class XPathParamMethodArgumentResolverTest { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = resolver.resolveArgument(messageContext, booleanParameter); + Object result = this.resolver.resolveArgument(messageContext, this.booleanParameter); assertThat(result).isInstanceOf(Boolean.class); @@ -109,7 +109,7 @@ public class XPathParamMethodArgumentResolverTest { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = resolver.resolveArgument(messageContext, doubleParameter); + Object result = this.resolver.resolveArgument(messageContext, this.doubleParameter); assertThat(result).isInstanceOf(Double.class); @@ -124,7 +124,7 @@ public class XPathParamMethodArgumentResolverTest { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = resolver.resolveArgument(messageContext, nodeParameter); + Object result = this.resolver.resolveArgument(messageContext, this.nodeParameter); assertThat(result).isInstanceOf(Node.class); @@ -139,7 +139,7 @@ public class XPathParamMethodArgumentResolverTest { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = resolver.resolveArgument(messageContext, nodeListParameter); + Object result = this.resolver.resolveArgument(messageContext, this.nodeListParameter); assertThat(result).isInstanceOf(NodeList.class); @@ -155,7 +155,7 @@ public class XPathParamMethodArgumentResolverTest { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = resolver.resolveArgument(messageContext, stringParameter); + Object result = this.resolver.resolveArgument(messageContext, this.stringParameter); assertThat(result).isInstanceOf(String.class); @@ -170,7 +170,7 @@ public class XPathParamMethodArgumentResolverTest { MockWebServiceMessage request = new MockWebServiceMessage(CONTENTS); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = resolver.resolveArgument(messageContext, convertedParameter); + Object result = this.resolver.resolveArgument(messageContext, this.convertedParameter); assertThat(result).isInstanceOf(Integer.class); assertThat(result).isEqualTo(42); @@ -183,7 +183,7 @@ public class XPathParamMethodArgumentResolverTest { "text"); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = resolver.resolveArgument(messageContext, namespaceMethodParameter); + Object result = this.resolver.resolveArgument(messageContext, this.namespaceMethodParameter); assertThat(result).isInstanceOf(String.class); assertThat(result).isEqualTo("text"); @@ -196,7 +196,7 @@ public class XPathParamMethodArgumentResolverTest { "text"); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = resolver.resolveArgument(messageContext, namespaceClassParameter); + Object result = this.resolver.resolveArgument(messageContext, this.namespaceClassParameter); assertThat(result).isInstanceOf(String.class); assertThat(result).isEqualTo("text"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java index 8499fbd8..a8952b9e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java @@ -50,20 +50,20 @@ public class JaxbElementPayloadMethodProcessorTest { @BeforeEach public void setUp() throws Exception { - processor = new JaxbElementPayloadMethodProcessor(); - supportedParameter = new MethodParameter(getClass().getMethod("supported", JAXBElement.class), 0); - supportedReturnType = new MethodParameter(getClass().getMethod("supported", JAXBElement.class), -1); - stringReturnType = new MethodParameter(getClass().getMethod("string"), -1); + this.processor = new JaxbElementPayloadMethodProcessor(); + this.supportedParameter = new MethodParameter(getClass().getMethod("supported", JAXBElement.class), 0); + this.supportedReturnType = new MethodParameter(getClass().getMethod("supported", JAXBElement.class), -1); + this.stringReturnType = new MethodParameter(getClass().getMethod("string"), -1); } @Test public void supportsParameter() { - assertThat(processor.supportsParameter(supportedParameter)).isTrue(); + assertThat(this.processor.supportsParameter(this.supportedParameter)).isTrue(); } @Test public void supportsReturnType() { - assertThat(processor.supportsReturnType(supportedReturnType)).isTrue(); + assertThat(this.processor.supportsReturnType(this.supportedReturnType)).isTrue(); } @Test @@ -73,7 +73,7 @@ public class JaxbElementPayloadMethodProcessorTest { "Foo"); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - JAXBElement result = processor.resolveArgument(messageContext, supportedParameter); + JAXBElement result = this.processor.resolveArgument(messageContext, this.supportedParameter); assertThat(result.getValue()).isInstanceOf(MyType.class); @@ -91,7 +91,7 @@ public class JaxbElementPayloadMethodProcessorTest { type.setString("Foo"); JAXBElement element = new JAXBElement<>(new QName("http://springframework.org", "type"), MyType.class, type); - processor.handleReturnValue(messageContext, supportedReturnType, element); + this.processor.handleReturnValue(messageContext, this.supportedReturnType, element); assertThat(messageContext.hasResponse()).isTrue(); @@ -111,7 +111,7 @@ public class JaxbElementPayloadMethodProcessorTest { String s = "Foo"; JAXBElement element = new JAXBElement<>(new QName("http://springframework.org", "string"), String.class, s); - processor.handleReturnValue(messageContext, stringReturnType, element); + this.processor.handleReturnValue(messageContext, this.stringReturnType, element); assertThat(messageContext.hasResponse()).isTrue(); @@ -128,7 +128,7 @@ public class JaxbElementPayloadMethodProcessorTest { MessageContext messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); - processor.handleReturnValue(messageContext, stringReturnType, null); + this.processor.handleReturnValue(messageContext, this.stringReturnType, null); assertThat(messageContext.hasResponse()).isFalse(); } @@ -150,7 +150,7 @@ public class JaxbElementPayloadMethodProcessorTest { @XmlElement(name = "string", namespace = "http://springframework.org") public String getString() { - return string; + return this.string; } public void setString(String string) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java index 1bd4e582..4f38d577 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java @@ -60,23 +60,23 @@ public class XmlRootElementPayloadMethodProcessorTest { @BeforeEach public void setUp() throws Exception { - processor = new XmlRootElementPayloadMethodProcessor(); - rootElementParameter = new MethodParameter(getClass().getMethod("rootElement", MyRootElement.class), 0); - typeParameter = new MethodParameter(getClass().getMethod("type", MyType.class), 0); - rootElementReturnType = new MethodParameter(getClass().getMethod("rootElement", MyRootElement.class), -1); + this.processor = new XmlRootElementPayloadMethodProcessor(); + this.rootElementParameter = new MethodParameter(getClass().getMethod("rootElement", MyRootElement.class), 0); + this.typeParameter = new MethodParameter(getClass().getMethod("type", MyType.class), 0); + this.rootElementReturnType = new MethodParameter(getClass().getMethod("rootElement", MyRootElement.class), -1); } @Test public void supportsParameter() { - assertThat(processor.supportsParameter(rootElementParameter)).isTrue(); - assertThat(processor.supportsParameter(typeParameter)).isTrue(); + assertThat(this.processor.supportsParameter(this.rootElementParameter)).isTrue(); + assertThat(this.processor.supportsParameter(this.typeParameter)).isTrue(); } @Test public void supportsReturnType() { - assertThat(processor.supportsReturnType(rootElementReturnType)).isTrue(); + assertThat(this.processor.supportsReturnType(this.rootElementReturnType)).isTrue(); } @Test @@ -86,7 +86,7 @@ public class XmlRootElementPayloadMethodProcessorTest { "Foo"); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = processor.resolveArgument(messageContext, rootElementParameter); + Object result = this.processor.resolveArgument(messageContext, this.rootElementParameter); assertThat(result).isInstanceOf(MyRootElement.class); @@ -102,7 +102,7 @@ public class XmlRootElementPayloadMethodProcessorTest { "Foo"); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = processor.resolveArgument(messageContext, typeParameter); + Object result = this.processor.resolveArgument(messageContext, this.typeParameter); assertThat(result).isInstanceOf(MyType.class); @@ -169,7 +169,7 @@ public class XmlRootElementPayloadMethodProcessorTest { // it is required but not used. MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Object result = processor.resolveArgument(messageContext, rootElementParameter); + Object result = this.processor.resolveArgument(messageContext, this.rootElementParameter); assertThat(result).isInstanceOf(MyRootElement.class); @@ -185,7 +185,7 @@ public class XmlRootElementPayloadMethodProcessorTest { MyRootElement rootElement = new MyRootElement(); rootElement.setString("Foo"); - processor.handleReturnValue(messageContext, rootElementReturnType, rootElement); + this.processor.handleReturnValue(messageContext, this.rootElementReturnType, rootElement); assertThat(messageContext.hasResponse()).isTrue(); @@ -203,7 +203,7 @@ public class XmlRootElementPayloadMethodProcessorTest { MessageContext messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); MyRootElement rootElement = null; - processor.handleReturnValue(messageContext, rootElementReturnType, rootElement); + this.processor.handleReturnValue(messageContext, this.rootElementReturnType, rootElement); assertThat(messageContext.hasResponse()).isFalse(); } @@ -223,7 +223,7 @@ public class XmlRootElementPayloadMethodProcessorTest { @XmlElement(name = "string", namespace = "http://springframework.org") public String getString() { - return string; + return this.string; } public void setString(String string) { @@ -239,7 +239,7 @@ public class XmlRootElementPayloadMethodProcessorTest { @XmlElement(name = "string", namespace = "http://springframework.org") public String getString() { - return string; + return this.string; } public void setString(String string) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java index bd34659c..7ca85e33 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java @@ -59,28 +59,28 @@ public class PayloadTransformingInterceptorTest { @BeforeEach public void setUp() throws Exception { - interceptor = new PayloadTransformingInterceptor(); + this.interceptor = new PayloadTransformingInterceptor(); TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); - transformer = transformerFactory.newTransformer(); - input = new ClassPathResource("transformInput.xml", getClass()); - output = new ClassPathResource("transformOutput.xml", getClass()); - xslt = new ClassPathResource("transformation.xslt", getClass()); + this.transformer = transformerFactory.newTransformer(); + this.input = new ClassPathResource("transformInput.xml", getClass()); + this.output = new ClassPathResource("transformOutput.xml", getClass()); + this.xslt = new ClassPathResource("transformation.xslt", getClass()); } @Test public void testHandleRequest() throws Exception { - interceptor.setRequestXslt(xslt); - interceptor.afterPropertiesSet(); - MockWebServiceMessage request = new MockWebServiceMessage(input); + this.interceptor.setRequestXslt(this.xslt); + this.interceptor.afterPropertiesSet(); + MockWebServiceMessage request = new MockWebServiceMessage(this.input); MessageContext context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context, null); + boolean result = this.interceptor.handleRequest(context, null); assertThat(result).isTrue(); StringResult expected = new StringResult(); - transformer.transform(new SAXSource(SaxUtils.createInputSource(output)), expected); + this.transformer.transform(new SAXSource(SaxUtils.createInputSource(this.output)), expected); XmlAssert.assertThat(request.getPayloadAsString()).and(expected.toString()).ignoreWhitespace().areSimilar(); } @@ -88,36 +88,36 @@ public class PayloadTransformingInterceptorTest { @Test public void testHandleRequestNoXslt() throws Exception { - interceptor.setResponseXslt(xslt); - interceptor.afterPropertiesSet(); - MockWebServiceMessage request = new MockWebServiceMessage(input); + this.interceptor.setResponseXslt(this.xslt); + this.interceptor.afterPropertiesSet(); + MockWebServiceMessage request = new MockWebServiceMessage(this.input); MessageContext context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context, null); + boolean result = this.interceptor.handleRequest(context, null); assertThat(result).isTrue(); StringResult expected = new StringResult(); - transformer.transform(new SAXSource(SaxUtils.createInputSource(input)), expected); + this.transformer.transform(new SAXSource(SaxUtils.createInputSource(this.input)), expected); XmlAssert.assertThat(request.getPayloadAsString()).and(expected.toString()).ignoreWhitespace().areIdentical(); } @Test public void testHandleResponse() throws Exception { - interceptor.setResponseXslt(xslt); - interceptor.afterPropertiesSet(); - MockWebServiceMessage request = new MockWebServiceMessage(input); + this.interceptor.setResponseXslt(this.xslt); + this.interceptor.afterPropertiesSet(); + MockWebServiceMessage request = new MockWebServiceMessage(this.input); MessageContext context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); - response.setPayload(input); + response.setPayload(this.input); - boolean result = interceptor.handleResponse(context, null); + boolean result = this.interceptor.handleResponse(context, null); assertThat(result).isTrue(); StringResult expected = new StringResult(); - transformer.transform(new SAXSource(SaxUtils.createInputSource(output)), expected); + this.transformer.transform(new SAXSource(SaxUtils.createInputSource(this.output)), expected); XmlAssert.assertThat(response.getPayloadAsString()).and(expected.toString()).ignoreWhitespace().areSimilar(); } @@ -125,19 +125,19 @@ public class PayloadTransformingInterceptorTest { @Test public void testHandleResponseNoXslt() throws Exception { - interceptor.setRequestXslt(xslt); - interceptor.afterPropertiesSet(); - MockWebServiceMessage request = new MockWebServiceMessage(input); + this.interceptor.setRequestXslt(this.xslt); + this.interceptor.afterPropertiesSet(); + MockWebServiceMessage request = new MockWebServiceMessage(this.input); MessageContext context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); - response.setPayload(input); + response.setPayload(this.input); - boolean result = interceptor.handleResponse(context, null); + boolean result = this.interceptor.handleResponse(context, null); assertThat(result).isTrue(); StringResult expected = new StringResult(); - transformer.transform(new SAXSource(SaxUtils.createInputSource(input)), expected); + this.transformer.transform(new SAXSource(SaxUtils.createInputSource(this.input)), expected); XmlAssert.assertThat(response.getPayloadAsString()).and(expected.toString()).ignoreWhitespace().areIdentical(); } @@ -145,20 +145,20 @@ public class PayloadTransformingInterceptorTest { @Test public void testSaaj() throws Exception { - interceptor.setRequestXslt(xslt); - interceptor.afterPropertiesSet(); + this.interceptor.setRequestXslt(this.xslt); + this.interceptor.afterPropertiesSet(); MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage saajMessage = messageFactory.createMessage(); SaajSoapMessage message = new SaajSoapMessage(saajMessage); - transformer.transform(new ResourceSource(input), message.getPayloadResult()); + this.transformer.transform(new ResourceSource(this.input), message.getPayloadResult()); MessageContext context = new DefaultMessageContext(message, new SaajSoapMessageFactory(messageFactory)); - assertThat(interceptor.handleRequest(context, null)).isTrue(); + assertThat(this.interceptor.handleRequest(context, null)).isTrue(); StringResult expected = new StringResult(); - transformer.transform(new SAXSource(SaxUtils.createInputSource(output)), expected); + this.transformer.transform(new SAXSource(SaxUtils.createInputSource(this.output)), expected); StringResult result = new StringResult(); - transformer.transform(message.getPayloadSource(), result); + this.transformer.transform(message.getPayloadSource(), result); XmlAssert.assertThat(result.toString()).and(expected.toString()).ignoreWhitespace().areSimilar(); } @@ -166,19 +166,19 @@ public class PayloadTransformingInterceptorTest { @Test public void testPox() throws Exception { - interceptor.setRequestXslt(xslt); - interceptor.afterPropertiesSet(); + this.interceptor.setRequestXslt(this.xslt); + this.interceptor.afterPropertiesSet(); DomPoxMessageFactory factory = new DomPoxMessageFactory(); DomPoxMessage message = factory.createWebServiceMessage(); - transformer.transform(new ResourceSource(input), message.getPayloadResult()); + this.transformer.transform(new ResourceSource(this.input), message.getPayloadResult()); MessageContext context = new DefaultMessageContext(message, factory); - assertThat(interceptor.handleRequest(context, null)).isTrue(); + assertThat(this.interceptor.handleRequest(context, null)).isTrue(); StringResult expected = new StringResult(); - transformer.transform(new SAXSource(SaxUtils.createInputSource(output)), expected); + this.transformer.transform(new SAXSource(SaxUtils.createInputSource(this.output)), expected); StringResult result = new StringResult(); - transformer.transform(message.getPayloadSource(), result); + this.transformer.transform(message.getPayloadSource(), result); XmlAssert.assertThat(result.toString()).and(expected.toString()).ignoreWhitespace().areSimilar(); @@ -186,7 +186,7 @@ public class PayloadTransformingInterceptorTest { @Test public void testNoStylesheetsSet() { - assertThatIllegalArgumentException().isThrownBy(() -> interceptor.afterPropertiesSet()); + assertThatIllegalArgumentException().isThrownBy(() -> this.interceptor.afterPropertiesSet()); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java index e8dd994d..9b93d9f9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java @@ -46,13 +46,13 @@ public class BridgedMethodRegistrationTest { @Test public void registration() throws NoSuchMethodException { - MethodEndpoint bridgedMethod = mapping + MethodEndpoint bridgedMethod = this.mapping .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); assertThat(bridgedMethod).isNotNull(); Method doIt = B.class.getMethod("doIt"); - MethodEndpoint expected = new MethodEndpoint("bridgedMethodEndpoint", applicationContext, doIt); + MethodEndpoint expected = new MethodEndpoint("bridgedMethodEndpoint", this.applicationContext, doIt); assertThat(bridgedMethod).isEqualTo(expected); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java index 8c4dc59e..3b57e406 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java @@ -48,13 +48,13 @@ public class CgLibProxyRegistrationTest { @Test public void registration() throws NoSuchMethodException { - MethodEndpoint cglibProxy = mapping + MethodEndpoint cglibProxy = this.mapping .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); assertThat(cglibProxy).isNotNull(); Method doIt = MyEndpoint.class.getMethod("doIt", Source.class); - MethodEndpoint expected = new MethodEndpoint("cgLibProxyEndpoint", applicationContext, doIt); + MethodEndpoint expected = new MethodEndpoint("cgLibProxyEndpoint", this.applicationContext, doIt); assertThat(cglibProxy).isEqualTo(expected); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java index 4a130cab..1d044da5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java @@ -39,7 +39,7 @@ public class EndpointMappingTest { @BeforeEach public void setUp() { - messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); + this.messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @Test @@ -49,13 +49,13 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); return null; } }; mapping.setDefaultEndpoint(defaultEndpoint); - EndpointInvocationChain result = mapping.getEndpoint(messageContext); + EndpointInvocationChain result = mapping.getEndpoint(this.messageContext); assertThat(result).isNotNull(); assertThat(result.getEndpoint()).isEqualTo(defaultEndpoint); @@ -68,12 +68,12 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); return endpoint; } }; - EndpointInvocationChain result = mapping.getEndpoint(messageContext); + EndpointInvocationChain result = mapping.getEndpoint(this.messageContext); assertThat(result).isNotNull(); assertThat(result.getEndpoint()).isEqualTo(endpoint); @@ -87,13 +87,13 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); return endpoint; } }; mapping.setInterceptors(new EndpointInterceptor[] { interceptor }); - EndpointInvocationChain result = mapping.getEndpoint(messageContext); + EndpointInvocationChain result = mapping.getEndpoint(this.messageContext); assertThat(result.getInterceptors()).hasSize(1); assertThat(result.getInterceptors()[0]).isEqualTo(interceptor); @@ -110,14 +110,14 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); return endpoint; } }; mapping.setApplicationContext(applicationContext); mapping.setInterceptors(new EndpointInterceptor[] { interceptor }); - EndpointInvocationChain result = mapping.getEndpoint(messageContext); + EndpointInvocationChain result = mapping.getEndpoint(this.messageContext); assertThat(result.getInterceptors()).hasSize(2); assertThat(result.getInterceptors()[0]).isEqualTo(interceptor); @@ -134,13 +134,13 @@ public class EndpointMappingTest { @Override protected Object getEndpointInternal(MessageContext message) { - assertThat(message).isEqualTo(messageContext); + assertThat(message).isEqualTo(EndpointMappingTest.this.messageContext); return "endpoint"; } }; mapping.setApplicationContext(applicationContext); - EndpointInvocationChain result = mapping.getEndpoint(messageContext); + EndpointInvocationChain result = mapping.getEndpoint(this.messageContext); assertThat(result).isNotNull(); } @@ -155,13 +155,13 @@ public class EndpointMappingTest { @Override protected Object getEndpointInternal(MessageContext message) { - assertThat(message).isEqualTo(messageContext); + assertThat(message).isEqualTo(EndpointMappingTest.this.messageContext); return "noSuchBean"; } }; mapping.setApplicationContext(applicationContext); - EndpointInvocationChain result = mapping.getEndpoint(messageContext); + EndpointInvocationChain result = mapping.getEndpoint(this.messageContext); assertThat(result).isNull(); } @@ -176,17 +176,17 @@ public class EndpointMappingTest { @Override protected Object getEndpointInternal(MessageContext message) { - assertThat(message).isEqualTo(messageContext); + assertThat(message).isEqualTo(EndpointMappingTest.this.messageContext); return "endpoint"; } }; mapping.setApplicationContext(applicationContext); - EndpointInvocationChain result = mapping.getEndpoint(messageContext); + EndpointInvocationChain result = mapping.getEndpoint(this.messageContext); assertThat(result).isNotNull(); - result = mapping.getEndpoint(messageContext); + result = mapping.getEndpoint(this.messageContext); assertThat(result).isNotNull(); assertThat(MyEndpoint.constructorCount).isEqualTo(2); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java index fca9360f..2a23b13a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java @@ -48,12 +48,13 @@ public class JdkProxyRegistrationTest { @Test public void registration() throws NoSuchMethodException { - MethodEndpoint jdkProxy = mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); + MethodEndpoint jdkProxy = this.mapping + .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); assertThat(jdkProxy).isNotNull(); Method doIt = MyEndpointImpl.class.getMethod("doIt", Source.class); - MethodEndpoint expected = new MethodEndpoint("jdkProxyEndpoint", applicationContext, doIt); + MethodEndpoint expected = new MethodEndpoint("jdkProxyEndpoint", this.applicationContext, doIt); assertThat(jdkProxy).isEqualTo(expected); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java index fecd32a2..e0fea088 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/LogAspect.java @@ -31,7 +31,7 @@ public class LogAspect { private boolean logInvoked = false; public boolean isLogInvoked() { - return logInvoked; + return this.logInvoked; } @Pointcut("@annotation(org.springframework.ws.server.endpoint.mapping.Log)") @@ -42,7 +42,7 @@ public class LogAspect { @Around("loggedMethod()") public Object log(ProceedingJoinPoint joinPoint) throws Throwable { - logInvoked = true; + this.logInvoked = true; logger.info("Before: " + joinPoint.getSignature()); try { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java index a572ab61..25ac5c15 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java @@ -120,12 +120,12 @@ public class MapBasedSoapEndpointMappingTest { @Override protected boolean validateLookupKey(String key) { - return Arrays.binarySearch(validKeys, key) >= 0; + return Arrays.binarySearch(this.validKeys, key) >= 0; } @Override protected String getLookupKeyForMessage(MessageContext messageContext) { - return key; + return this.key; } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java index 50246950..aa088830 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java @@ -60,12 +60,13 @@ public class PayloadRootAnnotationMethodEndpointMappingTest { @Test public void registrationSingle() throws NoSuchMethodException { - MethodEndpoint endpoint = mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); + MethodEndpoint endpoint = this.mapping + .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request")); assertThat(endpoint).isNotNull(); Method doIt = MyEndpoint.class.getMethod("doIt", Source.class); - MethodEndpoint expected = new MethodEndpoint("endpoint", applicationContext, doIt); + MethodEndpoint expected = new MethodEndpoint("endpoint", this.applicationContext, doIt); assertThat(endpoint).isEqualTo(expected); } @@ -74,14 +75,15 @@ public class PayloadRootAnnotationMethodEndpointMappingTest { public void registrationMultiple() throws NoSuchMethodException { Method doItMultiple = MyEndpoint.class.getMethod("doItMultiple"); - MethodEndpoint expected = new MethodEndpoint("endpoint", applicationContext, doItMultiple); + MethodEndpoint expected = new MethodEndpoint("endpoint", this.applicationContext, doItMultiple); - MethodEndpoint endpoint = mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request1")); + MethodEndpoint endpoint = this.mapping + .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request1")); assertThat(endpoint).isNotNull(); assertThat(endpoint).isEqualTo(expected); - endpoint = mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request2")); + endpoint = this.mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request2")); assertThat(endpoint).isNotNull(); assertThat(endpoint).isEqualTo(expected); @@ -91,14 +93,15 @@ public class PayloadRootAnnotationMethodEndpointMappingTest { public void registrationRepeatable() throws NoSuchMethodException { Method doItMultiple = MyEndpoint.class.getMethod("doItRepeatable"); - MethodEndpoint expected = new MethodEndpoint("endpoint", applicationContext, doItMultiple); + MethodEndpoint expected = new MethodEndpoint("endpoint", this.applicationContext, doItMultiple); - MethodEndpoint endpoint = mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request3")); + MethodEndpoint endpoint = this.mapping + .lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request3")); assertThat(endpoint).isNotNull(); assertThat(endpoint).isEqualTo(expected); - endpoint = mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request4")); + endpoint = this.mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Request4")); assertThat(endpoint).isNotNull(); assertThat(endpoint).isEqualTo(expected); @@ -106,7 +109,7 @@ public class PayloadRootAnnotationMethodEndpointMappingTest { @Test public void registrationInvalid() { - assertThat(mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Invalid"))).isNull(); + assertThat(this.mapping.lookupEndpoint(new QName("http://springframework.org/spring-ws", "Invalid"))).isNull(); } @Test @@ -121,16 +124,16 @@ public class PayloadRootAnnotationMethodEndpointMappingTest { adapter.afterPropertiesSet(); MessageDispatcher messageDispatcher = new SoapMessageDispatcher(); - messageDispatcher.setApplicationContext(applicationContext); - messageDispatcher.setEndpointMappings(Collections.singletonList(mapping)); + messageDispatcher.setApplicationContext(this.applicationContext); + messageDispatcher.setEndpointMappings(Collections.singletonList(this.mapping)); messageDispatcher.setEndpointAdapters(Collections.singletonList(adapter)); messageDispatcher.receive(messageContext); - MyEndpoint endpoint = applicationContext.getBean("endpoint", MyEndpoint.class); + MyEndpoint endpoint = this.applicationContext.getBean("endpoint", MyEndpoint.class); assertThat(endpoint.isDoItInvoked()).isTrue(); - LogAspect aspect = (LogAspect) applicationContext.getBean("logAspect"); + LogAspect aspect = (LogAspect) this.applicationContext.getBean("logAspect"); assertThat(aspect.isLogInvoked()).isTrue(); } @@ -142,14 +145,14 @@ public class PayloadRootAnnotationMethodEndpointMappingTest { private boolean doItInvoked = false; public boolean isDoItInvoked() { - return doItInvoked; + return this.doItInvoked; } @PayloadRoot(localPart = "Request", namespace = "http://springframework.org/spring-ws") @Log public void doIt(@RequestPayload Source payload) { - doItInvoked = true; + this.doItInvoked = true; logger.info("In doIt()"); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java index 12e5c14c..4e0252c9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java @@ -34,7 +34,7 @@ public class PayloadRootQNameEndpointMappingTest { @BeforeEach public void setUp() { - mapping = new PayloadRootQNameEndpointMapping(); + this.mapping = new PayloadRootQNameEndpointMapping(); } @Test @@ -43,7 +43,7 @@ public class PayloadRootQNameEndpointMappingTest { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - QName qName = mapping.resolveQName(context); + QName qName = this.mapping.resolveQName(context); assertThat(qName).isNotNull(); assertThat(qName).isEqualTo(new QName("root")); @@ -55,7 +55,7 @@ public class PayloadRootQNameEndpointMappingTest { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - QName qName = mapping.resolveQName(context); + QName qName = this.mapping.resolveQName(context); assertThat(qName).isNotNull(); assertThat(qName).isEqualTo(new QName("namespace", "localname", "prefix")); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java index 22475ae9..4161ff64 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java @@ -33,21 +33,21 @@ public class SimpleMethodEndpointMappingTest { @BeforeEach public void setUp() throws Exception { - mapping = new SimpleMethodEndpointMapping(); - mapping.setMethodPrefix("prefix"); - mapping.setMethodSuffix("Suffix"); + this.mapping = new SimpleMethodEndpointMapping(); + this.mapping.setMethodPrefix("prefix"); + this.mapping.setMethodSuffix("Suffix"); MyBean bean = new MyBean(); - mapping.setEndpoints(new Object[] { bean }); - mapping.afterPropertiesSet(); + this.mapping.setEndpoints(new Object[] { bean }); + this.mapping.afterPropertiesSet(); } @Test public void testRegistration() { - assertThat(mapping.lookupEndpoint("MyRequest")).isNotNull(); - assertThat(mapping.lookupEndpoint("request")).isNull(); + assertThat(this.mapping.lookupEndpoint("MyRequest")).isNotNull(); + assertThat(this.mapping.lookupEndpoint("request")).isNull(); } @Test @@ -56,7 +56,7 @@ public class SimpleMethodEndpointMappingTest { MockWebServiceMessage request = new MockWebServiceMessage(""); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - assertThat(mapping.getLookupKeyForMessage(messageContext)).isEqualTo("MyRequest"); + assertThat(this.mapping.getLookupKeyForMessage(messageContext)).isEqualTo("MyRequest"); } @Test @@ -66,7 +66,7 @@ public class SimpleMethodEndpointMappingTest { ""); MessageContext messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - assertThat(mapping.getLookupKeyForMessage(messageContext)).isEqualTo("MyRequest"); + assertThat(this.mapping.getLookupKeyForMessage(messageContext)).isEqualTo("MyRequest"); } private static class MyBean { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java index 65e08e78..1a7b984e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java @@ -44,8 +44,8 @@ public class UriEndpointMappingTest { @BeforeEach public void setUp() { - mapping = new UriEndpointMapping(); - context = new DefaultMessageContext(new MockWebServiceMessageFactory()); + this.mapping = new UriEndpointMapping(); + this.context = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @AfterEach @@ -64,7 +64,7 @@ public class UriEndpointMappingTest { replay(connectionMock); - assertThat(mapping.getLookupKeyForMessage(context)).isEqualTo(uri.toString()); + assertThat(this.mapping.getLookupKeyForMessage(this.context)).isEqualTo(uri.toString()); verify(connectionMock); } @@ -72,7 +72,7 @@ public class UriEndpointMappingTest { @Test public void getLookupKeyForMessagePath() throws Exception { - mapping.setUsePath(true); + this.mapping.setUsePath(true); WebServiceConnection connectionMock = createMock(WebServiceConnection.class); TransportContextHolder.setTransportContext(new DefaultTransportContext(connectionMock)); @@ -82,7 +82,7 @@ public class UriEndpointMappingTest { replay(connectionMock); - assertThat(mapping.getLookupKeyForMessage(context)).isEqualTo("/foo/bar"); + assertThat(this.mapping.getLookupKeyForMessage(this.context)).isEqualTo("/foo/bar"); verify(connectionMock); } @@ -90,8 +90,8 @@ public class UriEndpointMappingTest { @Test public void testValidateLookupKey() { - assertThat(mapping.validateLookupKey("http://example.com/services")).isTrue(); - assertThat(mapping.validateLookupKey("some string")).isFalse(); + assertThat(this.mapping.validateLookupKey("http://example.com/services")).isTrue(); + assertThat(this.mapping.validateLookupKey("some string")).isFalse(); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java index cabbc9f5..74b6e40a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java @@ -32,19 +32,19 @@ public class XPathPayloadEndpointMappingTest { @BeforeEach public void setUp() { - mapping = new XPathPayloadEndpointMapping(); + this.mapping = new XPathPayloadEndpointMapping(); } @Test public void testGetLookupKeyForMessage() throws Exception { - mapping.setExpression("/root/text()"); - mapping.afterPropertiesSet(); + this.mapping.setExpression("/root/text()"); + this.mapping.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage("value"); MessageContext context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - String result = mapping.getLookupKeyForMessage(context); + String result = this.mapping.getLookupKeyForMessage(context); assertThat(result).isNotNull(); assertThat(result).isEqualTo("value"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java index 5a7b325e..dea2f241 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java @@ -32,14 +32,14 @@ public class XmlRootElementEndpointMappingTest { @BeforeEach public void createMapping() { - mapping = new XmlRootElementEndpointMapping(); + this.mapping = new XmlRootElementEndpointMapping(); } @Test public void rootElement() throws NoSuchMethodException { Method rootElement = getClass().getMethod("rootElement", MyRootElement.class); - QName name = mapping.getLookupKeyForMethod(rootElement); + QName name = this.mapping.getLookupKeyForMethod(rootElement); assertThat(name).isEqualTo(new QName("myNamespace", "myRoot")); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java index b7b26a78..735aa645 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java @@ -38,8 +38,8 @@ public abstract class AbstractSoapBodyTest extends AbstractSoapElementTest { @Override protected final SoapElement createSoapElement() throws Exception { - soapBody = createSoapBody(); - return soapBody; + this.soapBody = createSoapBody(); + return this.soapBody; } protected abstract SoapBody createSoapBody() throws Exception; @@ -48,7 +48,7 @@ public abstract class AbstractSoapBodyTest extends AbstractSoapElementTest { public void testPayload() throws Exception { String payload = ""; - transformer.transform(new StringSource(payload), soapBody.getPayloadResult()); + this.transformer.transform(new StringSource(payload), this.soapBody.getPayloadResult()); assertPayloadEqual(payload); } @@ -57,10 +57,10 @@ public abstract class AbstractSoapBodyTest extends AbstractSoapElementTest { public void testGetPayloadResultTwice() throws Exception { String payload = ""; - transformer.transform(new StringSource(payload), soapBody.getPayloadResult()); - transformer.transform(new StringSource(payload), soapBody.getPayloadResult()); + this.transformer.transform(new StringSource(payload), this.soapBody.getPayloadResult()); + this.transformer.transform(new StringSource(payload), this.soapBody.getPayloadResult()); DOMResult domResult = new DOMResult(); - transformer.transform(soapBody.getSource(), domResult); + this.transformer.transform(this.soapBody.getSource(), domResult); Element bodyElement = ((Document) domResult.getNode()).getDocumentElement(); NodeList children = bodyElement.getChildNodes(); @@ -69,23 +69,23 @@ public abstract class AbstractSoapBodyTest extends AbstractSoapElementTest { @Test public void testNoFault() { - assertThat(soapBody.hasFault()).isFalse(); + assertThat(this.soapBody.hasFault()).isFalse(); } @Test public void testAddFaultWithExistingPayload() throws Exception { StringSource contents = new StringSource(""); - transformer.transform(contents, soapBody.getPayloadResult()); - soapBody.addMustUnderstandFault("faultString", Locale.ENGLISH); + this.transformer.transform(contents, this.soapBody.getPayloadResult()); + this.soapBody.addMustUnderstandFault("faultString", Locale.ENGLISH); - assertThat(soapBody.hasFault()).isTrue(); + assertThat(this.soapBody.hasFault()).isTrue(); } protected void assertPayloadEqual(String expectedPayload) throws Exception { StringResult result = new StringResult(); - transformer.transform(soapBody.getPayloadSource(), result); + this.transformer.transform(this.soapBody.getPayloadSource(), result); XmlAssert.assertThat(result.toString()).and(expectedPayload).ignoreWhitespace().areSimilar(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTest.java index 51e855e4..b5f4470e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTest.java @@ -39,8 +39,8 @@ public abstract class AbstractSoapElementTest { public final void setUp() throws Exception { TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); - transformer = transformerFactory.newTransformer(); - soapElement = createSoapElement(); + this.transformer = transformerFactory.newTransformer(); + this.soapElement = createSoapElement(); } protected abstract SoapElement createSoapElement() throws Exception; @@ -50,11 +50,11 @@ public abstract class AbstractSoapElementTest { QName name = new QName("http://springframework.org/spring-ws", "attribute"); String value = "value"; - soapElement.addAttribute(name, value); + this.soapElement.addAttribute(name, value); - assertThat(soapElement.getAttributeValue(name)).isEqualTo(value); + assertThat(this.soapElement.getAttributeValue(name)).isEqualTo(value); - Iterator allAttributes = soapElement.getAllAttributes(); + Iterator allAttributes = this.soapElement.getAllAttributes(); assertThat(allAttributes.hasNext()).isTrue(); } @@ -64,7 +64,7 @@ public abstract class AbstractSoapElementTest { String prefix = "p"; String namespace = "http://springframework.org/spring-ws"; - soapElement.addNamespaceDeclaration(prefix, namespace); + this.soapElement.addNamespaceDeclaration(prefix, namespace); } @Test @@ -72,7 +72,7 @@ public abstract class AbstractSoapElementTest { String prefix = ""; String namespace = "http://springframework.org/spring-ws"; - soapElement.addNamespaceDeclaration(prefix, namespace); + this.soapElement.addNamespaceDeclaration(prefix, namespace); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTest.java index 05860ee7..da973fe9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTest.java @@ -27,8 +27,8 @@ public abstract class AbstractSoapEnvelopeTest extends AbstractSoapElementTest { @Override protected final SoapElement createSoapElement() throws Exception { - soapEnvelope = createSoapEnvelope(); - return soapEnvelope; + this.soapEnvelope = createSoapEnvelope(); + return this.soapEnvelope; } protected abstract SoapEnvelope createSoapEnvelope() throws Exception; @@ -36,7 +36,7 @@ public abstract class AbstractSoapEnvelopeTest extends AbstractSoapElementTest { @Test public void testGetHeader() { - SoapHeader header = soapEnvelope.getHeader(); + SoapHeader header = this.soapEnvelope.getHeader(); assertThat(header).isNotNull(); } @@ -44,7 +44,7 @@ public abstract class AbstractSoapEnvelopeTest extends AbstractSoapElementTest { @Test public void testGetBody() { - SoapBody body = soapEnvelope.getBody(); + SoapBody body = this.soapEnvelope.getBody(); assertThat(body).isNotNull(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTest.java index aad6799b..506b8036 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTest.java @@ -39,8 +39,8 @@ public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { @Override protected final SoapElement createSoapElement() throws Exception { - soapHeader = createSoapHeader(); - return soapHeader; + this.soapHeader = createSoapHeader(); + return this.soapHeader; } protected abstract SoapHeader createSoapHeader() throws Exception; @@ -49,17 +49,17 @@ public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { public void testAddHeaderElement() throws Exception { QName qName = new QName(NAMESPACE, "localName", PREFIX); - SoapHeaderElement headerElement = soapHeader.addHeaderElement(qName); + SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); assertThat(headerElement).isNotNull(); assertThat(headerElement.getName()).isEqualTo(qName); - Iterator iterator = soapHeader.examineAllHeaderElements(); + Iterator iterator = this.soapHeader.examineAllHeaderElements(); assertThat(iterator.hasNext()).isTrue(); String payload = ""; - transformer.transform(new StringSource(payload), headerElement.getResult()); + this.transformer.transform(new StringSource(payload), headerElement.getResult()); assertHeaderElementEqual(headerElement, ""); @@ -69,10 +69,10 @@ public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { public void testRemoveHeaderElement() { QName qName = new QName(NAMESPACE, "localName", PREFIX); - soapHeader.removeHeaderElement(qName); - soapHeader.addHeaderElement(qName); - soapHeader.removeHeaderElement(qName); - Iterator iterator = soapHeader.examineAllHeaderElements(); + this.soapHeader.removeHeaderElement(qName); + this.soapHeader.addHeaderElement(qName); + this.soapHeader.removeHeaderElement(qName); + Iterator iterator = this.soapHeader.examineAllHeaderElements(); assertThat(iterator.hasNext()).isFalse(); } @@ -81,14 +81,14 @@ public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { public void testExamineAllHeaderElement() throws Exception { QName qName = new QName(NAMESPACE, "localName", PREFIX); - SoapHeaderElement headerElement = soapHeader.addHeaderElement(qName); + SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); assertThat(headerElement.getName()).isEqualTo(qName); assertThat(headerElement).isNotNull(); String payload = ""; - transformer.transform(new StringSource(payload), headerElement.getResult()); - Iterator iterator = soapHeader.examineAllHeaderElements(); + this.transformer.transform(new StringSource(payload), headerElement.getResult()); + Iterator iterator = this.soapHeader.examineAllHeaderElements(); assertThat(iterator).isNotNull(); assertThat(iterator.hasNext()).isTrue(); @@ -98,7 +98,7 @@ public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { assertThat(headerElement.getName()).isEqualTo(qName); StringResult result = new StringResult(); - transformer.transform(headerElement.getSource(), result); + this.transformer.transform(headerElement.getSource(), result); XmlAssert.assertThat(result.toString()) .and("") @@ -112,9 +112,9 @@ public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { QName name1 = new QName(NAMESPACE, "name1", PREFIX); QName name2 = new QName(NAMESPACE, "name2", PREFIX); - soapHeader.addHeaderElement(name1); - soapHeader.addHeaderElement(name2); - Iterator iterator = soapHeader.examineHeaderElements(name1); + this.soapHeader.addHeaderElement(name1); + this.soapHeader.addHeaderElement(name2); + Iterator iterator = this.soapHeader.examineHeaderElements(name1); assertThat(iterator).isNotNull(); assertThat(iterator.hasNext()).isTrue(); @@ -129,14 +129,14 @@ public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { public void testExamineMustUnderstandHeaderElements() { QName qName1 = new QName(NAMESPACE, "localName1", PREFIX); - SoapHeaderElement headerElement1 = soapHeader.addHeaderElement(qName1); + SoapHeaderElement headerElement1 = this.soapHeader.addHeaderElement(qName1); headerElement1.setMustUnderstand(true); headerElement1.setActorOrRole("role1"); QName qName2 = new QName(NAMESPACE, "localName2", PREFIX); - SoapHeaderElement headerElement2 = soapHeader.addHeaderElement(qName2); + SoapHeaderElement headerElement2 = this.soapHeader.addHeaderElement(qName2); headerElement2.setMustUnderstand(true); headerElement2.setActorOrRole("role2"); - Iterator iterator = soapHeader.examineMustUnderstandHeaderElements("role1"); + Iterator iterator = this.soapHeader.examineMustUnderstandHeaderElements("role1"); assertThat(iterator).isNotNull(); assertThat(iterator.hasNext()).isTrue(); @@ -153,8 +153,8 @@ public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { public void testGetResult() throws Exception { String content = ""; - transformer.transform(new StringSource(content), soapHeader.getResult()); - Iterator iterator = soapHeader.examineAllHeaderElements(); + this.transformer.transform(new StringSource(content), this.soapHeader.getResult()); + Iterator iterator = this.soapHeader.examineAllHeaderElements(); assertThat(iterator.hasNext()).isTrue(); @@ -167,7 +167,7 @@ public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { protected void assertHeaderElementEqual(SoapHeaderElement headerElement, String expected) throws Exception { StringResult result = new StringResult(); - transformer.transform(headerElement.getSource(), result); + this.transformer.transform(headerElement.getSource(), result); XmlAssert.assertThat(result.toString()).and(expected).ignoreWhitespace().areSimilar(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTest.java index 42862afb..9fd47b59 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTest.java @@ -30,7 +30,7 @@ public abstract class AbstractSoapMessageFactoryTest extends AbstractWebServiceM @Test public void testCreateEmptySoapMessage() { - WebServiceMessage message = messageFactory.createWebServiceMessage(); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(); assertThat(message).isInstanceOf(SoapMessage.class); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.java index d6e05576..fb292919 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.java @@ -57,8 +57,8 @@ public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest { @Override protected MimeMessage createMimeMessage() throws Exception { - soapMessage = createSoapMessage(); - return soapMessage; + this.soapMessage = createSoapMessage(); + return this.soapMessage; } protected abstract SoapMessage createSoapMessage() throws Exception; @@ -68,7 +68,7 @@ public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest { XmlValidator validator = XmlValidatorFactory.createValidator(getSoapSchemas(), XmlValidatorFactory.SCHEMA_W3C_XML); - SAXParseException[] errors = validator.validate(soapMessage.getEnvelope().getSource()); + SAXParseException[] errors = validator.validate(this.soapMessage.getEnvelope().getSource()); if (errors.length > 0) { fail(StringUtils.arrayToCommaDelimitedString(errors)); @@ -78,18 +78,18 @@ public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest { @Test public void testSoapAction() { - assertThat(soapMessage.getSoapAction()).isEqualTo("\"\""); + assertThat(this.soapMessage.getSoapAction()).isEqualTo("\"\""); - soapMessage.setSoapAction("SoapAction"); + this.soapMessage.setSoapAction("SoapAction"); - assertThat(soapMessage.getSoapAction()).isEqualTo("\"SoapAction\""); + assertThat(this.soapMessage.getSoapAction()).isEqualTo("\"SoapAction\""); } @Test public void testCharsetAttribute() throws Exception { MockTransportOutputStream outputStream = new MockTransportOutputStream(new ByteArrayOutputStream()); - soapMessage.writeTo(outputStream); + this.soapMessage.writeTo(outputStream); Map headers = outputStream.getHeaders(); String contentType = headers.get(TransportConstants.HEADER_CONTENT_TYPE); @@ -109,7 +109,7 @@ public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest { @Test public void testSetStreamingPayload() throws Exception { - if (!(soapMessage instanceof StreamingWebServiceMessage streamingMessage)) { + if (!(this.soapMessage instanceof StreamingWebServiceMessage streamingMessage)) { return; } @@ -132,13 +132,13 @@ public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest { }); StringResult result = new StringResult(); - transformer.transform(streamingMessage.getPayloadSource(), result); + this.transformer.transform(streamingMessage.getPayloadSource(), result); String expected = "Foo"; XmlAssert.assertThat(result.toString()).and(expected).ignoreWhitespace().areSimilar(); - soapMessage.writeTo(new ByteArrayOutputStream()); + this.soapMessage.writeTo(new ByteArrayOutputStream()); } protected abstract Resource[] getSoapSchemas(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java index 27d97095..a71f6536 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java @@ -37,7 +37,7 @@ public abstract class AbstractWsAddressingTest { @BeforeEach public void createMessageFactory() throws Exception { - messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); + this.messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); } protected SaajSoapMessage loadSaajMessage(String fileName) throws SOAPException, IOException { @@ -48,7 +48,7 @@ public abstract class AbstractWsAddressingTest { try (is) { assertThat(is).isNotNull(); - return new SaajSoapMessage(messageFactory.createMessage(mimeHeaders, is)); + return new SaajSoapMessage(this.messageFactory.createMessage(mimeHeaders, is)); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java index d0b60780..fe516435 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java @@ -55,11 +55,11 @@ public abstract class AbstractActionCallbackTest extends AbstractWsAddressingTes @BeforeEach public void createMocks() { - strategyMock = createMock(MessageIdStrategy.class); + this.strategyMock = createMock(MessageIdStrategy.class); - connectionMock = createMock(WebServiceConnection.class); + this.connectionMock = createMock(WebServiceConnection.class); - TransportContext transportContext = new DefaultTransportContext(connectionMock); + TransportContext transportContext = new DefaultTransportContext(this.connectionMock); TransportContextHolder.setTransportContext(transportContext); } @@ -73,21 +73,21 @@ public abstract class AbstractActionCallbackTest extends AbstractWsAddressingTes URI action = new URI("http://example.com/fabrikam/mail/Delete"); URI to = new URI("mailto:fabrikam@example.com"); - callback = new ActionCallback(action, getVersion(), to); - callback.setMessageIdStrategy(strategyMock); + this.callback = new ActionCallback(action, getVersion(), to); + this.callback.setMessageIdStrategy(this.strategyMock); SaajSoapMessage message = createDeleteMessage(); - expect(strategyMock.newMessageId(message)).andReturn(new URI("http://example.com/someuniquestring")); - callback.setReplyTo(new EndpointReference(new URI("http://example.com/business/client1"))); + expect(this.strategyMock.newMessageId(message)).andReturn(new URI("http://example.com/someuniquestring")); + this.callback.setReplyTo(new EndpointReference(new URI("http://example.com/business/client1"))); - replay(strategyMock, connectionMock); + replay(this.strategyMock, this.connectionMock); - callback.doWithMessage(message); + this.callback.doWithMessage(message); SaajSoapMessage expected = loadSaajMessage(getTestPath() + "/valid.xml"); assertXMLNotSimilar(expected, message); - verify(strategyMock, connectionMock); + verify(this.strategyMock, this.connectionMock); } @Test @@ -95,24 +95,24 @@ public abstract class AbstractActionCallbackTest extends AbstractWsAddressingTes URI action = new URI("http://example.com/fabrikam/mail/Delete"); URI connectionUri = new URI("mailto:fabrikam@example.com"); - callback = new ActionCallback(action, getVersion()); - callback.setMessageIdStrategy(strategyMock); - callback.setShouldInitializeTo(true); - expect(connectionMock.getUri()).andReturn(connectionUri); + this.callback = new ActionCallback(action, getVersion()); + this.callback.setMessageIdStrategy(this.strategyMock); + this.callback.setShouldInitializeTo(true); + expect(this.connectionMock.getUri()).andReturn(connectionUri); SaajSoapMessage message = createDeleteMessage(); - expect(strategyMock.newMessageId(message)).andReturn(new URI("http://example.com/someuniquestring")); - callback.setReplyTo(new EndpointReference(new URI("http://example.com/business/client1"))); + expect(this.strategyMock.newMessageId(message)).andReturn(new URI("http://example.com/someuniquestring")); + this.callback.setReplyTo(new EndpointReference(new URI("http://example.com/business/client1"))); - replay(strategyMock, connectionMock); + replay(this.strategyMock, this.connectionMock); - callback.doWithMessage(message); + this.callback.doWithMessage(message); SaajSoapMessage expected = loadSaajMessage(getTestPath() + "/valid.xml"); assertXMLNotSimilar(expected, message); - verify(strategyMock, connectionMock); + verify(this.strategyMock, this.connectionMock); } @Test @@ -120,29 +120,29 @@ public abstract class AbstractActionCallbackTest extends AbstractWsAddressingTes URI action = new URI("http://example.com/fabrikam/mail/Delete"); URI connectionUri = new URI("mailto:fabrikam@example.com"); - callback = new ActionCallback(action, getVersion()); - callback.setMessageIdStrategy(strategyMock); - callback.setShouldInitializeTo(false); - expect(connectionMock.getUri()).andReturn(connectionUri).times(0, 1); + this.callback = new ActionCallback(action, getVersion()); + this.callback.setMessageIdStrategy(this.strategyMock); + this.callback.setShouldInitializeTo(false); + expect(this.connectionMock.getUri()).andReturn(connectionUri).times(0, 1); SaajSoapMessage message = createDeleteMessage(); - expect(strategyMock.newMessageId(message)).andReturn(new URI("http://example.com/someuniquestring")); - callback.setReplyTo(new EndpointReference(new URI("http://example.com/business/client1"))); + expect(this.strategyMock.newMessageId(message)).andReturn(new URI("http://example.com/someuniquestring")); + this.callback.setReplyTo(new EndpointReference(new URI("http://example.com/business/client1"))); - replay(strategyMock, connectionMock); + replay(this.strategyMock, this.connectionMock); - callback.doWithMessage(message); + this.callback.doWithMessage(message); SaajSoapMessage expected = loadSaajMessage(getTestPath() + "/request-without-shouldInitializeTo.xml"); assertXMLSimilar(expected, message); - verify(strategyMock, connectionMock); + verify(this.strategyMock, this.connectionMock); } private SaajSoapMessage createDeleteMessage() throws SOAPException { - SOAPMessage saajMessage = messageFactory.createMessage(); + SOAPMessage saajMessage = this.messageFactory.createMessage(); SOAPBody saajBody = saajMessage.getSOAPBody(); SOAPBodyElement delete = saajBody.addBodyElement(new QName("http://example.com/fabrikam", "Delete")); SOAPElement maxCount = delete.addChildElement(new QName("http://example.com/fabrikam", "maxCount")); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java index 23d6b6d7..6c47d7dd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java @@ -29,17 +29,17 @@ public class UuidMessageIdStrategyTest { @BeforeEach public final void setUp() { - strategy = new UuidMessageIdStrategy(); + this.strategy = new UuidMessageIdStrategy(); } @Test public void testStrategy() { - URI messageId1 = strategy.newMessageId(null); + URI messageId1 = this.strategy.newMessageId(null); assertThat(messageId1).isNotNull(); - URI messageId2 = strategy.newMessageId(null); + URI messageId2 = this.strategy.newMessageId(null); assertThat(messageId2).isNotNull(); assertThat(messageId2).isNotEqualTo(messageId1); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java index 1a57704f..a599eae9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java @@ -51,12 +51,12 @@ public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddres @BeforeEach public void createMocks() throws Exception { - strategyMock = createMock(MessageIdStrategy.class); - expect(strategyMock.isDuplicate(isA(URI.class))).andReturn(false).anyTimes(); + this.strategyMock = createMock(MessageIdStrategy.class); + expect(this.strategyMock.isDuplicate(isA(URI.class))).andReturn(false).anyTimes(); URI replyAction = new URI("urn:replyAction"); URI faultAction = new URI("urn:faultAction"); - interceptor = new AddressingEndpointInterceptor(getVersion(), strategyMock, new WebServiceMessageSender[0], - replyAction, faultAction); + this.interceptor = new AddressingEndpointInterceptor(getVersion(), this.strategyMock, + new WebServiceMessageSender[0], replyAction, faultAction); } @Test @@ -65,41 +65,41 @@ public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddres SaajSoapMessage validRequest = loadSaajMessage(getTestPath() + "/valid.xml"); Iterator iterator = validRequest.getSoapHeader().examineAllHeaderElements(); - replay(strategyMock); + replay(this.strategyMock); while (iterator.hasNext()) { SoapHeaderElement headerElement = iterator.next(); - assertThat(interceptor.understands(headerElement)).isTrue(); + assertThat(this.interceptor.understands(headerElement)).isTrue(); } - verify(strategyMock); + verify(this.strategyMock); } @Test public void testValidRequest() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/valid.xml"); - MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(messageFactory)); + MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); - replay(strategyMock); + replay(this.strategyMock); - boolean result = interceptor.handleRequest(context, null); + boolean result = this.interceptor.handleRequest(context, null); assertThat(result).isTrue(); assertThat(context.hasResponse()).isFalse(); - verify(strategyMock); + verify(this.strategyMock); } @Test public void testNoMessageId() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-no-message-id.xml"); - MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(messageFactory)); + MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); - replay(strategyMock); + replay(this.strategyMock); - boolean result = interceptor.handleRequest(context, null); + boolean result = this.interceptor.handleRequest(context, null); assertThat(result).isFalse(); assertThat(context.hasResponse()).isTrue(); @@ -108,20 +108,20 @@ public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddres assertXMLSimilar(expectedResponse, (SaajSoapMessage) context.getResponse()); - verify(strategyMock); + verify(this.strategyMock); } @Test public void testNoReplyTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-no-reply-to.xml"); - MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(messageFactory)); + MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); URI messageId = new URI("uid:1234"); - expect(strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); - replay(strategyMock); + expect(this.strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); + replay(this.strategyMock); - boolean result = interceptor.handleResponse(context, null); + boolean result = this.interceptor.handleResponse(context, null); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -130,20 +130,20 @@ public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddres assertXMLNotSimilar(expectedResponse, (SaajSoapMessage) context.getResponse()); - verify(strategyMock); + verify(this.strategyMock); } @Test public void testAnonymousReplyTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-anonymous.xml"); - MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(messageFactory)); + MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); URI messageId = new URI("uid:1234"); - expect(strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); - replay(strategyMock); + expect(this.strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); + replay(this.strategyMock); - boolean result = interceptor.handleResponse(context, null); + boolean result = this.interceptor.handleResponse(context, null); assertThat(result).isTrue(); @@ -151,37 +151,37 @@ public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddres assertXMLNotSimilar(expectedResponse, (SaajSoapMessage) context.getResponse()); - verify(strategyMock); + verify(this.strategyMock); } @Test public void testNoneReplyTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-none.xml"); - MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(messageFactory)); - replay(strategyMock); - boolean result = interceptor.handleResponse(context, null); + MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); + replay(this.strategyMock); + boolean result = this.interceptor.handleResponse(context, null); assertThat(result).isFalse(); assertThat(context.hasResponse()).isFalse(); - verify(strategyMock); + verify(this.strategyMock); } @Test public void testFaultTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-fault-to.xml"); - MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(messageFactory)); + MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); SaajSoapMessage response = (SaajSoapMessage) context.getResponse(); response.getSoapBody().addServerOrReceiverFault("Error", Locale.ENGLISH); URI messageId = new URI("uid:1234"); - expect(strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); + expect(this.strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); - replay(strategyMock); + replay(this.strategyMock); - boolean result = interceptor.handleFault(context, null); + boolean result = this.interceptor.handleFault(context, null); assertThat(result).isTrue(); @@ -189,7 +189,7 @@ public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddres assertXMLNotSimilar(expectedResponse, (SaajSoapMessage) context.getResponse()); - verify(strategyMock); + verify(this.strategyMock); } @Test @@ -199,17 +199,17 @@ public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddres URI replyAction = new URI("urn:replyAction"); URI faultAction = new URI("urn:replyAction"); - interceptor = new AddressingEndpointInterceptor(getVersion(), strategyMock, + this.interceptor = new AddressingEndpointInterceptor(getVersion(), this.strategyMock, new WebServiceMessageSender[] { senderMock }, replyAction, faultAction); WebServiceConnection connectionMock = createMock(WebServiceConnection.class); SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/valid.xml"); - MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(messageFactory)); + MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); SaajSoapMessage response = (SaajSoapMessage) context.getResponse(); URI messageId = new URI("uid:1234"); - expect(strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); + expect(this.strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); URI uri = new URI("http://example.com/business/client1"); expect(senderMock.supports(uri)).andReturn(true); @@ -217,14 +217,14 @@ public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddres connectionMock.send(response); connectionMock.close(); - replay(strategyMock, senderMock, connectionMock); + replay(this.strategyMock, senderMock, connectionMock); - boolean result = interceptor.handleResponse(context, null); + boolean result = this.interceptor.handleResponse(context, null); assertThat(result).isFalse(); assertThat(context.hasResponse()).isFalse(); - verify(strategyMock, senderMock, connectionMock); + verify(this.strategyMock, senderMock, connectionMock); } protected abstract AddressingVersion getVersion(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java index 56eb3486..074c63ed 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java @@ -46,11 +46,11 @@ public class AddressingInterceptor10Test extends AbstractAddressingInterceptorTe public void testNoTo() throws Exception { SaajSoapMessage valid = loadSaajMessage(getTestPath() + "/request-no-to.xml"); - MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(messageFactory)); + MessageContext context = new DefaultMessageContext(valid, new SaajSoapMessageFactory(this.messageFactory)); URI messageId = new URI("uid:1234"); - expect(strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); - replay(strategyMock); - boolean result = interceptor.handleResponse(context, null); + expect(this.strategyMock.newMessageId((SoapMessage) context.getResponse())).andReturn(messageId); + replay(this.strategyMock); + boolean result = this.interceptor.handleResponse(context, null); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -59,7 +59,7 @@ public class AddressingInterceptor10Test extends AbstractAddressingInterceptorTe assertXMLSimilar(expectedResponse, (SaajSoapMessage) context.getResponse()); - verify(strategyMock); + verify(this.strategyMock); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java index f24ae6fa..1244d75e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java @@ -56,16 +56,16 @@ public class AnnotationActionMethodEndpointMappingTest { @BeforeEach public void setUp() throws Exception { - messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); + this.messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); - applicationContext = new StaticApplicationContext(); - applicationContext.registerSingleton("mapping", AnnotationActionEndpointMapping.class); - applicationContext.registerSingleton("interceptor", MyInterceptor.class); - applicationContext.registerSingleton("smartIntercepter", MySmartInterceptor.class); - applicationContext.registerSingleton("endpoint", MyEndpoint.class); - applicationContext.refresh(); + this.applicationContext = new StaticApplicationContext(); + this.applicationContext.registerSingleton("mapping", AnnotationActionEndpointMapping.class); + this.applicationContext.registerSingleton("interceptor", MyInterceptor.class); + this.applicationContext.registerSingleton("smartIntercepter", MySmartInterceptor.class); + this.applicationContext.registerSingleton("endpoint", MyEndpoint.class); + this.applicationContext.refresh(); - mapping = (AnnotationActionEndpointMapping) applicationContext.getBean("mapping"); + this.mapping = (AnnotationActionEndpointMapping) this.applicationContext.getBean("mapping"); } @Test @@ -73,11 +73,11 @@ public class AnnotationActionMethodEndpointMappingTest { MessageContext messageContext = createMessageContext(); - EndpointInvocationChain chain = mapping.getEndpoint(messageContext); + EndpointInvocationChain chain = this.mapping.getEndpoint(messageContext); assertThat(chain).isNotNull(); - MethodEndpoint expected = new MethodEndpoint(applicationContext.getBean("endpoint"), "doIt"); + MethodEndpoint expected = new MethodEndpoint(this.applicationContext.getBean("endpoint"), "doIt"); assertThat(chain.getEndpoint()).isEqualTo(expected); assertThat(chain.getInterceptors()).hasSize(2); @@ -93,8 +93,8 @@ public class AnnotationActionMethodEndpointMappingTest { try (is) { assertThat(is).isNotNull(); - SaajSoapMessage message = new SaajSoapMessage(messageFactory.createMessage(mimeHeaders, is)); - return new DefaultMessageContext(message, new SaajSoapMessageFactory(messageFactory)); + SaajSoapMessage message = new SaajSoapMessage(this.messageFactory.createMessage(mimeHeaders, is)); + return new DefaultMessageContext(message, new SaajSoapMessageFactory(this.messageFactory)); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java index 9b6b0547..92c22c0e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java @@ -44,32 +44,33 @@ public class SimpleActionEndpointMappingTest extends AbstractWsAddressingTest { @BeforeEach public void createMappings() throws Exception { - mapping = new SimpleActionEndpointMapping(); + this.mapping = new SimpleActionEndpointMapping(); - endpoint1 = new Endpoint1(); + this.endpoint1 = new Endpoint1(); Endpoint2 endpoint2 = new Endpoint2(); Map map = new HashMap<>(); - map.put("http://example.com/fabrikam/mail/Delete", endpoint1); + map.put("http://example.com/fabrikam/mail/Delete", this.endpoint1); map.put("http://example.com/fabrikam/mail/Add", endpoint2); - mapping.setPreInterceptors(new EndpointInterceptor[] { new PayloadLoggingInterceptor() }); - mapping.setPostInterceptors(new EndpointInterceptor[] { new PayloadValidatingInterceptor() }); - mapping.setAddress(new URI("mailto:fabrikam@example.com")); - mapping.setActionMap(map); - mapping.afterPropertiesSet(); + this.mapping.setPreInterceptors(new EndpointInterceptor[] { new PayloadLoggingInterceptor() }); + this.mapping.setPostInterceptors(new EndpointInterceptor[] { new PayloadValidatingInterceptor() }); + this.mapping.setAddress(new URI("mailto:fabrikam@example.com")); + this.mapping.setActionMap(map); + this.mapping.afterPropertiesSet(); } @Test public void testMatch() throws Exception { SaajSoapMessage message = loadSaajMessage("200408/valid.xml"); - MessageContext messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(messageFactory)); + MessageContext messageContext = new DefaultMessageContext(message, + new SaajSoapMessageFactory(this.messageFactory)); - EndpointInvocationChain endpoint = mapping.getEndpoint(messageContext); + EndpointInvocationChain endpoint = this.mapping.getEndpoint(messageContext); assertThat(endpoint).isNotNull(); - assertThat(endpoint.getEndpoint()).isEqualTo(endpoint1); + assertThat(endpoint.getEndpoint()).isEqualTo(this.endpoint1); EndpointInterceptor[] interceptors = endpoint.getInterceptors(); @@ -83,9 +84,10 @@ public class SimpleActionEndpointMappingTest extends AbstractWsAddressingTest { public void testNoMatch() throws Exception { SaajSoapMessage message = loadSaajMessage("200408/response-no-message-id.xml"); - MessageContext messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(messageFactory)); + MessageContext messageContext = new DefaultMessageContext(message, + new SaajSoapMessageFactory(this.messageFactory)); - EndpointInvocationChain endpoint = mapping.getEndpoint(messageContext); + EndpointInvocationChain endpoint = this.mapping.getEndpoint(messageContext); assertThat(endpoint).isNull(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTest.java index 12212b3c..9e9c00af 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTest.java @@ -43,20 +43,20 @@ public class SaajSoapActionCallbackTest { MessageFactory messageFactory11 = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); - saaj11Factory.setSoapVersion(SoapVersion.SOAP_11); - saaj11Factory.setMessageFactory(messageFactory11); - saaj11Factory.afterPropertiesSet(); + this.saaj11Factory.setSoapVersion(SoapVersion.SOAP_11); + this.saaj11Factory.setMessageFactory(messageFactory11); + this.saaj11Factory.afterPropertiesSet(); MessageFactory messageFactory12 = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); - saaj12Factory.setSoapVersion(SoapVersion.SOAP_12); - saaj12Factory.setMessageFactory(messageFactory12); - saaj12Factory.afterPropertiesSet(); + this.saaj12Factory.setSoapVersion(SoapVersion.SOAP_12); + this.saaj12Factory.setMessageFactory(messageFactory12); + this.saaj12Factory.afterPropertiesSet(); } @Test public void noSoapAction11ShouldProduceEmptySoapActionHeader() { - SaajSoapMessage message = saaj11Factory.createWebServiceMessage(); + SaajSoapMessage message = this.saaj11Factory.createWebServiceMessage(); String[] soapActionHeaders = message.getSaajMessage() .getMimeHeaders() .getHeader(TransportConstants.HEADER_SOAP_ACTION); @@ -67,7 +67,7 @@ public class SaajSoapActionCallbackTest { @Test public void soapAction11ShouldProduceSoapActionHeader() throws IOException { - SaajSoapMessage message = saaj11Factory.createWebServiceMessage(); + SaajSoapMessage message = this.saaj11Factory.createWebServiceMessage(); SoapActionCallback callback = new SoapActionCallback("testAction"); callback.doWithMessage(message); String[] soapActionHeaders = message.getSaajMessage() @@ -80,7 +80,7 @@ public class SaajSoapActionCallbackTest { @Test public void emptySoapAction11() throws IOException { - SaajSoapMessage message = saaj11Factory.createWebServiceMessage(); + SaajSoapMessage message = this.saaj11Factory.createWebServiceMessage(); SoapActionCallback callback = new SoapActionCallback(null); callback.doWithMessage(message); String[] soapActionHeaders = message.getSaajMessage() @@ -93,7 +93,7 @@ public class SaajSoapActionCallbackTest { @Test public void noSoapAction12() { - SaajSoapMessage message = saaj12Factory.createWebServiceMessage(); + SaajSoapMessage message = this.saaj12Factory.createWebServiceMessage(); String[] soapActionHeaders = message.getSaajMessage() .getMimeHeaders() .getHeader(TransportConstants.HEADER_SOAP_ACTION); @@ -104,7 +104,7 @@ public class SaajSoapActionCallbackTest { @Test public void soapAction12ShouldProduceNoSoapActionHeader() throws IOException { - SaajSoapMessage message = saaj12Factory.createWebServiceMessage(); + SaajSoapMessage message = this.saaj12Factory.createWebServiceMessage(); SoapActionCallback callback = new SoapActionCallback("testAction"); callback.doWithMessage(message); String[] soapActionHeaders = message.getSaajMessage() @@ -121,7 +121,7 @@ public class SaajSoapActionCallbackTest { @Test public void emptySoapAction12ShouldProduceNoSoapActionHeader() throws IOException { - SaajSoapMessage message = saaj12Factory.createWebServiceMessage(); + SaajSoapMessage message = this.saaj12Factory.createWebServiceMessage(); SoapActionCallback callback = new SoapActionCallback(null); callback.doWithMessage(message); String[] soapActionHeaders = message.getSaajMessage() diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java index c6c3ca80..312169b6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java @@ -46,8 +46,8 @@ public class SaajSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryTe public void properties() throws IOException { Map properties = Collections.singletonMap(SOAPMessage.WRITE_XML_DECLARATION, "true"); - ((SaajSoapMessageFactory) messageFactory).setMessageProperties(properties); - SoapMessage soapMessage = (SoapMessage) messageFactory.createWebServiceMessage(); + ((SaajSoapMessageFactory) this.messageFactory).setMessageProperties(properties); + SoapMessage soapMessage = (SoapMessage) this.messageFactory.createWebServiceMessage(); ByteArrayOutputStream os = new ByteArrayOutputStream(); soapMessage.writeTo(os); String result = os.toString(StandardCharsets.UTF_8); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java index 252c3d28..2e0848bf 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java @@ -54,19 +54,19 @@ public class SaajSoap11MessageTest extends AbstractSoap11MessageTest { protected final SoapMessage createSoapMessage() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); - saajMessage = messageFactory.createMessage(); - saajMessage.getSOAPHeader().detachNode(); + this.saajMessage = messageFactory.createMessage(); + this.saajMessage.getSOAPHeader().detachNode(); - return new SaajSoapMessage(saajMessage, true, messageFactory); + return new SaajSoapMessage(this.saajMessage, true, messageFactory); } @Test public void testGetPayloadSource() throws Exception { - saajMessage.getSOAPPart().getEnvelope().getBody().addChildElement("child"); - Source source = soapMessage.getPayloadSource(); + this.saajMessage.getSOAPPart().getEnvelope().getBody().addChildElement("child"); + Source source = this.soapMessage.getPayloadSource(); StringResult result = new StringResult(); - transformer.transform(source, result); + this.transformer.transform(source, result); XmlAssert.assertThat(result.toString()).and("").ignoreWhitespace().areIdentical(); } @@ -74,12 +74,12 @@ public class SaajSoap11MessageTest extends AbstractSoap11MessageTest { @Test public void testGetPayloadSourceText() throws Exception { - SOAPBody body = saajMessage.getSOAPPart().getEnvelope().getBody(); + SOAPBody body = this.saajMessage.getSOAPPart().getEnvelope().getBody(); body.addTextNode(" "); body.addChildElement("child"); - Source source = soapMessage.getPayloadSource(); + Source source = this.soapMessage.getPayloadSource(); StringResult result = new StringResult(); - transformer.transform(source, result); + this.transformer.transform(source, result); XmlAssert.assertThat(result.toString()).and("").ignoreWhitespace().areIdentical(); } @@ -88,9 +88,9 @@ public class SaajSoap11MessageTest extends AbstractSoap11MessageTest { public void testGetPayloadResult() throws Exception { StringSource source = new StringSource(""); - Result result = soapMessage.getPayloadResult(); - transformer.transform(source, result); - SOAPBody body = saajMessage.getSOAPPart().getEnvelope().getBody(); + Result result = this.soapMessage.getPayloadResult(); + this.transformer.transform(source, result); + SOAPBody body = this.saajMessage.getSOAPPart().getEnvelope().getBody(); Iterator iterator = body.getChildElements(); assertThat(iterator.hasNext()).isTrue(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java index b1e4dd2f..7902bdeb 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java @@ -49,28 +49,28 @@ public class SaajSoap12MessageTest extends AbstractSoap12MessageTest { protected SoapMessage createSoapMessage() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); - saajMessage = messageFactory.createMessage(); - saajMessage.getSOAPHeader().detachNode(); - return new SaajSoapMessage(saajMessage, true, messageFactory); + this.saajMessage = messageFactory.createMessage(); + this.saajMessage.getSOAPHeader().detachNode(); + return new SaajSoapMessage(this.saajMessage, true, messageFactory); } public void testGetPayloadSource() throws Exception { - saajMessage.getSOAPBody().addChildElement("child"); - Source source = soapMessage.getPayloadSource(); + this.saajMessage.getSOAPBody().addChildElement("child"); + Source source = this.soapMessage.getPayloadSource(); StringResult result = new StringResult(); - transformer.transform(source, result); + this.transformer.transform(source, result); XmlAssert.assertThat(result.toString()).and("").ignoreWhitespace().areIdentical(); } public void testGetPayloadSourceText() throws Exception { - saajMessage.getSOAPBody().addTextNode(" "); - saajMessage.getSOAPBody().addChildElement("child"); - Source source = soapMessage.getPayloadSource(); + this.saajMessage.getSOAPBody().addTextNode(" "); + this.saajMessage.getSOAPBody().addChildElement("child"); + Source source = this.soapMessage.getPayloadSource(); StringResult result = new StringResult(); - transformer.transform(source, result); + this.transformer.transform(source, result); XmlAssert.assertThat(result.toString()).and("").ignoreWhitespace().areIdentical(); } @@ -78,11 +78,11 @@ public class SaajSoap12MessageTest extends AbstractSoap12MessageTest { public void testGetPayloadResult() throws Exception { StringSource source = new StringSource(""); - Result result = soapMessage.getPayloadResult(); - transformer.transform(source, result); + Result result = this.soapMessage.getPayloadResult(); + this.transformer.transform(source, result); - assertThat(saajMessage.getSOAPBody().hasChildNodes()).isTrue(); - assertThat(saajMessage.getSOAPBody().getFirstChild().getLocalName()).isEqualTo("child"); + assertThat(this.saajMessage.getSOAPBody().hasChildNodes()).isTrue(); + assertThat(this.saajMessage.getSOAPBody().getFirstChild().getLocalName()).isEqualTo("child"); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java index 9503c901..9c7e2f99 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java @@ -50,9 +50,9 @@ public class SaajContentHandlerTest { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage message = messageFactory.createMessage(); - envelope = message.getSOAPPart().getEnvelope(); - handler = new SaajContentHandler(envelope.getBody()); - transformer = TransformerFactoryUtils.newInstance().newTransformer(); + this.envelope = message.getSOAPPart().getEnvelope(); + this.handler = new SaajContentHandler(this.envelope.getBody()); + this.transformer = TransformerFactoryUtils.newInstance().newTransformer(); } @Test @@ -62,15 +62,15 @@ public class SaajContentHandlerTest { + "xmlns:child='http://springframework.org/spring-ws/2'>" + "Content"; Source source = new StringSource(content); - Result result = new SAXResult(handler); - transformer.transform(source, result); - Name rootName = envelope.createName("Root", "", "http://springframework.org/spring-ws/1"); - Iterator iterator = envelope.getBody().getChildElements(rootName); + Result result = new SAXResult(this.handler); + this.transformer.transform(source, result); + Name rootName = this.envelope.createName("Root", "", "http://springframework.org/spring-ws/1"); + Iterator iterator = this.envelope.getBody().getChildElements(rootName); assertThat(iterator.hasNext()).isTrue(); SOAPBodyElement rootElement = (SOAPBodyElement) iterator.next(); - Name childName = envelope.createName("Child", "child", "http://springframework.org/spring-ws/2"); + Name childName = this.envelope.createName("Child", "child", "http://springframework.org/spring-ws/2"); iterator = rootElement.getChildElements(childName); assertThat(iterator.hasNext()).isTrue(); @@ -79,7 +79,7 @@ public class SaajContentHandlerTest { assertThat(childElement.getValue()).isEqualTo("Content"); - Name attributeName = envelope.createName("attribute"); + Name attributeName = this.envelope.createName("attribute"); assertThat(childElement.getAttributeValue(attributeName)).isEqualTo("value"); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java index 1ccb8e7f..c542a2be 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java @@ -47,13 +47,13 @@ public class SaajUtilsTest { @BeforeEach public void setUp() throws Exception { - messageFactory = MessageFactory.newInstance(); + this.messageFactory = MessageFactory.newInstance(); } @Test public void testToName() throws Exception { - SOAPMessage message = messageFactory.createMessage(); + SOAPMessage message = this.messageFactory.createMessage(); QName qName = new QName("localPart"); SOAPEnvelope envelope = message.getSOAPPart().getEnvelope(); Name name = SaajUtils.toName(qName, envelope); @@ -67,7 +67,7 @@ public class SaajUtilsTest { @Test public void testToNameNamespace() throws Exception { - SOAPMessage message = messageFactory.createMessage(); + SOAPMessage message = this.messageFactory.createMessage(); QName qName = new QName("namespace", "localPart"); SOAPEnvelope envelope = message.getSOAPPart().getEnvelope(); envelope.addNamespaceDeclaration("prefix", "namespace"); @@ -82,7 +82,7 @@ public class SaajUtilsTest { @Test public void testToNameNamespacePrefix() throws Exception { - SOAPMessage message = messageFactory.createMessage(); + SOAPMessage message = this.messageFactory.createMessage(); QName qName = new QName("namespace", "localPart", "prefix"); SOAPEnvelope envelope = message.getSOAPPart().getEnvelope(); Name name = SaajUtils.toName(qName, envelope); @@ -96,7 +96,7 @@ public class SaajUtilsTest { @Test public void testToQName() throws Exception { - SOAPMessage message = messageFactory.createMessage(); + SOAPMessage message = this.messageFactory.createMessage(); Name name = message.getSOAPPart().getEnvelope().createName("localPart", null, null); QName qName = SaajUtils.toQName(name); @@ -109,7 +109,7 @@ public class SaajUtilsTest { @Test public void testToQNameNamespace() throws Exception { - SOAPMessage message = messageFactory.createMessage(); + SOAPMessage message = this.messageFactory.createMessage(); Name name = message.getSOAPPart().getEnvelope().createName("localPart", null, "namespace"); QName qName = SaajUtils.toQName(name); @@ -122,7 +122,7 @@ public class SaajUtilsTest { @Test public void testToQNamePrefixNamespace() throws Exception { - SOAPMessage message = messageFactory.createMessage(); + SOAPMessage message = this.messageFactory.createMessage(); Name name = message.getSOAPPart().getEnvelope().createName("localPart", "prefix", "namespace"); QName qName = SaajUtils.toQName(name); @@ -140,7 +140,7 @@ public class SaajUtilsTest { DocumentBuilder builder = factory.newDocumentBuilder(); Document document = builder.parse(getClass().getResourceAsStream("soapMessage.xml")); SOAPMessage soapMessage = SaajUtils.loadMessage(new ClassPathResource("soapMessage.xml", getClass()), - messageFactory); + this.messageFactory); XmlAssert.assertThat(document).and(soapMessage.getSOAPPart()).ignoreWhitespace().areIdentical(); } @@ -158,7 +158,7 @@ public class SaajUtilsTest { Resource resource = new ClassPathResource("invalidNamespaceReferenceSoapMessage.xml", getClass()); InputStream in = resource.getInputStream(); MimeHeaders headers = new MimeHeaders(); - SOAPMessage soapMessage = messageFactory.createMessage(headers, in); + SOAPMessage soapMessage = this.messageFactory.createMessage(headers, in); SaajUtils.getSaajVersion(soapMessage); }); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java index c11ddbd5..4933df5a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java @@ -45,22 +45,22 @@ public class SaajXmlReaderTest { public void setUp() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(); - message = messageFactory.createMessage(); - SOAPEnvelope envelope = message.getSOAPPart().getEnvelope(); - saajReader = new SaajXmlReader(envelope); - transformer = TransformerFactoryUtils.newInstance().newTransformer(); + this.message = messageFactory.createMessage(); + SOAPEnvelope envelope = this.message.getSOAPPart().getEnvelope(); + this.saajReader = new SaajXmlReader(envelope); + this.transformer = TransformerFactoryUtils.newInstance().newTransformer(); } @Test public void testNamespacesPrefixes() throws Exception { - saajReader.setFeature("http://xml.org/sax/features/namespaces", true); - saajReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); + this.saajReader.setFeature("http://xml.org/sax/features/namespaces", true); + this.saajReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); DOMResult result = new DOMResult(); - Source source = new SAXSource(saajReader, new InputSource()); - transformer.transform(source, result); + Source source = new SAXSource(this.saajReader, new InputSource()); + this.transformer.transform(source, result); DOMResult expected = new DOMResult(); - transformer.transform(new DOMSource(message.getSOAPPart().getEnvelope()), expected); + this.transformer.transform(new DOMSource(this.message.getSOAPPart().getEnvelope()), expected); assertThat(result.getNode()).and(expected.getNode()).ignoreWhitespace().areIdentical(); } @@ -68,13 +68,13 @@ public class SaajXmlReaderTest { @Test public void testNamespacesNoPrefixes() throws Exception { - saajReader.setFeature("http://xml.org/sax/features/namespaces", true); - saajReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false); + this.saajReader.setFeature("http://xml.org/sax/features/namespaces", true); + this.saajReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false); DOMResult result = new DOMResult(); - Source source = new SAXSource(saajReader, new InputSource()); - transformer.transform(source, result); + Source source = new SAXSource(this.saajReader, new InputSource()); + this.transformer.transform(source, result); DOMResult expected = new DOMResult(); - transformer.transform(new DOMSource(message.getSOAPPart().getEnvelope()), expected); + this.transformer.transform(new DOMSource(this.message.getSOAPPart().getEnvelope()), expected); assertThat(result.getNode()).and(expected.getNode()).ignoreWhitespace().areIdentical(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java index c17a08ed..2174e59c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java @@ -56,8 +56,8 @@ public class SoapMessageDispatcherTest { @BeforeEach public void setUp() { - interceptorMock = createMock(SoapEndpointInterceptor.class); - dispatcher = new SoapMessageDispatcher(); + this.interceptorMock = createMock(SoapEndpointInterceptor.class); + this.dispatcher = new SoapMessageDispatcher(); } @Test @@ -71,18 +71,18 @@ public class SoapMessageDispatcherTest { header.setMustUnderstand(true); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(request), factory); - expect(interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(true); + expect(this.interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(true); - replay(interceptorMock); + replay(this.interceptorMock); SoapEndpointInvocationChain chain = new SoapEndpointInvocationChain(new Object(), - new SoapEndpointInterceptor[] { interceptorMock }); + new SoapEndpointInterceptor[] { this.interceptorMock }); - boolean result = dispatcher.handleRequest(chain, context); + boolean result = this.dispatcher.handleRequest(chain, context); assertThat(result).isTrue(); - verify(interceptorMock); + verify(this.interceptorMock); } @Test @@ -96,18 +96,18 @@ public class SoapMessageDispatcherTest { header.setRole(SOAPConstants.URI_SOAP_1_2_ROLE_NEXT); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(request), factory); - expect(interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(true); + expect(this.interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(true); - replay(interceptorMock); + replay(this.interceptorMock); SoapEndpointInvocationChain chain = new SoapEndpointInvocationChain(new Object(), - new SoapEndpointInterceptor[] { interceptorMock }); + new SoapEndpointInterceptor[] { this.interceptorMock }); - boolean result = dispatcher.handleRequest(chain, context); + boolean result = this.dispatcher.handleRequest(chain, context); assertThat(result).isTrue(); - verify(interceptorMock); + verify(this.interceptorMock); } @Test @@ -121,14 +121,14 @@ public class SoapMessageDispatcherTest { header.setMustUnderstand(true); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(request), factory); - expect(interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(false); + expect(this.interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(false); - replay(interceptorMock); + replay(this.interceptorMock); SoapEndpointInvocationChain chain = new SoapEndpointInvocationChain(new Object(), - new SoapEndpointInterceptor[] { interceptorMock }); + new SoapEndpointInterceptor[] { this.interceptorMock }); - boolean result = dispatcher.handleRequest(chain, context); + boolean result = this.dispatcher.handleRequest(chain, context); assertThat(result).isFalse(); assertThat(context.hasResponse()).isTrue(); @@ -144,7 +144,7 @@ public class SoapMessageDispatcherTest { .isEqualTo(SoapMessageDispatcher.DEFAULT_MUST_UNDERSTAND_FAULT_STRING); assertThat(fault.getFaultStringLocale()).isEqualTo(Locale.ENGLISH); - verify(interceptorMock); + verify(this.interceptorMock); } @Test @@ -158,14 +158,14 @@ public class SoapMessageDispatcherTest { header.setRole(SOAPConstants.URI_SOAP_1_2_ROLE_NEXT); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(request), factory); - expect(interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(false); + expect(this.interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(false); - replay(interceptorMock); + replay(this.interceptorMock); SoapEndpointInvocationChain chain = new SoapEndpointInvocationChain(new Object(), - new SoapEndpointInterceptor[] { interceptorMock }); + new SoapEndpointInterceptor[] { this.interceptorMock }); - boolean result = dispatcher.handleRequest(chain, context); + boolean result = this.dispatcher.handleRequest(chain, context); assertThat(result).isFalse(); assertThat(context.hasResponse()).isTrue(); @@ -191,7 +191,7 @@ public class SoapMessageDispatcherTest { assertThat(headerElement.getName()) .isEqualTo(new QName(SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE, "NotUnderstood")); - verify(interceptorMock); + verify(this.interceptorMock); } @Test @@ -206,18 +206,18 @@ public class SoapMessageDispatcherTest { header.setMustUnderstand(true); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(request), factory); - expect(interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(true); + expect(this.interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(true); - replay(interceptorMock); + replay(this.interceptorMock); SoapEndpointInvocationChain chain = new SoapEndpointInvocationChain(new Object(), - new SoapEndpointInterceptor[] { interceptorMock }, new String[] { headerActor }, true); + new SoapEndpointInterceptor[] { this.interceptorMock }, new String[] { headerActor }, true); - boolean result = dispatcher.handleRequest(chain, context); + boolean result = this.dispatcher.handleRequest(chain, context); assertThat(result).isTrue(); - verify(interceptorMock); + verify(this.interceptorMock); } @Test @@ -232,18 +232,18 @@ public class SoapMessageDispatcherTest { header.setMustUnderstand(true); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(request), factory); - expect(interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(true); + expect(this.interceptorMock.understands(isA(SoapHeaderElement.class))).andReturn(true); - replay(interceptorMock); + replay(this.interceptorMock); SoapEndpointInvocationChain chain = new SoapEndpointInvocationChain(new Object(), - new SoapEndpointInterceptor[] { interceptorMock }, new String[] { headerRole }, true); + new SoapEndpointInterceptor[] { this.interceptorMock }, new String[] { headerRole }, true); - boolean result = dispatcher.handleRequest(chain, context); + boolean result = this.dispatcher.handleRequest(chain, context); assertThat(result).isTrue(); - verify(interceptorMock); + verify(this.interceptorMock); } @Test @@ -254,16 +254,16 @@ public class SoapMessageDispatcherTest { request.getSOAPHeader().detachNode(); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(request), factory); - replay(interceptorMock); + replay(this.interceptorMock); SoapEndpointInvocationChain chain = new SoapEndpointInvocationChain(new Object(), - new SoapEndpointInterceptor[] { interceptorMock }, new String[] { "role" }, true); + new SoapEndpointInterceptor[] { this.interceptorMock }, new String[] { "role" }, true); - boolean result = dispatcher.handleRequest(chain, context); + boolean result = this.dispatcher.handleRequest(chain, context); assertThat(result).isTrue(); - verify(interceptorMock); + verify(this.interceptorMock); } @Test @@ -277,15 +277,15 @@ public class SoapMessageDispatcherTest { header.setMustUnderstand(true); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(request), factory); - replay(interceptorMock); + replay(this.interceptorMock); SoapEndpointInvocationChain chain = new SoapEndpointInvocationChain(new Object(), null); - boolean result = dispatcher.handleRequest(chain, context); + boolean result = this.dispatcher.handleRequest(chain, context); assertThat(result).isFalse(); - verify(interceptorMock); + verify(this.interceptorMock); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java index 0660bf60..a182dcbb 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java @@ -60,7 +60,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage request = messageFactory.createMessage(); request.getSOAPBody().addBodyElement(new QName("http://www.springframework.org/spring-ws", "request")); - messageContext = new DefaultMessageContext(new SaajSoapMessage(request), + this.messageContext = new DefaultMessageContext(new SaajSoapMessage(request), new SaajSoapMessageFactory(messageFactory)); } @@ -80,13 +80,13 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { } }; endpoint.setValidator(new PersonValidator()); - endpoint.setMessageSource(messageSource); + endpoint.setMessageSource(this.messageSource); endpoint.setMarshaller(marshaller); endpoint.setUnmarshaller(marshaller); - endpoint.invoke(messageContext); + endpoint.invoke(this.messageContext); - SOAPMessage response = ((SaajSoapMessage) messageContext.getResponse()).getSaajMessage(); + SOAPMessage response = ((SaajSoapMessage) this.messageContext.getResponse()).getSaajMessage(); assertThat(response.getSOAPBody().hasFault()).isTrue(); @@ -132,13 +132,13 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { } }; endpoint.setValidator(new PersonValidator()); - endpoint.setMessageSource(messageSource); + endpoint.setMessageSource(this.messageSource); endpoint.setMarshaller(marshaller); endpoint.setUnmarshaller(marshaller); - endpoint.invoke(messageContext); + endpoint.invoke(this.messageContext); - SOAPMessage response = ((SaajSoapMessage) messageContext.getResponse()).getSaajMessage(); + SOAPMessage response = ((SaajSoapMessage) this.messageContext.getResponse()).getSaajMessage(); assertThat(response.getSOAPBody().hasFault()).isFalse(); } @@ -179,7 +179,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { } public String getName() { - return name; + return this.name; } public void setName(String name) { @@ -187,7 +187,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { } public int getAge() { - return age; + return this.age; } public void setAge(int age) { @@ -195,7 +195,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { } public String toString() { - return "Person{" + name + "," + age + "}"; + return "Person{" + this.name + "," + this.age + "}"; } } @@ -210,7 +210,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { @Override public Object unmarshal(Source source) throws XmlMappingException { - return person; + return this.person; } @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java index 69948484..b6cab31e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java @@ -49,28 +49,28 @@ public class SimpleSoapExceptionResolverTest { @BeforeEach public void setUp() { - exceptionResolver = new SimpleSoapExceptionResolver(); - factoryMock = createMock(WebServiceMessageFactory.class); - messageContext = new DefaultMessageContext(new MockWebServiceMessage(), factoryMock); - messageMock = createMock(SoapMessage.class); - bodyMock = createMock(Soap11Body.class); + this.exceptionResolver = new SimpleSoapExceptionResolver(); + this.factoryMock = createMock(WebServiceMessageFactory.class); + this.messageContext = new DefaultMessageContext(new MockWebServiceMessage(), this.factoryMock); + this.messageMock = createMock(SoapMessage.class); + this.bodyMock = createMock(Soap11Body.class); } @Test public void testResolveExceptionInternal() { Exception exception = new Exception("message"); - expect(factoryMock.createWebServiceMessage()).andReturn(messageMock); - expect(messageMock.getSoapBody()).andReturn(bodyMock); - expect(bodyMock.addServerOrReceiverFault(exception.getMessage(), Locale.ENGLISH)).andReturn(null); + expect(this.factoryMock.createWebServiceMessage()).andReturn(this.messageMock); + expect(this.messageMock.getSoapBody()).andReturn(this.bodyMock); + expect(this.bodyMock.addServerOrReceiverFault(exception.getMessage(), Locale.ENGLISH)).andReturn(null); - replay(factoryMock, messageMock, bodyMock); + replay(this.factoryMock, this.messageMock, this.bodyMock); - boolean result = exceptionResolver.resolveExceptionInternal(messageContext, null, exception); + boolean result = this.exceptionResolver.resolveExceptionInternal(this.messageContext, null, exception); assertThat(result).isTrue(); - verify(factoryMock, messageMock, bodyMock); + verify(this.factoryMock, this.messageMock, this.bodyMock); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java index 25354f79..32e66a76 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java @@ -46,7 +46,7 @@ public class SoapFaultAnnotationExceptionResolverTest { @BeforeEach public void setUp() { - resolver = new SoapFaultAnnotationExceptionResolver(); + this.resolver = new SoapFaultAnnotationExceptionResolver(); } @Test @@ -56,7 +56,7 @@ public class SoapFaultAnnotationExceptionResolverTest { SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); MessageContext context = new DefaultMessageContext(factory); - boolean result = resolver.resolveException(context, null, new MyClientException()); + boolean result = this.resolver.resolveException(context, null, new MyClientException()); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -79,7 +79,7 @@ public class SoapFaultAnnotationExceptionResolverTest { SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); MessageContext context = new DefaultMessageContext(factory); - boolean result = resolver.resolveException(context, null, new MySenderException()); + boolean result = this.resolver.resolveException(context, null, new MySenderException()); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -102,7 +102,7 @@ public class SoapFaultAnnotationExceptionResolverTest { SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); MessageContext context = new DefaultMessageContext(factory); - boolean result = resolver.resolveException(context, null, new MyServerException()); + boolean result = this.resolver.resolveException(context, null, new MyServerException()); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -126,7 +126,7 @@ public class SoapFaultAnnotationExceptionResolverTest { SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(message), factory); - boolean result = resolver.resolveException(context, null, new MyReceiverException()); + boolean result = this.resolver.resolveException(context, null, new MyReceiverException()); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -148,12 +148,12 @@ public class SoapFaultAnnotationExceptionResolverTest { SoapFaultDefinition defaultFault = new SoapFaultDefinition(); defaultFault.setFaultCode(SoapFaultDefinition.CLIENT); defaultFault.setFaultStringOrReason("faultstring"); - resolver.setDefaultFault(defaultFault); + this.resolver.setDefaultFault(defaultFault); MessageFactory saajFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); MessageContext context = new DefaultMessageContext(factory); - boolean result = resolver.resolveException(context, null, new NonAnnotatedException()); + boolean result = this.resolver.resolveException(context, null, new NonAnnotatedException()); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -176,7 +176,7 @@ public class SoapFaultAnnotationExceptionResolverTest { SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); MessageContext context = new DefaultMessageContext(factory); - boolean result = resolver.resolveException(context, null, new MyCustomException()); + boolean result = this.resolver.resolveException(context, null, new MyCustomException()); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -199,7 +199,7 @@ public class SoapFaultAnnotationExceptionResolverTest { SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); MessageContext context = new DefaultMessageContext(factory); - boolean result = resolver.resolveException(context, null, new MySubClientException()); + boolean result = this.resolver.resolveException(context, null, new MySubClientException()); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -222,7 +222,8 @@ public class SoapFaultAnnotationExceptionResolverTest { SoapMessageFactory factory = new SaajSoapMessageFactory(saajFactory); MessageContext context = new DefaultMessageContext(factory); - boolean result = resolver.resolveException(context, null, new NoStringOrReasonException("Exception message")); + boolean result = this.resolver.resolveException(context, null, + new NoStringOrReasonException("Exception message")); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java index 0891f077..ea8c96e3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java @@ -31,14 +31,14 @@ public class SoapFaultDefinitionEditorTest { @BeforeEach public void setUp() { - editor = new SoapFaultDefinitionEditor(); + this.editor = new SoapFaultDefinitionEditor(); } @Test public void testSetAsTextNoLocale() { - editor.setAsText("Server, Server error"); - SoapFaultDefinition definition = (SoapFaultDefinition) editor.getValue(); + this.editor.setAsText("Server, Server error"); + SoapFaultDefinition definition = (SoapFaultDefinition) this.editor.getValue(); assertThat(definition).isNotNull(); assertThat(definition.getFaultCode()).isEqualTo(new QName("Server")); @@ -49,8 +49,8 @@ public class SoapFaultDefinitionEditorTest { @Test public void testSetAsTextLocale() { - editor.setAsText("Server, Server error, nl"); - SoapFaultDefinition definition = (SoapFaultDefinition) editor.getValue(); + this.editor.setAsText("Server, Server error, nl"); + SoapFaultDefinition definition = (SoapFaultDefinition) this.editor.getValue(); assertThat(definition).isNotNull(); assertThat(definition.getFaultCode()).isEqualTo(new QName("Server")); @@ -61,8 +61,8 @@ public class SoapFaultDefinitionEditorTest { @Test public void testSetAsTextSender() { - editor.setAsText("SENDER, Server error"); - SoapFaultDefinition definition = (SoapFaultDefinition) editor.getValue(); + this.editor.setAsText("SENDER, Server error"); + SoapFaultDefinition definition = (SoapFaultDefinition) this.editor.getValue(); assertThat(definition).isNotNull(); assertThat(definition.getFaultCode()).isEqualTo(SoapFaultDefinition.SENDER); @@ -72,8 +72,8 @@ public class SoapFaultDefinitionEditorTest { @Test public void testSetAsTextReceiver() { - editor.setAsText("RECEIVER, Server error"); - SoapFaultDefinition definition = (SoapFaultDefinition) editor.getValue(); + this.editor.setAsText("RECEIVER, Server error"); + SoapFaultDefinition definition = (SoapFaultDefinition) this.editor.getValue(); assertThat(definition).isNotNull(); assertThat(definition.getFaultCode()).isEqualTo(SoapFaultDefinition.RECEIVER); @@ -82,15 +82,15 @@ public class SoapFaultDefinitionEditorTest { @Test public void testSetAsTextIllegalArgument() { - editor.setAsText("SOAP-ENV:Server"); + this.editor.setAsText("SOAP-ENV:Server"); } @Test public void testSetAsTextEmpty() { - editor.setAsText(""); + this.editor.setAsText(""); - assertThat(editor.getValue()).isNull(); + assertThat(this.editor.getValue()).isNull(); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java index 1b1432c0..920e6e4f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java @@ -45,15 +45,15 @@ public class SoapFaultMappingExceptionResolverTest { @BeforeEach public void setUp() { - resolver = new SoapFaultMappingExceptionResolver(); + this.resolver = new SoapFaultMappingExceptionResolver(); } @Test public void testGetDepth() { - assertThat(resolver.getDepth("java.lang.Exception", new Exception())).isEqualTo(0); - assertThat(resolver.getDepth("java.lang.Exception", new IllegalArgumentException())).isEqualTo(2); - assertThat(resolver.getDepth("IllegalArgumentException", new IllegalStateException())).isEqualTo(-1); + assertThat(this.resolver.getDepth("java.lang.Exception", new Exception())).isEqualTo(0); + assertThat(this.resolver.getDepth("java.lang.Exception", new IllegalArgumentException())).isEqualTo(2); + assertThat(this.resolver.getDepth("IllegalArgumentException", new IllegalStateException())).isEqualTo(-1); } @Test @@ -62,14 +62,14 @@ public class SoapFaultMappingExceptionResolverTest { Properties mappings = new Properties(); mappings.setProperty(Exception.class.getName(), "SERVER, Server error"); mappings.setProperty(RuntimeException.class.getName(), "CLIENT, Client error"); - resolver.setExceptionMappings(mappings); + this.resolver.setExceptionMappings(mappings); MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage message = messageFactory.createMessage(); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(message), factory); - boolean result = resolver.resolveException(context, null, new IllegalArgumentException("bla")); + boolean result = this.resolver.resolveException(context, null, new IllegalArgumentException("bla")); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -91,14 +91,14 @@ public class SoapFaultMappingExceptionResolverTest { Properties mappings = new Properties(); mappings.setProperty(Exception.class.getName(), "RECEIVER, Receiver error, en"); mappings.setProperty(RuntimeException.class.getName(), "SENDER, Sender error, en"); - resolver.setExceptionMappings(mappings); + this.resolver.setExceptionMappings(mappings); MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SOAPMessage message = messageFactory.createMessage(); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(message), factory); - boolean result = resolver.resolveException(context, null, new IllegalArgumentException("bla")); + boolean result = this.resolver.resolveException(context, null, new IllegalArgumentException("bla")); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -120,14 +120,14 @@ public class SoapFaultMappingExceptionResolverTest { Properties mappings = new Properties(); mappings.setProperty(Exception.class.getName(), "CLIENT, Client error"); mappings.setProperty(RuntimeException.class.getName(), "SERVER, Server error"); - resolver.setExceptionMappings(mappings); + this.resolver.setExceptionMappings(mappings); MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage message = messageFactory.createMessage(); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(message), factory); - boolean result = resolver.resolveException(context, null, new IllegalArgumentException("bla")); + boolean result = this.resolver.resolveException(context, null, new IllegalArgumentException("bla")); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -149,14 +149,14 @@ public class SoapFaultMappingExceptionResolverTest { Properties mappings = new Properties(); mappings.setProperty(Exception.class.getName(), "SENDER, Sender error"); mappings.setProperty(RuntimeException.class.getName(), "RECEIVER, Receiver error"); - resolver.setExceptionMappings(mappings); + this.resolver.setExceptionMappings(mappings); MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); SOAPMessage message = messageFactory.createMessage(); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(message), factory); - boolean result = resolver.resolveException(context, null, new IllegalArgumentException("bla")); + boolean result = this.resolver.resolveException(context, null, new IllegalArgumentException("bla")); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -177,16 +177,16 @@ public class SoapFaultMappingExceptionResolverTest { Properties mappings = new Properties(); mappings.setProperty(SoapMessageException.class.getName(), "SERVER,Server error"); - resolver.setExceptionMappings(mappings); + this.resolver.setExceptionMappings(mappings); SoapFaultDefinition defaultFault = new SoapFaultDefinition(); defaultFault.setFaultCode(SoapFaultDefinition.CLIENT); - resolver.setDefaultFault(defaultFault); + this.resolver.setDefaultFault(defaultFault); MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage message = messageFactory.createMessage(); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(message), factory); - boolean result = resolver.resolveException(context, null, new IllegalArgumentException("bla")); + boolean result = this.resolver.resolveException(context, null, new IllegalArgumentException("bla")); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -202,7 +202,7 @@ public class SoapFaultMappingExceptionResolverTest { assertThat(fault.getFaultDetail()).isNull(); // SWS-226 - result = resolver.resolveException(context, null, new IllegalArgumentException()); + result = this.resolver.resolveException(context, null, new IllegalArgumentException()); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); @@ -223,14 +223,14 @@ public class SoapFaultMappingExceptionResolverTest { Properties mappings = new Properties(); mappings.setProperty(IOException.class.getName(), "SERVER"); - resolver.setExceptionMappings(mappings); + this.resolver.setExceptionMappings(mappings); MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); SOAPMessage message = messageFactory.createMessage(); SoapMessageFactory factory = new SaajSoapMessageFactory(messageFactory); MessageContext context = new DefaultMessageContext(new SaajSoapMessage(message), factory); - boolean result = resolver.resolveException(context, null, new IOException()); + boolean result = this.resolver.resolveException(context, null, new IOException()); assertThat(result).isTrue(); assertThat(context.hasResponse()).isTrue(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java index 2129e44f..db303ed9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java @@ -59,42 +59,43 @@ public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodA @BeforeEach public void setUp() throws Exception { - resolver = new SoapHeaderElementMethodArgumentResolver(); - messageContext = createSaajMessageContext(); - SoapMessage message = (SoapMessage) messageContext.getRequest(); + this.resolver = new SoapHeaderElementMethodArgumentResolver(); + this.messageContext = createSaajMessageContext(); + SoapMessage message = (SoapMessage) this.messageContext.getRequest(); for (int i = 0; i < 3; i++) { SoapHeaderElement element = message.getSoapHeader().addHeaderElement(HEADER_QNAME); element.setText(HEADER_CONTENT + i); } - soapHeaderWithEmptyValue = new MethodParameter( + this.soapHeaderWithEmptyValue = new MethodParameter( getClass().getMethod("soapHeaderWithEmptyValue", SoapHeaderElement.class), 0); - soapHeaderElementParameter = new MethodParameter( + this.soapHeaderElementParameter = new MethodParameter( getClass().getMethod("soapHeaderElement", SoapHeaderElement.class), 0); - soapHeaderElementListParameter = new MethodParameter(getClass().getMethod("soapHeaderElementList", List.class), + this.soapHeaderElementListParameter = new MethodParameter( + getClass().getMethod("soapHeaderElementList", List.class), 0); + this.soapHeaderMismatch = new MethodParameter( + getClass().getMethod("soapHeaderMismatch", SoapHeaderElement.class), 0); + this.soapHeaderMismatchList = new MethodParameter(getClass().getMethod("soapHeaderMismatchList", List.class), 0); - soapHeaderMismatch = new MethodParameter(getClass().getMethod("soapHeaderMismatch", SoapHeaderElement.class), - 0); - soapHeaderMismatchList = new MethodParameter(getClass().getMethod("soapHeaderMismatchList", List.class), 0); } @Test public void supportsParameter() { - assertThat(resolver.supportsParameter(soapHeaderElementParameter)).isTrue(); - assertThat(resolver.supportsParameter(soapHeaderElementListParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.soapHeaderElementParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.soapHeaderElementListParameter)).isTrue(); } @Test public void failOnEmptyValue() { assertThatIllegalArgumentException() - .isThrownBy(() -> resolver.resolveArgument(messageContext, soapHeaderWithEmptyValue)); + .isThrownBy(() -> this.resolver.resolveArgument(this.messageContext, this.soapHeaderWithEmptyValue)); } @Test public void resolveSoapHeaderElement() throws Exception { - Object result = resolver.resolveArgument(messageContext, soapHeaderElementParameter); + Object result = this.resolver.resolveArgument(this.messageContext, this.soapHeaderElementParameter); assertThat(SoapHeaderElement.class).isAssignableFrom(result.getClass()); @@ -108,7 +109,7 @@ public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodA @SuppressWarnings("unchecked") public void resolveSoapHeaderElementList() throws Exception { - Object result = resolver.resolveArgument(messageContext, soapHeaderElementListParameter); + Object result = this.resolver.resolveArgument(this.messageContext, this.soapHeaderElementListParameter); assertThat(List.class).isAssignableFrom(result.getClass()); @@ -128,7 +129,7 @@ public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodA @Test public void resolveSoapHeaderMismatch() throws Exception { - Object result = resolver.resolveArgument(messageContext, soapHeaderMismatch); + Object result = this.resolver.resolveArgument(this.messageContext, this.soapHeaderMismatch); assertThat(result).isNull(); } @@ -136,7 +137,7 @@ public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodA @Test public void resolveSoapHeaderMismatchList() throws Exception { - Object result = resolver.resolveArgument(messageContext, soapHeaderMismatchList); + Object result = this.resolver.resolveArgument(this.messageContext, this.soapHeaderMismatchList); assertThat(List.class).isAssignableFrom(result.getClass()); assertThat((List) result).isEmpty(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java index 40ccbf1b..2706d2af 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java @@ -47,27 +47,27 @@ public class SoapMethodArgumentResolverTest extends AbstractMethodArgumentResolv @BeforeEach public void setUp() throws Exception { - resolver = new SoapMethodArgumentResolver(); - soapMessageParameter = new MethodParameter(getClass().getMethod("soapMessage", SoapMessage.class), 0); - soapEnvelopeParameter = new MethodParameter(getClass().getMethod("soapEnvelope", SoapEnvelope.class), 0); - soapBodyParameter = new MethodParameter(getClass().getMethod("soapBody", SoapBody.class), 0); - soapHeaderParameter = new MethodParameter(getClass().getMethod("soapHeader", SoapHeader.class), 0); + this.resolver = new SoapMethodArgumentResolver(); + this.soapMessageParameter = new MethodParameter(getClass().getMethod("soapMessage", SoapMessage.class), 0); + this.soapEnvelopeParameter = new MethodParameter(getClass().getMethod("soapEnvelope", SoapEnvelope.class), 0); + this.soapBodyParameter = new MethodParameter(getClass().getMethod("soapBody", SoapBody.class), 0); + this.soapHeaderParameter = new MethodParameter(getClass().getMethod("soapHeader", SoapHeader.class), 0); } @Test public void supportsParameter() { - assertThat(resolver.supportsParameter(soapMessageParameter)).isTrue(); - assertThat(resolver.supportsParameter(soapEnvelopeParameter)).isTrue(); - assertThat(resolver.supportsParameter(soapBodyParameter)).isTrue(); - assertThat(resolver.supportsParameter(soapHeaderParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.soapMessageParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.soapEnvelopeParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.soapBodyParameter)).isTrue(); + assertThat(this.resolver.supportsParameter(this.soapHeaderParameter)).isTrue(); } @Test public void resolveSoapMessageSaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); - Object result = resolver.resolveArgument(messageContext, soapMessageParameter); + Object result = this.resolver.resolveArgument(messageContext, this.soapMessageParameter); assertThat(result).isEqualTo(messageContext.getRequest()); } @@ -76,7 +76,7 @@ public class SoapMethodArgumentResolverTest extends AbstractMethodArgumentResolv public void resolveSoapEnvelopeSaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); - Object result = resolver.resolveArgument(messageContext, soapEnvelopeParameter); + Object result = this.resolver.resolveArgument(messageContext, this.soapEnvelopeParameter); assertThat(result).isEqualTo(((SoapMessage) messageContext.getRequest()).getEnvelope()); } @@ -85,7 +85,7 @@ public class SoapMethodArgumentResolverTest extends AbstractMethodArgumentResolv public void resolveSoapBodySaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); - Object result = resolver.resolveArgument(messageContext, soapBodyParameter); + Object result = this.resolver.resolveArgument(messageContext, this.soapBodyParameter); assertThat(result).isEqualTo(((SoapMessage) messageContext.getRequest()).getSoapBody()); } @@ -94,7 +94,7 @@ public class SoapMethodArgumentResolverTest extends AbstractMethodArgumentResolv public void resolveSoapHeaderSaaj() throws Exception { MessageContext messageContext = createSaajMessageContext(); - Object result = resolver.resolveArgument(messageContext, soapHeaderParameter); + Object result = this.resolver.resolveArgument(messageContext, this.soapHeaderParameter); assertThat(result).isEqualTo(((SoapMessage) messageContext.getRequest()).getSoapHeader()); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java index df633e51..8180e982 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java @@ -42,30 +42,30 @@ public class PayloadRootSmartSoapEndpointInterceptorTest { @BeforeEach public void setUp() { - delegate = new EndpointInterceptorAdapter(); + this.delegate = new EndpointInterceptorAdapter(); - namespaceUri = "http://springframework.org/spring-ws"; - localPart = "element"; + this.namespaceUri = "http://springframework.org/spring-ws"; + this.localPart = "element"; MockWebServiceMessage request = new MockWebServiceMessage( - "<" + localPart + " xmlns=\"" + namespaceUri + "\" />"); - messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + "<" + this.localPart + " xmlns=\"" + this.namespaceUri + "\" />"); + this.messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); } @Test public void neitherNamespaceNorLocalPart() { assertThatIllegalArgumentException() - .isThrownBy(() -> new PayloadRootSmartSoapEndpointInterceptor(delegate, null, null)); + .isThrownBy(() -> new PayloadRootSmartSoapEndpointInterceptor(this.delegate, null, null)); } @Test public void shouldInterceptFullMatch() { - PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(delegate, - namespaceUri, localPart); + PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(this.delegate, + this.namespaceUri, this.localPart); - boolean result = interceptor.shouldIntercept(messageContext, null); + boolean result = interceptor.shouldIntercept(this.messageContext, null); assertThat(result).isTrue(); } @@ -73,10 +73,10 @@ public class PayloadRootSmartSoapEndpointInterceptorTest { @Test public void shouldInterceptFullNonMatch() { - PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(delegate, - "http://springframework.org/other", localPart); + PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(this.delegate, + "http://springframework.org/other", this.localPart); - boolean result = interceptor.shouldIntercept(messageContext, null); + boolean result = interceptor.shouldIntercept(this.messageContext, null); assertThat(result).isFalse(); } @@ -84,10 +84,10 @@ public class PayloadRootSmartSoapEndpointInterceptorTest { @Test public void shouldInterceptNamespaceUriMatch() { - PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(delegate, - namespaceUri, null); + PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(this.delegate, + this.namespaceUri, null); - boolean result = interceptor.shouldIntercept(messageContext, null); + boolean result = interceptor.shouldIntercept(this.messageContext, null); assertThat(result).isTrue(); } @@ -95,10 +95,10 @@ public class PayloadRootSmartSoapEndpointInterceptorTest { @Test public void shouldInterceptNamespaceUriNonMatch() { - PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(delegate, + PayloadRootSmartSoapEndpointInterceptor interceptor = new PayloadRootSmartSoapEndpointInterceptor(this.delegate, "http://springframework.org/other", null); - boolean result = interceptor.shouldIntercept(messageContext, null); + boolean result = interceptor.shouldIntercept(this.messageContext, null); assertThat(result).isFalse(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java index 683e303e..4a52343a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java @@ -78,31 +78,31 @@ public class PayloadValidatingInterceptorTest { @BeforeEach public void setUp() throws Exception { - interceptor = new PayloadValidatingInterceptor(); - interceptor.setSchema(new ClassPathResource(SCHEMA, getClass())); - interceptor.setValidateRequest(true); - interceptor.setValidateResponse(true); - interceptor.afterPropertiesSet(); + this.interceptor = new PayloadValidatingInterceptor(); + this.interceptor.setSchema(new ClassPathResource(SCHEMA, getClass())); + this.interceptor.setValidateRequest(true); + this.interceptor.setValidateResponse(true); + this.interceptor.afterPropertiesSet(); - soap11Factory = new SaajSoapMessageFactory(MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL)); - soap12Factory = new SaajSoapMessageFactory(MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL)); - transformer = TransformerFactoryUtils.newInstance().newTransformer(); + this.soap11Factory = new SaajSoapMessageFactory(MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL)); + this.soap12Factory = new SaajSoapMessageFactory(MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL)); + this.transformer = TransformerFactoryUtils.newInstance().newTransformer(); } @Test public void testHandleInvalidRequestSoap11() throws Exception { - SoapMessage invalidMessage = soap11Factory.createWebServiceMessage(); + SoapMessage invalidMessage = this.soap11Factory.createWebServiceMessage(); InputStream inputStream = getClass().getResourceAsStream(INVALID_MESSAGE); - transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); - context = new DefaultMessageContext(invalidMessage, soap11Factory); + this.transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); + this.context = new DefaultMessageContext(invalidMessage, this.soap11Factory); - boolean result = interceptor.handleRequest(context, null); + boolean result = this.interceptor.handleRequest(this.context, null); assertThat(result).isFalse(); - assertThat(context.hasResponse()).isTrue(); + assertThat(this.context.hasResponse()).isTrue(); - SoapMessage response = (SoapMessage) context.getResponse(); + SoapMessage response = (SoapMessage) this.context.getResponse(); assertThat(response.getSoapBody().hasFault()).isTrue(); @@ -117,17 +117,17 @@ public class PayloadValidatingInterceptorTest { @Test public void testHandleInvalidRequestSoap12() throws Exception { - SoapMessage invalidMessage = soap12Factory.createWebServiceMessage(); + SoapMessage invalidMessage = this.soap12Factory.createWebServiceMessage(); InputStream inputStream = getClass().getResourceAsStream(INVALID_MESSAGE); - transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); - context = new DefaultMessageContext(invalidMessage, soap12Factory); + this.transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); + this.context = new DefaultMessageContext(invalidMessage, this.soap12Factory); - boolean result = interceptor.handleRequest(context, null); + boolean result = this.interceptor.handleRequest(this.context, null); assertThat(result).isFalse(); - assertThat(context.hasResponse()).isTrue(); + assertThat(this.context.hasResponse()).isTrue(); - SoapMessage response = (SoapMessage) context.getResponse(); + SoapMessage response = (SoapMessage) this.context.getResponse(); assertThat(response.getSoapBody().hasFault()).isTrue(); @@ -144,21 +144,21 @@ public class PayloadValidatingInterceptorTest { String faultString = "fout"; Locale locale = new Locale("nl"); - interceptor.setFaultStringOrReason(faultString); - interceptor.setFaultStringOrReasonLocale(locale); - interceptor.setAddValidationErrorDetail(false); + this.interceptor.setFaultStringOrReason(faultString); + this.interceptor.setFaultStringOrReasonLocale(locale); + this.interceptor.setAddValidationErrorDetail(false); - SoapMessage invalidMessage = soap11Factory.createWebServiceMessage(); + SoapMessage invalidMessage = this.soap11Factory.createWebServiceMessage(); InputStream inputStream = getClass().getResourceAsStream(INVALID_MESSAGE); - transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); - context = new DefaultMessageContext(invalidMessage, soap11Factory); + this.transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); + this.context = new DefaultMessageContext(invalidMessage, this.soap11Factory); - boolean result = interceptor.handleRequest(context, null); + boolean result = this.interceptor.handleRequest(this.context, null); assertThat(result).isFalse(); - assertThat(context.hasResponse()).isTrue(); + assertThat(this.context.hasResponse()).isTrue(); - SoapMessage response = (SoapMessage) context.getResponse(); + SoapMessage response = (SoapMessage) this.context.getResponse(); assertThat(response.getSoapBody().hasFault()).isTrue(); @@ -175,8 +175,8 @@ public class PayloadValidatingInterceptorTest { MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(INVALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context, null); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + boolean result = this.interceptor.handleRequest(this.context, null); assertThat(result).isFalse(); } @@ -186,21 +186,21 @@ public class PayloadValidatingInterceptorTest { MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context, null); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + boolean result = this.interceptor.handleRequest(this.context, null); assertThat(result).isTrue(); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); } @Test public void testHandleInvalidResponse() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); response.setPayload(new ClassPathResource(INVALID_MESSAGE, getClass())); - boolean result = interceptor.handleResponse(context, null); + boolean result = this.interceptor.handleResponse(this.context, null); assertThat(result).isFalse(); } @@ -208,10 +208,10 @@ public class PayloadValidatingInterceptorTest { @Test public void testHandleValidResponse() throws Exception { MockWebServiceMessage request = new MockWebServiceMessage(); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); response.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); - boolean result = interceptor.handleResponse(context, null); + boolean result = this.interceptor.handleResponse(this.context, null); assertThat(result).isTrue(); } @@ -233,13 +233,13 @@ public class PayloadValidatingInterceptorTest { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage saajMessage = SaajUtils.loadMessage(new ClassPathResource(VALID_SOAP_MESSAGE, getClass()), messageFactory); - context = new DefaultMessageContext(new SaajSoapMessage(saajMessage), + this.context = new DefaultMessageContext(new SaajSoapMessage(saajMessage), new SaajSoapMessageFactory(messageFactory)); - boolean result = interceptor.handleRequest(context, null); + boolean result = interceptor.handleRequest(this.context, null); assertThat(result).isTrue(); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); } finally { // Reset the property @@ -253,20 +253,20 @@ public class PayloadValidatingInterceptorTest { assertThatIllegalArgumentException().isThrownBy(() -> { - interceptor.setSchema(new ClassPathResource("invalid")); - interceptor.afterPropertiesSet(); + this.interceptor.setSchema(new ClassPathResource("invalid")); + this.interceptor.afterPropertiesSet(); }); } @Test public void testHandlerInvalidRequestMultipleSchemas() throws Exception { - interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), + this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(new ClassPathResource(INVALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context, null); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + boolean result = this.interceptor.handleRequest(this.context, null); assertThat(result).isFalse(); } @@ -274,29 +274,29 @@ public class PayloadValidatingInterceptorTest { @Test public void testHandleValidRequestMultipleSchemas() throws Exception { - interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), + this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(new ClassPathResource(VALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context, null); + boolean result = this.interceptor.handleRequest(this.context, null); assertThat(result).isTrue(); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); } @Test public void testHandleInvalidResponseMultipleSchemas() throws Exception { - interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), + this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); response.setPayload(new ClassPathResource(INVALID_MESSAGE, getClass())); - boolean result = interceptor.handleResponse(context, null); + boolean result = this.interceptor.handleResponse(this.context, null); assertThat(result).isFalse(); } @@ -304,14 +304,14 @@ public class PayloadValidatingInterceptorTest { @Test public void testHandleValidResponseMultipleSchemas() throws Exception { - interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), + this.interceptor.setSchemas(new ClassPathResource(PRODUCT_SCHEMA, getClass()), new ClassPathResource(SIZE_SCHEMA, getClass())); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - MockWebServiceMessage response = (MockWebServiceMessage) context.getResponse(); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + MockWebServiceMessage response = (MockWebServiceMessage) this.context.getResponse(); response.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); - boolean result = interceptor.handleResponse(context, null); + boolean result = this.interceptor.handleResponse(this.context, null); assertThat(result).isTrue(); } @@ -328,11 +328,11 @@ public class PayloadValidatingInterceptorTest { interceptor.afterPropertiesSet(); MockWebServiceMessage request = new MockWebServiceMessage(); request.setPayload(new ClassPathResource(VALID_MESSAGE, getClass())); - context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - boolean result = interceptor.handleRequest(context, null); + this.context = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); + boolean result = interceptor.handleRequest(this.context, null); assertThat(result).isTrue(); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); } @Test @@ -353,16 +353,16 @@ public class PayloadValidatingInterceptorTest { } }; - interceptor.setErrorHandler(errorHandler); - SoapMessage invalidMessage = soap11Factory.createWebServiceMessage(); + this.interceptor.setErrorHandler(errorHandler); + SoapMessage invalidMessage = this.soap11Factory.createWebServiceMessage(); InputStream inputStream = getClass().getResourceAsStream(INVALID_MESSAGE); - transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); - context = new DefaultMessageContext(invalidMessage, soap11Factory); + this.transformer.transform(new StreamSource(inputStream), invalidMessage.getPayloadResult()); + this.context = new DefaultMessageContext(invalidMessage, this.soap11Factory); - boolean result = interceptor.handleRequest(context, null); + boolean result = this.interceptor.handleRequest(this.context, null); assertThat(result).isTrue(); - assertThat(context.hasResponse()).isFalse(); + assertThat(this.context.hasResponse()).isFalse(); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java index 0bff675c..797353d4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java @@ -40,28 +40,30 @@ public class SoapActionSmartEndpointInterceptorTest { @BeforeEach public void setUp() { - delegate = new EndpointInterceptorAdapter(); + this.delegate = new EndpointInterceptorAdapter(); - soapAction = "http://springframework.org/spring-ws"; + this.soapAction = "http://springframework.org/spring-ws"; SaajSoapMessageFactory messageFactory = new SaajSoapMessageFactory(); messageFactory.afterPropertiesSet(); SaajSoapMessage request = messageFactory.createWebServiceMessage(); - request.setSoapAction(soapAction); - messageContext = new DefaultMessageContext(request, messageFactory); + request.setSoapAction(this.soapAction); + this.messageContext = new DefaultMessageContext(request, messageFactory); } @Test public void neitherNamespaceNorLocalPart() { - assertThatIllegalArgumentException().isThrownBy(() -> new SoapActionSmartEndpointInterceptor(delegate, null)); + assertThatIllegalArgumentException() + .isThrownBy(() -> new SoapActionSmartEndpointInterceptor(this.delegate, null)); } @Test public void shouldInterceptMatch() { - SoapActionSmartEndpointInterceptor interceptor = new SoapActionSmartEndpointInterceptor(delegate, soapAction); + SoapActionSmartEndpointInterceptor interceptor = new SoapActionSmartEndpointInterceptor(this.delegate, + this.soapAction); - boolean result = interceptor.shouldIntercept(messageContext, null); + boolean result = interceptor.shouldIntercept(this.messageContext, null); assertThat(result).isTrue(); } @@ -69,10 +71,10 @@ public class SoapActionSmartEndpointInterceptorTest { @Test public void shouldInterceptNonMatch() { - SoapActionSmartEndpointInterceptor interceptor = new SoapActionSmartEndpointInterceptor(delegate, + SoapActionSmartEndpointInterceptor interceptor = new SoapActionSmartEndpointInterceptor(this.delegate, "http://springframework.org/other"); - boolean result = interceptor.shouldIntercept(messageContext, null); + boolean result = interceptor.shouldIntercept(this.messageContext, null); assertThat(result).isFalse(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java index 24923149..25a211c9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java @@ -41,28 +41,29 @@ public class DelegatingSoapEndpointMappingTest { @BeforeEach public void setUp() { - endpointMapping = new DelegatingSoapEndpointMapping(); - mock = createMock(EndpointMapping.class); - endpointMapping.setDelegate(mock); + this.endpointMapping = new DelegatingSoapEndpointMapping(); + this.mock = createMock(EndpointMapping.class); + this.endpointMapping.setDelegate(this.mock); } @Test public void testGetEndpointMapping() throws Exception { String role = "http://www.springframework.org/spring-ws/role"; - endpointMapping.setActorOrRole(role); + this.endpointMapping.setActorOrRole(role); MessageContext context = new DefaultMessageContext(new MockWebServiceMessageFactory()); EndpointInvocationChain delegateChain = new EndpointInvocationChain(new Object()); - expect(mock.getEndpoint(context)).andReturn(delegateChain); + expect(this.mock.getEndpoint(context)).andReturn(delegateChain); - replay(mock); + replay(this.mock); - SoapEndpointInvocationChain resultChain = (SoapEndpointInvocationChain) endpointMapping.getEndpoint(context); + SoapEndpointInvocationChain resultChain = (SoapEndpointInvocationChain) this.endpointMapping + .getEndpoint(context); assertThat(resultChain).isNotNull(); assertThat(resultChain.getActorsOrRoles()).containsExactly(role); - verify(mock); + verify(this.mock); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java index 221090ef..70f747a2 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java @@ -47,11 +47,11 @@ public class SoapActionAnnotationMethodEndpointMappingTest { @BeforeEach public void setUp() { - applicationContext = new StaticApplicationContext(); - applicationContext.registerSingleton("mapping", SoapActionAnnotationMethodEndpointMapping.class); - applicationContext.registerSingleton("endpoint", MyEndpoint.class); - applicationContext.refresh(); - mapping = (SoapActionAnnotationMethodEndpointMapping) applicationContext.getBean("mapping"); + this.applicationContext = new StaticApplicationContext(); + this.applicationContext.registerSingleton("mapping", SoapActionAnnotationMethodEndpointMapping.class); + this.applicationContext.registerSingleton("endpoint", MyEndpoint.class); + this.applicationContext.refresh(); + this.mapping = (SoapActionAnnotationMethodEndpointMapping) this.applicationContext.getBean("mapping"); } @Test @@ -63,12 +63,12 @@ public class SoapActionAnnotationMethodEndpointMappingTest { replay(requestMock, factoryMock); MessageContext context = new DefaultMessageContext(requestMock, factoryMock); - EndpointInvocationChain chain = mapping.getEndpoint(context); + EndpointInvocationChain chain = this.mapping.getEndpoint(context); assertThat(chain).isNotNull(); Method doIt = MyEndpoint.class.getMethod("doIt"); - MethodEndpoint expected = new MethodEndpoint("endpoint", applicationContext, doIt); + MethodEndpoint expected = new MethodEndpoint("endpoint", this.applicationContext, doIt); assertThat(chain.getEndpoint()).isEqualTo(expected); @@ -85,15 +85,15 @@ public class SoapActionAnnotationMethodEndpointMappingTest { replay(requestMock, factoryMock); Method doItMultiple = MyEndpoint.class.getMethod("doItMultiple"); - MethodEndpoint expected = new MethodEndpoint("endpoint", applicationContext, doItMultiple); + MethodEndpoint expected = new MethodEndpoint("endpoint", this.applicationContext, doItMultiple); MessageContext context = new DefaultMessageContext(requestMock, factoryMock); - EndpointInvocationChain chain = mapping.getEndpoint(context); + EndpointInvocationChain chain = this.mapping.getEndpoint(context); assertThat(chain).isNotNull(); assertThat(chain.getEndpoint()).isEqualTo(expected); - chain = mapping.getEndpoint(context); + chain = this.mapping.getEndpoint(context); assertThat(chain).isNotNull(); assertThat(chain.getEndpoint()).isEqualTo(expected); @@ -111,15 +111,15 @@ public class SoapActionAnnotationMethodEndpointMappingTest { replay(requestMock, factoryMock); Method doItRepeatable = MyEndpoint.class.getMethod("doItRepeatable"); - MethodEndpoint expected = new MethodEndpoint("endpoint", applicationContext, doItRepeatable); + MethodEndpoint expected = new MethodEndpoint("endpoint", this.applicationContext, doItRepeatable); MessageContext context = new DefaultMessageContext(requestMock, factoryMock); - EndpointInvocationChain chain = mapping.getEndpoint(context); + EndpointInvocationChain chain = this.mapping.getEndpoint(context); assertThat(chain).isNotNull(); assertThat(chain.getEndpoint()).isEqualTo(expected); - chain = mapping.getEndpoint(context); + chain = this.mapping.getEndpoint(context); assertThat(chain).isNotNull(); assertThat(chain.getEndpoint()).isEqualTo(expected); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java index 7c009067..bb87f672 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java @@ -36,31 +36,31 @@ public class SoapActionEndpointMappingTest { @BeforeEach public void setUp() throws Exception { - mapping = new SoapActionEndpointMapping(); - context = new DefaultMessageContext(new SaajSoapMessageFactory(MessageFactory.newInstance())); + this.mapping = new SoapActionEndpointMapping(); + this.context = new DefaultMessageContext(new SaajSoapMessageFactory(MessageFactory.newInstance())); } @Test public void testGetLookupKeyForMessage() throws Exception { String soapAction = "http://springframework.org/spring-ws/SoapAction"; - ((SoapMessage) context.getRequest()).setSoapAction(soapAction); + ((SoapMessage) this.context.getRequest()).setSoapAction(soapAction); - assertThat(mapping.getLookupKeyForMessage(context)).isEqualTo(soapAction); + assertThat(this.mapping.getLookupKeyForMessage(this.context)).isEqualTo(soapAction); } @Test public void testGetLookupKeyForMessageQuoted() throws Exception { String soapAction = "http://springframework.org/spring-ws/SoapAction"; - ((SoapMessage) context.getRequest()).setSoapAction(soapAction); + ((SoapMessage) this.context.getRequest()).setSoapAction(soapAction); - assertThat(mapping.getLookupKeyForMessage(context)).isEqualTo(soapAction); + assertThat(this.mapping.getLookupKeyForMessage(this.context)).isEqualTo(soapAction); } @Test public void testValidateLookupKey() { - assertThat(mapping.validateLookupKey("SoapAction")).isTrue(); + assertThat(this.mapping.validateLookupKey("SoapAction")).isTrue(); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTest.java index ab7839aa..9f0a84c4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTest.java @@ -37,19 +37,19 @@ public abstract class AbstractSoap11BodyTest extends AbstractSoapBodyTest { @Test public void testGetType() { - assertThat(soapBody).isInstanceOf(Soap11Body.class); + assertThat(this.soapBody).isInstanceOf(Soap11Body.class); } @Test public void testGetName() { - assertThat(soapBody.getName()).isEqualTo(SoapVersion.SOAP_11.getBodyName()); + assertThat(this.soapBody.getName()).isEqualTo(SoapVersion.SOAP_11.getBodyName()); } @Test public void testGetSource() throws Exception { StringResult result = new StringResult(); - transformer.transform(soapBody.getSource(), result); + this.transformer.transform(this.soapBody.getSource(), result); XmlAssert.assertThat(result.toString()) .and("") @@ -60,34 +60,34 @@ public abstract class AbstractSoap11BodyTest extends AbstractSoapBodyTest { @Test public void testAddMustUnderstandFault() throws Exception { - SoapFault fault = soapBody.addMustUnderstandFault("SOAP Must Understand Error", null); + SoapFault fault = this.soapBody.addMustUnderstandFault("SOAP Must Understand Error", null); assertThat(fault.getFaultCode()) .isEqualTo(new QName("http://schemas.xmlsoap.org/soap/envelope/", "MustUnderstand")); assertPayloadEqual("" + "" - + soapBody.getName().getPrefix() + ":MustUnderstand" + + this.soapBody.getName().getPrefix() + ":MustUnderstand" + "SOAP Must Understand Error"); } @Test public void testAddClientFault() throws Exception { - SoapFault fault = soapBody.addClientOrSenderFault("faultString", null); + SoapFault fault = this.soapBody.addClientOrSenderFault("faultString", null); assertThat(fault.getFaultCode()).isEqualTo(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Client")); assertPayloadEqual("" + "" - + soapBody.getName().getPrefix() + ":Client" + "faultString" + + this.soapBody.getName().getPrefix() + ":Client" + "faultString" + ""); } @Test public void testAddServerFault() throws Exception { - SoapFault fault = soapBody.addServerOrReceiverFault("faultString", null); + SoapFault fault = this.soapBody.addServerOrReceiverFault("faultString", null); assertThat(fault.getFaultCode()).isEqualTo(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Server")); assertPayloadEqual("" + "" - + soapBody.getName().getPrefix() + ":Server" + "faultString" + + this.soapBody.getName().getPrefix() + ":Server" + "faultString" + ""); } @@ -96,11 +96,11 @@ public abstract class AbstractSoap11BodyTest extends AbstractSoapBodyTest { QName faultCode = new QName("http://www.springframework.org", "fault", "spring"); String faultString = "faultString"; - Soap11Fault fault = ((Soap11Body) soapBody).addFault(faultCode, faultString, Locale.ENGLISH); + Soap11Fault fault = ((Soap11Body) this.soapBody).addFault(faultCode, faultString, Locale.ENGLISH); assertThat(fault).isNotNull(); - assertThat(soapBody.hasFault()).isTrue(); - assertThat(soapBody.getFault()).isNotNull(); + assertThat(this.soapBody.hasFault()).isTrue(); + assertThat(this.soapBody.getFault()).isNotNull(); assertThat(fault.getFaultCode()).isEqualTo(faultCode); assertThat(fault.getFaultStringOrReason()).isEqualTo(faultString); assertThat(fault.getFaultStringLocale()).isEqualTo(Locale.ENGLISH); @@ -120,11 +120,11 @@ public abstract class AbstractSoap11BodyTest extends AbstractSoapBodyTest { QName faultCode = new QName("http://www.springframework.org", "fault"); String faultString = "faultString"; - Soap11Fault fault = ((Soap11Body) soapBody).addFault(faultCode, faultString, Locale.ENGLISH); + Soap11Fault fault = ((Soap11Body) this.soapBody).addFault(faultCode, faultString, Locale.ENGLISH); assertThat(fault).isNotNull(); - assertThat(soapBody.hasFault()).isTrue(); - assertThat(soapBody.getFault()).isNotNull(); + assertThat(this.soapBody.hasFault()).isTrue(); + assertThat(this.soapBody.getFault()).isNotNull(); assertThat(fault.getFaultCode()).isEqualTo(faultCode); assertThat(fault.getFaultStringOrReason()).isEqualTo(faultString); assertThat(fault.getFaultStringLocale()).isEqualTo(Locale.ENGLISH); @@ -140,15 +140,15 @@ public abstract class AbstractSoap11BodyTest extends AbstractSoapBodyTest { QName faultCode = new QName("http://www.springframework.org", "fault", "spring"); String faultString = "faultString"; - SoapFault fault = ((Soap11Body) soapBody).addFault(faultCode, faultString, null); + SoapFault fault = ((Soap11Body) this.soapBody).addFault(faultCode, faultString, null); SoapFaultDetail detail = fault.addFaultDetail(); QName detailName = new QName("http://www.springframework.org", "detailEntry", "spring"); SoapFaultDetailElement detailElement1 = detail.addFaultDetailElement(detailName); StringSource detailContents = new StringSource(""); - transformer.transform(detailContents, detailElement1.getResult()); + this.transformer.transform(detailContents, detailElement1.getResult()); SoapFaultDetailElement detailElement2 = detail.addFaultDetailElement(detailName); detailContents = new StringSource(""); - transformer.transform(detailContents, detailElement2.getResult()); + this.transformer.transform(detailContents, detailElement2.getResult()); assertPayloadEqual( "" @@ -163,11 +163,11 @@ public abstract class AbstractSoap11BodyTest extends AbstractSoapBodyTest { @Test public void testAddFaultWithDetailResult() throws Exception { - SoapFault fault = ((Soap11Body) soapBody).addFault(new QName("namespace", "localPart", "prefix"), "Fault", + SoapFault fault = ((Soap11Body) this.soapBody).addFault(new QName("namespace", "localPart", "prefix"), "Fault", null); SoapFaultDetail detail = fault.addFaultDetail(); - transformer.transform(new StringSource(""), detail.getResult()); - transformer.transform(new StringSource(""), detail.getResult()); + this.transformer.transform(new StringSource(""), detail.getResult()); + this.transformer.transform(new StringSource(""), detail.getResult()); assertPayloadEqual("" + "prefix:localPart" diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTest.java index 2f3f8bad..379abebd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTest.java @@ -31,7 +31,7 @@ public abstract class AbstractSoap11EnvelopeTest extends AbstractSoapEnvelopeTes @Test public void testGetName() { - assertThat(soapEnvelope.getName()) + assertThat(this.soapEnvelope.getName()) .isEqualTo(new QName(SoapVersion.SOAP_11.getEnvelopeNamespaceUri(), "Envelope")); } @@ -39,7 +39,7 @@ public abstract class AbstractSoap11EnvelopeTest extends AbstractSoapEnvelopeTes public void testGetContent() throws Exception { StringResult result = new StringResult(); - transformer.transform(soapEnvelope.getSource(), result); + this.transformer.transform(this.soapEnvelope.getSource(), result); XmlAssert.assertThat(result.toString()) .and("
") diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTest.java index df0c54b8..23eb3fc6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTest.java @@ -37,19 +37,20 @@ public abstract class AbstractSoap11HeaderTest extends AbstractSoapHeaderTest { @Test public void testGetType() { - assertThat(soapHeader).isInstanceOf(Soap11Header.class); + assertThat(this.soapHeader).isInstanceOf(Soap11Header.class); } @Test public void testGetName() { - assertThat(soapHeader.getName()).isEqualTo(new QName(SoapVersion.SOAP_11.getEnvelopeNamespaceUri(), "Header")); + assertThat(this.soapHeader.getName()) + .isEqualTo(new QName(SoapVersion.SOAP_11.getEnvelopeNamespaceUri(), "Header")); } @Test public void testGetSource() throws Exception { StringResult result = new StringResult(); - transformer.transform(soapHeader.getSource(), result); + this.transformer.transform(this.soapHeader.getSource(), result); XmlAssert.assertThat(result.toString()) .and("") @@ -61,15 +62,15 @@ public abstract class AbstractSoap11HeaderTest extends AbstractSoapHeaderTest { public void testExamineHeaderElementsToProcessActors() { QName qName = new QName(NAMESPACE, "localName1", PREFIX); - SoapHeaderElement headerElement = soapHeader.addHeaderElement(qName); + SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole("role1"); qName = new QName(NAMESPACE, "localName2", PREFIX); - headerElement = soapHeader.addHeaderElement(qName); + headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole("role2"); qName = new QName(NAMESPACE, "localName3", PREFIX); - headerElement = soapHeader.addHeaderElement(qName); + headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole(SoapVersion.SOAP_11.getNextActorOrRoleUri()); - Iterator iterator = ((Soap11Header) soapHeader) + Iterator iterator = ((Soap11Header) this.soapHeader) .examineHeaderElementsToProcess(new String[] { "role1" }); assertThat(iterator).isNotNull(); @@ -88,15 +89,15 @@ public abstract class AbstractSoap11HeaderTest extends AbstractSoapHeaderTest { public void testExamineHeaderElementsToProcessNoActors() { QName qName = new QName(NAMESPACE, "localName1", PREFIX); - SoapHeaderElement headerElement = soapHeader.addHeaderElement(qName); + SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole(""); qName = new QName(NAMESPACE, "localName2", PREFIX); - headerElement = soapHeader.addHeaderElement(qName); + headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole("role1"); qName = new QName(NAMESPACE, "localName3", PREFIX); - headerElement = soapHeader.addHeaderElement(qName); + headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole(SoapVersion.SOAP_11.getNextActorOrRoleUri()); - Iterator iterator = ((Soap11Header) soapHeader) + Iterator iterator = ((Soap11Header) this.soapHeader) .examineHeaderElementsToProcess(new String[0]); assertThat(iterator).isNotNull(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTest.java index 60101002..14261e56 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTest.java @@ -39,7 +39,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Test public void testCreateEmptySoap11Message() { - WebServiceMessage message = messageFactory.createWebServiceMessage(); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(); assertThat(message).isInstanceOf(SoapMessage.class); @@ -58,7 +58,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa headers.put("SOAPAction", soapAction); TransportInputStream tis = new MockTransportInputStream(is, headers); - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); assertThat(message).isInstanceOf(SoapMessage.class); @@ -77,7 +77,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa headers.put("Content-Type", "text/xml"); TransportInputStream tis = new MockTransportInputStream(is, headers); - messageFactory.createWebServiceMessage(tis); + this.messageFactory.createWebServiceMessage(tis); } @Override @@ -89,7 +89,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa "multipart/related;" + "type=\"text/xml\";" + "boundary=\"----=_Part_0_11416420.1149699787554\""); TransportInputStream tis = new MockTransportInputStream(is, headers); - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); assertThat(message).isInstanceOf(SoapMessage.class); @@ -119,7 +119,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa + "boundary=\"MIMEBoundaryurn_uuid_492264AB42E57108E01176731445507\""); TransportInputStream tis = new MockTransportInputStream(is, headers); - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); assertThat(message).isInstanceOf(SoapMessage.class); @@ -148,7 +148,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa + "boundary=\"MIMEBoundaryurn_uuid_492264AB42E57108E01176731445507\""); TransportInputStream tis = new MockTransportInputStream(is, headers); - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); assertThat(message).isInstanceOf(SoapMessage.class); SoapMessage soapMessage = (SoapMessage) message; assertThat(soapMessage.getVersion()).isEqualTo(SoapVersion.SOAP_11); @@ -170,7 +170,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa headers.put("Content-Type", "text/xml; charset=UTF-8"); TransportInputStream tis = new MockTransportInputStream(is, headers); - SoapMessage message = (SoapMessage) messageFactory.createWebServiceMessage(tis); + SoapMessage message = (SoapMessage) this.messageFactory.createWebServiceMessage(tis); assertThat(message.getVersion()).isEqualTo(SoapVersion.SOAP_11); } @@ -183,7 +183,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa headers.put("Content-Type", "text/xml; charset=UTF-16"); TransportInputStream tis = new MockTransportInputStream(is, headers); - SoapMessage message = (SoapMessage) messageFactory.createWebServiceMessage(tis); + SoapMessage message = (SoapMessage) this.messageFactory.createWebServiceMessage(tis); assertThat(message.getVersion()).isEqualTo(SoapVersion.SOAP_11); } @@ -196,7 +196,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa headers.put("Content-Type", "text/xml; charset=UTF-16"); TransportInputStream tis = new MockTransportInputStream(is, headers); - SoapMessage message = (SoapMessage) messageFactory.createWebServiceMessage(tis); + SoapMessage message = (SoapMessage) this.messageFactory.createWebServiceMessage(tis); assertThat(message.getVersion()).isEqualTo(SoapVersion.SOAP_11); } @@ -207,7 +207,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11.xml"); TransportInputStream tis = new MockTransportInputStream(is, Collections.emptyMap()); - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); assertThat(message).isInstanceOf(SoapMessage.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTest.java index 39ed99b8..b18ab40f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTest.java @@ -51,21 +51,21 @@ public abstract class AbstractSoap11MessageTest extends AbstractSoapMessageTest @Override public void testGetVersion() { - assertThat(soapMessage.getVersion()).isEqualTo(SoapVersion.SOAP_11); + assertThat(this.soapMessage.getVersion()).isEqualTo(SoapVersion.SOAP_11); } @Override public void testWriteToTransportOutputStream() throws Exception { - SoapBody body = soapMessage.getSoapBody(); + SoapBody body = this.soapMessage.getSoapBody(); String payload = ""; - transformer.transform(new StringSource(payload), body.getPayloadResult()); + this.transformer.transform(new StringSource(payload), body.getPayloadResult()); ByteArrayOutputStream bos = new ByteArrayOutputStream(); MockTransportOutputStream tos = new MockTransportOutputStream(bos); String soapAction = "http://springframework.org/spring-ws/Action"; - soapMessage.setSoapAction(soapAction); - soapMessage.writeTo(tos); + this.soapMessage.setSoapAction(soapAction); + this.soapMessage.writeTo(tos); String result = bos.toString(StandardCharsets.UTF_8); XmlAssert.assertThat(result) @@ -92,10 +92,10 @@ public abstract class AbstractSoap11MessageTest extends AbstractSoapMessageTest public void testWriteToTransportResponseAttachment() throws Exception { InputStreamSource inputStreamSource = new ByteArrayResource("contents".getBytes(StandardCharsets.UTF_8)); - soapMessage.addAttachment("contentId", inputStreamSource, "text/plain"); + this.soapMessage.addAttachment("contentId", inputStreamSource, "text/plain"); ByteArrayOutputStream bos = new ByteArrayOutputStream(); MockTransportOutputStream tos = new MockTransportOutputStream(bos); - soapMessage.writeTo(tos); + this.soapMessage.writeTo(tos); String contentType = tos.getHeaders().get("Content-Type"); assertThat(contentType.indexOf("multipart/related")).isNotEqualTo(-1); @@ -105,8 +105,8 @@ public abstract class AbstractSoap11MessageTest extends AbstractSoapMessageTest @Override public void testToDocument() throws Exception { - transformer.transform(new StringSource(""), - soapMessage.getSoapBody().getPayloadResult()); + this.transformer.transform(new StringSource(""), + this.soapMessage.getSoapBody().getPayloadResult()); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -125,7 +125,7 @@ public abstract class AbstractSoap11MessageTest extends AbstractSoapMessageTest Element payload = expected.createElementNS("http://www.springframework.org", "payload"); body.appendChild(payload); - Document result = soapMessage.getDocument(); + Document result = this.soapMessage.getDocument(); XmlAssert.assertThat(result).and(expected).ignoreWhitespace().areIdentical(); } @@ -133,15 +133,15 @@ public abstract class AbstractSoap11MessageTest extends AbstractSoapMessageTest @Override public void testSetLiveDocument() throws Exception { - transformer.transform(new StringSource(""), - soapMessage.getSoapBody().getPayloadResult()); + this.transformer.transform(new StringSource(""), + this.soapMessage.getSoapBody().getPayloadResult()); - Document document = soapMessage.getDocument(); + Document document = this.soapMessage.getDocument(); - soapMessage.setDocument(document); + this.soapMessage.setDocument(document); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - soapMessage.writeTo(bos); + this.soapMessage.writeTo(bos); String result = bos.toString(StandardCharsets.UTF_8); @@ -156,22 +156,22 @@ public abstract class AbstractSoap11MessageTest extends AbstractSoapMessageTest @Override public void testSetOtherDocument() throws Exception { - transformer.transform(new StringSource(""), - soapMessage.getSoapBody().getPayloadResult()); + this.transformer.transform(new StringSource(""), + this.soapMessage.getSoapBody().getPayloadResult()); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - soapMessage.writeTo(bos); + this.soapMessage.writeTo(bos); ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); DOMResult domResult = new DOMResult(); - transformer.transform(new StreamSource(bis), domResult); + this.transformer.transform(new StreamSource(bis), domResult); Document document = (Document) domResult.getNode(); - soapMessage.setDocument(document); + this.soapMessage.setDocument(document); bos = new ByteArrayOutputStream(); - soapMessage.writeTo(bos); + this.soapMessage.writeTo(bos); String result = bos.toString(StandardCharsets.UTF_8); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTest.java index 69f1cc12..6b6d521f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTest.java @@ -38,19 +38,19 @@ public abstract class AbstractSoap12BodyTest extends AbstractSoapBodyTest { @Test public void testGetType() { - assertThat(soapBody).isInstanceOf(Soap12Body.class); + assertThat(this.soapBody).isInstanceOf(Soap12Body.class); } @Test public void testGetName() { - assertThat(soapBody.getName()).isEqualTo(new QName(SoapVersion.SOAP_12.getEnvelopeNamespaceUri(), "Body")); + assertThat(this.soapBody.getName()).isEqualTo(new QName(SoapVersion.SOAP_12.getEnvelopeNamespaceUri(), "Body")); } @Test public void testGetSource() throws Exception { StringResult result = new StringResult(); - transformer.transform(soapBody.getSource(), result); + this.transformer.transform(this.soapBody.getSource(), result); XmlAssert.assertThat(result.toString()) .and("") @@ -61,17 +61,17 @@ public abstract class AbstractSoap12BodyTest extends AbstractSoapBodyTest { @Test public void testAddMustUnderstandFault() throws Exception { - SoapFault fault = soapBody.addMustUnderstandFault("SOAP Must Understand Error", Locale.ENGLISH); + SoapFault fault = this.soapBody.addMustUnderstandFault("SOAP Must Understand Error", Locale.ENGLISH); assertThat(fault.getFaultCode()) .isEqualTo(new QName("http://www.w3.org/2003/05/soap-envelope", "MustUnderstand")); StringResult result = new StringResult(); - transformer.transform(fault.getSource(), result); + this.transformer.transform(fault.getSource(), result); XmlAssert.assertThat(result.toString()) .and("" - + "" + soapBody.getName().getPrefix() + + "" + this.soapBody.getName().getPrefix() + ":MustUnderstand" + "SOAP Must Understand Error" + "") @@ -82,16 +82,16 @@ public abstract class AbstractSoap12BodyTest extends AbstractSoapBodyTest { @Test public void testAddSenderFault() throws Exception { - SoapFault fault = soapBody.addClientOrSenderFault("faultString", Locale.ENGLISH); + SoapFault fault = this.soapBody.addClientOrSenderFault("faultString", Locale.ENGLISH); assertThat(fault.getFaultCode()).isEqualTo(new QName("http://www.w3.org/2003/05/soap-envelope", "Sender")); StringResult result = new StringResult(); - transformer.transform(fault.getSource(), result); + this.transformer.transform(fault.getSource(), result); XmlAssert.assertThat(result.toString()) .and("" - + "" + soapBody.getName().getPrefix() + + "" + this.soapBody.getName().getPrefix() + ":Sender" + "faultString" + "") @@ -102,16 +102,16 @@ public abstract class AbstractSoap12BodyTest extends AbstractSoapBodyTest { @Test public void testAddReceiverFault() throws Exception { - SoapFault fault = soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); + SoapFault fault = this.soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); assertThat(fault.getFaultCode()).isEqualTo(new QName("http://www.w3.org/2003/05/soap-envelope", "Receiver")); StringResult result = new StringResult(); - transformer.transform(fault.getSource(), result); + this.transformer.transform(fault.getSource(), result); XmlAssert.assertThat(result.toString()) .and("" - + "" + soapBody.getName().getPrefix() + + "" + this.soapBody.getName().getPrefix() + ":Receiver" + "faultString" + "") @@ -122,19 +122,19 @@ public abstract class AbstractSoap12BodyTest extends AbstractSoapBodyTest { @Test public void testAddFaultWithDetail() throws Exception { - SoapFault fault = soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); + SoapFault fault = this.soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); SoapFaultDetail detail = fault.addFaultDetail(); SoapFaultDetailElement detailElement = detail .addFaultDetailElement(new QName("namespace", "localPart", "prefix")); StringSource detailContents = new StringSource(""); - transformer.transform(detailContents, detailElement.getResult()); + this.transformer.transform(detailContents, detailElement.getResult()); StringResult result = new StringResult(); - transformer.transform(fault.getSource(), result); + this.transformer.transform(fault.getSource(), result); XmlAssert.assertThat(result.toString()) .and("" - + "" + soapBody.getName().getPrefix() + ":Receiver" - + "" + + "" + this.soapBody.getName().getPrefix() + + ":Receiver" + "" + "faultString" + "" + "") @@ -145,17 +145,17 @@ public abstract class AbstractSoap12BodyTest extends AbstractSoapBodyTest { @Test public void testAddFaultWithDetailResult() throws Exception { - SoapFault fault = soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); + SoapFault fault = this.soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); SoapFaultDetail detail = fault.addFaultDetail(); - transformer.transform(new StringSource(""), detail.getResult()); - transformer.transform(new StringSource(""), detail.getResult()); + this.transformer.transform(new StringSource(""), detail.getResult()); + this.transformer.transform(new StringSource(""), detail.getResult()); StringResult result = new StringResult(); - transformer.transform(fault.getSource(), result); + this.transformer.transform(fault.getSource(), result); XmlAssert.assertThat(result.toString()) .and("" - + "" + soapBody.getName().getPrefix() + ":Receiver" - + "" + + "" + this.soapBody.getName().getPrefix() + + ":Receiver" + "" + "faultString" + "" + "" + "" + "") @@ -166,7 +166,7 @@ public abstract class AbstractSoap12BodyTest extends AbstractSoapBodyTest { @Test public void testAddFaultWithSubcode() throws Exception { - Soap12Fault fault = (Soap12Fault) soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); + Soap12Fault fault = (Soap12Fault) this.soapBody.addServerOrReceiverFault("faultString", Locale.ENGLISH); QName subcode1 = new QName("http://www.springframework.org", "Subcode1", "spring-ws"); fault.addFaultSubcode(subcode1); QName subcode2 = new QName("http://www.springframework.org", "Subcode2", "spring-ws"); @@ -180,11 +180,12 @@ public abstract class AbstractSoap12BodyTest extends AbstractSoapBodyTest { assertThat(iterator.hasNext()).isFalse(); StringResult result = new StringResult(); - transformer.transform(fault.getSource(), result); + this.transformer.transform(fault.getSource(), result); XmlAssert.assertThat(result.toString()) .and("" - + "" + soapBody.getName().getPrefix() + ":Receiver" + + "" + this.soapBody.getName().getPrefix() + + ":Receiver" + "spring-ws:Subcode1" + "spring-ws:Subcode2" + "" diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTest.java index 41195c64..7be1c660 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTest.java @@ -31,7 +31,7 @@ public abstract class AbstractSoap12EnvelopeTest extends AbstractSoapEnvelopeTes @Test public void testGetName() { - assertThat(soapEnvelope.getName()) + assertThat(this.soapEnvelope.getName()) .isEqualTo(new QName(SoapVersion.SOAP_12.getEnvelopeNamespaceUri(), "Envelope")); } @@ -39,7 +39,7 @@ public abstract class AbstractSoap12EnvelopeTest extends AbstractSoapEnvelopeTes public void testGetSource() throws Exception { StringResult result = new StringResult(); - transformer.transform(soapEnvelope.getSource(), result); + this.transformer.transform(this.soapEnvelope.getSource(), result); XmlAssert.assertThat(result.toString()) .and("
" + "") diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTest.java index 4d82f835..ed2fae0f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTest.java @@ -35,19 +35,20 @@ public abstract class AbstractSoap12HeaderTest extends AbstractSoapHeaderTest { @Test public void testGetType() { - assertThat(soapHeader).isInstanceOf(Soap12Header.class); + assertThat(this.soapHeader).isInstanceOf(Soap12Header.class); } @Test public void testGetName() { - assertThat(soapHeader.getName()).isEqualTo(new QName(SoapVersion.SOAP_12.getEnvelopeNamespaceUri(), "Header")); + assertThat(this.soapHeader.getName()) + .isEqualTo(new QName(SoapVersion.SOAP_12.getEnvelopeNamespaceUri(), "Header")); } @Test public void testGetSource() throws Exception { StringResult result = new StringResult(); - transformer.transform(soapHeader.getSource(), result); + this.transformer.transform(this.soapHeader.getSource(), result); XmlAssert.assertThat(result.toString()) .and("
") @@ -58,11 +59,11 @@ public abstract class AbstractSoap12HeaderTest extends AbstractSoapHeaderTest { @Test public void testAddNotUnderstood() throws Exception { - Soap12Header soap12Header = (Soap12Header) soapHeader; + Soap12Header soap12Header = (Soap12Header) this.soapHeader; QName headerName = new QName("http://www.springframework.org", "NotUnderstood", "spring-ws"); soap12Header.addNotUnderstoodHeaderElement(headerName); StringResult result = new StringResult(); - transformer.transform(soapHeader.getSource(), result); + this.transformer.transform(this.soapHeader.getSource(), result); XmlAssert.assertThat(result.toString()) .and("
" @@ -77,10 +78,10 @@ public abstract class AbstractSoap12HeaderTest extends AbstractSoapHeaderTest { String[] supportedUris = new String[] { "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/2003/05/soap-envelope" }; - Soap12Header soap12Header = (Soap12Header) soapHeader; + Soap12Header soap12Header = (Soap12Header) this.soapHeader; SoapHeaderElement header = soap12Header.addUpgradeHeaderElement(supportedUris); StringResult result = new StringResult(); - transformer.transform(soapHeader.getSource(), result); + this.transformer.transform(this.soapHeader.getSource(), result); assertThat(header.getName()).isEqualTo(new QName("http://www.w3.org/2003/05/soap-envelope", "Upgrade")); // XMLUnit can't test this: @@ -98,15 +99,15 @@ public abstract class AbstractSoap12HeaderTest extends AbstractSoapHeaderTest { public void testExamineHeaderElementsToProcessActors() { QName qName = new QName(NAMESPACE, "localName1", PREFIX); - SoapHeaderElement headerElement = soapHeader.addHeaderElement(qName); + SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole("role1"); qName = new QName(NAMESPACE, "localName2", PREFIX); - headerElement = soapHeader.addHeaderElement(qName); + headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole("role2"); qName = new QName(NAMESPACE, "localName3", PREFIX); - headerElement = soapHeader.addHeaderElement(qName); + headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole(SoapVersion.SOAP_12.getNextActorOrRoleUri()); - Iterator iterator = ((Soap12Header) soapHeader) + Iterator iterator = ((Soap12Header) this.soapHeader) .examineHeaderElementsToProcess(new String[] { "role1" }, false); assertThat(iterator).isNotNull(); @@ -125,16 +126,16 @@ public abstract class AbstractSoap12HeaderTest extends AbstractSoapHeaderTest { public void testExamineHeaderElementsToProcessNoActors() { QName qName = new QName(NAMESPACE, "localName1", PREFIX); - SoapHeaderElement headerElement = soapHeader.addHeaderElement(qName); + SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole(""); qName = new QName(NAMESPACE, "localName2", PREFIX); - headerElement = soapHeader.addHeaderElement(qName); + headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole("role1"); qName = new QName(NAMESPACE, "localName3", PREFIX); - headerElement = soapHeader.addHeaderElement(qName); + headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole(SoapVersion.SOAP_12.getNextActorOrRoleUri()); - Iterator iterator = ((Soap12Header) soapHeader).examineHeaderElementsToProcess(new String[0], - false); + Iterator iterator = ((Soap12Header) this.soapHeader) + .examineHeaderElementsToProcess(new String[0], false); assertThat(iterator).isNotNull(); assertThat(iterator.hasNext()).isTrue(); @@ -152,9 +153,9 @@ public abstract class AbstractSoap12HeaderTest extends AbstractSoapHeaderTest { public void testExamineHeaderElementsToProcessUltimateDestination() { QName qName = new QName(NAMESPACE, "localName", PREFIX); - SoapHeaderElement headerElement = soapHeader.addHeaderElement(qName); + SoapHeaderElement headerElement = this.soapHeader.addHeaderElement(qName); headerElement.setActorOrRole(SoapVersion.SOAP_12.getUltimateReceiverRoleUri()); - Iterator iterator = ((Soap12Header) soapHeader) + Iterator iterator = ((Soap12Header) this.soapHeader) .examineHeaderElementsToProcess(new String[] { "role" }, true); assertThat(iterator).isNotNull(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTest.java index 55c8daf8..31056f70 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTest.java @@ -38,7 +38,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa @Override public void testCreateEmptyMessage() { - WebServiceMessage message = messageFactory.createWebServiceMessage(); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(); assertThat(message).isInstanceOf(SoapMessage.class); @@ -56,7 +56,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa headers.put(TransportConstants.HEADER_CONTENT_TYPE, "application/soap+xml; action=" + soapAction); TransportInputStream tis = new MockTransportInputStream(is, headers); - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); assertThat(message).isInstanceOf(SoapMessage.class); SoapMessage soapMessage = (SoapMessage) message; @@ -73,7 +73,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa headers.put(TransportConstants.HEADER_CONTENT_TYPE, "application/soap+xml"); TransportInputStream tis = new MockTransportInputStream(is, headers); - messageFactory.createWebServiceMessage(tis); + this.messageFactory.createWebServiceMessage(tis); } @Override @@ -85,7 +85,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa + "boundary=\"----=_Part_0_11416420.1149699787554\""); TransportInputStream tis = new MockTransportInputStream(is, headers); - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); assertThat(message).isInstanceOf(SoapMessage.class); @@ -110,7 +110,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa + "boundary=\"MIMEBoundaryurn_uuid_40864869929B855F971176851454455\""); TransportInputStream tis = new MockTransportInputStream(is, headers); - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); assertThat(message).isInstanceOf(SoapMessage.class); SoapMessage soapMessage = (SoapMessage) message; @@ -132,7 +132,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12.xml"); TransportInputStream tis = new MockTransportInputStream(is, Collections.emptyMap()); - WebServiceMessage message = messageFactory.createWebServiceMessage(tis); + WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); assertThat(message).isInstanceOf(SoapMessage.class); SoapMessage soapMessage = (SoapMessage) message; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTest.java index 08e21244..8b9badbc 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTest.java @@ -47,7 +47,7 @@ public abstract class AbstractSoap12MessageTest extends AbstractSoapMessageTest @Override public void testGetVersion() { - assertThat(soapMessage.getVersion()).isEqualTo(SoapVersion.SOAP_12); + assertThat(this.soapMessage.getVersion()).isEqualTo(SoapVersion.SOAP_12); } @Override @@ -60,15 +60,15 @@ public abstract class AbstractSoap12MessageTest extends AbstractSoapMessageTest @Override public void testWriteToTransportOutputStream() throws Exception { - SoapBody body = soapMessage.getSoapBody(); + SoapBody body = this.soapMessage.getSoapBody(); String payload = ""; - transformer.transform(new StringSource(payload), body.getPayloadResult()); + this.transformer.transform(new StringSource(payload), body.getPayloadResult()); final ByteArrayOutputStream bos = new ByteArrayOutputStream(); MockTransportOutputStream tos = new MockTransportOutputStream(bos); String soapAction = "http://springframework.org/spring-ws/Action"; - soapMessage.setSoapAction(soapAction); - soapMessage.writeTo(tos); + this.soapMessage.setSoapAction(soapAction); + this.soapMessage.writeTo(tos); String result = bos.toString(StandardCharsets.UTF_8); XmlAssert.assertThat(result) @@ -93,10 +93,10 @@ public abstract class AbstractSoap12MessageTest extends AbstractSoapMessageTest public void testWriteToTransportResponseAttachment() throws Exception { InputStreamSource inputStreamSource = new ByteArrayResource("contents".getBytes(StandardCharsets.UTF_8)); - soapMessage.addAttachment("contentId", inputStreamSource, "text/plain"); + this.soapMessage.addAttachment("contentId", inputStreamSource, "text/plain"); ByteArrayOutputStream bos = new ByteArrayOutputStream(); MockTransportOutputStream tos = new MockTransportOutputStream(bos); - soapMessage.writeTo(tos); + this.soapMessage.writeTo(tos); String contentType = tos.getHeaders().get("Content-Type"); assertThat(contentType).contains("multipart/related"); @@ -106,8 +106,8 @@ public abstract class AbstractSoap12MessageTest extends AbstractSoapMessageTest @Override public void testToDocument() throws Exception { - transformer.transform(new StringSource(""), - soapMessage.getSoapBody().getPayloadResult()); + this.transformer.transform(new StringSource(""), + this.soapMessage.getSoapBody().getPayloadResult()); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -126,7 +126,7 @@ public abstract class AbstractSoap12MessageTest extends AbstractSoapMessageTest Element payload = expected.createElementNS("http://www.springframework.org", "payload"); body.appendChild(payload); - Document result = soapMessage.getDocument(); + Document result = this.soapMessage.getDocument(); XmlAssert.assertThat(result).and(expected).ignoreWhitespace().areIdentical(); } @@ -134,15 +134,15 @@ public abstract class AbstractSoap12MessageTest extends AbstractSoapMessageTest @Override public void testSetLiveDocument() throws Exception { - transformer.transform(new StringSource(""), - soapMessage.getSoapBody().getPayloadResult()); + this.transformer.transform(new StringSource(""), + this.soapMessage.getSoapBody().getPayloadResult()); - Document document = soapMessage.getDocument(); + Document document = this.soapMessage.getDocument(); - soapMessage.setDocument(document); + this.soapMessage.setDocument(document); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - soapMessage.writeTo(bos); + this.soapMessage.writeTo(bos); String result = bos.toString(StandardCharsets.UTF_8); @@ -157,22 +157,22 @@ public abstract class AbstractSoap12MessageTest extends AbstractSoapMessageTest @Override public void testSetOtherDocument() throws Exception { - transformer.transform(new StringSource(""), - soapMessage.getSoapBody().getPayloadResult()); + this.transformer.transform(new StringSource(""), + this.soapMessage.getSoapBody().getPayloadResult()); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - soapMessage.writeTo(bos); + this.soapMessage.writeTo(bos); ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); DOMResult domResult = new DOMResult(); - transformer.transform(new StreamSource(bis), domResult); + this.transformer.transform(new StreamSource(bis), domResult); Document document = (Document) domResult.getNode(); - soapMessage.setDocument(document); + this.soapMessage.setDocument(document); bos = new ByteArrayOutputStream(); - soapMessage.writeTo(bos); + this.soapMessage.writeTo(bos); String result = bos.toString(StandardCharsets.UTF_8); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java index bd6c5eb1..71c98a68 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java @@ -114,7 +114,7 @@ public class DefaultStrategiesHelperTest { private ApplicationContext applicationContext; public ApplicationContext getApplicationContext() { - return applicationContext; + return this.applicationContext; } @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java index 47ff6f3c..00d33f4d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportInputStream.java @@ -43,23 +43,23 @@ public class MockTransportInputStream extends TransportInputStream { Assert.notNull(inputStream, "inputStream must not be null"); this.inputStream = inputStream; - headers = new HashMap<>(); + this.headers = new HashMap<>(); } @Override protected InputStream createInputStream() { - return inputStream; + return this.inputStream; } @Override public Iterator getHeaderNames() { - return headers.keySet().iterator(); + return this.headers.keySet().iterator(); } @Override public Iterator getHeaders(String name) { - String[] values = StringUtils.delimitedListToStringArray(headers.get(name), ", "); + String[] values = StringUtils.delimitedListToStringArray(this.headers.get(name), ", "); return Arrays.asList(values).iterator(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java index d288c8f9..16f51009 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/MockTransportOutputStream.java @@ -36,16 +36,16 @@ public class MockTransportOutputStream extends TransportOutputStream { @Override protected OutputStream createOutputStream() { - return outputStream; + return this.outputStream; } public Map getHeaders() { - return headers; + return this.headers; } @Override public void addHeader(String name, String value) { - headers.put(name, value); + this.headers.put(name, value); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java index 31c89343..e3110470 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java @@ -99,24 +99,24 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTest expectedClass, List actual) { @@ -71,9 +71,9 @@ public class MessageDispatcherServletTest { @Test public void testDefaultStrategies() throws ServletException { - servlet.setContextClass(StaticWebApplicationContext.class); - servlet.init(config); - MessageDispatcher messageDispatcher = (MessageDispatcher) servlet.getMessageReceiver(); + this.servlet.setContextClass(StaticWebApplicationContext.class); + this.servlet.init(this.config); + MessageDispatcher messageDispatcher = (MessageDispatcher) this.servlet.getMessageReceiver(); assertThat(messageDispatcher).isNotNull(); } @@ -81,9 +81,9 @@ public class MessageDispatcherServletTest { @Test public void testDetectedStrategies() throws ServletException { - servlet.setContextClass(DetectWebApplicationContext.class); - servlet.init(config); - MessageDispatcher messageDispatcher = (MessageDispatcher) servlet.getMessageReceiver(); + this.servlet.setContextClass(DetectWebApplicationContext.class); + this.servlet.init(this.config); + MessageDispatcher messageDispatcher = (MessageDispatcher) this.servlet.getMessageReceiver(); assertThat(messageDispatcher).isNotNull(); assertStrategies(PayloadRootQNameEndpointMapping.class, messageDispatcher.getEndpointMappings()); @@ -94,12 +94,12 @@ public class MessageDispatcherServletTest { @Test public void testDetectWsdlDefinitions() throws Exception { - servlet.setContextClass(WsdlDefinitionWebApplicationContext.class); - servlet.init(config); + this.servlet.setContextClass(WsdlDefinitionWebApplicationContext.class); + this.servlet.init(this.config); MockHttpServletRequest request = new MockHttpServletRequest(HttpTransportConstants.METHOD_GET, "/definition.wsdl"); MockHttpServletResponse response = new MockHttpServletResponse(); - servlet.service(request, response); + this.servlet.service(request, response); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java index 0a16ee2a..586b889d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java @@ -69,25 +69,25 @@ public class WebServiceMessageReceiverHandlerAdapterTest { @BeforeEach public void setUp() { - adapter = new WebServiceMessageReceiverHandlerAdapter(); - httpRequest = new MockHttpServletRequest(); - httpResponse = new MockHttpServletResponse(); - factoryMock = createMock(WebServiceMessageFactory.class); - adapter.setMessageFactory(factoryMock); - requestMock = createMock("request", FaultAwareWebServiceMessage.class); - responseMock = createMock("response", FaultAwareWebServiceMessage.class); + this.adapter = new WebServiceMessageReceiverHandlerAdapter(); + this.httpRequest = new MockHttpServletRequest(); + this.httpResponse = new MockHttpServletResponse(); + this.factoryMock = createMock(WebServiceMessageFactory.class); + this.adapter.setMessageFactory(this.factoryMock); + this.requestMock = createMock("request", FaultAwareWebServiceMessage.class); + this.responseMock = createMock("response", FaultAwareWebServiceMessage.class); } @Test public void testHandleNonPost() throws Exception { - httpRequest.setMethod(HttpTransportConstants.METHOD_GET); + this.httpRequest.setMethod(HttpTransportConstants.METHOD_GET); replayMockControls(); - adapter.handle(httpRequest, httpResponse, (WebServiceMessageReceiver) messageContext -> { + this.adapter.handle(this.httpRequest, this.httpResponse, (WebServiceMessageReceiver) messageContext -> { }); - assertThat(httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_METHOD_NOT_ALLOWED); + assertThat(this.httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_METHOD_NOT_ALLOWED); verifyMockControls(); } @@ -95,19 +95,19 @@ public class WebServiceMessageReceiverHandlerAdapterTest { @Test public void testHandlePostNoResponse() throws Exception { - httpRequest.setMethod(HttpTransportConstants.METHOD_POST); - httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); - httpRequest.setContentType("text/xml; charset=\"utf-8\""); - httpRequest.setCharacterEncoding("UTF-8"); - expect(factoryMock.createWebServiceMessage(isA(InputStream.class))).andReturn(responseMock); + this.httpRequest.setMethod(HttpTransportConstants.METHOD_POST); + this.httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); + this.httpRequest.setContentType("text/xml; charset=\"utf-8\""); + this.httpRequest.setCharacterEncoding("UTF-8"); + expect(this.factoryMock.createWebServiceMessage(isA(InputStream.class))).andReturn(this.responseMock); replayMockControls(); - adapter.handle(httpRequest, httpResponse, (WebServiceMessageReceiver) messageContext -> { + this.adapter.handle(this.httpRequest, this.httpResponse, (WebServiceMessageReceiver) messageContext -> { }); - assertThat(httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_ACCEPTED); - assertThat(httpResponse.getContentAsString()).hasSize(0); + assertThat(this.httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_ACCEPTED); + assertThat(this.httpResponse.getContentAsString()).hasSize(0); verifyMockControls(); } @@ -115,20 +115,21 @@ public class WebServiceMessageReceiverHandlerAdapterTest { @Test public void testHandlePostResponse() throws Exception { - httpRequest.setMethod(HttpTransportConstants.METHOD_POST); - httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); - httpRequest.setContentType("text/xml; charset=\"utf-8\""); - httpRequest.setCharacterEncoding("UTF-8"); - expect(factoryMock.createWebServiceMessage(isA(InputStream.class))).andReturn(requestMock); - expect(factoryMock.createWebServiceMessage()).andReturn(responseMock); - expect(responseMock.getFaultCode()).andReturn(null); - responseMock.writeTo(isA(OutputStream.class)); + this.httpRequest.setMethod(HttpTransportConstants.METHOD_POST); + this.httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); + this.httpRequest.setContentType("text/xml; charset=\"utf-8\""); + this.httpRequest.setCharacterEncoding("UTF-8"); + expect(this.factoryMock.createWebServiceMessage(isA(InputStream.class))).andReturn(this.requestMock); + expect(this.factoryMock.createWebServiceMessage()).andReturn(this.responseMock); + expect(this.responseMock.getFaultCode()).andReturn(null); + this.responseMock.writeTo(isA(OutputStream.class)); replayMockControls(); - adapter.handle(httpRequest, httpResponse, (WebServiceMessageReceiver) MessageContext::getResponse); + this.adapter.handle(this.httpRequest, this.httpResponse, + (WebServiceMessageReceiver) MessageContext::getResponse); - assertThat(httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_OK); + assertThat(this.httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_OK); verifyMockControls(); } @@ -136,20 +137,21 @@ public class WebServiceMessageReceiverHandlerAdapterTest { @Test public void testHandlePostFault() throws Exception { - httpRequest.setMethod(HttpTransportConstants.METHOD_POST); - httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); - httpRequest.setContentType("text/xml; charset=\"utf-8\""); - httpRequest.setCharacterEncoding("UTF-8"); - expect(factoryMock.createWebServiceMessage(isA(InputStream.class))).andReturn(requestMock); - expect(factoryMock.createWebServiceMessage()).andReturn(responseMock); - expect(responseMock.getFaultCode()).andReturn(SoapVersion.SOAP_11.getServerOrReceiverFaultName()); - responseMock.writeTo(isA(OutputStream.class)); + this.httpRequest.setMethod(HttpTransportConstants.METHOD_POST); + this.httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); + this.httpRequest.setContentType("text/xml; charset=\"utf-8\""); + this.httpRequest.setCharacterEncoding("UTF-8"); + expect(this.factoryMock.createWebServiceMessage(isA(InputStream.class))).andReturn(this.requestMock); + expect(this.factoryMock.createWebServiceMessage()).andReturn(this.responseMock); + expect(this.responseMock.getFaultCode()).andReturn(SoapVersion.SOAP_11.getServerOrReceiverFaultName()); + this.responseMock.writeTo(isA(OutputStream.class)); replayMockControls(); - adapter.handle(httpRequest, httpResponse, (WebServiceMessageReceiver) MessageContext::getResponse); + this.adapter.handle(this.httpRequest, this.httpResponse, + (WebServiceMessageReceiver) MessageContext::getResponse); - assertThat(httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + assertThat(this.httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); verifyMockControls(); } @@ -157,19 +159,19 @@ public class WebServiceMessageReceiverHandlerAdapterTest { @Test public void testHandleNotFound() throws Exception { - httpRequest.setMethod(HttpTransportConstants.METHOD_POST); - httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); - httpRequest.setContentType("text/xml; charset=\"utf-8\""); - httpRequest.setCharacterEncoding("UTF-8"); - expect(factoryMock.createWebServiceMessage(isA(InputStream.class))).andReturn(requestMock); + this.httpRequest.setMethod(HttpTransportConstants.METHOD_POST); + this.httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); + this.httpRequest.setContentType("text/xml; charset=\"utf-8\""); + this.httpRequest.setCharacterEncoding("UTF-8"); + expect(this.factoryMock.createWebServiceMessage(isA(InputStream.class))).andReturn(this.requestMock); replayMockControls(); - adapter.handle(httpRequest, httpResponse, (WebServiceMessageReceiver) messageContext -> { + this.adapter.handle(this.httpRequest, this.httpResponse, (WebServiceMessageReceiver) messageContext -> { throw new NoEndpointFoundException(messageContext.getRequest()); }); - assertThat(httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_NOT_FOUND); + assertThat(this.httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_NOT_FOUND); verifyMockControls(); @@ -178,29 +180,29 @@ public class WebServiceMessageReceiverHandlerAdapterTest { @Test public void testHandleInvalidXml() throws Exception { - httpRequest.setMethod(HttpTransportConstants.METHOD_POST); - httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); - httpRequest.setContentType("text/xml; charset=\"utf-8\""); - httpRequest.setCharacterEncoding("UTF-8"); - expect(factoryMock.createWebServiceMessage(isA(InputStream.class))) + this.httpRequest.setMethod(HttpTransportConstants.METHOD_POST); + this.httpRequest.setContent(REQUEST.getBytes(StandardCharsets.UTF_8)); + this.httpRequest.setContentType("text/xml; charset=\"utf-8\""); + this.httpRequest.setCharacterEncoding("UTF-8"); + expect(this.factoryMock.createWebServiceMessage(isA(InputStream.class))) .andThrow(new InvalidXmlException(null, null)); replayMockControls(); - adapter.handle(httpRequest, httpResponse, (WebServiceMessageReceiver) messageContext -> { + this.adapter.handle(this.httpRequest, this.httpResponse, (WebServiceMessageReceiver) messageContext -> { }); - assertThat(httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_BAD_REQUEST); + assertThat(this.httpResponse.getStatus()).isEqualTo(HttpServletResponse.SC_BAD_REQUEST); verifyMockControls(); } private void replayMockControls() { - replay(factoryMock, requestMock, responseMock); + replay(this.factoryMock, this.requestMock, this.responseMock); } private void verifyMockControls() { - verify(factoryMock, requestMock, responseMock); + verify(this.factoryMock, this.requestMock, this.responseMock); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java index 6c7857b9..bcf58d50 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapterTest.java @@ -56,82 +56,82 @@ public class WsdlDefinitionHandlerAdapterTest { @BeforeEach public void setUp() throws Exception { - adapter = new WsdlDefinitionHandlerAdapter(); - definitionMock = createMock(WsdlDefinition.class); - adapter.afterPropertiesSet(); - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); + this.adapter = new WsdlDefinitionHandlerAdapter(); + this.definitionMock = createMock(WsdlDefinition.class); + this.adapter.afterPropertiesSet(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); } @Test public void handleGet() throws Exception { - request.setMethod(HttpTransportConstants.METHOD_GET); + this.request.setMethod(HttpTransportConstants.METHOD_GET); String definition = ""; - expect(definitionMock.getSource()).andReturn(new StringSource(definition)); + expect(this.definitionMock.getSource()).andReturn(new StringSource(definition)); - replay(definitionMock); + replay(this.definitionMock); - adapter.handle(request, response, definitionMock); + this.adapter.handle(this.request, this.response, this.definitionMock); - XmlAssert.assertThat(response.getContentAsString()).and(definition).ignoreWhitespace().areIdentical(); + XmlAssert.assertThat(this.response.getContentAsString()).and(definition).ignoreWhitespace().areIdentical(); - verify(definitionMock); + verify(this.definitionMock); } @Test public void handleNonGet() throws Exception { - request.setMethod(HttpTransportConstants.METHOD_POST); + this.request.setMethod(HttpTransportConstants.METHOD_POST); - replay(definitionMock); + replay(this.definitionMock); - adapter.handle(request, response, definitionMock); + this.adapter.handle(this.request, this.response, this.definitionMock); - assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_METHOD_NOT_ALLOWED); + assertThat(this.response.getStatus()).isEqualTo(HttpServletResponse.SC_METHOD_NOT_ALLOWED); - verify(definitionMock); + verify(this.definitionMock); } @Test public void transformLocations() throws Exception { - adapter.setTransformLocations(true); - request.setMethod(HttpTransportConstants.METHOD_GET); - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(8080); - request.setContextPath("/context"); - request.setServletPath("/service.wsdl"); - request.setPathInfo(null); - request.setRequestURI("/context/service.wsdl"); + this.adapter.setTransformLocations(true); + this.request.setMethod(HttpTransportConstants.METHOD_GET); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(8080); + this.request.setContextPath("/context"); + this.request.setServletPath("/service.wsdl"); + this.request.setPathInfo(null); + this.request.setRequestURI("/context/service.wsdl"); - replay(definitionMock); + replay(this.definitionMock); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); Document result = documentBuilder.parse(getClass().getResourceAsStream("wsdl11-input.wsdl")); - adapter.transformLocations(result, request); + this.adapter.transformLocations(result, this.request); Document expectedDocument = documentBuilder.parse(getClass().getResourceAsStream("wsdl11-expected.wsdl")); XmlAssert.assertThat(result).and(expectedDocument).ignoreWhitespace().areIdentical(); - verify(definitionMock); + verify(this.definitionMock); } @Test public void transformLocationFullUrl() throws Exception { - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(8080); - request.setContextPath("/context"); - request.setPathInfo("/service.wsdl"); - request.setRequestURI("/context/service.wsdl"); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(8080); + this.request.setContextPath("/context"); + this.request.setPathInfo("/service.wsdl"); + this.request.setRequestURI("/context/service.wsdl"); String oldLocation = "http://localhost:8080/context/service"; - String result = adapter.transformLocation(oldLocation, request); + String result = this.adapter.transformLocation(oldLocation, this.request); assertThat(result).isNotNull(); assertThat(new URI(result)).isEqualTo(new URI("http://example.com:8080/context/service")); @@ -140,14 +140,14 @@ public class WsdlDefinitionHandlerAdapterTest { @Test public void transformLocationEmptyContextFullUrl() throws Exception { - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(8080); - request.setContextPath(""); - request.setRequestURI("/service.wsdl"); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(8080); + this.request.setContextPath(""); + this.request.setRequestURI("/service.wsdl"); String oldLocation = "http://localhost:8080/service"; - String result = adapter.transformLocation(oldLocation, request); + String result = this.adapter.transformLocation(oldLocation, this.request); assertThat(result).isNotNull(); assertThat(new URI(result)).isEqualTo(new URI("http://example.com:8080/service")); @@ -156,15 +156,15 @@ public class WsdlDefinitionHandlerAdapterTest { @Test public void transformLocationRelativeUrl() throws Exception { - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(8080); - request.setContextPath("/context"); - request.setPathInfo("/service.wsdl"); - request.setRequestURI("/context/service.wsdl"); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(8080); + this.request.setContextPath("/context"); + this.request.setPathInfo("/service.wsdl"); + this.request.setRequestURI("/context/service.wsdl"); String oldLocation = "/service"; - String result = adapter.transformLocation(oldLocation, request); + String result = this.adapter.transformLocation(oldLocation, this.request); assertThat(result).isNotNull(); assertThat(new URI(result)).isEqualTo(new URI("http://example.com:8080/context/service")); @@ -173,14 +173,14 @@ public class WsdlDefinitionHandlerAdapterTest { @Test public void transformLocationEmptyContextRelativeUrl() throws Exception { - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(8080); - request.setContextPath(""); - request.setRequestURI("/service.wsdl"); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(8080); + this.request.setContextPath(""); + this.request.setRequestURI("/service.wsdl"); String oldLocation = "/service"; - String result = adapter.transformLocation(oldLocation, request); + String result = this.adapter.transformLocation(oldLocation, this.request); assertThat(result).isNotNull(); assertThat(new URI(result)).isEqualTo(new URI("http://example.com:8080/service")); @@ -189,22 +189,22 @@ public class WsdlDefinitionHandlerAdapterTest { @Test public void handleSimpleWsdl11DefinitionWithoutTransformLocations() throws Exception { - adapter.setTransformLocations(false); - request.setMethod(HttpTransportConstants.METHOD_GET); - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(8080); - request.setContextPath("/context"); - request.setServletPath("/service.wsdl"); - request.setPathInfo(null); - request.setRequestURI("/context/service.wsdl"); + this.adapter.setTransformLocations(false); + this.request.setMethod(HttpTransportConstants.METHOD_GET); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(8080); + this.request.setContextPath("/context"); + this.request.setServletPath("/service.wsdl"); + this.request.setPathInfo(null); + this.request.setRequestURI("/context/service.wsdl"); SimpleWsdl11Definition definition = new SimpleWsdl11Definition( new ClassPathResource("echo-input.wsdl", getClass())); - adapter.handle(request, response, definition); + this.adapter.handle(this.request, this.response, definition); - InputStream inputStream = new ByteArrayInputStream(response.getContentAsByteArray()); + InputStream inputStream = new ByteArrayInputStream(this.response.getContentAsByteArray()); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); @@ -219,24 +219,24 @@ public class WsdlDefinitionHandlerAdapterTest { @Test public void handleSimpleWsdl11DefinitionWithTransformLocation() throws Exception { - adapter.setTransformLocations(true); - adapter.setTransformSchemaLocations(true); + this.adapter.setTransformLocations(true); + this.adapter.setTransformSchemaLocations(true); - request.setMethod(HttpTransportConstants.METHOD_GET); - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(80); - request.setContextPath("/context"); - request.setServletPath("/service.wsdl"); - request.setPathInfo(null); - request.setRequestURI("/context/service.wsdl"); + this.request.setMethod(HttpTransportConstants.METHOD_GET); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(80); + this.request.setContextPath("/context"); + this.request.setServletPath("/service.wsdl"); + this.request.setPathInfo(null); + this.request.setRequestURI("/context/service.wsdl"); SimpleWsdl11Definition definition = new SimpleWsdl11Definition( new ClassPathResource("echo-input.wsdl", getClass())); - adapter.handle(request, response, definition); + this.adapter.handle(this.request, this.response, definition); - InputStream inputStream = new ByteArrayInputStream(response.getContentAsByteArray()); + InputStream inputStream = new ByteArrayInputStream(this.response.getContentAsByteArray()); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); @@ -252,18 +252,18 @@ public class WsdlDefinitionHandlerAdapterTest { public void handlesForwardedHeadersInRequest() { // given - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(80); - request.setContextPath("/context"); - request.setPathInfo("/service.wsdl"); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(80); + this.request.setContextPath("/context"); + this.request.setPathInfo("/service.wsdl"); - request.addHeader("X-Forwarded-Proto", "https"); - request.addHeader("X-Forwarded-Host", "loadbalancer.com"); - request.addHeader("X-Forwarded-Port", "8080"); + this.request.addHeader("X-Forwarded-Proto", "https"); + this.request.addHeader("X-Forwarded-Host", "loadbalancer.com"); + this.request.addHeader("X-Forwarded-Port", "8080"); // when - String result = adapter.transformLocation("/service", request); + String result = this.adapter.transformLocation("/service", this.request); // then assertThat(URI.create("https://loadbalancer.com:8080/context/service")).isEqualTo(URI.create(result)); @@ -273,14 +273,14 @@ public class WsdlDefinitionHandlerAdapterTest { public void handlesNoForwardedHeadersInRequest() { // given - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(80); - request.setContextPath("/context"); - request.setPathInfo("/service.wsdl"); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(80); + this.request.setContextPath("/context"); + this.request.setPathInfo("/service.wsdl"); // when - String result = adapter.transformLocation("/service", request); + String result = this.adapter.transformLocation("/service", this.request); // then assertThat(URI.create("http://example.com:80/context/service")).isEqualTo(URI.create(result)); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java index d3785868..b29008dc 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapterTest.java @@ -49,10 +49,10 @@ public class XsdSchemaHandlerAdapterTest { @BeforeEach public void setUp() throws Exception { - adapter = new XsdSchemaHandlerAdapter(); - adapter.afterPropertiesSet(); - request = new MockHttpServletRequest(); - response = new MockHttpServletResponse(); + this.adapter = new XsdSchemaHandlerAdapter(); + this.adapter.afterPropertiesSet(); + this.request = new MockHttpServletRequest(); + this.response = new MockHttpServletResponse(); } @Test @@ -64,52 +64,52 @@ public class XsdSchemaHandlerAdapterTest { schema.afterPropertiesSet(); long lastModified = single.getFile().lastModified(); - assertThat(adapter.getLastModified(null, schema)).isEqualTo(lastModified); + assertThat(this.adapter.getLastModified(null, schema)).isEqualTo(lastModified); } @Test public void handleGet() throws Exception { - request.setMethod(HttpTransportConstants.METHOD_GET); + this.request.setMethod(HttpTransportConstants.METHOD_GET); Resource single = new ClassPathResource("single.xsd", getClass()); SimpleXsdSchema schema = new SimpleXsdSchema(single); schema.afterPropertiesSet(); - adapter.handle(request, response, schema); + this.adapter.handle(this.request, this.response, schema); String expected = new String(FileCopyUtils.copyToByteArray(single.getFile())); - XmlAssert.assertThat(response.getContentAsString()).and(expected).ignoreWhitespace().areIdentical(); + XmlAssert.assertThat(this.response.getContentAsString()).and(expected).ignoreWhitespace().areIdentical(); } @Test public void handleNonGet() throws Exception { - request.setMethod(HttpTransportConstants.METHOD_POST); - adapter.handle(request, response, null); + this.request.setMethod(HttpTransportConstants.METHOD_POST); + this.adapter.handle(this.request, this.response, null); - assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_METHOD_NOT_ALLOWED); + assertThat(this.response.getStatus()).isEqualTo(HttpServletResponse.SC_METHOD_NOT_ALLOWED); } @Test public void handleGetWithTransformLocation() throws Exception { - adapter.setTransformSchemaLocations(true); + this.adapter.setTransformSchemaLocations(true); - request.setMethod(HttpTransportConstants.METHOD_GET); - request.setScheme("http"); - request.setServerName("example.com"); - request.setServerPort(80); - request.setContextPath("/context"); - request.setServletPath("/service.xsd"); - request.setPathInfo(null); - request.setRequestURI("/context/service.xsd"); + this.request.setMethod(HttpTransportConstants.METHOD_GET); + this.request.setScheme("http"); + this.request.setServerName("example.com"); + this.request.setServerPort(80); + this.request.setContextPath("/context"); + this.request.setServletPath("/service.xsd"); + this.request.setPathInfo(null); + this.request.setRequestURI("/context/service.xsd"); Resource importing = new ClassPathResource("importing-input.xsd", getClass()); SimpleXsdSchema schema = new SimpleXsdSchema(importing); schema.afterPropertiesSet(); - adapter.handle(request, response, schema); + this.adapter.handle(this.request, this.response, schema); - InputStream inputStream = new ByteArrayInputStream(response.getContentAsByteArray()); + InputStream inputStream = new ByteArrayInputStream(this.response.getContentAsByteArray()); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java index 729ff2f1..29558576 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java @@ -48,21 +48,21 @@ public class WebServiceMessageReceiverObjectSupportTest { @BeforeEach public void setUp() { - receiverSupport = new MyReceiverSupport(); - messageFactory = new MockWebServiceMessageFactory(); - receiverSupport.setMessageFactory(messageFactory); - connectionMock = mock(FaultAwareWebServiceConnection.class); - request = new MockWebServiceMessage(); + this.receiverSupport = new MyReceiverSupport(); + this.messageFactory = new MockWebServiceMessageFactory(); + this.receiverSupport.setMessageFactory(this.messageFactory); + this.connectionMock = mock(FaultAwareWebServiceConnection.class); + this.request = new MockWebServiceMessage(); } @Test public void handleConnectionResponse() throws Exception { - when(connectionMock.receive(messageFactory)).thenReturn(request); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(this.request); - connectionMock.setFaultCode(null); - connectionMock.send(isA(WebServiceMessage.class)); - connectionMock.close(); + this.connectionMock.setFaultCode(null); + this.connectionMock.send(isA(WebServiceMessage.class)); + this.connectionMock.close(); WebServiceMessageReceiver receiver = new WebServiceMessageReceiver() { @@ -73,9 +73,9 @@ public class WebServiceMessageReceiverObjectSupportTest { } }; - receiverSupport.handleConnection(connectionMock, receiver); + this.receiverSupport.handleConnection(this.connectionMock, receiver); - verify(connectionMock).receive(messageFactory); + verify(this.connectionMock).receive(this.messageFactory); } @Test @@ -83,10 +83,10 @@ public class WebServiceMessageReceiverObjectSupportTest { final QName faultCode = SoapVersion.SOAP_11.getClientOrSenderFaultName(); - when(connectionMock.receive(messageFactory)).thenReturn(request); - connectionMock.setFaultCode(faultCode); - connectionMock.send(isA(WebServiceMessage.class)); - connectionMock.close(); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(this.request); + this.connectionMock.setFaultCode(faultCode); + this.connectionMock.send(isA(WebServiceMessage.class)); + this.connectionMock.close(); WebServiceMessageReceiver receiver = new WebServiceMessageReceiver() { @@ -99,16 +99,16 @@ public class WebServiceMessageReceiverObjectSupportTest { } }; - receiverSupport.handleConnection(connectionMock, receiver); + this.receiverSupport.handleConnection(this.connectionMock, receiver); - verify(connectionMock).receive(messageFactory); + verify(this.connectionMock).receive(this.messageFactory); } @Test public void handleConnectionNoResponse() throws Exception { - when(connectionMock.receive(messageFactory)).thenReturn(request); - connectionMock.close(); + when(this.connectionMock.receive(this.messageFactory)).thenReturn(this.request); + this.connectionMock.close(); WebServiceMessageReceiver receiver = new WebServiceMessageReceiver() { @@ -117,9 +117,9 @@ public class WebServiceMessageReceiverObjectSupportTest { } }; - receiverSupport.handleConnection(connectionMock, receiver); + this.receiverSupport.handleConnection(this.connectionMock, receiver); - verify(connectionMock).receive(messageFactory); + verify(this.connectionMock).receive(this.messageFactory); } private static class MyReceiverSupport extends WebServiceMessageReceiverObjectSupport { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java index f7f1ba97..6b8cb256 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11DefinitionTest.java @@ -46,12 +46,12 @@ public class DefaultWsdl11DefinitionTest { @BeforeEach public void setUp() throws Exception { - definition = new DefaultWsdl11Definition(); + this.definition = new DefaultWsdl11Definition(); TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); - transformer = transformerFactory.newTransformer(); + this.transformer = transformerFactory.newTransformer(); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); - documentBuilder = documentBuilderFactory.newDocumentBuilder(); + this.documentBuilder = documentBuilderFactory.newDocumentBuilder(); } @Test @@ -60,19 +60,19 @@ public class DefaultWsdl11DefinitionTest { Resource resource = new ClassPathResource("single.xsd", getClass()); SimpleXsdSchema schema = new SimpleXsdSchema(resource); schema.afterPropertiesSet(); - definition.setSchema(schema); + this.definition.setSchema(schema); - definition.setTargetNamespace("http://www.springframework.org/spring-ws/single/definitions"); - definition.setPortTypeName("Order"); - definition.setLocationUri("http://localhost:8080/"); + this.definition.setTargetNamespace("http://www.springframework.org/spring-ws/single/definitions"); + this.definition.setPortTypeName("Order"); + this.definition.setLocationUri("http://localhost:8080/"); - definition.afterPropertiesSet(); + this.definition.afterPropertiesSet(); DOMResult domResult = new DOMResult(); - transformer.transform(definition.getSource(), domResult); + this.transformer.transform(this.definition.getSource(), domResult); Document result = (Document) domResult.getNode(); - Document expected = documentBuilder.parse(getClass().getResourceAsStream("single-inline.wsdl")); + Document expected = this.documentBuilder.parse(getClass().getResourceAsStream("single-inline.wsdl")); assertThat(result).and(expected).ignoreWhitespace().areIdentical(); } @@ -84,18 +84,18 @@ public class DefaultWsdl11DefinitionTest { CommonsXsdSchemaCollection schemaCollection = new CommonsXsdSchemaCollection(resource); schemaCollection.setInline(true); schemaCollection.afterPropertiesSet(); - definition.setSchemaCollection(schemaCollection); + this.definition.setSchemaCollection(schemaCollection); - definition.setPortTypeName("Order"); - definition.setTargetNamespace("http://www.springframework.org/spring-ws/include/definitions"); - definition.setLocationUri("http://localhost:8080/"); - definition.afterPropertiesSet(); + this.definition.setPortTypeName("Order"); + this.definition.setTargetNamespace("http://www.springframework.org/spring-ws/include/definitions"); + this.definition.setLocationUri("http://localhost:8080/"); + this.definition.afterPropertiesSet(); DOMResult domResult = new DOMResult(); - transformer.transform(definition.getSource(), domResult); + this.transformer.transform(this.definition.getSource(), domResult); Document result = (Document) domResult.getNode(); - Document expected = documentBuilder.parse(getClass().getResourceAsStream("include-inline.wsdl")); + Document expected = this.documentBuilder.parse(getClass().getResourceAsStream("include-inline.wsdl")); assertThat(result).and(expected).ignoreWhitespace().areIdentical(); } @@ -107,18 +107,18 @@ public class DefaultWsdl11DefinitionTest { CommonsXsdSchemaCollection schemaCollection = new CommonsXsdSchemaCollection(resource); schemaCollection.setInline(true); schemaCollection.afterPropertiesSet(); - definition.setSchemaCollection(schemaCollection); + this.definition.setSchemaCollection(schemaCollection); - definition.setPortTypeName("Order"); - definition.setTargetNamespace("http://www.springframework.org/spring-ws/import/definitions"); - definition.setLocationUri("http://localhost:8080/"); - definition.afterPropertiesSet(); + this.definition.setPortTypeName("Order"); + this.definition.setTargetNamespace("http://www.springframework.org/spring-ws/import/definitions"); + this.definition.setLocationUri("http://localhost:8080/"); + this.definition.afterPropertiesSet(); DOMResult domResult = new DOMResult(); - transformer.transform(definition.getSource(), domResult); + this.transformer.transform(this.definition.getSource(), domResult); Document result = (Document) domResult.getNode(); - Document expected = documentBuilder.parse(getClass().getResourceAsStream("import-inline.wsdl")); + Document expected = this.documentBuilder.parse(getClass().getResourceAsStream("import-inline.wsdl")); assertThat(result).and(expected).ignoreWhitespace().areIdentical(); } @@ -129,21 +129,21 @@ public class DefaultWsdl11DefinitionTest { Resource resource = new ClassPathResource("single.xsd", getClass()); SimpleXsdSchema schema = new SimpleXsdSchema(resource); schema.afterPropertiesSet(); - definition.setSchema(schema); + this.definition.setSchema(schema); - definition.setTargetNamespace("http://www.springframework.org/spring-ws/single/definitions"); - definition.setPortTypeName("Order"); - definition.setLocationUri("http://localhost:8080/"); - definition.setCreateSoap11Binding(true); - definition.setCreateSoap12Binding(true); + this.definition.setTargetNamespace("http://www.springframework.org/spring-ws/single/definitions"); + this.definition.setPortTypeName("Order"); + this.definition.setLocationUri("http://localhost:8080/"); + this.definition.setCreateSoap11Binding(true); + this.definition.setCreateSoap12Binding(true); - definition.afterPropertiesSet(); + this.definition.afterPropertiesSet(); DOMResult domResult = new DOMResult(); - transformer.transform(definition.getSource(), domResult); + this.transformer.transform(this.definition.getSource(), domResult); Document result = (Document) domResult.getNode(); - Document expected = documentBuilder.parse(getClass().getResourceAsStream("soap-11-12.wsdl")); + Document expected = this.documentBuilder.parse(getClass().getResourceAsStream("soap-11-12.wsdl")); assertThat(result).and(expected).ignoreWhitespace().areIdentical(); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java index 56cc8a38..cedc6ca3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/SimpleWsdl11DefinitionTest.java @@ -30,14 +30,14 @@ public class SimpleWsdl11DefinitionTest { @BeforeEach public void setUp() throws Exception { - definition = new SimpleWsdl11Definition(); - definition.setWsdl(new ClassPathResource("complete.wsdl", getClass())); - definition.afterPropertiesSet(); + this.definition = new SimpleWsdl11Definition(); + this.definition.setWsdl(new ClassPathResource("complete.wsdl", getClass())); + this.definition.afterPropertiesSet(); } @Test public void testGetSource() { - assertThat(definition.getSource()).isNotNull(); + assertThat(this.definition.getSource()).isNotNull(); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java index 048c4aec..5a7c0ddd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java @@ -52,21 +52,21 @@ public class Wsdl4jDefinitionTest { try (InputStream is = getClass().getResourceAsStream("complete.wsdl")) { Definition wsdl4jDefinition = reader.readWSDL(null, new InputSource(is)); - definition = new Wsdl4jDefinition(wsdl4jDefinition); + this.definition = new Wsdl4jDefinition(wsdl4jDefinition); } - transformer = TransformerFactoryUtils.newInstance().newTransformer(); + this.transformer = TransformerFactoryUtils.newInstance().newTransformer(); } @Test public void testGetSource() throws Exception { - Source source = definition.getSource(); + Source source = this.definition.getSource(); assertThat(source).isNotNull(); DOMResult result = new DOMResult(); - transformer.transform(source, result); + this.transformer.transform(source, result); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java index 95474afb..dfe2d35a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProviderTest.java @@ -48,12 +48,12 @@ public class DefaultMessagesProviderTest { @BeforeEach public void setUp() throws Exception { - provider = new DefaultMessagesProvider(); + this.provider = new DefaultMessagesProvider(); WSDLFactory factory = WSDLFactory.newInstance(); - definition = factory.newDefinition(); + this.definition = factory.newDefinition(); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); - documentBuilder = documentBuilderFactory.newDocumentBuilder(); + this.documentBuilder = documentBuilderFactory.newDocumentBuilder(); } @Test @@ -61,25 +61,25 @@ public class DefaultMessagesProviderTest { public void testAddMessages() throws Exception { String definitionNamespace = "http://springframework.org/spring-ws"; - definition.addNamespace("tns", definitionNamespace); - definition.setTargetNamespace(definitionNamespace); + this.definition.addNamespace("tns", definitionNamespace); + this.definition.setTargetNamespace(definitionNamespace); String schemaNamespace = "http://www.springframework.org/spring-ws/schema"; - definition.addNamespace("schema", schemaNamespace); + this.definition.addNamespace("schema", schemaNamespace); Resource resource = new ClassPathResource("schema.xsd", getClass()); - Document schemaDocument = documentBuilder.parse(SaxUtils.createInputSource(resource)); - Types types = definition.createTypes(); - definition.setTypes(types); - Schema schema = (Schema) definition.getExtensionRegistry() + Document schemaDocument = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); + Types types = this.definition.createTypes(); + this.definition.setTypes(types); + Schema schema = (Schema) this.definition.getExtensionRegistry() .createExtension(Types.class, new QName("http://www.w3.org/2001/XMLSchema", "schema")); types.addExtensibilityElement(schema); schema.setElement(schemaDocument.getDocumentElement()); - provider.addMessages(definition); + this.provider.addMessages(this.definition); - assertThat(definition.getMessages()).hasSize(3); + assertThat(this.definition.getMessages()).hasSize(3); - Message message = definition.getMessage(new QName(definitionNamespace, "GetOrderRequest")); + Message message = this.definition.getMessage(new QName(definitionNamespace, "GetOrderRequest")); assertThat(message).isNotNull(); @@ -88,7 +88,7 @@ public class DefaultMessagesProviderTest { assertThat(part).isNotNull(); assertThat(part.getElementName()).isEqualTo(new QName(schemaNamespace, "GetOrderRequest")); - message = definition.getMessage(new QName(definitionNamespace, "GetOrderResponse")); + message = this.definition.getMessage(new QName(definitionNamespace, "GetOrderResponse")); assertThat(message).isNotNull(); @@ -97,7 +97,7 @@ public class DefaultMessagesProviderTest { assertThat(part).isNotNull(); assertThat(part.getElementName()).isEqualTo(new QName(schemaNamespace, "GetOrderResponse")); - message = definition.getMessage(new QName(definitionNamespace, "GetOrderFault")); + message = this.definition.getMessage(new QName(definitionNamespace, "GetOrderFault")); assertThat(message).isNotNull(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java index 359f3e9c..e05f691e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProviderTest.java @@ -40,29 +40,29 @@ public class InliningXsdSchemaTypesProviderTest { @BeforeEach public void setUp() throws Exception { - provider = new InliningXsdSchemaTypesProvider(); + this.provider = new InliningXsdSchemaTypesProvider(); WSDLFactory factory = WSDLFactory.newInstance(); - definition = factory.newDefinition(); + this.definition = factory.newDefinition(); } @Test public void testSingle() throws Exception { String definitionNamespace = "http://springframework.org/spring-ws"; - definition.addNamespace("tns", definitionNamespace); - definition.setTargetNamespace(definitionNamespace); + this.definition.addNamespace("tns", definitionNamespace); + this.definition.setTargetNamespace(definitionNamespace); String schemaNamespace = "http://www.springframework.org/spring-ws/schema"; - definition.addNamespace("schema", schemaNamespace); + this.definition.addNamespace("schema", schemaNamespace); Resource resource = new ClassPathResource("schema.xsd", getClass()); SimpleXsdSchema schema = new SimpleXsdSchema(resource); schema.afterPropertiesSet(); - provider.setSchema(schema); + this.provider.setSchema(schema); - provider.addTypes(definition); + this.provider.addTypes(this.definition); - Types types = definition.getTypes(); + Types types = this.definition.getTypes(); assertThat(types).isNotNull(); assertThat(types.getExtensibilityElements()).hasSize(1); @@ -76,21 +76,21 @@ public class InliningXsdSchemaTypesProviderTest { public void testComplex() throws Exception { String definitionNamespace = "http://springframework.org/spring-ws"; - definition.addNamespace("tns", definitionNamespace); - definition.setTargetNamespace(definitionNamespace); + this.definition.addNamespace("tns", definitionNamespace); + this.definition.setTargetNamespace(definitionNamespace); String schemaNamespace = "http://www.springframework.org/spring-ws/schema"; - definition.addNamespace("schema", schemaNamespace); + this.definition.addNamespace("schema", schemaNamespace); Resource resource = new ClassPathResource("A.xsd", getClass()); CommonsXsdSchemaCollection collection = new CommonsXsdSchemaCollection(resource); collection.setInline(true); collection.afterPropertiesSet(); - provider.setSchemaCollection(collection); + this.provider.setSchemaCollection(collection); - provider.addTypes(definition); + this.provider.addTypes(this.definition); - Types types = definition.getTypes(); + Types types = this.definition.getTypes(); assertThat(types).isNotNull(); assertThat(types.getExtensibilityElements()).hasSize(2); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java index e5bd58ec..d90a148a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap11ProviderTest.java @@ -54,9 +54,9 @@ public class Soap11ProviderTest { @BeforeEach public void setUp() throws Exception { - provider = new Soap11Provider(); + this.provider = new Soap11Provider(); WSDLFactory factory = WSDLFactory.newInstance(); - definition = factory.newDefinition(); + this.definition = factory.newDefinition(); } @Test @@ -64,41 +64,41 @@ public class Soap11ProviderTest { public void testPopulateBinding() throws Exception { String namespace = "http://springframework.org/spring-ws"; - definition.addNamespace("tns", namespace); - definition.setTargetNamespace(namespace); + this.definition.addNamespace("tns", namespace); + this.definition.setTargetNamespace(namespace); - PortType portType = definition.createPortType(); + PortType portType = this.definition.createPortType(); portType.setQName(new QName(namespace, "PortType")); portType.setUndefined(false); - definition.addPortType(portType); - Operation operation = definition.createOperation(); + this.definition.addPortType(portType); + Operation operation = this.definition.createOperation(); operation.setName("Operation"); operation.setUndefined(false); operation.setStyle(OperationType.REQUEST_RESPONSE); portType.addOperation(operation); - Input input = definition.createInput(); + Input input = this.definition.createInput(); input.setName("Input"); operation.setInput(input); - Output output = definition.createOutput(); + Output output = this.definition.createOutput(); output.setName("Output"); operation.setOutput(output); - Fault fault = definition.createFault(); + Fault fault = this.definition.createFault(); fault.setName("Fault"); operation.addFault(fault); Properties soapActions = new Properties(); soapActions.setProperty("Operation", namespace + "/Action"); - provider.setSoapActions(soapActions); + this.provider.setSoapActions(soapActions); - provider.setServiceName("Service"); + this.provider.setServiceName("Service"); String locationUri = "http://localhost:8080/services"; - provider.setLocationUri(locationUri); + this.provider.setLocationUri(locationUri); - provider.addBindings(definition); - provider.addServices(definition); + this.provider.addBindings(this.definition); + this.provider.addServices(this.definition); - Binding binding = definition.getBinding(new QName(namespace, "PortTypeSoap11")); + Binding binding = this.definition.getBinding(new QName(namespace, "PortTypeSoap11")); assertThat(binding).isNotNull(); assertThat(binding.getPortType()).isEqualTo(portType); @@ -147,7 +147,7 @@ public class Soap11ProviderTest { assertThat(soapFault.getUse()).isEqualTo("literal"); - Service service = definition.getService(new QName(namespace, "Service")); + Service service = this.definition.getService(new QName(namespace, "Service")); assertThat(service).isNotNull(); assertThat(service.getPorts()).hasSize(1); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java index d0c8da61..782d0d61 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/Soap12ProviderTest.java @@ -54,50 +54,50 @@ public class Soap12ProviderTest { @BeforeEach public void setUp() throws Exception { - provider = new Soap12Provider(); + this.provider = new Soap12Provider(); WSDLFactory factory = WSDLFactory.newInstance(); - definition = factory.newDefinition(); + this.definition = factory.newDefinition(); } @Test @SuppressWarnings("unchecked") public void testPopulateBinding() throws Exception { String namespace = "http://springframework.org/spring-ws"; - definition.addNamespace("tns", namespace); - definition.setTargetNamespace(namespace); + this.definition.addNamespace("tns", namespace); + this.definition.setTargetNamespace(namespace); - PortType portType = definition.createPortType(); + PortType portType = this.definition.createPortType(); portType.setQName(new QName(namespace, "PortType")); portType.setUndefined(false); - definition.addPortType(portType); - Operation operation = definition.createOperation(); + this.definition.addPortType(portType); + Operation operation = this.definition.createOperation(); operation.setName("Operation"); operation.setUndefined(false); operation.setStyle(OperationType.REQUEST_RESPONSE); portType.addOperation(operation); - Input input = definition.createInput(); + Input input = this.definition.createInput(); input.setName("Input"); operation.setInput(input); - Output output = definition.createOutput(); + Output output = this.definition.createOutput(); output.setName("Output"); operation.setOutput(output); - Fault fault = definition.createFault(); + Fault fault = this.definition.createFault(); fault.setName("Fault"); operation.addFault(fault); Properties soapActions = new Properties(); soapActions.setProperty("Operation", namespace + "/Action"); - provider.setSoapActions(soapActions); + this.provider.setSoapActions(soapActions); - provider.setServiceName("Service"); + this.provider.setServiceName("Service"); String locationUri = "http://localhost:8080/services"; - provider.setLocationUri(locationUri); + this.provider.setLocationUri(locationUri); - provider.addBindings(definition); - provider.addServices(definition); + this.provider.addBindings(this.definition); + this.provider.addServices(this.definition); - Binding binding = definition.getBinding(new QName(namespace, "PortTypeSoap12")); + Binding binding = this.definition.getBinding(new QName(namespace, "PortTypeSoap12")); assertThat(binding).isNotNull(); assertThat(binding.getPortType()).isEqualTo(portType); @@ -146,7 +146,7 @@ public class Soap12ProviderTest { assertThat(soapFault.getUse()).isEqualTo("literal"); - Service service = definition.getService(new QName(namespace, "Service")); + Service service = this.definition.getService(new QName(namespace, "Service")); assertThat(service).isNotNull(); assertThat(service.getPorts()).hasSize(1); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java index e975b4e5..e61f68cd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SoapProviderTest.java @@ -45,9 +45,9 @@ public class SoapProviderTest { @BeforeEach public void setUp() throws Exception { - provider = new SoapProvider(); + this.provider = new SoapProvider(); WSDLFactory factory = WSDLFactory.newInstance(); - definition = factory.newDefinition(); + this.definition = factory.newDefinition(); } @Test @@ -55,52 +55,52 @@ public class SoapProviderTest { public void testPopulateBinding() throws Exception { String namespace = "http://springframework.org/spring-ws"; - definition.addNamespace("tns", namespace); - definition.setTargetNamespace(namespace); + this.definition.addNamespace("tns", namespace); + this.definition.setTargetNamespace(namespace); - PortType portType = definition.createPortType(); + PortType portType = this.definition.createPortType(); portType.setQName(new QName(namespace, "PortType")); portType.setUndefined(false); - definition.addPortType(portType); - Operation operation = definition.createOperation(); + this.definition.addPortType(portType); + Operation operation = this.definition.createOperation(); operation.setName("Operation"); operation.setUndefined(false); operation.setStyle(OperationType.REQUEST_RESPONSE); portType.addOperation(operation); - Input input = definition.createInput(); + Input input = this.definition.createInput(); input.setName("Input"); operation.setInput(input); - Output output = definition.createOutput(); + Output output = this.definition.createOutput(); output.setName("Output"); operation.setOutput(output); - Fault fault = definition.createFault(); + Fault fault = this.definition.createFault(); fault.setName("Fault"); operation.addFault(fault); Properties soapActions = new Properties(); soapActions.setProperty("Operation", namespace + "/Action"); - provider.setSoapActions(soapActions); + this.provider.setSoapActions(soapActions); - provider.setServiceName("Service"); + this.provider.setServiceName("Service"); String locationUri = "http://localhost:8080/services"; - provider.setLocationUri(locationUri); + this.provider.setLocationUri(locationUri); - provider.setCreateSoap11Binding(true); - provider.setCreateSoap12Binding(true); + this.provider.setCreateSoap11Binding(true); + this.provider.setCreateSoap12Binding(true); - provider.addBindings(definition); - provider.addServices(definition); + this.provider.addBindings(this.definition); + this.provider.addServices(this.definition); - Binding binding = definition.getBinding(new QName(namespace, "PortTypeSoap11")); + Binding binding = this.definition.getBinding(new QName(namespace, "PortTypeSoap11")); assertThat(binding).isNotNull(); - binding = definition.getBinding(new QName(namespace, "PortTypeSoap12")); + binding = this.definition.getBinding(new QName(namespace, "PortTypeSoap12")); assertThat(binding).isNotNull(); - Service service = definition.getService(new QName(namespace, "Service")); + Service service = this.definition.getService(new QName(namespace, "Service")); assertThat(service).isNotNull(); assertThat(service.getPorts()).hasSize(2); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java index 6b191042..a603d76c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedMessagesProviderTest.java @@ -48,13 +48,13 @@ public class SuffixBasedMessagesProviderTest { @BeforeEach public void setUp() throws Exception { - provider = new SuffixBasedMessagesProvider(); - provider.setFaultSuffix("Foo"); + this.provider = new SuffixBasedMessagesProvider(); + this.provider.setFaultSuffix("Foo"); WSDLFactory factory = WSDLFactory.newInstance(); - definition = factory.newDefinition(); + this.definition = factory.newDefinition(); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); - documentBuilder = documentBuilderFactory.newDocumentBuilder(); + this.documentBuilder = documentBuilderFactory.newDocumentBuilder(); } @Test @@ -62,25 +62,25 @@ public class SuffixBasedMessagesProviderTest { public void testAddMessages() throws Exception { String definitionNamespace = "http://springframework.org/spring-ws"; - definition.addNamespace("tns", definitionNamespace); - definition.setTargetNamespace(definitionNamespace); + this.definition.addNamespace("tns", definitionNamespace); + this.definition.setTargetNamespace(definitionNamespace); String schemaNamespace = "http://www.springframework.org/spring-ws/schema"; - definition.addNamespace("schema", schemaNamespace); + this.definition.addNamespace("schema", schemaNamespace); Resource resource = new ClassPathResource("schema.xsd", getClass()); - Document schemaDocument = documentBuilder.parse(SaxUtils.createInputSource(resource)); - Types types = definition.createTypes(); - definition.setTypes(types); - Schema schema = (Schema) definition.getExtensionRegistry() + Document schemaDocument = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); + Types types = this.definition.createTypes(); + this.definition.setTypes(types); + Schema schema = (Schema) this.definition.getExtensionRegistry() .createExtension(Types.class, new QName("http://www.w3.org/2001/XMLSchema", "schema")); types.addExtensibilityElement(schema); schema.setElement(schemaDocument.getDocumentElement()); - provider.addMessages(definition); + this.provider.addMessages(this.definition); - assertThat(definition.getMessages()).hasSize(2); + assertThat(this.definition.getMessages()).hasSize(2); - Message message = definition.getMessage(new QName(definitionNamespace, "GetOrderRequest")); + Message message = this.definition.getMessage(new QName(definitionNamespace, "GetOrderRequest")); assertThat(message).isNotNull(); @@ -89,7 +89,7 @@ public class SuffixBasedMessagesProviderTest { assertThat(part).isNotNull(); assertThat(part.getElementName()).isEqualTo(new QName(schemaNamespace, "GetOrderRequest")); - message = definition.getMessage(new QName(definitionNamespace, "GetOrderResponse")); + message = this.definition.getMessage(new QName(definitionNamespace, "GetOrderResponse")); assertThat(message).isNotNull(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java index 92d8f59c..f37671c7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/provider/SuffixBasedPortTypesProviderTest.java @@ -37,9 +37,9 @@ public class SuffixBasedPortTypesProviderTest { @BeforeEach public void setUp() throws Exception { - provider = new SuffixBasedPortTypesProvider(); + this.provider = new SuffixBasedPortTypesProvider(); WSDLFactory factory = WSDLFactory.newInstance(); - definition = factory.newDefinition(); + this.definition = factory.newDefinition(); } @Test @@ -47,25 +47,25 @@ public class SuffixBasedPortTypesProviderTest { public void testAddPortTypes() throws Exception { String namespace = "http://springframework.org/spring-ws"; - definition.addNamespace("tns", namespace); - definition.setTargetNamespace(namespace); + this.definition.addNamespace("tns", namespace); + this.definition.setTargetNamespace(namespace); - Message message = definition.createMessage(); + Message message = this.definition.createMessage(); message.setQName(new QName(namespace, "OperationRequest")); - definition.addMessage(message); + this.definition.addMessage(message); - message = definition.createMessage(); + message = this.definition.createMessage(); message.setQName(new QName(namespace, "OperationResponse")); - definition.addMessage(message); + this.definition.addMessage(message); - message = definition.createMessage(); + message = this.definition.createMessage(); message.setQName(new QName(namespace, "OperationFault")); - definition.addMessage(message); + this.definition.addMessage(message); - provider.setPortTypeName("PortType"); - provider.addPortTypes(definition); + this.provider.setPortTypeName("PortType"); + this.provider.addPortTypes(this.definition); - PortType portType = definition.getPortType(new QName(namespace, "PortType")); + PortType portType = this.definition.getPortType(new QName(namespace, "PortType")); assertThat(portType).isNotNull(); diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java index b553910b..92f6e8ee 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java @@ -132,9 +132,9 @@ public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInter */ @Override public final boolean handleRequest(MessageContext messageContext, Object endpoint) throws Exception { - if (validateRequest) { + if (this.validateRequest) { Assert.isInstanceOf(SoapMessage.class, messageContext.getRequest()); - if (skipValidationIfNoHeaderPresent + if (this.skipValidationIfNoHeaderPresent && !isSecurityHeaderPresent((SoapMessage) messageContext.getRequest())) { return true; } @@ -168,7 +168,7 @@ public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInter public final boolean handleResponse(MessageContext messageContext, Object endpoint) throws Exception { boolean result = true; try { - if (secureResponse) { + if (this.secureResponse) { Assert.isTrue(messageContext.hasResponse(), "MessageContext contains no response"); Assert.isInstanceOf(SoapMessage.class, messageContext.getResponse()); try { @@ -220,7 +220,7 @@ public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInter */ @Override public final boolean handleRequest(MessageContext messageContext) throws WebServiceClientException { - if (secureRequest) { + if (this.secureRequest) { Assert.isInstanceOf(SoapMessage.class, messageContext.getRequest()); try { secureMessage((SoapMessage) messageContext.getRequest(), messageContext); @@ -249,10 +249,10 @@ public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInter */ @Override public final boolean handleResponse(MessageContext messageContext) throws WebServiceClientException { - if (validateResponse) { + if (this.validateResponse) { Assert.isTrue(messageContext.hasResponse(), "MessageContext contains no response"); Assert.isInstanceOf(SoapMessage.class, messageContext.getResponse()); - if (skipValidationIfNoHeaderPresent + if (this.skipValidationIfNoHeaderPresent && !isSecurityHeaderPresent((SoapMessage) messageContext.getResponse())) { return true; } @@ -292,8 +292,8 @@ public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInter * default) otherwise */ protected boolean handleSecurementException(WsSecuritySecurementException ex, MessageContext messageContext) { - if (logger.isErrorEnabled()) { - logger.error("Could not secure response: " + ex.getMessage(), ex); + if (this.logger.isErrorEnabled()) { + this.logger.error("Could not secure response: " + ex.getMessage(), ex); } return false; } @@ -309,15 +309,15 @@ public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInter * default) otherwise */ protected boolean handleValidationException(WsSecurityValidationException ex, MessageContext messageContext) { - if (logger.isWarnEnabled()) { - logger.warn("Could not validate request: " + ex.getMessage()); + if (this.logger.isWarnEnabled()) { + this.logger.warn("Could not validate request: " + ex.getMessage()); } - if (exceptionResolver != null) { - exceptionResolver.resolveException(messageContext, null, ex); + if (this.exceptionResolver != null) { + this.exceptionResolver.resolveException(messageContext, null, ex); } else { - if (logger.isDebugEnabled()) { - logger.debug("No exception resolver present, creating basic soap fault"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("No exception resolver present, creating basic soap fault"); } SoapBody response = ((SoapMessage) messageContext.getResponse()).getSoapBody(); response.addClientOrSenderFault(ex.getMessage(), Locale.ENGLISH); @@ -335,8 +335,8 @@ public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInter * default) otherwise */ protected boolean handleFaultException(WsSecurityFaultException ex, MessageContext messageContext) { - if (logger.isWarnEnabled()) { - logger.warn("Could not handle request: " + ex.getMessage()); + if (this.logger.isWarnEnabled()) { + this.logger.warn("Could not handle request: " + ex.getMessage()); } SoapBody response = ((SoapMessage) messageContext.getResponse()).getSoapBody(); SoapFault fault; diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java index 6a699dfb..eab05c1d 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java @@ -46,17 +46,17 @@ public abstract class WsSecurityFaultException extends WsSecurityException { /** Returns the fault code for the exception. */ public QName getFaultCode() { - return faultCode; + return this.faultCode; } /** Returns the fault string for the exception. */ public String getFaultString() { - return faultString; + return this.faultString; } /** Returns the fault actor for the exception. */ public String getFaultActor() { - return faultActor; + return this.faultActor; } } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java index fa07431f..e64cedda 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CallbackHandlerChain.java @@ -39,13 +39,13 @@ public class CallbackHandlerChain extends AbstractCallbackHandler { } public CallbackHandler[] getCallbackHandlers() { - return callbackHandlers; + return this.callbackHandlers; } @Override protected void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { boolean allUnsupported = true; - for (CallbackHandler callbackHandler : callbackHandlers) { + for (CallbackHandler callbackHandler : this.callbackHandlers) { try { callbackHandler.handle(new Callback[] { callback }); allUnsupported = false; diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java index 2ee401b0..904ed0b9 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java @@ -85,7 +85,7 @@ public class KeyManagersFactoryBean implements FactoryBean, Initia @Override public KeyManager[] getObject() throws Exception { - return keyManagers; + return this.keyManagers; } @Override @@ -106,7 +106,7 @@ public class KeyManagersFactoryBean implements FactoryBean, Initia KeyManagerFactory keyManagerFactory = StringUtils.hasLength(this.provider) ? KeyManagerFactory.getInstance(algorithm, this.provider) : KeyManagerFactory.getInstance(algorithm); - keyManagerFactory.init(keyStore, password); + keyManagerFactory.init(this.keyStore, this.password); this.keyManagers = keyManagerFactory.getKeyManagers(); } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java index f183d855..249d4571 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java @@ -92,7 +92,7 @@ public class KeyStoreFactoryBean implements FactoryBean, InitializingB @Override public KeyStore getObject() { - return keyStore; + return this.keyStore; } @Override @@ -107,27 +107,27 @@ public class KeyStoreFactoryBean implements FactoryBean, InitializingB @Override public final void afterPropertiesSet() throws GeneralSecurityException, IOException { - if (StringUtils.hasLength(provider) && StringUtils.hasLength(type)) { - keyStore = KeyStore.getInstance(type, provider); + if (StringUtils.hasLength(this.provider) && StringUtils.hasLength(this.type)) { + this.keyStore = KeyStore.getInstance(this.type, this.provider); } - else if (StringUtils.hasLength(type)) { - keyStore = KeyStore.getInstance(type); + else if (StringUtils.hasLength(this.type)) { + this.keyStore = KeyStore.getInstance(this.type); } else { - keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); + this.keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); } InputStream is = null; try { - if (location != null && location.exists()) { - is = location.getInputStream(); + if (this.location != null && this.location.exists()) { + is = this.location.getInputStream(); if (logger.isInfoEnabled()) { - logger.info("Loading key store from " + location); + logger.info("Loading key store from " + this.location); } } else if (logger.isWarnEnabled()) { logger.warn("Creating empty key store"); } - keyStore.load(is, password); + this.keyStore.load(is, this.password); } finally { if (is != null) { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBean.java index cbba66d7..6972c140 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBean.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBean.java @@ -72,7 +72,7 @@ public class TrustManagersFactoryBean implements FactoryBean, In @Override public TrustManager[] getObject() throws Exception { - return trustManagers; + return this.trustManagers; } @Override @@ -94,7 +94,7 @@ public class TrustManagersFactoryBean implements FactoryBean, In ? TrustManagerFactory.getInstance(algorithm, this.provider) : TrustManagerFactory.getInstance(algorithm); - trustManagerFactory.init(keyStore); + trustManagerFactory.init(this.keyStore); this.trustManagers = trustManagerFactory.getTrustManagers(); } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java index 0238a21b..e190c4ee 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java @@ -53,8 +53,8 @@ class Wss4jHandler extends WSHandler { Wss4jHandler() { // set up default handler properties - options.setProperty(ConfigurationConstants.MUST_UNDERSTAND, Boolean.toString(true)); - options.setProperty(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, Boolean.toString(true)); + this.options.setProperty(ConfigurationConstants.MUST_UNDERSTAND, Boolean.toString(true)); + this.options.setProperty(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, Boolean.toString(true)); } @Override @@ -69,16 +69,16 @@ class Wss4jHandler extends WSHandler { } void setOption(String key, String value) { - options.setProperty(key, value); + this.options.setProperty(key, value); } void setOption(String key, boolean value) { - options.setProperty(key, Boolean.toString(value)); + this.options.setProperty(key, Boolean.toString(value)); } @Override public Object getOption(String key) { - return options.getProperty(key); + return this.options.getProperty(key); } void setSecurementPassword(String securementPassword) { @@ -99,7 +99,7 @@ class Wss4jHandler extends WSHandler { if (StringUtils.hasLength(contextPassword)) { return contextPassword; } - return securementPassword; + return this.securementPassword; } @Override @@ -109,17 +109,17 @@ class Wss4jHandler extends WSHandler { @Override protected Crypto loadEncryptionCrypto(RequestData reqData) throws WSSecurityException { - return securementEncryptionCrypto; + return this.securementEncryptionCrypto; } @Override public Crypto loadSignatureCrypto(RequestData reqData) throws WSSecurityException { - return securementSignatureCrypto; + return this.securementSignatureCrypto; } @Override public void setPassword(Object msgContext, String password) { - securementPassword = password; + this.securementPassword = password; } @Override diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java index bcac9198..6cbd60c0 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java @@ -227,11 +227,11 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * standard values. */ public void setSecurementActor(String securementActor) { - handler.setOption(WSHandlerConstants.ACTOR, securementActor); + this.handler.setOption(WSHandlerConstants.ACTOR, securementActor); } public void setSecurementEncryptionCrypto(Crypto securementEncryptionCrypto) { - handler.setSecurementEncryptionCrypto(securementEncryptionCrypto); + this.handler.setSecurementEncryptionCrypto(securementEncryptionCrypto); } /** @@ -243,7 +243,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * only. */ public void setSecurementEncryptionKeyIdentifier(String securementEncryptionKeyIdentifier) { - handler.setOption(WSHandlerConstants.ENC_KEY_ID, securementEncryptionKeyIdentifier); + this.handler.setOption(WSHandlerConstants.ENC_KEY_ID, securementEncryptionKeyIdentifier); } /** @@ -252,7 +252,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * {@link WSConstants#KEYTRANSPORT_RSAOAEP}. */ public void setSecurementEncryptionKeyTransportAlgorithm(String securementEncryptionKeyTransportAlgorithm) { - handler.setOption(WSHandlerConstants.ENC_KEY_TRANSPORT, securementEncryptionKeyTransportAlgorithm); + this.handler.setOption(WSHandlerConstants.ENC_KEY_TRANSPORT, securementEncryptionKeyTransportAlgorithm); } /** @@ -291,7 +291,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * by default. */ public void setSecurementEncryptionParts(String securementEncryptionParts) { - handler.setOption(WSHandlerConstants.ENCRYPTION_PARTS, securementEncryptionParts); + this.handler.setOption(WSHandlerConstants.ENCRYPTION_PARTS, securementEncryptionParts); } /** @@ -325,7 +325,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * a security risk, because the public key of that certificate is used only. */ public void setSecurementEncryptionUser(String securementEncryptionUser) { - handler.setOption(WSHandlerConstants.ENCRYPTION_USER, securementEncryptionUser); + this.handler.setOption(WSHandlerConstants.ENCRYPTION_USER, securementEncryptionUser); } public void setSecurementPassword(String securementPassword) { @@ -341,7 +341,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * The default setting is PW_DIGEST. */ public void setSecurementPasswordType(String securementUsernameTokenPasswordType) { - handler.setOption(WSHandlerConstants.PASSWORD_TYPE, securementUsernameTokenPasswordType); + this.handler.setOption(WSHandlerConstants.PASSWORD_TYPE, securementUsernameTokenPasswordType); } /** @@ -350,18 +350,18 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * @see WSConstants#DSA */ public void setSecurementSignatureAlgorithm(String securementSignatureAlgorithm) { - handler.setOption(WSHandlerConstants.SIG_ALGO, securementSignatureAlgorithm); + this.handler.setOption(WSHandlerConstants.SIG_ALGO, securementSignatureAlgorithm); } /** * Defines which signature digest algorithm to use. */ public void setSecurementSignatureDigestAlgorithm(String digestAlgorithm) { - handler.setOption(WSHandlerConstants.SIG_DIGEST_ALGO, digestAlgorithm); + this.handler.setOption(WSHandlerConstants.SIG_DIGEST_ALGO, digestAlgorithm); } public void setSecurementSignatureCrypto(Crypto securementSignatureCrypto) { - handler.setSecurementSignatureCrypto(securementSignatureCrypto); + this.handler.setSecurementSignatureCrypto(securementSignatureCrypto); } /** @@ -371,7 +371,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * {@code IssuerSerial} and {@code DirectReference} are valid only. */ public void setSecurementSignatureKeyIdentifier(String securementSignatureKeyIdentifier) { - handler.setOption(WSHandlerConstants.SIG_KEY_ID, securementSignatureKeyIdentifier); + this.handler.setOption(WSHandlerConstants.SIG_KEY_ID, securementSignatureKeyIdentifier); } /** @@ -401,7 +401,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * the SOAP namespace identifier can be empty ({@code {}}). */ public void setSecurementSignatureParts(String securementSignatureParts) { - handler.setOption(WSHandlerConstants.SIGNATURE_PARTS, securementSignatureParts); + this.handler.setOption(WSHandlerConstants.SIGNATURE_PARTS, securementSignatureParts); } /** @@ -414,7 +414,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * specified by {@link #setSecurementUsername(String)}. */ public void setSecurementSignatureUser(String securementSignatureUser) { - handler.setOption(WSHandlerConstants.SIGNATURE_USER, securementSignatureUser); + this.handler.setOption(WSHandlerConstants.SIGNATURE_USER, securementSignatureUser); } /** @@ -464,7 +464,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl this.validationActions = actions; try { - validationActionsVector = WSSecurityUtil.decodeAction(actions); + this.validationActionsVector = WSSecurityUtil.decodeAction(actions); } catch (WSSecurityException ex) { throw new IllegalArgumentException(ex); @@ -507,13 +507,13 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl */ public void setEnableSignatureConfirmation(boolean enableSignatureConfirmation) { - handler.setOption(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, enableSignatureConfirmation); + this.handler.setOption(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, enableSignatureConfirmation); this.enableSignatureConfirmation = enableSignatureConfirmation; } /** Sets if the generated timestamp header's precision is in milliseconds. */ public void setTimestampPrecisionInMilliseconds(boolean timestampPrecisionInMilliseconds) { - handler.setOption(WSHandlerConstants.TIMESTAMP_PRECISION, timestampPrecisionInMilliseconds); + this.handler.setOption(WSHandlerConstants.TIMESTAMP_PRECISION, timestampPrecisionInMilliseconds); } /** @@ -528,7 +528,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * messages. Default is {@code true}. */ public void setSecurementMustUnderstand(boolean securementMustUnderstand) { - handler.setOption(WSHandlerConstants.MUST_UNDERSTAND, securementMustUnderstand); + this.handler.setOption(WSHandlerConstants.MUST_UNDERSTAND, securementMustUnderstand); } /** @@ -536,7 +536,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * Default is {@code false}. */ public void setSecurementUsernameTokenNonce(boolean securementUsernameTokenNonce) { - handler.setOption(ConfigurationConstants.ADD_USERNAMETOKEN_NONCE, securementUsernameTokenNonce); + this.handler.setOption(ConfigurationConstants.ADD_USERNAMETOKEN_NONCE, securementUsernameTokenNonce); } /** @@ -544,7 +544,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * Default is {@code false}. */ public void setSecurementUsernameTokenCreated(boolean securementUsernameTokenCreated) { - handler.setOption(ConfigurationConstants.ADD_USERNAMETOKEN_CREATED, securementUsernameTokenCreated); + this.handler.setOption(ConfigurationConstants.ADD_USERNAMETOKEN_CREATED, securementUsernameTokenCreated); } /** @@ -557,8 +557,8 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl */ public void setWssConfig(WSSConfig config) { - securityEngine.setWssConfig(config); - wssConfig = config; + this.securityEngine.setWssConfig(config); + this.wssConfig = config; } /** @@ -608,7 +608,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl } public boolean getRemoveSecurityHeader() { - return removeSecurityHeader; + return this.removeSecurityHeader; } public void setRemoveSecurityHeader(boolean removeSecurityHeader) { @@ -618,15 +618,15 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl @Override public void afterPropertiesSet() throws Exception { - Assert.isTrue(validationActions != null || securementActions != null, + Assert.isTrue(this.validationActions != null || this.securementActions != null, "validationActions or securementActions are required"); - if (validationActions != null) { - if (validationActionsVector.contains(WSConstants.UT)) { - Assert.notNull(validationCallbackHandler, "validationCallbackHandler is required"); + if (this.validationActions != null) { + if (this.validationActionsVector.contains(WSConstants.UT)) { + Assert.notNull(this.validationCallbackHandler, "validationCallbackHandler is required"); } - if (validationActionsVector.contains(WSConstants.SIGN)) { - Assert.notNull(validationSignatureCrypto, "validationSignatureCrypto is required"); + if (this.validationActionsVector.contains(WSConstants.SIGN)) { + Assert.notNull(this.validationSignatureCrypto, "validationSignatureCrypto is required"); } } // securement actions are not to be validated at start up as they could @@ -639,23 +639,23 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl List securementActionsVector; try { - securementActionsVector = WSSecurityUtil.decodeHandlerAction(securementActions, wssConfig); + securementActionsVector = WSSecurityUtil.decodeHandlerAction(this.securementActions, this.wssConfig); } catch (WSSecurityException ex) { throw new Wss4jSecuritySecurementException(ex.getMessage(), ex); } - if (securementActionsVector.isEmpty() && !enableSignatureConfirmation) { + if (securementActionsVector.isEmpty() && !this.enableSignatureConfirmation) { return; } - if (logger.isDebugEnabled()) { - logger.debug("Securing message [" + soapMessage + "] with actions [" + securementActions + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Securing message [" + soapMessage + "] with actions [" + this.securementActions + "]"); } RequestData requestData = initializeRequestData(messageContext); Document envelopeAsDocument = soapMessage.getDocument(); try { - handler.doSenderAction(envelopeAsDocument, requestData, securementActionsVector, false); + this.handler.doSenderAction(envelopeAsDocument, requestData, securementActionsVector, false); } catch (WSSecurityException ex) { throw new Wss4jSecuritySecurementException(ex.getMessage(), ex); @@ -680,16 +680,16 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl requestData.setUsername(contextUsername); } else { - requestData.setUsername(securementUsername); + requestData.setUsername(this.securementUsername); } - requestData.setTimeStampTTL(securementTimeToLive); + requestData.setTimeStampTTL(this.securementTimeToLive); - requestData.setUseDerivedKeyForMAC(securementUseDerivedKey); + requestData.setUseDerivedKeyForMAC(this.securementUseDerivedKey); - requestData.setWssConfig(wssConfig); + requestData.setWssConfig(this.wssConfig); - messageContext.setProperty(WSHandlerConstants.TTL_TIMESTAMP, Integer.toString(securementTimeToLive)); + messageContext.setProperty(WSHandlerConstants.TTL_TIMESTAMP, Integer.toString(this.securementTimeToLive)); if (this.samlCallbackHandler != null) { messageContext.setProperty(WSHandlerConstants.SAML_CALLBACK_REF, this.samlCallbackHandler); @@ -711,29 +711,29 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl RequestData requestData = new RequestData(); requestData.setMsgContext(messageContext); - requestData.setWssConfig(wssConfig); + requestData.setWssConfig(this.wssConfig); - requestData.setDecCrypto(validationDecryptionCrypto); + requestData.setDecCrypto(this.validationDecryptionCrypto); - requestData.setSigVerCrypto(validationSignatureCrypto); + requestData.setSigVerCrypto(this.validationSignatureCrypto); - requestData.setCallbackHandler(validationCallbackHandler); + requestData.setCallbackHandler(this.validationCallbackHandler); - messageContext.setProperty(WSHandlerConstants.TIMESTAMP_STRICT, timestampStrict); - messageContext.setProperty(WSHandlerConstants.TTL_TIMESTAMP, Integer.toString(validationTimeToLive)); - messageContext.setProperty(WSHandlerConstants.TTL_FUTURE_TIMESTAMP, Integer.toString(futureTimeToLive)); + messageContext.setProperty(WSHandlerConstants.TIMESTAMP_STRICT, this.timestampStrict); + messageContext.setProperty(WSHandlerConstants.TTL_TIMESTAMP, Integer.toString(this.validationTimeToLive)); + messageContext.setProperty(WSHandlerConstants.TTL_FUTURE_TIMESTAMP, Integer.toString(this.futureTimeToLive)); - requestData.setTimeStampStrict(timestampStrict); - requestData.setTimeStampTTL(validationTimeToLive); - requestData.setTimeStampFutureTTL(futureTimeToLive); + requestData.setTimeStampStrict(this.timestampStrict); + requestData.setTimeStampTTL(this.validationTimeToLive); + requestData.setTimeStampFutureTTL(this.futureTimeToLive); - requestData.setAllowRSA15KeyTransportAlgorithm(allowRSA15KeyTransportAlgorithm); + requestData.setAllowRSA15KeyTransportAlgorithm(this.allowRSA15KeyTransportAlgorithm); - requestData.setDisableBSPEnforcement(!bspCompliant); + requestData.setDisableBSPEnforcement(!this.bspCompliant); if (requestData.getBSPEnforcer() != null) { - requestData.getBSPEnforcer().setDisableBSPRules(!bspCompliant); + requestData.getBSPEnforcer().setDisableBSPRules(!this.bspCompliant); } - requestData.setAddInclusivePrefixes(addInclusivePrefixes); + requestData.setAddInclusivePrefixes(this.addInclusivePrefixes); // allow for qualified password types for .Net interoperability requestData.setAllowNamespaceQualifiedPasswordTypes(true); @@ -744,11 +744,11 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl protected void validateMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecurityValidationException { - if (logger.isDebugEnabled()) { - logger.debug("Validating message [" + soapMessage + "] with actions [" + validationActions + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Validating message [" + soapMessage + "] with actions [" + this.validationActions + "]"); } - if (CollectionUtils.isEmpty(validationActionsVector)) { + if (CollectionUtils.isEmpty(this.validationActionsVector)) { return; } @@ -759,20 +759,20 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl try { RequestData validationData = initializeValidationRequestData(messageContext); - String actor = validationActor; + String actor = this.validationActor; if (actor == null) { actor = ""; } Element elem = WSSecurityUtil.getSecurityHeader(envelopeAsDocument, actor); - WSHandlerResult result = securityEngine.processSecurityHeader(elem, validationData); + WSHandlerResult result = this.securityEngine.processSecurityHeader(elem, validationData); // Results verification if (CollectionUtils.isEmpty(result.getResults())) { throw new Wss4jSecurityValidationException("No WS-Security header found"); } - checkResults(result.getResults(), validationActionsVector); + checkResults(result.getResults(), this.validationActionsVector); // puts the results in the context // useful for Signature Confirmation @@ -805,7 +805,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl protected void checkResults(List results, List validationActions) throws Wss4jSecurityValidationException { - if (!handler.checkReceiverResultsAnyOrder(results, validationActions)) { + if (!this.handler.checkReceiverResultsAnyOrder(results, validationActions)) { throw new Wss4jSecurityValidationException("Security processing failed (actions mismatch)"); } } @@ -823,7 +823,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl handlerResults = new ArrayList<>(); messageContext.setProperty(WSHandlerConstants.RECV_RESULTS, handlerResults); } - WSHandlerResult rResult = new WSHandlerResult(validationActor, results, Collections.emptyMap()); + WSHandlerResult rResult = new WSHandlerResult(this.validationActor, results, Collections.emptyMap()); handlerResults.add(0, rResult); messageContext.setProperty(WSHandlerConstants.RECV_RESULTS, handlerResults); } @@ -844,8 +844,8 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl credential.setCertificates(new X509Certificate[] { returnCert }); RequestData requestData = new RequestData(); - requestData.setSigVerCrypto(validationSignatureCrypto); - requestData.setEnableRevocation(enableRevocation); + requestData.setSigVerCrypto(this.validationSignatureCrypto); + requestData.setEnableRevocation(this.enableRevocation); SignatureTrustValidator validator = new SignatureTrustValidator(); validator.validate(credential, requestData); @@ -863,15 +863,15 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl if (!CollectionUtils.isEmpty(results)) { WSSecurityEngineResult actionResult = results.get(0); Timestamp timestamp = (Timestamp) actionResult.get(WSSecurityEngineResult.TAG_TIMESTAMP); - if (timestamp != null && timestampStrict) { + if (timestamp != null && this.timestampStrict) { Credential credential = new Credential(); credential.setTimestamp(timestamp); RequestData requestData = new RequestData(); requestData.setWssConfig(WSSConfig.getNewInstance()); - requestData.setTimeStampTTL(validationTimeToLive); - requestData.setTimeStampStrict(timestampStrict); - requestData.setTimeStampFutureTTL(futureTimeToLive); + requestData.setTimeStampTTL(this.validationTimeToLive); + requestData.setTimeStampStrict(this.timestampStrict); + requestData.setTimeStampFutureTTL(this.futureTimeToLive); TimestampValidator validator = new TimestampValidator(); validator.validate(credential, requestData); @@ -889,10 +889,10 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl if (principal instanceof WSUsernameTokenPrincipalImpl usernameTokenPrincipal) { UsernameTokenPrincipalCallback callback = new UsernameTokenPrincipalCallback(usernameTokenPrincipal); try { - validationCallbackHandler.handle(new Callback[] { callback }); + this.validationCallbackHandler.handle(new Callback[] { callback }); } catch (IOException ex) { - logger.warn("Principal callback resulted in IOException", ex); + this.logger.warn("Principal callback resulted in IOException", ex); } catch (UnsupportedCallbackException ex) { // ignore @@ -904,13 +904,13 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl @Override protected void cleanUp() { - if (validationCallbackHandler != null) { + if (this.validationCallbackHandler != null) { try { CleanupCallback cleanupCallback = new CleanupCallback(); - validationCallbackHandler.handle(new Callback[] { cleanupCallback }); + this.validationCallbackHandler.handle(new Callback[] { cleanupCallback }); } catch (IOException ex) { - logger.warn("Cleanup callback resulted in IOException", ex); + this.logger.warn("Cleanup callback resulted in IOException", ex); } catch (UnsupportedCallbackException ex) { // ignore diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java index 8c0b80ff..9c8d2002 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java @@ -61,7 +61,7 @@ public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler i * Default implementation throws an {@link UnsupportedCallbackException}. */ protected void handleDecrypt(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { - callback.setPassword(privateKeyPassword); + callback.setPassword(this.privateKeyPassword); } /** @@ -74,8 +74,8 @@ public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler i Key key; try { - key = keyStore.getKey(id, - symmetricKeyPassword != null ? symmetricKeyPassword : privateKeyPassword.toCharArray()); + key = this.keyStore.getKey(id, this.symmetricKeyPassword != null ? this.symmetricKeyPassword + : this.privateKeyPassword.toCharArray()); } catch (UnrecoverableKeyException | KeyStoreException | NoSuchAlgorithmException e) { throw new IOException("Could not get key", e); @@ -112,11 +112,11 @@ public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler i @Override public void afterPropertiesSet() throws Exception { - if (keyStore == null) { + if (this.keyStore == null) { loadDefaultKeyStore(); } - if (symmetricKeyPassword == null) { - symmetricKeyPassword = privateKeyPassword.toCharArray(); + if (this.symmetricKeyPassword == null) { + this.symmetricKeyPassword = this.privateKeyPassword.toCharArray(); } } @@ -126,13 +126,13 @@ public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler i */ protected void loadDefaultKeyStore() { try { - keyStore = KeyStoreUtils.loadDefaultKeyStore(); - if (logger.isDebugEnabled()) { - logger.debug("Loaded default key store"); + this.keyStore = KeyStoreUtils.loadDefaultKeyStore(); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Loaded default key store"); } } catch (Exception ex) { - logger.warn("Could not open default key store", ex); + this.logger.warn("Could not open default key store", ex); } } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SimplePasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SimplePasswordValidationCallbackHandler.java index 4b6dec54..25cf5ec3 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SimplePasswordValidationCallbackHandler.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SimplePasswordValidationCallbackHandler.java @@ -61,13 +61,13 @@ public class SimplePasswordValidationCallbackHandler extends AbstractWsPasswordC @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(users, "users is required"); + Assert.notNull(this.users, "users is required"); } @Override public void handleUsernameToken(WSPasswordCallback callback) throws IOException, UnsupportedCallbackException { String username = callback.getIdentifier(); - String passwd = users.get(username); + String passwd = this.users.get(username); callback.setPassword(passwd); } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandler.java index ebca7979..0e4f8c72 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandler.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandler.java @@ -67,7 +67,7 @@ public class SpringSecurityPasswordValidationCallbackHandler extends AbstractWsP @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(userDetailsService, "userDetailsService is required"); + Assert.notNull(this.userDetailsService, "userDetailsService is required"); } /** @@ -93,8 +93,8 @@ public class SpringSecurityPasswordValidationCallbackHandler extends AbstractWsP WSUsernameTokenPrincipalImpl principal = callback.getPrincipal(); UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(principal, principal.getPassword(), user.getAuthorities()); - if (logger.isDebugEnabled()) { - logger.debug("Authentication success: " + authRequest); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Authentication success: " + authRequest); } authRequest.setDetails(user); SecurityContextHolder.getContext().setAuthentication(authRequest); @@ -106,19 +106,19 @@ public class SpringSecurityPasswordValidationCallbackHandler extends AbstractWsP } private UserDetails loadUserDetails(String username) throws DataAccessException { - UserDetails user = userCache.getUserFromCache(username); + UserDetails user = this.userCache.getUserFromCache(username); if (user == null) { try { - user = userDetailsService.loadUserByUsername(username); + user = this.userDetailsService.loadUserByUsername(username); } catch (UsernameNotFoundException notFound) { - if (logger.isDebugEnabled()) { - logger.debug("Username '" + username + "' not found"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Username '" + username + "' not found"); } return null; } - userCache.putUserInCache(user); + this.userCache.putUserInCache(user); } return user; } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/UsernameTokenPrincipalCallback.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/UsernameTokenPrincipalCallback.java index 5cb702f7..3b83b5f0 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/UsernameTokenPrincipalCallback.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/UsernameTokenPrincipalCallback.java @@ -47,7 +47,7 @@ public class UsernameTokenPrincipalCallback implements Callback, Serializable { /** Get the retrieved {@code Principal}. */ public WSUsernameTokenPrincipalImpl getPrincipal() { - return principal; + return this.principal; } } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java index 6af1619d..81c18d67 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java @@ -162,10 +162,10 @@ public class CryptoFactoryBean implements FactoryBean, InitializingBean @Override public void afterPropertiesSet() throws Exception { - if (!configuration.containsKey(CRYPTO_PROVIDER_PROPERTY)) { - configuration.setProperty(CRYPTO_PROVIDER_PROPERTY, Merlin.class.getName()); + if (!this.configuration.containsKey(CRYPTO_PROVIDER_PROPERTY)) { + this.configuration.setProperty(CRYPTO_PROVIDER_PROPERTY, Merlin.class.getName()); } - this.crypto = CryptoFactory.getInstance(configuration); + this.crypto = CryptoFactory.getInstance(this.configuration); } @Override @@ -180,7 +180,7 @@ public class CryptoFactoryBean implements FactoryBean, InitializingBean @Override public Crypto getObject() throws Exception { - return crypto; + return this.crypto; } } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java index f63371de..a4058909 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationProvider.java @@ -65,8 +65,8 @@ public class X509AuthenticationProvider implements AuthenticationProvider, Initi @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(userCache, "An x509UserCache must be set"); - Assert.notNull(x509AuthoritiesPopulator, "An X509AuthoritiesPopulator must be set"); + Assert.notNull(this.userCache, "An x509UserCache must be set"); + Assert.notNull(this.x509AuthoritiesPopulator, "An X509AuthoritiesPopulator must be set"); Assert.notNull(this.messages, "A message source must be set"); } @@ -101,17 +101,17 @@ public class X509AuthenticationProvider implements AuthenticationProvider, Initi if (clientCertificate == null) { throw new BadCredentialsException( - messages.getMessage("X509AuthenticationProvider.certificateNull", "Certificate is null")); + this.messages.getMessage("X509AuthenticationProvider.certificateNull", "Certificate is null")); } - UserDetails user = userCache.getUserFromCache(clientCertificate); + UserDetails user = this.userCache.getUserFromCache(clientCertificate); if (user == null) { if (logger.isDebugEnabled()) { logger.debug("Authenticating with certificate " + clientCertificate); } - user = x509AuthoritiesPopulator.getUserDetails(clientCertificate); - userCache.putUserInCache(clientCertificate, user); + user = this.x509AuthoritiesPopulator.getUserDetails(clientCertificate); + this.userCache.putUserInCache(clientCertificate, user); } X509AuthenticationToken result = new X509AuthenticationToken(user, clientCertificate, user.getAuthorities()); diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java index fb583e65..14e7207c 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java @@ -78,12 +78,12 @@ public class X509AuthenticationToken extends AbstractAuthenticationToken { @Override public Object getCredentials() { - return credentials; + return this.credentials; } @Override public Object getPrincipal() { - return principal; + return this.principal; } } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java index 50e16809..50682447 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/EhCacheBasedX509UserCache.java @@ -60,7 +60,7 @@ public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBea @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(cache, "cache is mandatory"); + Assert.notNull(this.cache, "cache is mandatory"); } @Override @@ -68,7 +68,7 @@ public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBea Element element; try { - element = cache.get(userCert); + element = this.cache.get(userCert); } catch (CacheException cacheException) { throw new DataRetrievalFailureException("Cache failure: " + cacheException.getMessage()); @@ -100,7 +100,7 @@ public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBea logger.debug("Cache put: " + userCert.getSubjectDN()); } - cache.put(element); + this.cache.put(element); } @Override @@ -109,7 +109,7 @@ public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBea logger.debug("Cache remove: " + userCert.getSubjectDN()); } - cache.remove(userCert); + this.cache.remove(userCert); } public void setCache(Ehcache cache) { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/SpringBasedX509UserCache.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/SpringBasedX509UserCache.java index a4f48118..78ee5040 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/SpringBasedX509UserCache.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/SpringBasedX509UserCache.java @@ -44,7 +44,7 @@ public class SpringBasedX509UserCache implements X509UserCache, InitializingBean @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(cache, "cache is mandatory"); + Assert.notNull(this.cache, "cache is mandatory"); } @Override @@ -61,7 +61,7 @@ public class SpringBasedX509UserCache implements X509UserCache, InitializingBean logger.debug("X.509 Cache hit. SubjectDN: " + subjectDN); } - return cache.get(userCert, UserDetails.class); + return this.cache.get(userCert, UserDetails.class); } @Override @@ -71,7 +71,7 @@ public class SpringBasedX509UserCache implements X509UserCache, InitializingBean logger.debug("Cache put: " + userCert.getSubjectX500Principal()); } - cache.put(userCert, user); + this.cache.put(userCert, user); } @Override @@ -81,7 +81,7 @@ public class SpringBasedX509UserCache implements X509UserCache, InitializingBean logger.debug("Cache remove: " + userCert.getSubjectX500Principal()); } - cache.evict(userCert); + this.cache.evict(userCert); } public void setCache(Cache cache) { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java index d3372994..29fbddc2 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/DaoX509AuthoritiesPopulator.java @@ -61,20 +61,20 @@ public class DaoX509AuthoritiesPopulator implements X509AuthoritiesPopulator, In @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(userDetailsService, "An authenticationDao must be set"); + Assert.notNull(this.userDetailsService, "An authenticationDao must be set"); Assert.notNull(this.messages, "A message source must be set"); - subjectDNPattern = Pattern.compile(subjectDNRegex, Pattern.CASE_INSENSITIVE); + this.subjectDNPattern = Pattern.compile(this.subjectDNRegex, Pattern.CASE_INSENSITIVE); } @Override public UserDetails getUserDetails(X509Certificate clientCert) throws AuthenticationException { String subjectDN = clientCert.getSubjectX500Principal().getName(); - Matcher matcher = subjectDNPattern.matcher(subjectDN); + Matcher matcher = this.subjectDNPattern.matcher(subjectDN); if (!matcher.find()) { - throw new BadCredentialsException(messages.getMessage("DaoX509AuthoritiesPopulator.noMatching", + throw new BadCredentialsException(this.messages.getMessage("DaoX509AuthoritiesPopulator.noMatching", new Object[] { subjectDN }, "No matching pattern was found in subjectDN: {0}")); } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java index 7f4abb6e..45a754da 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java @@ -47,9 +47,9 @@ public class SkipValidationWsSecurityInterceptorTest { @BeforeEach public void setUp() throws Exception { - messageFactory = MessageFactory.newInstance(); - soapMessageFactory = new SaajSoapMessageFactory(messageFactory); - interceptor = new AbstractWsSecurityInterceptor() { + this.messageFactory = MessageFactory.newInstance(); + this.soapMessageFactory = new SaajSoapMessageFactory(this.messageFactory); + this.interceptor = new AbstractWsSecurityInterceptor() { @Override protected void validateMessage(SoapMessage soapMessage, MessageContext messageContext) @@ -66,7 +66,7 @@ public class SkipValidationWsSecurityInterceptorTest { protected void cleanUp() { } }; - interceptor.setSkipValidationIfNoHeaderPresent(true); + this.interceptor.setSkipValidationIfNoHeaderPresent(true); } @Test @@ -87,9 +87,9 @@ public class SkipValidationWsSecurityInterceptorTest { private void doTestSkipValidation(String fileName) throws Exception { SoapMessage message = loadSaajMessage(fileName); - MessageContext messageContext = new DefaultMessageContext(message, soapMessageFactory); + MessageContext messageContext = new DefaultMessageContext(message, this.soapMessageFactory); - assertThat(interceptor.handleRequest(messageContext, null)).isTrue(); + assertThat(this.interceptor.handleRequest(messageContext, null)).isTrue(); } private SaajSoapMessage loadSaajMessage(String fileName) throws SOAPException, IOException { @@ -101,7 +101,7 @@ public class SkipValidationWsSecurityInterceptorTest { assertThat(resource.exists()).isTrue(); try (InputStream is = resource.getInputStream()) { - return new SaajSoapMessage(messageFactory.createMessage(mimeHeaders, is)); + return new SaajSoapMessage(this.messageFactory.createMessage(mimeHeaders, is)); } } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java index 2d2b3a9a..6c7f4d90 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java @@ -39,15 +39,16 @@ public class CallbackHandlerChainTest { @Test public void testSupported() throws Exception { - CallbackHandlerChain chain = new CallbackHandlerChain(new CallbackHandler[] { supported }); - chain.handle(new Callback[] { callback }); + CallbackHandlerChain chain = new CallbackHandlerChain(new CallbackHandler[] { this.supported }); + chain.handle(new Callback[] { this.callback }); } @Test public void testUnsupportedSupported() throws Exception { - CallbackHandlerChain chain = new CallbackHandlerChain(new CallbackHandler[] { unsupported, supported }); - chain.handle(new Callback[] { callback }); + CallbackHandlerChain chain = new CallbackHandlerChain( + new CallbackHandler[] { this.unsupported, this.supported }); + chain.handle(new Callback[] { this.callback }); } @Test @@ -55,8 +56,8 @@ public class CallbackHandlerChainTest { assertThatExceptionOfType(UnsupportedCallbackException.class).isThrownBy(() -> { - CallbackHandlerChain chain = new CallbackHandlerChain(new CallbackHandler[] { unsupported }); - chain.handle(new Callback[] { callback }); + CallbackHandlerChain chain = new CallbackHandlerChain(new CallbackHandler[] { this.unsupported }); + chain.handle(new Callback[] { this.callback }); }); } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java index 3d2eb2ef..ee49cd4f 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java @@ -47,17 +47,17 @@ public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptor public void testSignAndValidate() throws Exception { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); - interceptor.setSecurementActions("Signature"); - interceptor.setEnableSignatureConfirmation(false); - interceptor.setSecurementPassword("123456"); - interceptor.setSecurementUsername("rsaKey"); - SOAPMessage saajMessage = saajSoap11MessageFactory.createMessage(); + this.interceptor.setSecurementActions("Signature"); + this.interceptor.setEnableSignatureConfirmation(false); + this.interceptor.setSecurementPassword("123456"); + this.interceptor.setSecurementUsername("rsaKey"); + SOAPMessage saajMessage = this.saajSoap11MessageFactory.createMessage(); transformer.transform(new StringSource(PAYLOAD), new DOMResult(saajMessage.getSOAPBody())); - SaajSoapMessage message = new SaajSoapMessage(saajMessage, saajSoap11MessageFactory); + SaajSoapMessage message = new SaajSoapMessage(saajMessage, this.saajSoap11MessageFactory); MessageContext messageContext = new DefaultMessageContext(message, - new SaajSoapMessageFactory(saajSoap11MessageFactory)); + new SaajSoapMessageFactory(this.saajSoap11MessageFactory)); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); SOAPHeader header = message.getSaajMessage().getSOAPHeader(); Iterator iterator = header.getChildElements(new QName( @@ -77,29 +77,29 @@ public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptor mimeHeaders.addHeader("Content-Type", "text/xml"); ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); - SOAPMessage signed = saajSoap11MessageFactory.createMessage(mimeHeaders, bis); - message = new SaajSoapMessage(signed, saajSoap11MessageFactory); - messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(saajSoap11MessageFactory)); + SOAPMessage signed = this.saajSoap11MessageFactory.createMessage(mimeHeaders, bis); + message = new SaajSoapMessage(signed, this.saajSoap11MessageFactory); + messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(this.saajSoap11MessageFactory)); - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); } @Test public void testSignWithoutInclusivePrefixesAndValidate() throws Exception { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); - interceptor.setSecurementActions("Signature"); - interceptor.setEnableSignatureConfirmation(false); - interceptor.setSecurementPassword("123456"); - interceptor.setSecurementUsername("rsaKey"); - interceptor.setAddInclusivePrefixes(false); - SOAPMessage saajMessage = saajSoap11MessageFactory.createMessage(); + this.interceptor.setSecurementActions("Signature"); + this.interceptor.setEnableSignatureConfirmation(false); + this.interceptor.setSecurementPassword("123456"); + this.interceptor.setSecurementUsername("rsaKey"); + this.interceptor.setAddInclusivePrefixes(false); + SOAPMessage saajMessage = this.saajSoap11MessageFactory.createMessage(); transformer.transform(new StringSource(PAYLOAD), new DOMResult(saajMessage.getSOAPBody())); - SaajSoapMessage message = new SaajSoapMessage(saajMessage, saajSoap11MessageFactory); + SaajSoapMessage message = new SaajSoapMessage(saajMessage, this.saajSoap11MessageFactory); MessageContext messageContext = new DefaultMessageContext(message, - new SaajSoapMessageFactory(saajSoap11MessageFactory)); + new SaajSoapMessageFactory(this.saajSoap11MessageFactory)); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); SOAPHeader header = message.getSaajMessage().getSOAPHeader(); Iterator iterator = header.getChildElements(new QName( @@ -119,11 +119,11 @@ public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptor mimeHeaders.addHeader("Content-Type", "text/xml"); ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); - SOAPMessage signed = saajSoap11MessageFactory.createMessage(mimeHeaders, bis); - message = new SaajSoapMessage(signed, saajSoap11MessageFactory); - messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(saajSoap11MessageFactory)); + SOAPMessage signed = this.saajSoap11MessageFactory.createMessage(mimeHeaders, bis); + message = new SaajSoapMessage(signed, this.saajSoap11MessageFactory); + messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(this.saajSoap11MessageFactory)); - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); } } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTest.java index 56fbf4e4..b448e2d6 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTest.java @@ -61,11 +61,11 @@ public class SaajWss4jSecurityInterceptorDefaultsTest extends Wss4jTest { Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); - SOAPMessage saajMessage = saajSoap11MessageFactory.createMessage(); + SOAPMessage saajMessage = this.saajSoap11MessageFactory.createMessage(); transformer.transform(new StringSource(PAYLOAD), new DOMResult(saajMessage.getSOAPBody())); - SoapMessage message = new SaajSoapMessage(saajMessage, saajSoap11MessageFactory); + SoapMessage message = new SaajSoapMessage(saajMessage, this.saajSoap11MessageFactory); MessageContext messageContext = new DefaultMessageContext(message, - new SaajSoapMessageFactory(saajSoap11MessageFactory)); + new SaajSoapMessageFactory(this.saajSoap11MessageFactory)); RequestData validationData = ReflectionTestUtils.invokeMethod(subject, "initializeValidationRequestData", messageContext); @@ -81,11 +81,11 @@ public class SaajWss4jSecurityInterceptorDefaultsTest extends Wss4jTest { subject.setAddInclusivePrefixes(false); Transformer transformer = TransformerFactoryUtils.newInstance().newTransformer(); - SOAPMessage saajMessage = saajSoap11MessageFactory.createMessage(); + SOAPMessage saajMessage = this.saajSoap11MessageFactory.createMessage(); transformer.transform(new StringSource(PAYLOAD), new DOMResult(saajMessage.getSOAPBody())); - SoapMessage message = new SaajSoapMessage(saajMessage, saajSoap11MessageFactory); + SoapMessage message = new SaajSoapMessage(saajMessage, this.saajSoap11MessageFactory); MessageContext messageContext = new DefaultMessageContext(message, - new SaajSoapMessageFactory(saajSoap11MessageFactory)); + new SaajSoapMessageFactory(this.saajSoap11MessageFactory)); RequestData validationData = ReflectionTestUtils.invokeMethod(subject, "initializeValidationRequestData", messageContext); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java index f3a75b12..f970de49 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java @@ -34,13 +34,13 @@ public abstract class Wss4jMessageInterceptorEncryptionTest extends Wss4jTest { @Override protected void onSetup() throws Exception { - interceptor = new Wss4jSecurityInterceptor(); - interceptor.setValidationActions("Encrypt"); - interceptor.setSecurementActions("Encrypt"); + this.interceptor = new Wss4jSecurityInterceptor(); + this.interceptor.setValidationActions("Encrypt"); + this.interceptor.setSecurementActions("Encrypt"); KeyStoreCallbackHandler callbackHandler = new KeyStoreCallbackHandler(); callbackHandler.setPrivateKeyPassword("123456"); - interceptor.setValidationCallbackHandler(callbackHandler); + this.interceptor.setValidationCallbackHandler(callbackHandler); CryptoFactoryBean cryptoFactoryBean = new CryptoFactoryBean(); @@ -54,10 +54,10 @@ public abstract class Wss4jMessageInterceptorEncryptionTest extends Wss4jTest { cryptoFactoryBeanConfig.setProperty("org.apache.ws.security.crypto.merlin.file", "private.jks"); cryptoFactoryBean.setConfiguration(cryptoFactoryBeanConfig); cryptoFactoryBean.afterPropertiesSet(); - interceptor.setValidationDecryptionCrypto(cryptoFactoryBean.getObject()); - interceptor.setSecurementEncryptionCrypto(cryptoFactoryBean.getObject()); + this.interceptor.setValidationDecryptionCrypto(cryptoFactoryBean.getObject()); + this.interceptor.setSecurementEncryptionCrypto(cryptoFactoryBean.getObject()); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); } @Test @@ -65,7 +65,7 @@ public abstract class Wss4jMessageInterceptorEncryptionTest extends Wss4jTest { SoapMessage message = loadSoap11Message("encrypted-soap.xml"); MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory()); - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); Document document = getDocument((SoapMessage) messageContext.getRequest()); assertXpathEvaluatesTo("Decryption error", "Hello", "/SOAP-ENV:Envelope/SOAP-ENV:Body/echo:echoRequest/text()", @@ -79,8 +79,8 @@ public abstract class Wss4jMessageInterceptorEncryptionTest extends Wss4jTest { SoapMessage message = loadSoap11Message("empty-soap.xml"); MessageContext messageContext = getSoap11MessageContext(message); - interceptor.setSecurementEncryptionUser("rsakey"); - interceptor.secureMessage(message, messageContext); + this.interceptor.setSecurementEncryptionUser("rsakey"); + this.interceptor.secureMessage(message, messageContext); Document document = getDocument(message); assertXpathExists("Encryption error", "/SOAP-ENV:Envelope/SOAP-ENV:Header/wsse:Security/xenc:EncryptedKey", diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java index 164d238f..1a717a9d 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java @@ -52,22 +52,22 @@ public abstract class Wss4jMessageInterceptorHeaderTest extends Wss4jTest { Properties users = new Properties(); users.setProperty("Bert", "Ernie"); - interceptor = new Wss4jSecurityInterceptor(); - interceptor.setValidateRequest(true); - interceptor.setSecureResponse(true); - interceptor.setValidationActions("UsernameToken"); + this.interceptor = new Wss4jSecurityInterceptor(); + this.interceptor.setValidateRequest(true); + this.interceptor.setSecureResponse(true); + this.interceptor.setValidationActions("UsernameToken"); SimplePasswordValidationCallbackHandler callbackHandler = new SimplePasswordValidationCallbackHandler(); callbackHandler.setUsers(users); - interceptor.setValidationCallbackHandler(callbackHandler); - interceptor.afterPropertiesSet(); + this.interceptor.setValidationCallbackHandler(callbackHandler); + this.interceptor.afterPropertiesSet(); - interceptorThatKeepsSecurityHeader = new Wss4jSecurityInterceptor(); - interceptorThatKeepsSecurityHeader.setValidateRequest(true); - interceptorThatKeepsSecurityHeader.setSecureResponse(true); - interceptorThatKeepsSecurityHeader.setValidationActions("UsernameToken"); - interceptorThatKeepsSecurityHeader.setValidationCallbackHandler(callbackHandler); - interceptorThatKeepsSecurityHeader.setRemoveSecurityHeader(false); - interceptorThatKeepsSecurityHeader.afterPropertiesSet(); + this.interceptorThatKeepsSecurityHeader = new Wss4jSecurityInterceptor(); + this.interceptorThatKeepsSecurityHeader.setValidateRequest(true); + this.interceptorThatKeepsSecurityHeader.setSecureResponse(true); + this.interceptorThatKeepsSecurityHeader.setValidationActions("UsernameToken"); + this.interceptorThatKeepsSecurityHeader.setValidationCallbackHandler(callbackHandler); + this.interceptorThatKeepsSecurityHeader.setRemoveSecurityHeader(false); + this.interceptorThatKeepsSecurityHeader.afterPropertiesSet(); } @Test @@ -75,7 +75,7 @@ public abstract class Wss4jMessageInterceptorHeaderTest extends Wss4jTest { SoapMessage message = loadSoap11Message("usernameTokenPlainTextWithHeaders-soap.xml"); MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory()); - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); Object result = getMessage(message); assertThat(result).isNotNull(); @@ -102,7 +102,7 @@ public abstract class Wss4jMessageInterceptorHeaderTest extends Wss4jTest { SoapMessage message = loadSoap11Message("usernameTokenPlainTextWithHeaders-soap.xml"); MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory()); - interceptorThatKeepsSecurityHeader.validateMessage(message, messageContext); + this.interceptorThatKeepsSecurityHeader.validateMessage(message, messageContext); Object result = getMessage(message); assertThat(result).isNotNull(); @@ -132,16 +132,16 @@ public abstract class Wss4jMessageInterceptorHeaderTest extends Wss4jTest { SoapMessage message = loadSoap11Message("emptySecurityHeader-soap.xml"); MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory()); - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); }); } @Test public void testPreserveCustomHeaders() throws Exception { - interceptor.setSecurementActions("UsernameToken"); - interceptor.setSecurementUsername("Bert"); - interceptor.setSecurementPassword("Ernie"); + this.interceptor.setSecurementActions("UsernameToken"); + this.interceptor.setSecurementUsername("Bert"); + this.interceptor.setSecurementPassword("Ernie"); ByteArrayOutputStream os = new ByteArrayOutputStream(); SoapMessage message = loadSoap11Message("customHeader-soap.xml"); @@ -153,7 +153,7 @@ public abstract class Wss4jMessageInterceptorHeaderTest extends Wss4jTest { document); assertXpathNotExists("Header 2 exist", "/SOAP-ENV:Envelope/SOAP-ENV:Header/test:header2", document); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); SoapHeaderElement element = message.getSoapHeader().addHeaderElement(new QName("http://test", "header2")); element.setText("test2"); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java index 8a12791a..784fdf3c 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java @@ -44,9 +44,9 @@ public abstract class Wss4jMessageInterceptorSamlTest extends Wss4jTest { @Override protected void onSetup() throws Exception { - interceptor = new Wss4jSecurityInterceptor(); - interceptor.setSecurementActions("SAMLTokenSigned"); - interceptor.setValidationActions("SAMLTokenSigned Signature"); + this.interceptor = new Wss4jSecurityInterceptor(); + this.interceptor.setSecurementActions("SAMLTokenSigned"); + this.interceptor.setValidationActions("SAMLTokenSigned Signature"); CryptoFactoryBean cryptoFactoryBean = new CryptoFactoryBean(); cryptoFactoryBean.setCryptoProvider(Merlin.class); cryptoFactoryBean.setKeyStoreType("jceks"); @@ -59,28 +59,28 @@ public abstract class Wss4jMessageInterceptorSamlTest extends Wss4jTest { type.setAlias("rsaKey"); X509Certificate userCertificate = crypto.getX509Certificates(type)[0]; - interceptor.setSecurementSignatureCrypto(crypto); - interceptor.setValidationSignatureCrypto(crypto); - interceptor.setSecurementSamlCallbackHandler(getSamlCalbackHandler(crypto, userCertificate)); - interceptor.afterPropertiesSet(); + this.interceptor.setSecurementSignatureCrypto(crypto); + this.interceptor.setValidationSignatureCrypto(crypto); + this.interceptor.setSecurementSamlCallbackHandler(getSamlCalbackHandler(crypto, userCertificate)); + this.interceptor.afterPropertiesSet(); } @Test public void testAddSAML() throws Exception { - interceptor.setSecurementPassword("123456"); - interceptor.setSecurementUsername("rsaKey"); + this.interceptor.setSecurementPassword("123456"); + this.interceptor.setSecurementUsername("rsaKey"); SoapMessage message = loadSoap11Message("empty-soap.xml"); MessageContext messageContext = getSoap11MessageContext(message); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); Document document = getDocument(message); assertXpathExists("Absent SAML Assertion element", "/SOAP-ENV:Envelope/SOAP-ENV:Header/wsse:Security/saml:Assertion", document); // lets verify the signature that we've just generated - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); } protected CallbackHandler getSamlCalbackHandler(Crypto crypto, X509Certificate userCert) { @@ -106,13 +106,13 @@ public abstract class Wss4jMessageInterceptorSamlTest extends Wss4jTest { if (value instanceof SAMLCallback callback) { callback.setSamlVersion(Version.SAML_20); - callback.setIssuerCrypto(crypto); + callback.setIssuerCrypto(this.crypto); callback.setIssuerKeyName("rsaKey"); callback.setIssuerKeyPassword("123456"); callback.setIssuer("test-issuer"); SubjectBean subject = new SubjectBean("test-subject", "", SAML2Constants.CONF_BEARER); KeyInfoBean keyInfo = new KeyInfoBean(); - keyInfo.setCertificate(userCertificate); + keyInfo.setCertificate(this.userCertificate); subject.setKeyInfo(keyInfo); callback.setSubject(subject); callback.setSignAssertion(true); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java index 577d4021..1765d054 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java @@ -36,8 +36,8 @@ public abstract class Wss4jMessageInterceptorSignTest extends Wss4jTest { @Override protected void onSetup() throws Exception { - interceptor = new Wss4jSecurityInterceptor(); - interceptor.setValidationActions("Signature"); + this.interceptor = new Wss4jSecurityInterceptor(); + this.interceptor.setValidationActions("Signature"); CryptoFactoryBean cryptoFactoryBean = new CryptoFactoryBean(); Properties cryptoFactoryBeanConfig = new Properties(); @@ -50,9 +50,9 @@ public abstract class Wss4jMessageInterceptorSignTest extends Wss4jTest { cryptoFactoryBeanConfig.setProperty("org.apache.ws.security.crypto.merlin.file", "private.jks"); cryptoFactoryBean.setConfiguration(cryptoFactoryBeanConfig); cryptoFactoryBean.afterPropertiesSet(); - interceptor.setValidationSignatureCrypto(cryptoFactoryBean.getObject()); - interceptor.setSecurementSignatureCrypto(cryptoFactoryBean.getObject()); - interceptor.afterPropertiesSet(); + this.interceptor.setValidationSignatureCrypto(cryptoFactoryBean.getObject()); + this.interceptor.setSecurementSignatureCrypto(cryptoFactoryBean.getObject()); + this.interceptor.afterPropertiesSet(); } @Test @@ -61,7 +61,7 @@ public abstract class Wss4jMessageInterceptorSignTest extends Wss4jTest { SoapMessage message = loadSoap11Message("signed-soap.xml"); MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory()); - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); Object result = getMessage(message); assertThat(result).isNotNull(); @@ -75,10 +75,10 @@ public abstract class Wss4jMessageInterceptorSignTest extends Wss4jTest { SoapMessage message = loadSoap11Message("signed-soap.xml"); MessageContext messageContext = getSoap11MessageContext(message); - interceptor.setEnableSignatureConfirmation(true); - interceptor.validateMessage(message, messageContext); + this.interceptor.setEnableSignatureConfirmation(true); + this.interceptor.validateMessage(message, messageContext); WebServiceMessage response = messageContext.getResponse(); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); assertThat(response).isNotNull(); @@ -90,16 +90,16 @@ public abstract class Wss4jMessageInterceptorSignTest extends Wss4jTest { @Test public void testSignResponse() throws Exception { - interceptor.setSecurementActions("Signature"); - interceptor.setEnableSignatureConfirmation(false); - interceptor.setSecurementPassword("123456"); - interceptor.setSecurementUsername("rsaKey"); + this.interceptor.setSecurementActions("Signature"); + this.interceptor.setEnableSignatureConfirmation(false); + this.interceptor.setSecurementPassword("123456"); + this.interceptor.setSecurementUsername("rsaKey"); SoapMessage message = loadSoap11Message("empty-soap.xml"); MessageContext messageContext = getSoap11MessageContext(message); // interceptor.setSecurementSignatureKeyIdentifier("IssuerSerial"); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); Document document = getDocument(message); assertXpathExists("Absent SignatureConfirmation element", @@ -109,14 +109,14 @@ public abstract class Wss4jMessageInterceptorSignTest extends Wss4jTest { @Test public void testSignResponseWithSignatureUser() throws Exception { - interceptor.setSecurementActions("Signature"); - interceptor.setEnableSignatureConfirmation(false); - interceptor.setSecurementPassword("123456"); - interceptor.setSecurementSignatureUser("rsaKey"); + this.interceptor.setSecurementActions("Signature"); + this.interceptor.setEnableSignatureConfirmation(false); + this.interceptor.setSecurementPassword("123456"); + this.interceptor.setSecurementSignatureUser("rsaKey"); SoapMessage message = loadSoap11Message("empty-soap.xml"); MessageContext messageContext = getSoap11MessageContext(message); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); Document document = getDocument(message); assertXpathExists("Absent SignatureConfirmation element", diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java index afe4b238..227869a8 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java @@ -40,17 +40,17 @@ public abstract class Wss4jMessageInterceptorSoapActionTest extends Wss4jTest { @Override protected void onSetup() throws Exception { - users = new Properties(); - users.setProperty("Bert", "Ernie"); - interceptor = new Wss4jSecurityInterceptor(); - interceptor.setValidationActions("UsernameToken"); - interceptor.setSecurementActions("UsernameToken"); - interceptor.setSecurementPasswordType(WSConstants.PW_TEXT); + this.users = new Properties(); + this.users.setProperty("Bert", "Ernie"); + this.interceptor = new Wss4jSecurityInterceptor(); + this.interceptor.setValidationActions("UsernameToken"); + this.interceptor.setSecurementActions("UsernameToken"); + this.interceptor.setSecurementPasswordType(WSConstants.PW_TEXT); SimplePasswordValidationCallbackHandler callbackHandler = new SimplePasswordValidationCallbackHandler(); - callbackHandler.setUsers(users); - interceptor.setValidationCallbackHandler(callbackHandler); + callbackHandler.setUsers(this.users); + this.interceptor.setValidationCallbackHandler(callbackHandler); - interceptor.afterPropertiesSet(); + this.interceptor.afterPropertiesSet(); } @Test @@ -59,7 +59,7 @@ public abstract class Wss4jMessageInterceptorSoapActionTest extends Wss4jTest { SoapMessage message = loadSoap11Message("usernameTokenPlainText-soap.xml"); message.setSoapAction(SOAP_ACTION); MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory()); - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); assertThat(message.getSoapAction()).isNotNull(); assertThat(message.getSoapAction()).isEqualTo(SOAP_ACTION); @@ -71,7 +71,7 @@ public abstract class Wss4jMessageInterceptorSoapActionTest extends Wss4jTest { message.setSoapAction(SOAP_ACTION); WebServiceMessageFactory messageFactory = getSoap12MessageFactory(); MessageContext messageContext = new DefaultMessageContext(message, messageFactory); - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); assertThat(message.getSoapAction()).isNotNull(); assertThat(message.getSoapAction()).isEqualTo(SOAP_ACTION); @@ -81,10 +81,10 @@ public abstract class Wss4jMessageInterceptorSoapActionTest extends Wss4jTest { public void testPreserveSoapActionOnSecurement() throws Exception { SoapMessage message = loadSoap11Message("empty-soap.xml"); message.setSoapAction(SOAP_ACTION); - interceptor.setSecurementUsername("Bert"); - interceptor.setSecurementPassword("Ernie"); + this.interceptor.setSecurementUsername("Bert"); + this.interceptor.setSecurementPassword("Ernie"); MessageContext messageContext = getSoap11MessageContext(message); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); assertThat(message.getSoapAction()).isNotNull(); assertThat(message.getSoapAction()).isEqualTo(SOAP_ACTION); @@ -94,10 +94,10 @@ public abstract class Wss4jMessageInterceptorSoapActionTest extends Wss4jTest { public void testPreserveSoap12ActionOnSecurement() throws Exception { SoapMessage message = loadSoap12Message("empty-soap12.xml"); message.setSoapAction(SOAP_ACTION); - interceptor.setSecurementUsername("Bert"); - interceptor.setSecurementPassword("Ernie"); + this.interceptor.setSecurementUsername("Bert"); + this.interceptor.setSecurementPassword("Ernie"); MessageContext messageContext = getSoap12MessageContext(message); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); assertThat(message.getSoapAction()).isNotNull(); assertThat(message.getSoapAction()).isEqualTo(SOAP_ACTION); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java index a54fb10f..b503b1f0 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java @@ -45,14 +45,14 @@ public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest e @Override protected void onSetup() { - authenticationManager = createMock(AuthenticationManager.class); - users.setProperty("Bert", "Ernie,ROLE_TEST"); + this.authenticationManager = createMock(AuthenticationManager.class); + this.users.setProperty("Bert", "Ernie,ROLE_TEST"); } @AfterEach public void tearDown() { - verify(authenticationManager); + verify(this.authenticationManager); SecurityContextHolder.clearContext(); } @@ -121,7 +121,7 @@ public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest e } SpringSecurityPasswordValidationCallbackHandler callbackHandler = new SpringSecurityPasswordValidationCallbackHandler(); - InMemoryUserDetailsManager userDetailsManager = new InMemoryUserDetailsManager(users); + InMemoryUserDetailsManager userDetailsManager = new InMemoryUserDetailsManager(this.users); callbackHandler.setUserDetailsService(userDetailsManager); if (digest) { @@ -133,7 +133,7 @@ public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest e interceptor.setValidationCallbackHandler(callbackHandler); interceptor.afterPropertiesSet(); - replay(authenticationManager); + replay(this.authenticationManager); return interceptor; } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java index d1e6cad3..dbb79871 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java @@ -105,10 +105,10 @@ public abstract class Wss4jMessageInterceptorTimestampTest extends Wss4jTest { MessageContext context = new DefaultMessageContext(message, getSoap11MessageFactory()); interceptor.secureMessage(message, context); - String created = xpathTemplate.evaluateAsString( + String created = this.xpathTemplate.evaluateAsString( "/SOAP-ENV:Envelope/SOAP-ENV:Header/wsse:Security/wsu:Timestamp/wsu:Created/text()", message.getEnvelope().getSource()); - String expires = xpathTemplate.evaluateAsString( + String expires = this.xpathTemplate.evaluateAsString( "/SOAP-ENV:Envelope/SOAP-ENV:Header/wsse:Security/wsu:Timestamp/wsu:Expires/text()", message.getEnvelope().getSource()); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java index 49ce5f86..607f5b72 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java @@ -35,7 +35,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTest extends Wss4jTest @Override protected void onSetup() { - users.setProperty("Bert", "Ernie"); + this.users.setProperty("Bert", "Ernie"); } @Test @@ -171,7 +171,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTest extends Wss4jTest interceptor.setSecurementActions(actions); } SimplePasswordValidationCallbackHandler callbackHandler = new SimplePasswordValidationCallbackHandler(); - callbackHandler.setUsers(users); + callbackHandler.setUsers(this.users); if (digest) { interceptor.setSecurementPasswordType(WSConstants.PW_DIGEST); } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java index 6cdbb74d..25ac989b 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java @@ -32,9 +32,9 @@ public abstract class Wss4jMessageInterceptorX509Test extends Wss4jTest { @Override protected void onSetup() throws Exception { - interceptor = new Wss4jSecurityInterceptor(); - interceptor.setSecurementActions("Signature"); - interceptor.setValidationActions("Signature"); + this.interceptor = new Wss4jSecurityInterceptor(); + this.interceptor.setSecurementActions("Signature"); + this.interceptor.setValidationActions("Signature"); CryptoFactoryBean cryptoFactoryBean = new CryptoFactoryBean(); cryptoFactoryBean.setCryptoProvider(Merlin.class); cryptoFactoryBean.setKeyStoreType("jceks"); @@ -42,29 +42,29 @@ public abstract class Wss4jMessageInterceptorX509Test extends Wss4jTest { cryptoFactoryBean.setKeyStoreLocation(new ClassPathResource("private.jks")); cryptoFactoryBean.afterPropertiesSet(); - interceptor.setSecurementSignatureCrypto(cryptoFactoryBean.getObject()); - interceptor.setValidationSignatureCrypto(cryptoFactoryBean.getObject()); - interceptor.afterPropertiesSet(); + this.interceptor.setSecurementSignatureCrypto(cryptoFactoryBean.getObject()); + this.interceptor.setValidationSignatureCrypto(cryptoFactoryBean.getObject()); + this.interceptor.afterPropertiesSet(); } @Test public void testAddCertificate() throws Exception { - interceptor.setSecurementPassword("123456"); - interceptor.setSecurementUsername("rsaKey"); + this.interceptor.setSecurementPassword("123456"); + this.interceptor.setSecurementUsername("rsaKey"); SoapMessage message = loadSoap11Message("empty-soap.xml"); MessageContext messageContext = getSoap11MessageContext(message); - interceptor.setSecurementSignatureKeyIdentifier("DirectReference"); + this.interceptor.setSecurementSignatureKeyIdentifier("DirectReference"); - interceptor.secureMessage(message, messageContext); + this.interceptor.secureMessage(message, messageContext); Document document = getDocument(message); assertXpathExists("Absent BinarySecurityToken element", "/SOAP-ENV:Envelope/SOAP-ENV:Header/wsse:Security/wsse:BinarySecurityToken", document); // lets verify the signature that we've just generated - interceptor.validateMessage(message, messageContext); + this.interceptor.validateMessage(message, messageContext); } } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java index fa4126ae..52a41acf 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java @@ -58,12 +58,12 @@ public abstract class Wss4jTest { @BeforeEach public final void setUp() throws Exception { - if (!saajTest) { + if (!this.saajTest) { throw new IllegalArgumentException("test class name must start with Saaj"); } - saajSoap11MessageFactory = MessageFactory.newInstance(); - saajSoap12MessageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); + this.saajSoap11MessageFactory = MessageFactory.newInstance(); + this.saajSoap12MessageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); Map namespaces = new HashMap<>(); namespaces.put("SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/"); @@ -76,7 +76,7 @@ public abstract class Wss4jTest { namespaces.put("saml", "urn:oasis:names:tc:SAML:2.0:assertion"); namespaces.put("test", "http://test"); - xpathTemplate.setNamespaces(namespaces); + this.xpathTemplate.setNamespaces(namespaces); onSetup(); } @@ -84,7 +84,7 @@ public abstract class Wss4jTest { protected void assertXpathEvaluatesTo(String message, String expectedValue, String xpathExpression, Document document) { - String actualValue = xpathTemplate.evaluateAsString(xpathExpression, new DOMSource(document)); + String actualValue = this.xpathTemplate.evaluateAsString(xpathExpression, new DOMSource(document)); assertThat(actualValue).isEqualTo(expectedValue); } @@ -92,28 +92,28 @@ public abstract class Wss4jTest { protected void assertXpathEvaluatesTo(String message, String expectedValue, String xpathExpression, String document) { - String actualValue = xpathTemplate.evaluateAsString(xpathExpression, new StringSource(document)); + String actualValue = this.xpathTemplate.evaluateAsString(xpathExpression, new StringSource(document)); assertThat(actualValue).isEqualTo(expectedValue); } protected void assertXpathExists(String message, String xpathExpression, Document document) { - Node node = xpathTemplate.evaluateAsNode(xpathExpression, new DOMSource(document)); + Node node = this.xpathTemplate.evaluateAsNode(xpathExpression, new DOMSource(document)); assertThat(node).isNotNull(); } protected void assertXpathNotExists(String message, String xpathExpression, Document document) { - Node node = xpathTemplate.evaluateAsNode(xpathExpression, new DOMSource(document)); + Node node = this.xpathTemplate.evaluateAsNode(xpathExpression, new DOMSource(document)); assertThat(node).isNull(); } protected void assertXpathNotExists(String message, String xpathExpression, String document) { - Node node = xpathTemplate.evaluateAsNode(xpathExpression, new StringSource(document)); + Node node = this.xpathTemplate.evaluateAsNode(xpathExpression, new StringSource(document)); assertThat(node).isNull(); } @@ -126,8 +126,8 @@ public abstract class Wss4jTest { assertThat(resource.exists()).isTrue(); try (InputStream is = resource.getInputStream()) { - return new SaajSoapMessage(saajSoap11MessageFactory.createMessage(mimeHeaders, is), - saajSoap11MessageFactory); + return new SaajSoapMessage(this.saajSoap11MessageFactory.createMessage(mimeHeaders, is), + this.saajSoap11MessageFactory); } } @@ -140,8 +140,8 @@ public abstract class Wss4jTest { assertThat(resource.exists()).isTrue(); try (InputStream is = resource.getInputStream()) { - return new SaajSoapMessage(saajSoap12MessageFactory.createMessage(mimeHeaders, is), - saajSoap12MessageFactory); + return new SaajSoapMessage(this.saajSoap12MessageFactory.createMessage(mimeHeaders, is), + this.saajSoap12MessageFactory); } } @@ -169,7 +169,7 @@ public abstract class Wss4jTest { protected SoapMessage loadSoap11Message(String fileName) throws Exception { - if (saajTest) { + if (this.saajTest) { return loadSaaj11Message(fileName); } @@ -178,7 +178,7 @@ public abstract class Wss4jTest { protected SoapMessage loadSoap12Message(String fileName) throws Exception { - if (saajTest) { + if (this.saajTest) { return loadSaaj12Message(fileName); } @@ -187,8 +187,8 @@ public abstract class Wss4jTest { protected SoapMessageFactory getSoap11MessageFactory() { - if (saajTest) { - return new SaajSoapMessageFactory(saajSoap11MessageFactory); + if (this.saajTest) { + return new SaajSoapMessageFactory(this.saajSoap11MessageFactory); } throw new IllegalArgumentException(); @@ -197,8 +197,8 @@ public abstract class Wss4jTest { protected SoapMessageFactory getSoap12MessageFactory() { SoapMessageFactory messageFactory; - if (saajTest) { - messageFactory = new SaajSoapMessageFactory(saajSoap12MessageFactory); + if (this.saajTest) { + messageFactory = new SaajSoapMessageFactory(this.saajSoap12MessageFactory); } else throw new IllegalArgumentException(); @@ -208,7 +208,7 @@ public abstract class Wss4jTest { protected Document getDocument(SoapMessage message) { - if (saajTest) { + if (this.saajTest) { return ((SaajSoapMessage) message).getSaajMessage().getSOAPPart(); } throw new IllegalArgumentException(); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java index b5a4e054..4a5233ba 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java @@ -36,8 +36,8 @@ public class KeyStoreCallbackHandlerTest { @BeforeEach public void setUp() throws Exception { - callbackHandler = new KeyStoreCallbackHandler(); - callback = new WSPasswordCallback("secretkey", WSPasswordCallback.SECRET_KEY); + this.callbackHandler = new KeyStoreCallbackHandler(); + this.callback = new WSPasswordCallback("secretkey", WSPasswordCallback.SECRET_KEY); KeyStoreFactoryBean factory = new KeyStoreFactoryBean(); factory.setLocation(new ClassPathResource("private.jks")); @@ -45,16 +45,16 @@ public class KeyStoreCallbackHandlerTest { factory.setType("JCEKS"); factory.afterPropertiesSet(); KeyStore keyStore = factory.getObject(); - callbackHandler.setKeyStore(keyStore); - callbackHandler.setSymmetricKeyPassword("123456"); + this.callbackHandler.setKeyStore(keyStore); + this.callbackHandler.setSymmetricKeyPassword("123456"); } @Test public void testHandleKeyName() throws Exception { - callbackHandler.handleInternal(callback); + this.callbackHandler.handleInternal(this.callback); - assertThat(callback.getKey()).isNotNull(); + assertThat(this.callback.getKey()).isNotNull(); } } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java index 60fe2ec2..9227081a 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java @@ -61,30 +61,30 @@ public class SpringSecurityPasswordValidationCallbackHandlerTest { // SecurityContextHolder} isn't clean SecurityContextHolder.clearContext(); - callbackHandler = new SpringSecurityPasswordValidationCallbackHandler(); + this.callbackHandler = new SpringSecurityPasswordValidationCallbackHandler(); - grantedAuthority = new SimpleGrantedAuthority("ROLE_1"); - user = new User("Ernie", "Bert", true, true, true, true, Collections.singleton(grantedAuthority)); + this.grantedAuthority = new SimpleGrantedAuthority("ROLE_1"); + this.user = new User("Ernie", "Bert", true, true, true, true, Collections.singleton(this.grantedAuthority)); WSUsernameTokenPrincipalImpl principal = new WSUsernameTokenPrincipalImpl("Ernie", true); - callback = new UsernameTokenPrincipalCallback(principal); + this.callback = new UsernameTokenPrincipalCallback(principal); - passwordCallback = new WSPasswordCallback("Ernie", null, "type", WSPasswordCallback.USERNAME_TOKEN); + this.passwordCallback = new WSPasswordCallback("Ernie", null, "type", WSPasswordCallback.USERNAME_TOKEN); } @Test public void testHandleUsernameToken() throws Exception { UserDetailsService userDetailsService = createMock(UserDetailsService.class); - callbackHandler.setUserDetailsService(userDetailsService); + this.callbackHandler.setUserDetailsService(userDetailsService); - expect(userDetailsService.loadUserByUsername("Ernie")).andReturn(user).anyTimes(); + expect(userDetailsService.loadUserByUsername("Ernie")).andReturn(this.user).anyTimes(); replay(userDetailsService); - callbackHandler.handleUsernameToken(passwordCallback); + this.callbackHandler.handleUsernameToken(this.passwordCallback); - assertThat(passwordCallback.getPassword()).isEqualTo("Bert"); + assertThat(this.passwordCallback.getPassword()).isEqualTo("Bert"); verify(userDetailsService); } @@ -93,16 +93,16 @@ public class SpringSecurityPasswordValidationCallbackHandlerTest { public void testHandleUsernameTokenUserNotFound() throws Exception { UserDetailsService userDetailsService = createMock(UserDetailsService.class); - callbackHandler.setUserDetailsService(userDetailsService); + this.callbackHandler.setUserDetailsService(userDetailsService); expect(userDetailsService.loadUserByUsername("Ernie")) .andThrow(new UsernameNotFoundException("User 'Ernie' not found")); replay(userDetailsService); - callbackHandler.handleUsernameToken(passwordCallback); + this.callbackHandler.handleUsernameToken(this.passwordCallback); - assertThat(passwordCallback.getPassword()).isNull(); + assertThat(this.passwordCallback.getPassword()).isNull(); verify(userDetailsService); } @@ -111,13 +111,13 @@ public class SpringSecurityPasswordValidationCallbackHandlerTest { public void testHandleUsernameTokenPrincipal() throws Exception { UserDetailsService userDetailsService = createMock(UserDetailsService.class); - callbackHandler.setUserDetailsService(userDetailsService); + this.callbackHandler.setUserDetailsService(userDetailsService); - expect(userDetailsService.loadUserByUsername("Ernie")).andReturn(user).anyTimes(); + expect(userDetailsService.loadUserByUsername("Ernie")).andReturn(this.user).anyTimes(); replay(userDetailsService); - callbackHandler.handleUsernameTokenPrincipal(callback); + this.callbackHandler.handleUsernameTokenPrincipal(this.callback); SecurityContext context = SecurityContextHolder.getContext(); assertThat(context).isNotNull(); @@ -130,9 +130,9 @@ public class SpringSecurityPasswordValidationCallbackHandlerTest { assertThat(authorities).isNotNull(); assertThat(authorities).isNotEmpty(); - assertThat(authorities.iterator().next()).isEqualTo(grantedAuthority); + assertThat(authorities.iterator().next()).isEqualTo(this.grantedAuthority); - assertThat(authentication.getDetails()).isEqualTo(user); + assertThat(authentication.getDetails()).isEqualTo(this.user); verify(userDetailsService); } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTest.java index 179418bd..a0c08d79 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTest.java @@ -32,7 +32,7 @@ public class CryptoFactoryBeanTest { @BeforeEach public void setUp() { - factoryBean = new CryptoFactoryBean(); + this.factoryBean = new CryptoFactoryBean(); } @Test @@ -45,10 +45,10 @@ public class CryptoFactoryBeanTest { configuration.setProperty("org.apache.ws.security.crypto.merlin.keystore.password", "123456"); configuration.setProperty("org.apache.ws.security.crypto.merlin.file", "private.jks"); - factoryBean.setConfiguration(configuration); - factoryBean.afterPropertiesSet(); + this.factoryBean.setConfiguration(configuration); + this.factoryBean.afterPropertiesSet(); - Object result = factoryBean.getObject(); + Object result = this.factoryBean.getObject(); assertThat(result).isNotNull(); assertThat(result).isInstanceOf(Merlin.class); @@ -57,11 +57,11 @@ public class CryptoFactoryBeanTest { @Test public void testProperties() throws Exception { - factoryBean.setKeyStoreType("jceks"); - factoryBean.setKeyStorePassword("123456"); - factoryBean.setKeyStoreLocation(new ClassPathResource("private.jks")); - factoryBean.afterPropertiesSet(); - Object result = factoryBean.getObject(); + this.factoryBean.setKeyStoreType("jceks"); + this.factoryBean.setKeyStorePassword("123456"); + this.factoryBean.setKeyStoreLocation(new ClassPathResource("private.jks")); + this.factoryBean.afterPropertiesSet(); + Object result = this.factoryBean.getObject(); assertThat(result).isNotNull(); assertThat(result).isInstanceOf(Merlin.class); diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java index d6901ddb..fd6ee565 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java @@ -66,12 +66,12 @@ public class HttpExchangeConnection extends AbstractReceiverConnection /** Returns the {@code HttpExchange} for this connection. */ public HttpExchange getHttpExchange() { - return httpExchange; + return this.httpExchange; } @Override public URI getUri() throws URISyntaxException { - return httpExchange.getRequestURI(); + return this.httpExchange.getRequestURI(); } void setChunkedEncoding(boolean chunkedEncoding) { @@ -80,7 +80,7 @@ public class HttpExchangeConnection extends AbstractReceiverConnection @Override public void endpointNotFound() { - responseStatusCode = HttpTransportConstants.STATUS_NOT_FOUND; + this.responseStatusCode = HttpTransportConstants.STATUS_NOT_FOUND; } /* @@ -103,18 +103,18 @@ public class HttpExchangeConnection extends AbstractReceiverConnection @Override public Iterator getRequestHeaderNames() throws IOException { - return httpExchange.getRequestHeaders().keySet().iterator(); + return this.httpExchange.getRequestHeaders().keySet().iterator(); } @Override public Iterator getRequestHeaders(String name) throws IOException { - List headers = httpExchange.getRequestHeaders().get(name); + List headers = this.httpExchange.getRequestHeaders().get(name); return headers != null ? headers.iterator() : Collections.emptyIterator(); } @Override protected InputStream getRequestInputStream() throws IOException { - return httpExchange.getRequestBody(); + return this.httpExchange.getRequestBody(); } /* @@ -123,41 +123,41 @@ public class HttpExchangeConnection extends AbstractReceiverConnection @Override public void addResponseHeader(String name, String value) throws IOException { - httpExchange.getResponseHeaders().add(name, value); + this.httpExchange.getResponseHeaders().add(name, value); } @Override protected OutputStream getResponseOutputStream() throws IOException { - if (chunkedEncoding) { - httpExchange.sendResponseHeaders(responseStatusCode, 0); - return httpExchange.getResponseBody(); + if (this.chunkedEncoding) { + this.httpExchange.sendResponseHeaders(this.responseStatusCode, 0); + return this.httpExchange.getResponseBody(); } else { - if (responseBuffer == null) { - responseBuffer = new ByteArrayOutputStream(); + if (this.responseBuffer == null) { + this.responseBuffer = new ByteArrayOutputStream(); } - return responseBuffer; + return this.responseBuffer; } } @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { - if (!chunkedEncoding) { - byte[] buf = responseBuffer.toByteArray(); - httpExchange.sendResponseHeaders(responseStatusCode, buf.length); - OutputStream responseBody = httpExchange.getResponseBody(); + if (!this.chunkedEncoding) { + byte[] buf = this.responseBuffer.toByteArray(); + this.httpExchange.sendResponseHeaders(this.responseStatusCode, buf.length); + OutputStream responseBody = this.httpExchange.getResponseBody(); FileCopyUtils.copy(buf, responseBody); } - responseBuffer = null; + this.responseBuffer = null; } @Override public void onClose() throws IOException { - if (responseStatusCode == HttpTransportConstants.STATUS_ACCEPTED - || responseStatusCode == HttpTransportConstants.STATUS_NOT_FOUND) { - httpExchange.sendResponseHeaders(responseStatusCode, -1); + if (this.responseStatusCode == HttpTransportConstants.STATUS_ACCEPTED + || this.responseStatusCode == HttpTransportConstants.STATUS_NOT_FOUND) { + this.httpExchange.sendResponseHeaders(this.responseStatusCode, -1); } - httpExchange.close(); + this.httpExchange.close(); } /* @@ -166,17 +166,17 @@ public class HttpExchangeConnection extends AbstractReceiverConnection @Override public boolean hasFault() throws IOException { - return responseStatusCode == HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR; + return this.responseStatusCode == HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR; } @Override @Deprecated public void setFault(boolean fault) throws IOException { if (fault) { - responseStatusCode = HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR; + this.responseStatusCode = HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR; } else { - responseStatusCode = HttpTransportConstants.STATUS_OK; + this.responseStatusCode = HttpTransportConstants.STATUS_OK; } } @@ -184,14 +184,14 @@ public class HttpExchangeConnection extends AbstractReceiverConnection public void setFaultCode(QName faultCode) throws IOException { if (faultCode != null) { if (SOAPConstants.SOAP_SENDER_FAULT.equals(faultCode)) { - responseStatusCode = HttpTransportConstants.STATUS_BAD_REQUEST; + this.responseStatusCode = HttpTransportConstants.STATUS_BAD_REQUEST; } else { - responseStatusCode = HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR; + this.responseStatusCode = HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR; } } else { - responseStatusCode = HttpTransportConstants.STATUS_OK; + this.responseStatusCode = HttpTransportConstants.STATUS_OK; } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java index 29aa0a1b..4b4f0dc1 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java @@ -128,7 +128,8 @@ public class HttpsUrlConnectionMessageSender extends HttpUrlConnectionMessageSen @Override public void afterPropertiesSet() throws Exception { Assert.isTrue( - !(ObjectUtils.isEmpty(keyManagers) && ObjectUtils.isEmpty(trustManagers) && (sslSocketFactory == null)), + !(ObjectUtils.isEmpty(this.keyManagers) && ObjectUtils.isEmpty(this.trustManagers) + && (this.sslSocketFactory == null)), "Setting either 'keyManagers', 'trustManagers' or 'sslSocketFactory' is required"); } @@ -138,8 +139,8 @@ public class HttpsUrlConnectionMessageSender extends HttpUrlConnectionMessageSen if (connection instanceof HttpsURLConnection httpsConnection) { httpsConnection.setSSLSocketFactory(createSslSocketFactory()); - if (hostnameVerifier != null) { - httpsConnection.setHostnameVerifier(hostnameVerifier); + if (this.hostnameVerifier != null) { + httpsConnection.setHostnameVerifier(this.hostnameVerifier); } } } @@ -149,13 +150,15 @@ public class HttpsUrlConnectionMessageSender extends HttpUrlConnectionMessageSen return this.sslSocketFactory; } try { - SSLContext sslContext = StringUtils.hasLength(sslProvider) - ? SSLContext.getInstance(sslProtocol, sslProvider) : SSLContext.getInstance(sslProtocol); - sslContext.init(keyManagers, trustManagers, rnd); - if (logger.isDebugEnabled()) { - logger.debug("Initialized SSL Context with key managers [" - + StringUtils.arrayToCommaDelimitedString(keyManagers) + "] trust managers [" - + StringUtils.arrayToCommaDelimitedString(trustManagers) + "] secure random [" + rnd + "]"); + SSLContext sslContext = StringUtils.hasLength(this.sslProvider) + ? SSLContext.getInstance(this.sslProtocol, this.sslProvider) + : SSLContext.getInstance(this.sslProtocol); + sslContext.init(this.keyManagers, this.trustManagers, this.rnd); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Initialized SSL Context with key managers [" + + StringUtils.arrayToCommaDelimitedString(this.keyManagers) + "] trust managers [" + + StringUtils.arrayToCommaDelimitedString(this.trustManagers) + "] secure random [" + this.rnd + + "]"); } return sslContext.getSocketFactory(); } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java index c3fa326a..08e89ea6 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java @@ -51,12 +51,12 @@ public class WebServiceMessageReceiverHttpHandler extends SimpleWebServiceMessag public void handle(HttpExchange httpExchange) throws IOException { if (HttpTransportConstants.METHOD_POST.equals(httpExchange.getRequestMethod())) { HttpExchangeConnection connection = new HttpExchangeConnection(httpExchange); - connection.setChunkedEncoding(chunkedEncoding); + connection.setChunkedEncoding(this.chunkedEncoding); try { handleConnection(connection); } catch (Exception ex) { - logger.error(ex); + this.logger.error(ex); } } else { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java index cad78e99..4ef85979 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java @@ -55,7 +55,7 @@ public class WsdlDefinitionHttpHandler extends TransformerObjectSupport implemen @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(definition, "'definition' is required"); + Assert.notNull(this.definition, "'definition' is required"); } @Override @@ -65,7 +65,7 @@ public class WsdlDefinitionHttpHandler extends TransformerObjectSupport implemen Headers headers = httpExchange.getResponseHeaders(); headers.set(HttpTransportConstants.HEADER_CONTENT_TYPE, CONTENT_TYPE); ByteArrayOutputStream os = new ByteArrayOutputStream(); - transform(definition.getSource(), new StreamResult(os)); + transform(this.definition.getSource(), new StreamResult(os)); byte[] buf = os.toByteArray(); httpExchange.sendResponseHeaders(HttpTransportConstants.STATUS_OK, buf.length); FileCopyUtils.copy(buf, httpExchange.getResponseBody()); @@ -75,7 +75,7 @@ public class WsdlDefinitionHttpHandler extends TransformerObjectSupport implemen } } catch (TransformerException ex) { - logger.error(ex, ex); + this.logger.error(ex, ex); } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java index dbe29cf8..e1464a02 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageInputStream.java @@ -43,7 +43,7 @@ class BytesMessageInputStream extends InputStream { @Override public int read(byte[] b) throws IOException { try { - return message.readBytes(b); + return this.message.readBytes(b); } catch (JMSException ex) { throw new JmsTransportException(ex); @@ -54,7 +54,7 @@ class BytesMessageInputStream extends InputStream { public int read(byte[] b, int off, int len) throws IOException { if (off == 0) { try { - return message.readBytes(b, len); + return this.message.readBytes(b, len); } catch (JMSException ex) { throw new JmsTransportException(ex); @@ -68,7 +68,7 @@ class BytesMessageInputStream extends InputStream { @Override public int read() throws IOException { try { - return message.readByte(); + return this.message.readByte(); } catch (MessageEOFException ex) { return -1; diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java index 3a55ac41..d8700a96 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/BytesMessageOutputStream.java @@ -42,7 +42,7 @@ class BytesMessageOutputStream extends OutputStream { @Override public void write(byte[] b) throws IOException { try { - message.writeBytes(b); + this.message.writeBytes(b); } catch (JMSException ex) { throw new JmsTransportException(ex); @@ -52,7 +52,7 @@ class BytesMessageOutputStream extends OutputStream { @Override public void write(byte[] b, int off, int len) throws IOException { try { - message.writeBytes(b, off, len); + this.message.writeBytes(b, off, len); } catch (JMSException ex) { throw new JmsTransportException(ex); @@ -62,7 +62,7 @@ class BytesMessageOutputStream extends OutputStream { @Override public void write(int b) throws IOException { try { - message.writeByte((byte) b); + this.message.writeByte((byte) b); } catch (JMSException ex) { throw new JmsTransportException(ex); diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiver.java index ab21a704..f6d7ec60 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageReceiver.java @@ -74,13 +74,13 @@ public class JmsMessageReceiver extends SimpleWebServiceMessageReceiverObjectSup connection = new JmsReceiverConnection((BytesMessage) request, session); } else if (request instanceof TextMessage) { - connection = new JmsReceiverConnection((TextMessage) request, textMessageEncoding, session); + connection = new JmsReceiverConnection((TextMessage) request, this.textMessageEncoding, session); } else { throw new IllegalArgumentException("Wrong message type: [" + request.getClass() + "]. Only BytesMessages or TextMessages can be handled."); } - connection.setPostProcessor(postProcessor); + connection.setPostProcessor(this.postProcessor); handleConnection(connection); } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java index a557c249..09e5367b 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java @@ -176,12 +176,12 @@ public class JmsMessageSender extends JmsDestinationAccessor implements WebServi jmsSession, requestDestination, requestMessage); wsConnection.setDeliveryMode(JmsTransportUtils.getDeliveryMode(uri)); wsConnection.setPriority(JmsTransportUtils.getPriority(uri)); - wsConnection.setReceiveTimeout(receiveTimeout); + wsConnection.setReceiveTimeout(this.receiveTimeout); wsConnection.setResponseDestination(resolveResponseDestination(jmsSession, uri)); wsConnection.setTimeToLive(JmsTransportUtils.getTimeToLive(uri)); - wsConnection.setTextMessageEncoding(textMessageEncoding); + wsConnection.setTextMessageEncoding(this.textMessageEncoding); wsConnection.setSessionTransacted(isSessionTransacted()); - wsConnection.setPostProcessor(postProcessor); + wsConnection.setPostProcessor(this.postProcessor); return wsConnection; } catch (JMSException ex) { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java index e84e6a00..65ed4c57 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsReceiverConnection.java @@ -98,7 +98,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { * {@link BytesMessage} or a {@link TextMessage}. */ public Message getRequestMessage() { - return requestMessage; + return this.requestMessage; } /** @@ -106,7 +106,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { * {@link BytesMessage} or a {@link TextMessage}. */ public Message getResponseMessage() { - return responseMessage; + return this.responseMessage; } /* @@ -116,7 +116,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { @Override public URI getUri() throws URISyntaxException { try { - return JmsTransportUtils.toUri(requestMessage.getJMSDestination()); + return JmsTransportUtils.toUri(this.requestMessage.getJMSDestination()); } catch (JMSException ex) { throw new URISyntaxException("", ex.getMessage()); @@ -144,7 +144,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { @Override public Iterator getRequestHeaderNames() throws IOException { try { - return JmsTransportUtils.getHeaderNames(requestMessage); + return JmsTransportUtils.getHeaderNames(this.requestMessage); } catch (JMSException ex) { throw new JmsTransportException("Could not get property names", ex); @@ -154,7 +154,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { @Override public Iterator getRequestHeaders(String name) throws IOException { try { - return JmsTransportUtils.getHeaders(requestMessage, name); + return JmsTransportUtils.getHeaders(this.requestMessage, name); } catch (JMSException ex) { throw new JmsTransportException("Could not get property value", ex); @@ -163,14 +163,14 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { @Override protected InputStream getRequestInputStream() throws IOException { - if (requestMessage instanceof BytesMessage) { - return new BytesMessageInputStream((BytesMessage) requestMessage); + if (this.requestMessage instanceof BytesMessage) { + return new BytesMessageInputStream((BytesMessage) this.requestMessage); } - else if (requestMessage instanceof TextMessage) { - return new TextMessageInputStream((TextMessage) requestMessage, textMessageEncoding); + else if (this.requestMessage instanceof TextMessage) { + return new TextMessageInputStream((TextMessage) this.requestMessage, this.textMessageEncoding); } else { - throw new IllegalStateException("Unknown request message type [" + requestMessage + "]"); + throw new IllegalStateException("Unknown request message type [" + this.requestMessage + "]"); } } @@ -181,20 +181,20 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { try { - if (requestMessage instanceof BytesMessage) { - responseMessage = session.createBytesMessage(); + if (this.requestMessage instanceof BytesMessage) { + this.responseMessage = this.session.createBytesMessage(); } - else if (requestMessage instanceof TextMessage) { - responseMessage = session.createTextMessage(); + else if (this.requestMessage instanceof TextMessage) { + this.responseMessage = this.session.createTextMessage(); } else { - throw new IllegalStateException("Unknown request message type [" + requestMessage + "]"); + throw new IllegalStateException("Unknown request message type [" + this.requestMessage + "]"); } - String correlation = requestMessage.getJMSCorrelationID(); + String correlation = this.requestMessage.getJMSCorrelationID(); if (correlation == null) { - correlation = requestMessage.getJMSMessageID(); + correlation = this.requestMessage.getJMSMessageID(); } - responseMessage.setJMSCorrelationID(correlation); + this.responseMessage.setJMSCorrelationID(correlation); } catch (JMSException ex) { throw new JmsTransportException("Could not create response message", ex); @@ -204,7 +204,7 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { @Override public void addResponseHeader(String name, String value) throws IOException { try { - JmsTransportUtils.addHeader(responseMessage, name, value); + JmsTransportUtils.addHeader(this.responseMessage, name, value); } catch (JMSException ex) { throw new JmsTransportException("Could not set property", ex); @@ -213,14 +213,14 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { @Override protected OutputStream getResponseOutputStream() throws IOException { - if (responseMessage instanceof BytesMessage) { - return new BytesMessageOutputStream((BytesMessage) responseMessage); + if (this.responseMessage instanceof BytesMessage) { + return new BytesMessageOutputStream((BytesMessage) this.responseMessage); } - else if (responseMessage instanceof TextMessage) { - return new TextMessageOutputStream((TextMessage) responseMessage, textMessageEncoding); + else if (this.responseMessage instanceof TextMessage) { + return new TextMessageOutputStream((TextMessage) this.responseMessage, this.textMessageEncoding); } else { - throw new IllegalStateException("Unknown response message type [" + responseMessage + "]"); + throw new IllegalStateException("Unknown response message type [" + this.responseMessage + "]"); } } @@ -228,14 +228,14 @@ public class JmsReceiverConnection extends AbstractReceiverConnection { protected void onSendAfterWrite(WebServiceMessage message) throws IOException { MessageProducer messageProducer = null; try { - if (requestMessage.getJMSReplyTo() != null) { - messageProducer = session.createProducer(requestMessage.getJMSReplyTo()); - messageProducer.setDeliveryMode(requestMessage.getJMSDeliveryMode()); - messageProducer.setPriority(requestMessage.getJMSPriority()); - if (postProcessor != null) { - responseMessage = postProcessor.postProcessMessage(responseMessage); + if (this.requestMessage.getJMSReplyTo() != null) { + messageProducer = this.session.createProducer(this.requestMessage.getJMSReplyTo()); + messageProducer.setDeliveryMode(this.requestMessage.getJMSDeliveryMode()); + messageProducer.setPriority(this.requestMessage.getJMSPriority()); + if (this.postProcessor != null) { + this.responseMessage = this.postProcessor.postProcessMessage(this.responseMessage); } - messageProducer.send(responseMessage); + messageProducer.send(this.responseMessage); } } catch (JMSException ex) { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java index c3d5e69a..7a312f8a 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java @@ -104,7 +104,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { * {@link BytesMessage} or a {@link TextMessage}. */ public Message getRequestMessage() { - return requestMessage; + return this.requestMessage; } /** @@ -112,7 +112,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { * {@link BytesMessage} or a {@link TextMessage}. */ public Message getResponseMessage() { - return responseMessage; + return this.responseMessage; } /* @@ -158,7 +158,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { @Override public URI getUri() throws URISyntaxException { try { - return JmsTransportUtils.toUri(requestDestination); + return JmsTransportUtils.toUri(this.requestDestination); } catch (JMSException ex) { throw new URISyntaxException("", ex.getMessage()); @@ -186,7 +186,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { @Override public void addRequestHeader(String name, String value) throws IOException { try { - JmsTransportUtils.addHeader(requestMessage, name, value); + JmsTransportUtils.addHeader(this.requestMessage, name, value); } catch (JMSException ex) { throw new JmsTransportException("Could not set property", ex); @@ -195,14 +195,14 @@ public class JmsSenderConnection extends AbstractSenderConnection { @Override protected OutputStream getRequestOutputStream() throws IOException { - if (requestMessage instanceof BytesMessage) { - return new BytesMessageOutputStream((BytesMessage) requestMessage); + if (this.requestMessage instanceof BytesMessage) { + return new BytesMessageOutputStream((BytesMessage) this.requestMessage); } - else if (requestMessage instanceof TextMessage) { - return new TextMessageOutputStream((TextMessage) requestMessage, textMessageEncoding); + else if (this.requestMessage instanceof TextMessage) { + return new TextMessageOutputStream((TextMessage) this.requestMessage, this.textMessageEncoding); } else { - throw new IllegalStateException("Unknown request message type [" + requestMessage + "]"); + throw new IllegalStateException("Unknown request message type [" + this.requestMessage + "]"); } } @@ -211,22 +211,22 @@ public class JmsSenderConnection extends AbstractSenderConnection { protected void onSendAfterWrite(WebServiceMessage message) throws IOException { MessageProducer messageProducer = null; try { - messageProducer = session.createProducer(requestDestination); - messageProducer.setDeliveryMode(deliveryMode); - messageProducer.setTimeToLive(timeToLive); - messageProducer.setPriority(priority); - if (responseDestination == null) { - responseDestination = session.createTemporaryQueue(); - temporaryResponseQueueCreated = true; + messageProducer = this.session.createProducer(this.requestDestination); + messageProducer.setDeliveryMode(this.deliveryMode); + messageProducer.setTimeToLive(this.timeToLive); + messageProducer.setPriority(this.priority); + if (this.responseDestination == null) { + this.responseDestination = this.session.createTemporaryQueue(); + this.temporaryResponseQueueCreated = true; } - requestMessage.setJMSReplyTo(responseDestination); - if (postProcessor != null) { - requestMessage = postProcessor.postProcessMessage(requestMessage); + this.requestMessage.setJMSReplyTo(this.responseDestination); + if (this.postProcessor != null) { + this.requestMessage = this.postProcessor.postProcessMessage(this.requestMessage); } - connection.start(); - messageProducer.send(requestMessage); - if (session.getTransacted() && isSessionLocallyTransacted(session)) { - JmsUtils.commitIfNecessary(session); + this.connection.start(); + messageProducer.send(this.requestMessage); + if (this.session.getTransacted() && isSessionLocallyTransacted(this.session)) { + JmsUtils.commitIfNecessary(this.session); } } catch (JMSException ex) { @@ -242,7 +242,8 @@ public class JmsSenderConnection extends AbstractSenderConnection { * (Session) */ private boolean isSessionLocallyTransacted(Session session) { - return sessionTransacted && !ConnectionFactoryUtils.isSessionTransactional(session, connectionFactory); + return this.sessionTransacted + && !ConnectionFactoryUtils.isSessionTransactional(session, this.connectionFactory); } /* @@ -253,17 +254,18 @@ public class JmsSenderConnection extends AbstractSenderConnection { protected void onReceiveBeforeRead() throws IOException { MessageConsumer messageConsumer = null; try { - if (temporaryResponseQueueCreated) { - messageConsumer = session.createConsumer(responseDestination); + if (this.temporaryResponseQueueCreated) { + messageConsumer = this.session.createConsumer(this.responseDestination); } else { - String messageId = requestMessage.getJMSMessageID().replaceAll("'", "''"); + String messageId = this.requestMessage.getJMSMessageID().replaceAll("'", "''"); String messageSelector = "JMSCorrelationID = '" + messageId + "'"; - messageConsumer = session.createConsumer(responseDestination, messageSelector); + messageConsumer = this.session.createConsumer(this.responseDestination, messageSelector); } - Message message = receiveTimeout >= 0 ? messageConsumer.receive(receiveTimeout) : messageConsumer.receive(); + Message message = this.receiveTimeout >= 0 ? messageConsumer.receive(this.receiveTimeout) + : messageConsumer.receive(); if (message instanceof BytesMessage || message instanceof TextMessage) { - responseMessage = message; + this.responseMessage = message; } else if (message != null) { throw new IllegalArgumentException("Wrong message type: [" + message.getClass() + "]. " @@ -275,9 +277,9 @@ public class JmsSenderConnection extends AbstractSenderConnection { } finally { JmsUtils.closeMessageConsumer(messageConsumer); - if (temporaryResponseQueueCreated) { + if (this.temporaryResponseQueueCreated) { try { - ((TemporaryQueue) responseDestination).delete(); + ((TemporaryQueue) this.responseDestination).delete(); } catch (JMSException ex) { // ignore @@ -288,13 +290,13 @@ public class JmsSenderConnection extends AbstractSenderConnection { @Override protected boolean hasResponse() throws IOException { - return responseMessage != null; + return this.responseMessage != null; } @Override public Iterator getResponseHeaderNames() throws IOException { try { - return JmsTransportUtils.getHeaderNames(responseMessage); + return JmsTransportUtils.getHeaderNames(this.responseMessage); } catch (JMSException ex) { throw new JmsTransportException("Could not get property names", ex); @@ -304,7 +306,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { @Override public Iterator getResponseHeaders(String name) throws IOException { try { - return JmsTransportUtils.getHeaders(responseMessage, name); + return JmsTransportUtils.getHeaders(this.responseMessage, name); } catch (JMSException ex) { throw new JmsTransportException("Could not get property value", ex); @@ -313,22 +315,22 @@ public class JmsSenderConnection extends AbstractSenderConnection { @Override protected InputStream getResponseInputStream() throws IOException { - if (responseMessage instanceof BytesMessage) { - return new BytesMessageInputStream((BytesMessage) responseMessage); + if (this.responseMessage instanceof BytesMessage) { + return new BytesMessageInputStream((BytesMessage) this.responseMessage); } - else if (responseMessage instanceof TextMessage) { - return new TextMessageInputStream((TextMessage) responseMessage, textMessageEncoding); + else if (this.responseMessage instanceof TextMessage) { + return new TextMessageInputStream((TextMessage) this.responseMessage, this.textMessageEncoding); } else { - throw new IllegalStateException("Unknown response message type [" + responseMessage + "]"); + throw new IllegalStateException("Unknown response message type [" + this.responseMessage + "]"); } } @Override protected void onClose() throws IOException { - JmsUtils.closeSession(session); - ConnectionFactoryUtils.releaseConnection(connection, connectionFactory, true); + JmsUtils.closeSession(this.session); + ConnectionFactoryUtils.releaseConnection(this.connection, this.connectionFactory, true); } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java index f21c6145..373f24d4 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportException.java @@ -34,17 +34,17 @@ public class JmsTransportException extends TransportException { public JmsTransportException(String msg, JMSException ex) { super(msg + ": " + ex.getMessage()); initCause(ex); - jmsException = ex; + this.jmsException = ex; } public JmsTransportException(JMSException ex) { super(ex.getMessage()); initCause(ex); - jmsException = ex; + this.jmsException = ex; } public JMSException getJmsException() { - return jmsException; + return this.jmsException; } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java index f31bfdcf..88feb788 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageOutputStream.java @@ -49,9 +49,9 @@ class TextMessageOutputStream extends FilterOutputStream { public void flush() throws IOException { super.flush(); try { - ByteArrayOutputStream baos = (ByteArrayOutputStream) out; - String text = baos.toString(encoding); - message.setText(text); + ByteArrayOutputStream baos = (ByteArrayOutputStream) this.out; + String text = baos.toString(this.encoding); + this.message.setText(text); } catch (JMSException ex) { throw new JmsTransportException(ex); diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java index 52cc9736..3ce12332 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java @@ -84,7 +84,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver * Non-default properties in this instance will override given JavaMail properties. */ public void setJavaMailProperties(Properties javaMailProperties) { - session = Session.getInstance(javaMailProperties, null); + this.session = Session.getInstance(javaMailProperties, null); } /** @@ -136,15 +136,15 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(storeUri, "Property 'storeUri' is required"); - Assert.notNull(transportUri, "Property 'transportUri' is required"); - if (monitoringStrategy == null) { - String protocol = storeUri.getProtocol(); + Assert.notNull(this.storeUri, "Property 'storeUri' is required"); + Assert.notNull(this.transportUri, "Property 'transportUri' is required"); + if (this.monitoringStrategy == null) { + String protocol = this.storeUri.getProtocol(); if ("pop3".equals(protocol)) { - monitoringStrategy = new Pop3PollingMonitoringStrategy(); + this.monitoringStrategy = new Pop3PollingMonitoringStrategy(); } else if ("imap".equals(protocol)) { - monitoringStrategy = new PollingMonitoringStrategy(); + this.monitoringStrategy = new PollingMonitoringStrategy(); } else { throw new IllegalArgumentException("Cannot determine monitoring strategy for \"" + protocol + "\". " @@ -162,57 +162,61 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver @Override protected void onStart() { - if (logger.isInfoEnabled()) { - logger.info("Starting mail receiver [" + MailTransportUtils.toPasswordProtectedString(storeUri) + "]"); + if (this.logger.isInfoEnabled()) { + this.logger + .info("Starting mail receiver [" + MailTransportUtils.toPasswordProtectedString(this.storeUri) + "]"); } execute(new MonitoringRunnable()); } @Override protected void onStop() { - if (logger.isInfoEnabled()) { - logger.info("Stopping mail receiver [" + MailTransportUtils.toPasswordProtectedString(storeUri) + "]"); + if (this.logger.isInfoEnabled()) { + this.logger + .info("Stopping mail receiver [" + MailTransportUtils.toPasswordProtectedString(this.storeUri) + "]"); } closeFolder(); } @Override protected void onShutdown() { - if (logger.isInfoEnabled()) { - logger.info("Shutting down mail receiver [" + MailTransportUtils.toPasswordProtectedString(storeUri) + "]"); + if (this.logger.isInfoEnabled()) { + this.logger.info("Shutting down mail receiver [" + + MailTransportUtils.toPasswordProtectedString(this.storeUri) + "]"); } closeFolder(); closeSession(); } private void openSession() throws MessagingException { - store = session.getStore(storeUri); - if (logger.isDebugEnabled()) { - logger.debug("Connecting to store [" + MailTransportUtils.toPasswordProtectedString(storeUri) + "]"); + this.store = this.session.getStore(this.storeUri); + if (this.logger.isDebugEnabled()) { + this.logger + .debug("Connecting to store [" + MailTransportUtils.toPasswordProtectedString(this.storeUri) + "]"); } - store.connect(); + this.store.connect(); } private void openFolder() throws MessagingException { - if (folder != null && folder.isOpen()) { + if (this.folder != null && this.folder.isOpen()) { return; } - folder = store.getFolder(storeUri); - if (folder == null || !folder.exists()) { + this.folder = this.store.getFolder(this.storeUri); + if (this.folder == null || !this.folder.exists()) { throw new IllegalStateException("No default folder to receive from"); } - if (logger.isDebugEnabled()) { - logger.debug("Opening folder [" + MailTransportUtils.toPasswordProtectedString(storeUri) + "]"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Opening folder [" + MailTransportUtils.toPasswordProtectedString(this.storeUri) + "]"); } - folder.open(monitoringStrategy.getFolderOpenMode()); + this.folder.open(this.monitoringStrategy.getFolderOpenMode()); } private void closeFolder() { - MailTransportUtils.closeFolder(folder, true); + MailTransportUtils.closeFolder(this.folder, true); } private void closeSession() { - MailTransportUtils.closeService(store); + MailTransportUtils.closeService(this.store); } private class MonitoringRunnable implements SchedulingAwareRunnable { @@ -223,20 +227,21 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver openFolder(); while (isRunning()) { try { - Message[] messages = monitoringStrategy.monitor(folder); + Message[] messages = MailMessageReceiver.this.monitoringStrategy + .monitor(MailMessageReceiver.this.folder); for (Message message : messages) { MessageHandler handler = new MessageHandler(message); execute(handler); } } catch (FolderClosedException ex) { - logger.debug("Folder closed, reopening"); + MailMessageReceiver.this.logger.debug("Folder closed, reopening"); if (isRunning()) { openFolder(); } } catch (MessagingException ex) { - logger.warn(ex); + MailMessageReceiver.this.logger.warn(ex); } } } @@ -245,7 +250,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver Thread.currentThread().interrupt(); } catch (MessagingException ex) { - logger.error(ex); + MailMessageReceiver.this.logger.error(ex); } } @@ -266,14 +271,15 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver @Override public void run() { - MailReceiverConnection connection = new MailReceiverConnection(message, session); - connection.setTransportUri(transportUri); - connection.setFrom(from); + MailReceiverConnection connection = new MailReceiverConnection(this.message, + MailMessageReceiver.this.session); + connection.setTransportUri(MailMessageReceiver.this.transportUri); + connection.setFrom(MailMessageReceiver.this.from); try { handleConnection(connection); } catch (Exception ex) { - logger.error("Could not handle incoming mail connection", ex); + MailMessageReceiver.this.logger.error("Could not handle incoming mail connection", ex); } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java index 3e47f979..b8b2b32d 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java @@ -105,7 +105,7 @@ public class MailMessageSender implements WebServiceMessageSender, InitializingB * Non-default properties in this instance will override given JavaMail properties. */ public void setJavaMailProperties(Properties javaMailProperties) { - session = Session.getInstance(javaMailProperties, null); + this.session = Session.getInstance(javaMailProperties, null); } /** @@ -157,17 +157,17 @@ public class MailMessageSender implements WebServiceMessageSender, InitializingB @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(transportUri, "'transportUri' is required"); - Assert.notNull(storeUri, "'storeUri' is required"); + Assert.notNull(this.transportUri, "'transportUri' is required"); + Assert.notNull(this.storeUri, "'storeUri' is required"); } @Override public WebServiceConnection createConnection(URI uri) throws IOException { InternetAddress to = MailTransportUtils.getTo(uri); - MailSenderConnection connection = new MailSenderConnection(session, transportUri, storeUri, to, - receiveSleepTime); - if (from != null) { - connection.setFrom(from); + MailSenderConnection connection = new MailSenderConnection(this.session, this.transportUri, this.storeUri, to, + this.receiveSleepTime); + if (this.from != null) { + connection.setFrom(this.from); } String subject = MailTransportUtils.getSubject(uri); if (subject != null) { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java index 6e3e1ee7..6b4a485b 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java @@ -82,12 +82,12 @@ public class MailReceiverConnection extends AbstractReceiverConnection { /** Returns the request message for this connection. */ public Message getRequestMessage() { - return requestMessage; + return this.requestMessage; } /** Returns the response message, if any, for this connection. */ public Message getResponseMessage() { - return responseMessage; + return this.responseMessage; } /* @@ -108,9 +108,9 @@ public class MailReceiverConnection extends AbstractReceiverConnection { @Override public URI getUri() throws URISyntaxException { try { - Address[] recipients = requestMessage.getRecipients(Message.RecipientType.TO); + Address[] recipients = this.requestMessage.getRecipients(Message.RecipientType.TO); if (!ObjectUtils.isEmpty(recipients) && recipients[0] instanceof InternetAddress) { - return MailTransportUtils.toUri((InternetAddress) recipients[0], requestMessage.getSubject()); + return MailTransportUtils.toUri((InternetAddress) recipients[0], this.requestMessage.getSubject()); } else { throw new URISyntaxException("", "Could not determine To header"); @@ -142,7 +142,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { public Iterator getRequestHeaderNames() throws IOException { try { List headers = new ArrayList<>(); - Enumeration enumeration = requestMessage.getAllHeaders(); + Enumeration enumeration = this.requestMessage.getAllHeaders(); while (enumeration.hasMoreElements()) { Header header = (Header) enumeration.nextElement(); headers.add(header.getName()); @@ -157,7 +157,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { @Override public Iterator getRequestHeaders(String name) throws IOException { try { - String[] headers = requestMessage.getHeader(name); + String[] headers = this.requestMessage.getHeader(name); return Arrays.asList(headers).iterator(); } catch (MessagingException ex) { @@ -168,7 +168,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { @Override protected InputStream getRequestInputStream() throws IOException { try { - return requestMessage.getInputStream(); + return this.requestMessage.getInputStream(); } catch (MessagingException ex) { throw new MailTransportException(ex); @@ -178,9 +178,9 @@ public class MailReceiverConnection extends AbstractReceiverConnection { @Override public void addResponseHeader(String name, String value) throws IOException { try { - responseMessage.addHeader(name, value); + this.responseMessage.addHeader(name, value); if (TransportConstants.HEADER_CONTENT_TYPE.equals(name)) { - responseContentType = value; + this.responseContentType = value; } } catch (MessagingException ex) { @@ -190,7 +190,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { @Override protected OutputStream getResponseOutputStream() throws IOException { - return responseBuffer; + return this.responseBuffer; } /* @@ -200,10 +200,10 @@ public class MailReceiverConnection extends AbstractReceiverConnection { @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { try { - responseMessage = requestMessage.reply(false); - responseMessage.setFrom(from); + this.responseMessage = this.requestMessage.reply(false); + this.responseMessage.setFrom(this.from); - responseBuffer = new ByteArrayOutputStream(); + this.responseBuffer = new ByteArrayOutputStream(); } catch (MessagingException ex) { throw new MailTransportException(ex); @@ -214,12 +214,12 @@ public class MailReceiverConnection extends AbstractReceiverConnection { protected void onSendAfterWrite(WebServiceMessage message) throws IOException { Transport transport = null; try { - responseMessage.setDataHandler( - new DataHandler(new ByteArrayDataSource(responseContentType, responseBuffer.toByteArray()))); - transport = session.getTransport(transportUri); + this.responseMessage.setDataHandler(new DataHandler( + new ByteArrayDataSource(this.responseContentType, this.responseBuffer.toByteArray()))); + transport = this.session.getTransport(this.transportUri); transport.connect(); - responseMessage.saveChanges(); - transport.sendMessage(responseMessage, responseMessage.getAllRecipients()); + this.responseMessage.saveChanges(); + transport.sendMessage(this.responseMessage, this.responseMessage.getAllRecipients()); } catch (MessagingException ex) { throw new MailTransportException(ex); @@ -242,12 +242,12 @@ public class MailReceiverConnection extends AbstractReceiverConnection { @Override public String getContentType() { - return contentType; + return this.contentType; } @Override public InputStream getInputStream() throws IOException { - return new ByteArrayInputStream(data); + return new ByteArrayInputStream(this.data); } @Override diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java index c691df06..996d20bf 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java @@ -112,12 +112,12 @@ public class MailSenderConnection extends AbstractSenderConnection { /** Returns the request message for this connection. */ public Message getRequestMessage() { - return requestMessage; + return this.requestMessage; } /** Returns the response message, if any, for this connection. */ public Message getResponseMessage() { - return responseMessage; + return this.responseMessage; } /* @@ -137,7 +137,7 @@ public class MailSenderConnection extends AbstractSenderConnection { */ @Override public URI getUri() throws URISyntaxException { - return MailTransportUtils.toUri(to, subject); + return MailTransportUtils.toUri(this.to, this.subject); } /* @@ -146,16 +146,16 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { try { - requestMessage = new MimeMessage(session); - requestMessage.setRecipient(Message.RecipientType.TO, to); - requestMessage.setSentDate(new Date()); - if (from != null) { - requestMessage.setFrom(from); + this.requestMessage = new MimeMessage(this.session); + this.requestMessage.setRecipient(Message.RecipientType.TO, this.to); + this.requestMessage.setSentDate(new Date()); + if (this.from != null) { + this.requestMessage.setFrom(this.from); } - if (subject != null) { - requestMessage.setSubject(subject); + if (this.subject != null) { + this.requestMessage.setSubject(this.subject); } - requestBuffer = new ByteArrayOutputStream(); + this.requestBuffer = new ByteArrayOutputStream(); } catch (MessagingException ex) { throw new MailTransportException(ex); @@ -165,9 +165,9 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override public void addRequestHeader(String name, String value) throws IOException { try { - requestMessage.addHeader(name, value); + this.requestMessage.addHeader(name, value); if (TransportConstants.HEADER_CONTENT_TYPE.equals(name)) { - requestContentType = value; + this.requestContentType = value; } } catch (MessagingException ex) { @@ -177,19 +177,19 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override protected OutputStream getRequestOutputStream() throws IOException { - return requestBuffer; + return this.requestBuffer; } @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { Transport transport = null; try { - requestMessage.setDataHandler( - new DataHandler(new ByteArrayDataSource(requestContentType, requestBuffer.toByteArray()))); - transport = session.getTransport(transportUri); + this.requestMessage.setDataHandler(new DataHandler( + new ByteArrayDataSource(this.requestContentType, this.requestBuffer.toByteArray()))); + transport = this.session.getTransport(this.transportUri); transport.connect(); - requestMessage.saveChanges(); - transport.sendMessage(requestMessage, requestMessage.getAllRecipients()); + this.requestMessage.saveChanges(); + transport.sendMessage(this.requestMessage, this.requestMessage.getAllRecipients()); } catch (MessagingException ex) { throw new MailTransportException(ex); @@ -206,10 +206,10 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override protected void onReceiveBeforeRead() throws IOException { try { - String requestMessageId = requestMessage.getMessageID(); - Assert.hasLength(requestMessageId, "No Message-ID found on request message [" + requestMessage + "]"); + String requestMessageId = this.requestMessage.getMessageID(); + Assert.hasLength(requestMessageId, "No Message-ID found on request message [" + this.requestMessage + "]"); try { - Thread.sleep(receiveTimeout); + Thread.sleep(this.receiveTimeout); } catch (InterruptedException e) { // Re-interrupt current thread, to allow other threads to react. @@ -217,15 +217,15 @@ public class MailSenderConnection extends AbstractSenderConnection { } openFolder(); SearchTerm searchTerm = new HeaderTerm(MailTransportConstants.HEADER_IN_REPLY_TO, requestMessageId); - Message[] responses = folder.search(searchTerm); + Message[] responses = this.folder.search(searchTerm); if (responses.length > 0) { if (responses.length > 1) { logger.warn("Received more than one response for request with ID [" + requestMessageId + "]"); } - responseMessage = responses[0]; + this.responseMessage = responses[0]; } - if (deleteAfterReceive) { - responseMessage.setFlag(Flags.Flag.DELETED, true); + if (this.deleteAfterReceive) { + this.responseMessage.setFlag(Flags.Flag.DELETED, true); } } catch (MessagingException ex) { @@ -234,30 +234,30 @@ public class MailSenderConnection extends AbstractSenderConnection { } private void openFolder() throws MessagingException { - store = session.getStore(storeUri); - store.connect(); - folder = store.getFolder(storeUri); - if (folder == null || !folder.exists()) { + this.store = this.session.getStore(this.storeUri); + this.store.connect(); + this.folder = this.store.getFolder(this.storeUri); + if (this.folder == null || !this.folder.exists()) { throw new IllegalStateException("No default folder to receive from"); } - if (deleteAfterReceive) { - folder.open(Folder.READ_WRITE); + if (this.deleteAfterReceive) { + this.folder.open(Folder.READ_WRITE); } else { - folder.open(Folder.READ_ONLY); + this.folder.open(Folder.READ_ONLY); } } @Override protected boolean hasResponse() throws IOException { - return responseMessage != null; + return this.responseMessage != null; } @Override public Iterator getResponseHeaderNames() throws IOException { try { List headers = new ArrayList<>(); - Enumeration enumeration = responseMessage.getAllHeaders(); + Enumeration enumeration = this.responseMessage.getAllHeaders(); while (enumeration.hasMoreElements()) { Header header = (Header) enumeration.nextElement(); headers.add(header.getName()); @@ -272,7 +272,7 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override public Iterator getResponseHeaders(String name) throws IOException { try { - String[] headers = responseMessage.getHeader(name); + String[] headers = this.responseMessage.getHeader(name); return Arrays.asList(headers).iterator(); } catch (MessagingException ex) { @@ -284,7 +284,7 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override protected InputStream getResponseInputStream() throws IOException { try { - return responseMessage.getDataHandler().getInputStream(); + return this.responseMessage.getDataHandler().getInputStream(); } catch (MessagingException ex) { throw new MailTransportException(ex); @@ -303,8 +303,8 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override public void onClose() throws IOException { - MailTransportUtils.closeFolder(folder, deleteAfterReceive); - MailTransportUtils.closeService(store); + MailTransportUtils.closeFolder(this.folder, this.deleteAfterReceive); + MailTransportUtils.closeService(this.store); } private static class ByteArrayDataSource implements DataSource { @@ -320,7 +320,7 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override public InputStream getInputStream() throws IOException { - return new ByteArrayInputStream(data); + return new ByteArrayInputStream(this.data); } @Override @@ -330,7 +330,7 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override public String getContentType() { - return contentType; + return this.contentType; } @Override diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java index ac5e0fbe..4c0d040f 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailTransportException.java @@ -34,17 +34,17 @@ public class MailTransportException extends TransportException { public MailTransportException(String msg, MessagingException ex) { super(msg + ": " + ex.getMessage()); initCause(ex); - messagingException = ex; + this.messagingException = ex; } public MailTransportException(MessagingException ex) { super(ex.getMessage()); initCause(ex); - messagingException = ex; + this.messagingException = ex; } public MessagingException getMessagingException() { - return messagingException; + return this.messagingException; } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java index 854978f4..f4611d5d 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java @@ -52,7 +52,7 @@ public abstract class AbstractMonitoringStrategy implements MonitoringStrategy { @Override public int getFolderOpenMode() { - return deleteMessages ? Folder.READ_WRITE : Folder.READ_ONLY; + return this.deleteMessages ? Folder.READ_WRITE : Folder.READ_ONLY; } /** @@ -71,13 +71,13 @@ public abstract class AbstractMonitoringStrategy implements MonitoringStrategy { public final Message[] monitor(Folder folder) throws MessagingException, InterruptedException { waitForNewMessages(folder); Message[] messages = searchForNewMessages(folder); - if (logger.isDebugEnabled()) { - logger.debug("Found " + messages.length + " new messages"); + if (this.logger.isDebugEnabled()) { + this.logger.debug("Found " + messages.length + " new messages"); } if (messages.length > 0) { fetchMessages(folder, messages); } - if (deleteMessages) { + if (this.deleteMessages) { deleteMessages(folder, messages); } return messages; diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java index 83f35e72..112e05ca 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java @@ -48,20 +48,20 @@ public class ImapIdleMonitoringStrategy extends AbstractMonitoringStrategy { if (searchForNewMessages(folder).length > 0) { return; } - if (messageCountListener == null) { + if (this.messageCountListener == null) { createMessageCountListener(); } - folder.addMessageCountListener(messageCountListener); + folder.addMessageCountListener(this.messageCountListener); try { imapFolder.idle(); } finally { - folder.removeMessageCountListener(messageCountListener); + folder.removeMessageCountListener(this.messageCountListener); } } private void createMessageCountListener() { - messageCountListener = new MessageCountAdapter() { + this.messageCountListener = new MessageCountAdapter() { @Override public void messagesAdded(MessageCountEvent e) { Message[] messages = e.getMessages(); diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java index 9e0ed999..96a34e80 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/PollingMonitoringStrategy.java @@ -50,7 +50,7 @@ public class PollingMonitoringStrategy extends AbstractMonitoringStrategy { @Override protected void waitForNewMessages(Folder folder) throws MessagingException, InterruptedException { - Thread.sleep(pollingInterval); + Thread.sleep(this.pollingInterval); afterSleep(folder); } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java index 371fe54b..db54e481 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java @@ -56,8 +56,8 @@ public abstract class AbstractAsyncStandaloneMessageReceiver extends AbstractSta @Override public void afterPropertiesSet() throws Exception { - if (taskExecutor == null) { - taskExecutor = createDefaultTaskExecutor(); + if (this.taskExecutor == null) { + this.taskExecutor = createDefaultTaskExecutor(); } super.afterPropertiesSet(); } @@ -72,7 +72,7 @@ public abstract class AbstractAsyncStandaloneMessageReceiver extends AbstractSta * @see org.springframework.core.task.SimpleAsyncTaskExecutor#SimpleAsyncTaskExecutor(String) */ protected TaskExecutor createDefaultTaskExecutor() { - String threadNamePrefix = beanName != null ? beanName + "-" : DEFAULT_THREAD_NAME_PREFIX; + String threadNamePrefix = this.beanName != null ? this.beanName + "-" : this.DEFAULT_THREAD_NAME_PREFIX; return new SimpleAsyncTaskExecutor(threadNamePrefix); } @@ -81,7 +81,7 @@ public abstract class AbstractAsyncStandaloneMessageReceiver extends AbstractSta * @see #setTaskExecutor(TaskExecutor) */ protected void execute(Runnable runnable) { - taskExecutor.execute(runnable); + this.taskExecutor.execute(runnable); } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java index 7ae44338..e933f90c 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractStandaloneMessageReceiver.java @@ -43,8 +43,8 @@ public abstract class AbstractStandaloneMessageReceiver extends SimpleWebService * but not shut down yet. */ public final boolean isActive() { - synchronized (lifecycleMonitor) { - return active; + synchronized (this.lifecycleMonitor) { + return this.active; } } @@ -54,8 +54,8 @@ public abstract class AbstractStandaloneMessageReceiver extends SimpleWebService */ @Override public final boolean isRunning() { - synchronized (lifecycleMonitor) { - return running; + synchronized (this.lifecycleMonitor) { + return this.running; } } @@ -87,11 +87,11 @@ public abstract class AbstractStandaloneMessageReceiver extends SimpleWebService * autoStartup} hasn't been turned off. */ public final void activate() throws Exception { - synchronized (lifecycleMonitor) { - active = true; + synchronized (this.lifecycleMonitor) { + this.active = true; } onActivate(); - if (autoStartup) { + if (this.autoStartup) { start(); } } @@ -99,8 +99,8 @@ public abstract class AbstractStandaloneMessageReceiver extends SimpleWebService /** Start this server. */ @Override public final void start() { - synchronized (lifecycleMonitor) { - running = true; + synchronized (this.lifecycleMonitor) { + this.running = true; } onStart(); } @@ -108,17 +108,17 @@ public abstract class AbstractStandaloneMessageReceiver extends SimpleWebService /** Stop this server. */ @Override public final void stop() { - synchronized (lifecycleMonitor) { - running = false; + synchronized (this.lifecycleMonitor) { + this.running = false; } onStop(); } /** Shut down this server. */ public final void shutdown() { - synchronized (lifecycleMonitor) { - running = false; - active = false; + synchronized (this.lifecycleMonitor) { + this.running = false; + this.active = false; } onShutdown(); } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java index b360977e..9edf9de8 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java @@ -38,7 +38,7 @@ public abstract class SimpleWebServiceMessageReceiverObjectSupport extends WebSe * Returns the {@code WebServiceMessageReceiver} used by this listener. */ public WebServiceMessageReceiver getMessageReceiver() { - return messageReceiver; + return this.messageReceiver; } /** diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageOutputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageOutputStream.java index 08a25b6e..fbae2c31 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageOutputStream.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageOutputStream.java @@ -48,9 +48,9 @@ class MessageOutputStream extends FilterOutputStream { @Override public void flush() throws IOException { super.flush(); - ByteArrayOutputStream bos = (ByteArrayOutputStream) out; - String text = bos.toString(encoding); - message.setBody(text); + ByteArrayOutputStream bos = (ByteArrayOutputStream) this.out; + String text = bos.toString(this.encoding); + this.message.setBody(text); } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java index 5ba461bd..2c101d3d 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java @@ -67,9 +67,9 @@ public class XmppMessageReceiver extends AbstractStandaloneMessageReceiver { @Override protected void onActivate() throws XMPPException, IOException, SmackException { - if (!connection.isConnected()) { + if (!this.connection.isConnected()) { try { - connection.connect(); + this.connection.connect(); } catch (InterruptedException e) { throw new IOException(e); @@ -79,30 +79,30 @@ public class XmppMessageReceiver extends AbstractStandaloneMessageReceiver { @Override protected void onStart() { - if (logger.isInfoEnabled()) { - logger.info("Starting XMPP receiver [" + connection.getUser() + "]"); + if (this.logger.isInfoEnabled()) { + this.logger.info("Starting XMPP receiver [" + this.connection.getUser() + "]"); } - packetListener = new WebServicePacketListener(); + this.packetListener = new WebServicePacketListener(); StanzaFilter packetFilter = new StanzaTypeFilter(Message.class); - connection.addAsyncStanzaListener(packetListener, packetFilter); + this.connection.addAsyncStanzaListener(this.packetListener, packetFilter); } @Override protected void onStop() { - if (logger.isInfoEnabled()) { - logger.info("Stopping XMPP receiver [" + connection.getUser() + "]"); + if (this.logger.isInfoEnabled()) { + this.logger.info("Stopping XMPP receiver [" + this.connection.getUser() + "]"); } - connection.removeAsyncStanzaListener(packetListener); - packetListener = null; + this.connection.removeAsyncStanzaListener(this.packetListener); + this.packetListener = null; } @Override protected void onShutdown() { - if (logger.isInfoEnabled()) { - logger.info("Shutting down XMPP receiver [" + connection.getUser() + "]"); + if (this.logger.isInfoEnabled()) { + this.logger.info("Shutting down XMPP receiver [" + this.connection.getUser() + "]"); } - if (connection.isConnected()) { - connection.disconnect(); + if (this.connection.isConnected()) { + this.connection.disconnect(); } } @@ -110,15 +110,16 @@ public class XmppMessageReceiver extends AbstractStandaloneMessageReceiver { @Override public void processStanza(Stanza packet) { - logger.info("Received " + packet); + XmppMessageReceiver.this.logger.info("Received " + packet); if (packet instanceof Message message) { try { - XmppReceiverConnection wsConnection = new XmppReceiverConnection(connection, message); - wsConnection.setMessageEncoding(messageEncoding); + XmppReceiverConnection wsConnection = new XmppReceiverConnection( + XmppMessageReceiver.this.connection, message); + wsConnection.setMessageEncoding(XmppMessageReceiver.this.messageEncoding); handleConnection(wsConnection); } catch (Exception ex) { - logger.error(ex); + XmppMessageReceiver.this.logger.error(ex); } } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java index 936541ab..50e5a64b 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java @@ -86,7 +86,7 @@ public class XmppMessageSender implements WebServiceMessageSender, InitializingB @Override public void afterPropertiesSet() throws Exception { - Assert.notNull(connection, "'connection' is required"); + Assert.notNull(this.connection, "'connection' is required"); } @Override @@ -94,8 +94,8 @@ public class XmppMessageSender implements WebServiceMessageSender, InitializingB String to = XmppTransportUtils.getTo(uri); String thread = createThread(); XmppSenderConnection connection = new XmppSenderConnection(this.connection, to, thread); - connection.setReceiveTimeout(receiveTimeout); - connection.setMessageEncoding(messageEncoding); + connection.setReceiveTimeout(this.receiveTimeout); + connection.setMessageEncoding(this.messageEncoding); return connection; } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java index be065d75..ece05b02 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java @@ -61,12 +61,12 @@ public class XmppReceiverConnection extends AbstractReceiverConnection { /** Returns the request message for this connection. */ public Message getRequestMessage() { - return requestMessage; + return this.requestMessage; } /** Returns the response message, if any, for this connection. */ public Message getResponseMessage() { - return responseMessage; + return this.responseMessage; } /* @@ -83,7 +83,7 @@ public class XmppReceiverConnection extends AbstractReceiverConnection { @Override public URI getUri() throws URISyntaxException { - return XmppTransportUtils.toUri(requestMessage); + return XmppTransportUtils.toUri(this.requestMessage); } /* @@ -92,12 +92,12 @@ public class XmppReceiverConnection extends AbstractReceiverConnection { @Override public boolean hasError() { - return XmppTransportUtils.hasError(responseMessage); + return XmppTransportUtils.hasError(this.responseMessage); } @Override public String getErrorMessage() { - return XmppTransportUtils.getErrorMessage(responseMessage); + return XmppTransportUtils.getErrorMessage(this.responseMessage); } /* @@ -106,17 +106,17 @@ public class XmppReceiverConnection extends AbstractReceiverConnection { @Override public Iterator getRequestHeaderNames() throws IOException { - return XmppTransportUtils.getHeaderNames(requestMessage); + return XmppTransportUtils.getHeaderNames(this.requestMessage); } @Override public Iterator getRequestHeaders(String name) throws IOException { - return XmppTransportUtils.getHeaders(requestMessage, name); + return XmppTransportUtils.getHeaders(this.requestMessage, name); } @Override protected InputStream getRequestInputStream() throws IOException { - return new MessageInputStream(requestMessage, messageEncoding); + return new MessageInputStream(this.requestMessage, this.messageEncoding); } /* @@ -125,25 +125,25 @@ public class XmppReceiverConnection extends AbstractReceiverConnection { @Override protected void onSendBeforeWrite(WebServiceMessage message) throws IOException { - responseMessage = new Message(requestMessage.getFrom(), Message.Type.chat); - responseMessage.setFrom(connection.getUser()); - responseMessage.setThread(requestMessage.getThread()); + this.responseMessage = new Message(this.requestMessage.getFrom(), Message.Type.chat); + this.responseMessage.setFrom(this.connection.getUser()); + this.responseMessage.setThread(this.requestMessage.getThread()); } @Override public void addResponseHeader(String name, String value) throws IOException { - XmppTransportUtils.addHeader(responseMessage, name, value); + XmppTransportUtils.addHeader(this.responseMessage, name, value); } @Override protected OutputStream getResponseOutputStream() throws IOException { - return new MessageOutputStream(responseMessage, messageEncoding); + return new MessageOutputStream(this.responseMessage, this.messageEncoding); } @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { try { - connection.sendStanza(responseMessage); + this.connection.sendStanza(this.responseMessage); } catch (SmackException.NotConnectedException | InterruptedException e) { throw new IOException(e); diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java index 8ab4fad0..c12ff781 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java @@ -78,12 +78,12 @@ public class XmppSenderConnection extends AbstractSenderConnection { /** Returns the request message for this connection. */ public Message getRequestMessage() { - return requestMessage; + return this.requestMessage; } /** Returns the response message, if any, for this connection. */ public Message getResponseMessage() { - return responseMessage; + return this.responseMessage; } /* @@ -104,7 +104,7 @@ public class XmppSenderConnection extends AbstractSenderConnection { @Override public URI getUri() throws URISyntaxException { - return XmppTransportUtils.toUri(requestMessage); + return XmppTransportUtils.toUri(this.requestMessage); } /* @@ -113,12 +113,12 @@ public class XmppSenderConnection extends AbstractSenderConnection { @Override public boolean hasError() { - return XmppTransportUtils.hasError(responseMessage); + return XmppTransportUtils.hasError(this.responseMessage); } @Override public String getErrorMessage() { - return XmppTransportUtils.getErrorMessage(responseMessage); + return XmppTransportUtils.getErrorMessage(this.responseMessage); } /* @@ -127,19 +127,19 @@ public class XmppSenderConnection extends AbstractSenderConnection { @Override public void addRequestHeader(String name, String value) { - XmppTransportUtils.addHeader(requestMessage, name, value); + XmppTransportUtils.addHeader(this.requestMessage, name, value); } @Override protected OutputStream getRequestOutputStream() throws IOException { - return new MessageOutputStream(requestMessage, messageEncoding); + return new MessageOutputStream(this.requestMessage, this.messageEncoding); } @Override protected void onSendAfterWrite(WebServiceMessage message) throws IOException { - requestMessage.setFrom(connection.getUser()); + this.requestMessage.setFrom(this.connection.getUser()); try { - connection.sendStanza(requestMessage); + this.connection.sendStanza(this.requestMessage); } catch (SmackException.NotConnectedException | InterruptedException e) { throw new IOException(e); @@ -154,11 +154,12 @@ public class XmppSenderConnection extends AbstractSenderConnection { protected void onReceiveBeforeRead() throws IOException { StanzaFilter packetFilter = createPacketFilter(); - StanzaCollector collector = connection.createStanzaCollector(packetFilter); + StanzaCollector collector = this.connection.createStanzaCollector(packetFilter); try { - Stanza packet = receiveTimeout >= 0 ? collector.nextResult(receiveTimeout) : collector.nextResult(); + Stanza packet = this.receiveTimeout >= 0 ? collector.nextResult(this.receiveTimeout) + : collector.nextResult(); if (packet instanceof Message) { - responseMessage = (Message) packet; + this.responseMessage = (Message) packet; } else if (packet != null) { throw new IllegalArgumentException( @@ -173,28 +174,28 @@ public class XmppSenderConnection extends AbstractSenderConnection { private StanzaFilter createPacketFilter() { AndFilter andFilter = new AndFilter(); andFilter.addFilter(new StanzaTypeFilter(Message.class)); - andFilter.addFilter(new ThreadFilter(requestMessage.getThread())); + andFilter.addFilter(new ThreadFilter(this.requestMessage.getThread())); return andFilter; } @Override protected boolean hasResponse() throws IOException { - return responseMessage != null; + return this.responseMessage != null; } @Override public Iterator getResponseHeaderNames() { - return XmppTransportUtils.getHeaderNames(responseMessage); + return XmppTransportUtils.getHeaderNames(this.responseMessage); } @Override public Iterator getResponseHeaders(String name) throws IOException { - return XmppTransportUtils.getHeaders(responseMessage, name); + return XmppTransportUtils.getHeaders(this.responseMessage, name); } @Override protected InputStream getResponseInputStream() throws IOException { - return new MessageInputStream(responseMessage, messageEncoding); + return new MessageInputStream(this.responseMessage, this.messageEncoding); } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java index 71dc94fb..fd719b7f 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java @@ -91,19 +91,20 @@ public class XmppConnectionFactoryBean implements FactoryBean @Override public void afterPropertiesSet() throws XMPPException, IOException, SmackException { - XMPPTCPConnectionConfiguration configuration = createConnectionConfiguration(host, port, serviceName); + XMPPTCPConnectionConfiguration configuration = createConnectionConfiguration(this.host, this.port, + this.serviceName); Assert.notNull(configuration, "'configuration' must not be null"); - Assert.hasText(username, "'username' must not be empty"); - Assert.hasText(password, "'password' must not be empty"); + Assert.hasText(this.username, "'username' must not be empty"); + Assert.hasText(this.password, "'password' must not be empty"); - connection = new XMPPTCPConnection(configuration); + this.connection = new XMPPTCPConnection(configuration); try { - connection.connect(); - if (StringUtils.hasText(resource)) { - connection.login(username, password, Resourcepart.from(resource)); + this.connection.connect(); + if (StringUtils.hasText(this.resource)) { + this.connection.login(this.username, this.password, Resourcepart.from(this.resource)); } else { - connection.login(username, password); + this.connection.login(this.username, this.password); } } catch (InterruptedException e) { @@ -113,12 +114,12 @@ public class XmppConnectionFactoryBean implements FactoryBean @Override public void destroy() { - connection.disconnect(); + this.connection.disconnect(); } @Override public XMPPTCPConnection getObject() { - return connection; + return this.connection; } @Override diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/SimpleTestingMessageReceiver.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/SimpleTestingMessageReceiver.java index 269823da..9dbdf461 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/SimpleTestingMessageReceiver.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/SimpleTestingMessageReceiver.java @@ -29,7 +29,7 @@ public class SimpleTestingMessageReceiver extends TransformerObjectSupport imple Assert.notNull(messageContext, "MessageContext is null"); - logger.info("Received " + messageContext.getRequest()); + this.logger.info("Received " + messageContext.getRequest()); Transformer transformer = createTransformer(); transformer.transform(messageContext.getRequest().getPayloadSource(), diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/SimpleHttpServerFactoryBean.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/SimpleHttpServerFactoryBean.java index 5b3d4d70..fda094bf 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/SimpleHttpServerFactoryBean.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/SimpleHttpServerFactoryBean.java @@ -142,8 +142,8 @@ class SimpleHttpServerFactoryBean implements FactoryBean, Initializi } }); } - if (logger.isInfoEnabled()) { - logger.info("Starting HttpServer at address " + address); + if (this.logger.isInfoEnabled()) { + this.logger.info("Starting HttpServer at address " + address); } this.server.start(); } @@ -165,7 +165,7 @@ class SimpleHttpServerFactoryBean implements FactoryBean, Initializi @Override public void destroy() { - logger.info("Stopping HttpServer"); + this.logger.info("Stopping HttpServer"); this.server.stop(this.shutdownDelay); } diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java index afa351fb..30b47f12 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java @@ -49,15 +49,15 @@ public class WebServiceHttpHandlerIntegrationTest { @BeforeEach public void createHttpClient() { - client = new HttpClient(); - url = "http://localhost:" + port + "/service"; + this.client = new HttpClient(); + this.url = "http://localhost:" + this.port + "/service"; } @Test public void testInvalidMethod() throws IOException { - GetMethod getMethod = new GetMethod(url); - client.executeMethod(getMethod); + GetMethod getMethod = new GetMethod(this.url); + this.client.executeMethod(getMethod); assertThat(getMethod.getStatusCode()).isEqualTo(HttpTransportConstants.STATUS_METHOD_NOT_ALLOWED); assertThat(getMethod.getResponseContentLength()).isEqualTo(0); @@ -66,14 +66,14 @@ public class WebServiceHttpHandlerIntegrationTest { @Test public void testNoResponse() throws IOException { - PostMethod postMethod = new PostMethod(url); + PostMethod postMethod = new PostMethod(this.url); postMethod.addRequestHeader(HttpTransportConstants.HEADER_CONTENT_TYPE, "text/xml"); postMethod.addRequestHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/NoResponse"); Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class); postMethod.setRequestEntity(new InputStreamRequestEntity(soapRequest.getInputStream())); - client.executeMethod(postMethod); + this.client.executeMethod(postMethod); assertThat(postMethod.getStatusCode()).isEqualTo(HttpTransportConstants.STATUS_ACCEPTED); assertThat(postMethod.getResponseContentLength()).isEqualTo(0); @@ -82,13 +82,13 @@ public class WebServiceHttpHandlerIntegrationTest { @Test public void testResponse() throws IOException { - PostMethod postMethod = new PostMethod(url); + PostMethod postMethod = new PostMethod(this.url); postMethod.addRequestHeader(HttpTransportConstants.HEADER_CONTENT_TYPE, "text/xml"); postMethod.addRequestHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/Response"); Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class); postMethod.setRequestEntity(new InputStreamRequestEntity(soapRequest.getInputStream())); - client.executeMethod(postMethod); + this.client.executeMethod(postMethod); assertThat(postMethod.getStatusCode()).isEqualTo(HttpTransportConstants.STATUS_OK); assertThat(postMethod.getResponseContentLength()).isGreaterThan(0); @@ -97,14 +97,14 @@ public class WebServiceHttpHandlerIntegrationTest { @Test public void testNoEndpoint() throws IOException { - PostMethod postMethod = new PostMethod(url); + PostMethod postMethod = new PostMethod(this.url); postMethod.addRequestHeader(HttpTransportConstants.HEADER_CONTENT_TYPE, "text/xml"); postMethod.addRequestHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/NoEndpoint"); Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class); postMethod.setRequestEntity(new InputStreamRequestEntity(soapRequest.getInputStream())); - client.executeMethod(postMethod); + this.client.executeMethod(postMethod); assertThat(postMethod.getStatusCode()).isEqualTo(HttpTransportConstants.STATUS_NOT_FOUND); assertThat(postMethod.getResponseContentLength()).isEqualTo(0); @@ -113,14 +113,14 @@ public class WebServiceHttpHandlerIntegrationTest { @Test public void testFault() throws IOException { - PostMethod postMethod = new PostMethod(url); + PostMethod postMethod = new PostMethod(this.url); postMethod.addRequestHeader(HttpTransportConstants.HEADER_CONTENT_TYPE, "text/xml"); postMethod.addRequestHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/Fault"); Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class); postMethod.setRequestEntity(new InputStreamRequestEntity(soapRequest.getInputStream())); - client.executeMethod(postMethod); + this.client.executeMethod(postMethod); assertThat(postMethod.getStatusCode()).isEqualTo(HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR); } diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java index 387a6217..02a10256 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java @@ -38,7 +38,7 @@ public class JmsIntegrationTest { public void testTemporaryQueue() { String content = ""; StringResult result = new StringResult(); - webServiceTemplate.sendSourceAndReceiveToResult(new StringSource(content), result); + this.webServiceTemplate.sendSourceAndReceiveToResult(new StringSource(content), result); assertThat(result.toString()).and(content).ignoreWhitespace().areSimilar(); } @@ -47,7 +47,7 @@ public class JmsIntegrationTest { String url = "jms:RequestQueue?deliveryMode=NON_PERSISTENT;replyToName=ResponseQueue"; String content = ""; StringResult result = new StringResult(); - webServiceTemplate.sendSourceAndReceiveToResult(url, new StringSource(content), result); + this.webServiceTemplate.sendSourceAndReceiveToResult(url, new StringSource(content), result); assertThat(result.toString()).and(content).ignoreWhitespace().areSimilar(); } diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java index 96bcf074..63832d92 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java @@ -57,7 +57,7 @@ public class JmsMessageSenderIntegrationTest { @BeforeEach public void createMessageFactory() throws Exception { - messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); + this.messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); } @Test @@ -65,22 +65,22 @@ public class JmsMessageSenderIntegrationTest { URI uri = new URI("jms:SenderRequestQueue?deliveryMode=NON_PERSISTENT"); - try (WebServiceConnection connection = messageSender.createConnection(uri)) { + try (WebServiceConnection connection = this.messageSender.createConnection(uri)) { - SoapMessage soapRequest = new SaajSoapMessage(messageFactory.createMessage()); + SoapMessage soapRequest = new SaajSoapMessage(this.messageFactory.createMessage()); soapRequest.setSoapAction(SOAP_ACTION); connection.send(soapRequest); - BytesMessage request = (BytesMessage) jmsTemplate.receive(); + BytesMessage request = (BytesMessage) this.jmsTemplate.receive(); assertThat(request).isNotNull(); assertThat(request.readByte()).isNotEqualTo(-1); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - messageFactory.createMessage().writeTo(bos); + this.messageFactory.createMessage().writeTo(bos); final byte[] buf = bos.toByteArray(); - jmsTemplate.send(request.getJMSReplyTo(), session -> { + this.jmsTemplate.send(request.getJMSReplyTo(), session -> { BytesMessage response = session.createBytesMessage(); response.setStringProperty(JmsTransportConstants.PROPERTY_SOAP_ACTION, SOAP_ACTION); @@ -90,7 +90,7 @@ public class JmsMessageSenderIntegrationTest { return response; }); - SoapMessage response = (SoapMessage) connection.receive(new SaajSoapMessageFactory(messageFactory)); + SoapMessage response = (SoapMessage) connection.receive(new SaajSoapMessageFactory(this.messageFactory)); assertThat(response).isNotNull(); assertThat(response.getSoapAction()).isEqualTo(SOAP_ACTION); @@ -104,22 +104,22 @@ public class JmsMessageSenderIntegrationTest { String responseQueueName = "SenderResponseQueue"; URI uri = new URI("jms:SenderRequestQueue?replyToName=" + responseQueueName + "&deliveryMode=NON_PERSISTENT"); - try (WebServiceConnection connection = messageSender.createConnection(uri)) { + try (WebServiceConnection connection = this.messageSender.createConnection(uri)) { - SoapMessage soapRequest = new SaajSoapMessage(messageFactory.createMessage()); + SoapMessage soapRequest = new SaajSoapMessage(this.messageFactory.createMessage()); soapRequest.setSoapAction(SOAP_ACTION); connection.send(soapRequest); - final BytesMessage request = (BytesMessage) jmsTemplate.receive(); + final BytesMessage request = (BytesMessage) this.jmsTemplate.receive(); assertThat(request).isNotNull(); assertThat(request.readByte()).isNotEqualTo(-1); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - messageFactory.createMessage().writeTo(bos); + this.messageFactory.createMessage().writeTo(bos); final byte[] buf = bos.toByteArray(); - jmsTemplate.send(responseQueueName, session -> { + this.jmsTemplate.send(responseQueueName, session -> { BytesMessage response = session.createBytesMessage(); response.setJMSCorrelationID(request.getJMSMessageID()); @@ -130,7 +130,7 @@ public class JmsMessageSenderIntegrationTest { return response; }); - SoapMessage response = (SoapMessage) connection.receive(new SaajSoapMessageFactory(messageFactory)); + SoapMessage response = (SoapMessage) connection.receive(new SaajSoapMessageFactory(this.messageFactory)); assertThat(response).isNotNull(); assertThat(response.getSoapAction()).isEqualTo(SOAP_ACTION); @@ -143,22 +143,22 @@ public class JmsMessageSenderIntegrationTest { URI uri = new URI("jms:SenderRequestQueue?deliveryMode=NON_PERSISTENT&messageType=TEXT_MESSAGE"); - try (WebServiceConnection connection = messageSender.createConnection(uri)) { + try (WebServiceConnection connection = this.messageSender.createConnection(uri)) { - SoapMessage soapRequest = new SaajSoapMessage(messageFactory.createMessage()); + SoapMessage soapRequest = new SaajSoapMessage(this.messageFactory.createMessage()); soapRequest.setSoapAction(SOAP_ACTION); connection.send(soapRequest); - TextMessage request = (TextMessage) jmsTemplate.receive(); + TextMessage request = (TextMessage) this.jmsTemplate.receive(); assertThat(request).isNotNull(); assertThat(request.getText()).isNotNull(); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - messageFactory.createMessage().writeTo(bos); + this.messageFactory.createMessage().writeTo(bos); final String text = bos.toString(StandardCharsets.UTF_8); - jmsTemplate.send(request.getJMSReplyTo(), session -> { + this.jmsTemplate.send(request.getJMSReplyTo(), session -> { TextMessage response = session.createTextMessage(); response.setStringProperty(JmsTransportConstants.PROPERTY_SOAP_ACTION, SOAP_ACTION); @@ -168,7 +168,7 @@ public class JmsMessageSenderIntegrationTest { return response; }); - SoapMessage response = (SoapMessage) connection.receive(new SaajSoapMessageFactory(messageFactory)); + SoapMessage response = (SoapMessage) connection.receive(new SaajSoapMessageFactory(this.messageFactory)); assertThat(response).isNotNull(); assertThat(response.getSoapAction()).isEqualTo(SOAP_ACTION); @@ -181,19 +181,19 @@ public class JmsMessageSenderIntegrationTest { URI uri = new URI("jms:SenderRequestQueue?deliveryMode=NON_PERSISTENT"); - try (WebServiceConnection connection = messageSender.createConnection(uri)) { + try (WebServiceConnection connection = this.messageSender.createConnection(uri)) { - SoapMessage soapRequest = new SaajSoapMessage(messageFactory.createMessage()); + SoapMessage soapRequest = new SaajSoapMessage(this.messageFactory.createMessage()); soapRequest.setSoapAction(SOAP_ACTION); connection.send(soapRequest); - BytesMessage request = (BytesMessage) jmsTemplate.receive(); + BytesMessage request = (BytesMessage) this.jmsTemplate.receive(); assertThat(request).isNotNull(); ByteArrayOutputStream bos = new ByteArrayOutputStream(); - messageFactory.createMessage().writeTo(bos); - SoapMessage response = (SoapMessage) connection.receive(new SaajSoapMessageFactory(messageFactory)); + this.messageFactory.createMessage().writeTo(bos); + SoapMessage response = (SoapMessage) connection.receive(new SaajSoapMessageFactory(this.messageFactory)); assertThat(response).isNull(); } @@ -210,13 +210,13 @@ public class JmsMessageSenderIntegrationTest { URI uri = new URI("jms:SenderRequestQueue?deliveryMode=NON_PERSISTENT"); - try (JmsSenderConnection connection = (JmsSenderConnection) messageSender.createConnection(uri)) { + try (JmsSenderConnection connection = (JmsSenderConnection) this.messageSender.createConnection(uri)) { connection.setPostProcessor(processor); - SoapMessage soapRequest = new SaajSoapMessage(messageFactory.createMessage()); + SoapMessage soapRequest = new SaajSoapMessage(this.messageFactory.createMessage()); connection.send(soapRequest); - BytesMessage request = (BytesMessage) jmsTemplate.receive(); + BytesMessage request = (BytesMessage) this.jmsTemplate.receive(); assertThat(request).isNotNull(); assertThat(request.getBooleanProperty("processed")).isTrue(); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java index e1cde9b4..608abadf 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java @@ -62,14 +62,14 @@ public class WebServiceMessageListenerIntegrationTest { final byte[] b = CONTENT.getBytes(StandardCharsets.UTF_8); - jmsTemplate.send(requestQueue, session -> { + this.jmsTemplate.send(this.requestQueue, session -> { BytesMessage request = session.createBytesMessage(); - request.setJMSReplyTo(responseQueue); + request.setJMSReplyTo(this.responseQueue); request.writeBytes(b); return request; }); - BytesMessage response = (BytesMessage) jmsTemplate.receive(responseQueue); + BytesMessage response = (BytesMessage) this.jmsTemplate.receive(this.responseQueue); assertThat(response).isNotNull(); } @@ -77,14 +77,14 @@ public class WebServiceMessageListenerIntegrationTest { @Test public void testReceiveQueueTextMessage() { - jmsTemplate.send(requestQueue, session -> { + this.jmsTemplate.send(this.requestQueue, session -> { TextMessage request = session.createTextMessage(CONTENT); - request.setJMSReplyTo(responseQueue); + request.setJMSReplyTo(this.responseQueue); return request; }); - TextMessage response = (TextMessage) jmsTemplate.receive(responseQueue); + TextMessage response = (TextMessage) this.jmsTemplate.receive(this.responseQueue); assertThat(response).isNotNull(); } @@ -94,7 +94,7 @@ public class WebServiceMessageListenerIntegrationTest { final byte[] b = CONTENT.getBytes(StandardCharsets.UTF_8); - jmsTemplate.send(requestTopic, session -> { + this.jmsTemplate.send(this.requestTopic, session -> { BytesMessage request = session.createBytesMessage(); request.writeBytes(b); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java index e5e51851..345aa308 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java @@ -49,9 +49,9 @@ public class MailIntegrationTest { String content = ""; StringResult result = new StringResult(); - webServiceTemplate.sendSourceAndReceiveToResult(new StringSource(content), result); + this.webServiceTemplate.sendSourceAndReceiveToResult(new StringSource(content), result); - MimeMessage[] receivedMessages = greenMailBean.getGreenMail().getReceivedMessages(); + MimeMessage[] receivedMessages = this.greenMailBean.getGreenMail().getReceivedMessages(); assertThat(receivedMessages).hasSize(1); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java index e6780c61..d8f4ffe7 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java @@ -51,24 +51,25 @@ public class MailMessageSenderIntegrationTest { @BeforeEach public void setUp() throws Exception { - greenMailBean = new GreenMailBean(); - greenMailBean.setAutostart(true); - greenMailBean.setSmtpProtocol(true); - greenMailBean.setImapProtocol(true); - greenMailBean.setUsers(Collections.singletonList("system:password@localhost")); - greenMailBean.afterPropertiesSet(); + this.greenMailBean = new GreenMailBean(); + this.greenMailBean.setAutostart(true); + this.greenMailBean.setSmtpProtocol(true); + this.greenMailBean.setImapProtocol(true); + this.greenMailBean.setUsers(Collections.singletonList("system:password@localhost")); + this.greenMailBean.afterPropertiesSet(); - messageSender = new MailMessageSender(); - messageSender.setFrom("Spring-WS SOAP Client "); - messageSender.setTransportUri("smtp://localhost:" + greenMailBean.getGreenMail().getSmtp().getPort()); - messageSender.setStoreUri("imap://localhost:" + greenMailBean.getGreenMail().getImap().getPort() + "/INBOX"); - messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); - messageSender.afterPropertiesSet(); + this.messageSender = new MailMessageSender(); + this.messageSender.setFrom("Spring-WS SOAP Client "); + this.messageSender.setTransportUri("smtp://localhost:" + this.greenMailBean.getGreenMail().getSmtp().getPort()); + this.messageSender + .setStoreUri("imap://localhost:" + this.greenMailBean.getGreenMail().getImap().getPort() + "/INBOX"); + this.messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); + this.messageSender.afterPropertiesSet(); } @AfterEach void tearDown() throws Exception { - greenMailBean.destroy(); + this.greenMailBean.destroy(); } @Disabled @@ -77,15 +78,15 @@ public class MailMessageSenderIntegrationTest { URI mailTo = new URI("mailto:server@localhost?subject=SOAP%20Test"); - try (WebServiceConnection connection = messageSender.createConnection(mailTo)) { + try (WebServiceConnection connection = this.messageSender.createConnection(mailTo)) { - SOAPMessage saajMessage = messageFactory.createMessage(); + SOAPMessage saajMessage = this.messageFactory.createMessage(); saajMessage.getSOAPBody().addBodyElement(new QName("http://springframework.org", "test")); SoapMessage soapRequest = new SaajSoapMessage(saajMessage); soapRequest.setSoapAction(SOAP_ACTION); connection.send(soapRequest); - MimeMessage[] receivedMessages = greenMailBean.getGreenMail().getReceivedMessages(); + MimeMessage[] receivedMessages = this.greenMailBean.getGreenMail().getReceivedMessages(); assertThat(receivedMessages).hasSize(1); assertThat(receivedMessages[0].getAllRecipients()).extracting(Address::toString) .contains("server@localhost"); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java index 6dc6a7cd..65b952c2 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java @@ -30,12 +30,12 @@ public class XmppConnectionFactoryBeanTest { @BeforeEach public void createFactoryBean() { - factoryBean = new XmppConnectionFactoryBean(); + this.factoryBean = new XmppConnectionFactoryBean(); } @Test public void noHost() { - assertThatIllegalArgumentException().isThrownBy(() -> factoryBean.afterPropertiesSet()); + assertThatIllegalArgumentException().isThrownBy(() -> this.factoryBean.afterPropertiesSet()); } @Test @@ -43,14 +43,14 @@ public class XmppConnectionFactoryBeanTest { assertThatIllegalArgumentException().isThrownBy(() -> { - factoryBean.setHost("jabber.org"); - factoryBean.afterPropertiesSet(); + this.factoryBean.setHost("jabber.org"); + this.factoryBean.afterPropertiesSet(); }); } @Test public void wrongPort() { - assertThatIllegalArgumentException().isThrownBy(() -> factoryBean.setPort(-10)); + assertThatIllegalArgumentException().isThrownBy(() -> this.factoryBean.setPort(-10)); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ErrorResponseCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ErrorResponseCreator.java index 9b62e8b5..8a3498a1 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ErrorResponseCreator.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ErrorResponseCreator.java @@ -45,7 +45,7 @@ class ErrorResponseCreator implements ResponseCreator { } String getErrorMessage() { - return errorMessage; + return this.errorMessage; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ExceptionResponseCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ExceptionResponseCreator.java index 1bf1a638..c95abf58 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ExceptionResponseCreator.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ExceptionResponseCreator.java @@ -44,11 +44,11 @@ class ExceptionResponseCreator implements ResponseCreator { @Override public WebServiceMessage createResponse(URI uri, WebServiceMessage request, WebServiceMessageFactory factory) throws IOException { - if (exception instanceof IOException) { - throw (IOException) exception; + if (this.exception instanceof IOException) { + throw (IOException) this.exception; } else { - throw (RuntimeException) exception; + throw (RuntimeException) this.exception; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockSenderConnection.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockSenderConnection.java index ff820091..958b5d4c 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockSenderConnection.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockSenderConnection.java @@ -46,7 +46,7 @@ class MockSenderConnection implements WebServiceConnection, ResponseActions { void addRequestMatcher(RequestMatcher requestMatcher) { Assert.notNull(requestMatcher, "'requestMatcher' must not be null"); - requestMatchers.add(requestMatcher); + this.requestMatchers.add(requestMatcher); } void setUri(URI uri) { @@ -72,9 +72,9 @@ class MockSenderConnection implements WebServiceConnection, ResponseActions { @Override public void send(WebServiceMessage message) throws IOException { - if (!requestMatchers.isEmpty()) { - for (RequestMatcher requestMatcher : requestMatchers) { - requestMatcher.match(uri, message); + if (!this.requestMatchers.isEmpty()) { + for (RequestMatcher requestMatcher : this.requestMatchers) { + requestMatcher.match(this.uri, message); } } else { @@ -85,8 +85,8 @@ class MockSenderConnection implements WebServiceConnection, ResponseActions { @Override public WebServiceMessage receive(WebServiceMessageFactory messageFactory) throws IOException { - if (responseCreator != null) { - return responseCreator.createResponse(uri, request, messageFactory); + if (this.responseCreator != null) { + return this.responseCreator.createResponse(this.uri, this.request, messageFactory); } else { return null; @@ -95,18 +95,18 @@ class MockSenderConnection implements WebServiceConnection, ResponseActions { @Override public URI getUri() { - return uri; + return this.uri; } @Override public boolean hasError() throws IOException { - return responseCreator instanceof ErrorResponseCreator; + return this.responseCreator instanceof ErrorResponseCreator; } @Override public String getErrorMessage() throws IOException { - if (responseCreator instanceof ErrorResponseCreator) { - return ((ErrorResponseCreator) responseCreator).getErrorMessage(); + if (this.responseCreator instanceof ErrorResponseCreator) { + return ((ErrorResponseCreator) this.responseCreator).getErrorMessage(); } else { return null; @@ -115,10 +115,10 @@ class MockSenderConnection implements WebServiceConnection, ResponseActions { @Override public void close() throws IOException { - requestMatchers.clear(); - request = null; - responseCreator = null; - uri = null; + this.requestMatchers.clear(); + this.request = null; + this.responseCreator = null; + this.uri = null; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSender.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSender.java index 86a6e8d0..c752dce7 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSender.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSender.java @@ -43,14 +43,14 @@ public class MockWebServiceMessageSender implements WebServiceMessageSender { @Override public MockSenderConnection createConnection(URI uri) throws IOException { Assert.notNull(uri, "'uri' must not be null"); - if (connectionIterator == null) { - connectionIterator = expectedConnections.iterator(); + if (this.connectionIterator == null) { + this.connectionIterator = this.expectedConnections.iterator(); } - if (!connectionIterator.hasNext()) { + if (!this.connectionIterator.hasNext()) { throw new AssertionError("No further connections expected"); } - MockSenderConnection currentConnection = connectionIterator.next(); + MockSenderConnection currentConnection = this.connectionIterator.next(); currentConnection.setUri(uri); return currentConnection; } @@ -64,24 +64,25 @@ public class MockWebServiceMessageSender implements WebServiceMessageSender { } MockSenderConnection expectNewConnection() { - Assert.state(connectionIterator == null, "Can not expect another connection, the test is already underway"); + Assert.state(this.connectionIterator == null, + "Can not expect another connection, the test is already underway"); MockSenderConnection connection = new MockSenderConnection(); - expectedConnections.add(connection); + this.expectedConnections.add(connection); return connection; } void verifyConnections() { - if (expectedConnections.isEmpty()) { + if (this.expectedConnections.isEmpty()) { return; } - if (connectionIterator == null || connectionIterator.hasNext()) { + if (this.connectionIterator == null || this.connectionIterator.hasNext()) { throw new AssertionError("Further connection(s) expected"); } } void reset() { - expectedConnections.clear(); - connectionIterator = null; + this.expectedConnections.clear(); + this.connectionIterator = null; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java index 417b062e..4a929d1e 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java @@ -167,7 +167,7 @@ public class MockWebServiceServer { * @return the response actions */ public ResponseActions expect(RequestMatcher requestMatcher) { - MockSenderConnection connection = mockMessageSender.expectNewConnection(); + MockSenderConnection connection = this.mockMessageSender.expectNewConnection(); connection.addRequestMatcher(requestMatcher); return connection; } @@ -178,14 +178,14 @@ public class MockWebServiceServer { * @throws AssertionError in case of unmet expectations */ public void verify() { - mockMessageSender.verifyConnections(); + this.mockMessageSender.verifyConnections(); } /** * Reset the {@link MockWebServiceMessageSender}'s expectations. */ public void reset() { - mockMessageSender.reset(); + this.mockMessageSender.reset(); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java index e2472fde..80ff7e4e 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java @@ -205,7 +205,7 @@ public abstract class ResponseCreators { @Override public WebServiceMessage createResponse(URI uri, WebServiceMessage request, WebServiceMessageFactory messageFactory) throws IOException { - return adaptee.createMessage(messageFactory); + return this.adaptee.createMessage(messageFactory); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java index 35813ee7..fd5f6b3a 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java @@ -38,7 +38,7 @@ class UriMatcher implements RequestMatcher { @Override public void match(URI actual, WebServiceMessage request) { - assertEquals("Unexpected connection", expected, actual, "Payload", request.getPayloadSource()); + assertEquals("Unexpected connection", this.expected, actual, "Payload", request.getPayloadSource()); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapter.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapter.java index 2b8372ca..e5124f12 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapter.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapter.java @@ -40,7 +40,7 @@ class WebServiceMessageMatcherAdapter implements RequestMatcher { @Override public void match(URI uri, WebServiceMessage request) throws IOException, AssertionError { - adaptee.match(request); + this.adaptee.match(request); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/XPathExpectationsHelperAdapter.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/XPathExpectationsHelperAdapter.java index 685003ec..8d5384e8 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/XPathExpectationsHelperAdapter.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/XPathExpectationsHelperAdapter.java @@ -32,37 +32,37 @@ class XPathExpectationsHelperAdapter implements RequestXPathExpectations { private final XPathExpectationsHelper helper; XPathExpectationsHelperAdapter(String expression, Map namespaces) { - helper = new XPathExpectationsHelper(expression, namespaces); + this.helper = new XPathExpectationsHelper(expression, namespaces); } @Override public RequestMatcher exists() { - return new WebServiceMessageMatcherAdapter(helper.exists()); + return new WebServiceMessageMatcherAdapter(this.helper.exists()); } @Override public RequestMatcher doesNotExist() { - return new WebServiceMessageMatcherAdapter(helper.doesNotExist()); + return new WebServiceMessageMatcherAdapter(this.helper.doesNotExist()); } @Override public RequestMatcher evaluatesTo(boolean expectedValue) { - return new WebServiceMessageMatcherAdapter(helper.evaluatesTo(expectedValue)); + return new WebServiceMessageMatcherAdapter(this.helper.evaluatesTo(expectedValue)); } @Override public RequestMatcher evaluatesTo(int expectedValue) { - return new WebServiceMessageMatcherAdapter(helper.evaluatesTo(expectedValue)); + return new WebServiceMessageMatcherAdapter(this.helper.evaluatesTo(expectedValue)); } @Override public RequestMatcher evaluatesTo(double expectedValue) { - return new WebServiceMessageMatcherAdapter(helper.evaluatesTo(expectedValue)); + return new WebServiceMessageMatcherAdapter(this.helper.evaluatesTo(expectedValue)); } @Override public RequestMatcher evaluatesTo(String expectedValue) { - return new WebServiceMessageMatcherAdapter(helper.evaluatesTo(expectedValue)); + return new WebServiceMessageMatcherAdapter(this.helper.evaluatesTo(expectedValue)); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java index 60eb1c54..4484ac88 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java @@ -177,10 +177,10 @@ public class MockWebServiceClient { public ResponseActions sendRequest(RequestCreator requestCreator) { Assert.notNull(requestCreator, "'requestCreator' must not be null"); try { - WebServiceMessage request = requestCreator.createRequest(messageFactory); - MessageContext messageContext = new DefaultMessageContext(request, messageFactory); + WebServiceMessage request = requestCreator.createRequest(this.messageFactory); + MessageContext messageContext = new DefaultMessageContext(request, this.messageFactory); - messageReceiver.receive(messageContext); + this.messageReceiver.receive(messageContext); return new MockWebServiceClientResponseActions(messageContext); } @@ -204,8 +204,8 @@ public class MockWebServiceClient { @Override public ResponseActions andExpect(ResponseMatcher responseMatcher) { - WebServiceMessage request = messageContext.getRequest(); - WebServiceMessage response = messageContext.getResponse(); + WebServiceMessage request = this.messageContext.getRequest(); + WebServiceMessage response = this.messageContext.getResponse(); if (response == null) { fail("No response received"); return null; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java index db7e8dba..41713e74 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java @@ -100,7 +100,7 @@ public abstract class RequestCreators { @Override public WebServiceMessage createRequest(WebServiceMessageFactory messageFactory) throws IOException { - return adaptee.createMessage(messageFactory); + return this.adaptee.createMessage(messageFactory); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java index 91fc17b2..f45be742 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java @@ -53,8 +53,8 @@ abstract class SoapFaultResponseMatcher implements ResponseMatcher { SoapFault soapFault = responseBody.getFault(); QName expectedFaultCode = getExpectedFaultCode(soapResponse.getVersion()); assertEquals("Invalid SOAP Fault code", expectedFaultCode, soapFault.getFaultCode()); - if (expectedFaultStringOrReason != null) { - assertEquals("Invalid SOAP Fault string/reason", expectedFaultStringOrReason, + if (this.expectedFaultStringOrReason != null) { + assertEquals("Invalid SOAP Fault string/reason", this.expectedFaultStringOrReason, soapFault.getFaultStringOrReason()); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapter.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapter.java index f2f8cab3..c29cc9b3 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapter.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapter.java @@ -39,7 +39,7 @@ class WebServiceMessageMatcherAdapter implements ResponseMatcher { @Override public void match(WebServiceMessage request, WebServiceMessage response) throws IOException, AssertionError { - adaptee.match(response); + this.adaptee.match(response); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/XPathExpectationsHelperAdapter.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/XPathExpectationsHelperAdapter.java index 95d74170..01232535 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/XPathExpectationsHelperAdapter.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/XPathExpectationsHelperAdapter.java @@ -32,37 +32,37 @@ class XPathExpectationsHelperAdapter implements ResponseXPathExpectations { private final XPathExpectationsHelper helper; XPathExpectationsHelperAdapter(String expression, Map namespaces) { - helper = new XPathExpectationsHelper(expression, namespaces); + this.helper = new XPathExpectationsHelper(expression, namespaces); } @Override public ResponseMatcher exists() { - return new WebServiceMessageMatcherAdapter(helper.exists()); + return new WebServiceMessageMatcherAdapter(this.helper.exists()); } @Override public ResponseMatcher doesNotExist() { - return new WebServiceMessageMatcherAdapter(helper.doesNotExist()); + return new WebServiceMessageMatcherAdapter(this.helper.doesNotExist()); } @Override public ResponseMatcher evaluatesTo(boolean expectedValue) { - return new WebServiceMessageMatcherAdapter(helper.evaluatesTo(expectedValue)); + return new WebServiceMessageMatcherAdapter(this.helper.evaluatesTo(expectedValue)); } @Override public ResponseMatcher evaluatesTo(int expectedValue) { - return new WebServiceMessageMatcherAdapter(helper.evaluatesTo(expectedValue)); + return new WebServiceMessageMatcherAdapter(this.helper.evaluatesTo(expectedValue)); } @Override public ResponseMatcher evaluatesTo(double expectedValue) { - return new WebServiceMessageMatcherAdapter(helper.evaluatesTo(expectedValue)); + return new WebServiceMessageMatcherAdapter(this.helper.evaluatesTo(expectedValue)); } @Override public ResponseMatcher evaluatesTo(String expectedValue) { - return new WebServiceMessageMatcherAdapter(helper.evaluatesTo(expectedValue)); + return new WebServiceMessageMatcherAdapter(this.helper.evaluatesTo(expectedValue)); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/MockStrategiesHelper.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/MockStrategiesHelper.java index 8cb18cb1..d0f06c5e 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/MockStrategiesHelper.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/MockStrategiesHelper.java @@ -56,7 +56,7 @@ public class MockStrategiesHelper { * Returns the application context. */ public ApplicationContext getApplicationContext() { - return applicationContext; + return this.applicationContext; } /** @@ -67,7 +67,7 @@ public class MockStrategiesHelper { */ public T getStrategy(Class type) { Assert.notNull(type, "'type' must not be null"); - Map map = applicationContext.getBeansOfType(type); + Map map = this.applicationContext.getBeansOfType(type); if (map.isEmpty()) { return null; } @@ -107,7 +107,7 @@ public class MockStrategiesHelper { } T defaultStrategy = BeanUtils.instantiateClass(defaultType); if (defaultStrategy instanceof ApplicationContextAware applicationContextAware) { - applicationContextAware.setApplicationContext(applicationContext); + applicationContextAware.setApplicationContext(this.applicationContext); } if (defaultStrategy instanceof InitializingBean initializingBean) { try { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java index f45681ad..9e798e74 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java @@ -57,7 +57,7 @@ public class SourceAssertionError extends AssertionError { * @return the source */ public Source getSource() { - return source; + return this.source; } @Override @@ -68,7 +68,7 @@ public class SourceAssertionError extends AssertionError { if (sourceString != null) { String newLine = System.lineSeparator(); builder.append(newLine); - String label = sourceLabel != null ? sourceLabel : "Source"; + String label = this.sourceLabel != null ? this.sourceLabel : "Source"; builder.append(label); builder.append(": "); builder.append(sourceString); @@ -77,11 +77,11 @@ public class SourceAssertionError extends AssertionError { } private String getSourceString() { - if (source != null) { + if (this.source != null) { try { StringResult result = new StringResult(); Transformer transformer = createNonIndentingTransformer(); - transformer.transform(source, result); + transformer.transform(this.source, result); return result.toString(); } catch (TransformerException ex) { @@ -92,7 +92,7 @@ public class SourceAssertionError extends AssertionError { } private Transformer createNonIndentingTransformer() throws TransformerConfigurationException { - Transformer transformer = transformerHelper.createTransformer(); + Transformer transformer = this.transformerHelper.createTransformer(); transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); transformer.setOutputProperty(OutputKeys.INDENT, "no"); return transformer; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java index b5f97248..21cc5066 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java @@ -53,7 +53,7 @@ public class PayloadMessageCreator extends AbstractMessageCreator { @Override protected void doWithMessage(WebServiceMessage message) throws IOException { try { - transformerHelper.transform(payload, message.getPayloadResult()); + this.transformerHelper.transform(this.payload, message.getPayloadResult()); } catch (TransformerException ex) { fail("Could not transform request payload to message: " + ex.getMessage()); diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java index 83ec33a2..36b76a94 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java @@ -61,7 +61,7 @@ public class SoapEnvelopeMessageCreator extends AbstractMessageCreator { SoapMessage soapMessage = (SoapMessage) message; try { DOMResult result = new DOMResult(); - transformerHelper.transform(soapEnvelope, result); + this.transformerHelper.transform(this.soapEnvelope, result); soapMessage.setDocument((Document) result.getNode()); } catch (TransformerException ex) { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java index 7ba82297..a04e6382 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java @@ -60,7 +60,7 @@ public class PayloadDiffMatcher extends DiffMatcher { } protected Diff createDiff(Source payload) { - Document expectedDocument = createDocumentFromSource(expected); + Document expectedDocument = createDocumentFromSource(this.expected); Document actualDocument = createDocumentFromSource(payload); return new Diff(expectedDocument, actualDocument); } @@ -68,7 +68,7 @@ public class PayloadDiffMatcher extends DiffMatcher { private Document createDocumentFromSource(Source source) { try { DOMResult result = new DOMResult(); - transformerHelper.transform(source, result); + this.transformerHelper.transform(source, result); return (Document) result.getNode(); } catch (TransformerException ex) { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java index e118c91a..5080cf28 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java @@ -52,13 +52,13 @@ public class SchemaValidatingMatcher implements WebServiceMessageMatcher { Resource[] joinedSchemas = new Resource[furtherSchemas.length + 1]; joinedSchemas[0] = schema; System.arraycopy(furtherSchemas, 0, joinedSchemas, 1, furtherSchemas.length); - xmlValidator = XmlValidatorFactory.createValidator(joinedSchemas, XmlValidatorFactory.SCHEMA_W3C_XML); + this.xmlValidator = XmlValidatorFactory.createValidator(joinedSchemas, XmlValidatorFactory.SCHEMA_W3C_XML); } @Override public void match(WebServiceMessage message) throws IOException, AssertionError { - SAXParseException[] exceptions = xmlValidator.validate(message.getPayloadSource()); + SAXParseException[] exceptions = this.xmlValidator.validate(message.getPayloadSource()); if (!ObjectUtils.isEmpty(exceptions)) { fail("XML is not valid: " + Arrays.toString(exceptions), "Payload", message.getPayloadSource()); } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java index 153a3257..af4417a8 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java @@ -62,7 +62,7 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { protected void match(SoapMessage soapMessage) throws IOException, AssertionError { Document actualDocument = soapMessage.getDocument(); - Document expectedDocument = createDocumentFromSource(expected); + Document expectedDocument = createDocumentFromSource(this.expected); Diff diff = new Diff(expectedDocument, actualDocument); assertTrue("Envelopes are different, " + diff, diff.similar()); } @@ -71,7 +71,7 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { try { DOMResult result = new DOMResult(); - transformerHelper.transform(source, result); + this.transformerHelper.transform(source, result); return (Document) result.getNode(); } catch (TransformerException ex) { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java index 1b475413..970ea699 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java @@ -58,12 +58,12 @@ public class SoapHeaderMatcher extends AbstractSoapMessageMatcher { boolean found = false; while (soapHeaderElementIterator.hasNext()) { SoapHeaderElement soapHeaderElement = soapHeaderElementIterator.next(); - if (soapHeaderName.equals(soapHeaderElement.getName())) { + if (this.soapHeaderName.equals(soapHeaderElement.getName())) { found = true; break; } } - assertTrue("SOAP header [" + soapHeaderName + "] not found", found, "Envelope", + assertTrue("SOAP header [" + this.soapHeaderName + "] not found", found, "Envelope", soapMessage.getEnvelope().getSource()); } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java index 394cfcb6..74bf1337 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java @@ -73,9 +73,10 @@ public class XPathExpectationsHelper { return new WebServiceMessageMatcher() { public void match(WebServiceMessage message) throws IOException, AssertionError { Node payload = transformToNode(message); - Node result = expression.evaluateAsNode(payload); + Node result = XPathExpectationsHelper.this.expression.evaluateAsNode(payload); if (result == null) { - fail("No match for \"" + expressionString + "\" found", "Payload", message.getPayloadSource()); + fail("No match for \"" + XPathExpectationsHelper.this.expressionString + "\" found", "Payload", + message.getPayloadSource()); } } }; @@ -85,9 +86,10 @@ public class XPathExpectationsHelper { return new WebServiceMessageMatcher() { public void match(WebServiceMessage message) throws IOException, AssertionError { Node payload = transformToNode(message); - Node result = expression.evaluateAsNode(payload); + Node result = XPathExpectationsHelper.this.expression.evaluateAsNode(payload); if (result != null) { - fail("Match for \"" + expressionString + "\" found", "Payload", message.getPayloadSource()); + fail("Match for \"" + XPathExpectationsHelper.this.expressionString + "\" found", "Payload", + message.getPayloadSource()); } } }; @@ -97,9 +99,9 @@ public class XPathExpectationsHelper { return new WebServiceMessageMatcher() { public void match(WebServiceMessage message) throws IOException, AssertionError { Node payload = transformToNode(message); - boolean result = expression.evaluateAsBoolean(payload); - assertEquals("Evaluation of XPath expression \"" + expressionString + "\" failed.", expectedValue, - result, "Payload", message.getPayloadSource()); + boolean result = XPathExpectationsHelper.this.expression.evaluateAsBoolean(payload); + assertEquals("Evaluation of XPath expression \"" + XPathExpectationsHelper.this.expressionString + + "\" failed.", expectedValue, result, "Payload", message.getPayloadSource()); } }; @@ -113,9 +115,9 @@ public class XPathExpectationsHelper { return new WebServiceMessageMatcher() { public void match(WebServiceMessage message) throws IOException, AssertionError { Node payload = transformToNode(message); - double result = expression.evaluateAsNumber(payload); - assertEquals("Evaluation of XPath expression \"" + expressionString + "\" failed.", expectedValue, - result, "Payload", message.getPayloadSource()); + double result = XPathExpectationsHelper.this.expression.evaluateAsNumber(payload); + assertEquals("Evaluation of XPath expression \"" + XPathExpectationsHelper.this.expressionString + + "\" failed.", expectedValue, result, "Payload", message.getPayloadSource()); } }; @@ -126,9 +128,9 @@ public class XPathExpectationsHelper { return new WebServiceMessageMatcher() { public void match(WebServiceMessage message) throws IOException, AssertionError { Node payload = transformToNode(message); - String result = expression.evaluateAsString(payload); - assertEquals("Evaluation of XPath expression \"" + expressionString + "\" failed.", expectedValue, - result, "Payload", message.getPayloadSource()); + String result = XPathExpectationsHelper.this.expression.evaluateAsString(payload); + assertEquals("Evaluation of XPath expression \"" + XPathExpectationsHelper.this.expressionString + + "\" failed.", expectedValue, result, "Payload", message.getPayloadSource()); } }; } @@ -136,7 +138,7 @@ public class XPathExpectationsHelper { private Node transformToNode(WebServiceMessage request) { DOMResult domResult = new DOMResult(); try { - transformerHelper.transform(request.getPayloadSource(), domResult); + this.transformerHelper.transform(request.getPayloadSource(), domResult); return domResult.getNode(); } catch (TransformerException ex) { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java index 0f8cb8cc..fad47cba 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java @@ -65,7 +65,7 @@ public class PayloadDiffMatcher extends DiffMatcher { protected Diff createDiff(Source payload) { - Document expectedDocument = createDocumentFromSource(expected); + Document expectedDocument = createDocumentFromSource(this.expected); Document actualDocument = createDocumentFromSource(payload); return DiffBuilder.compare(expectedDocument) // @@ -82,7 +82,7 @@ public class PayloadDiffMatcher extends DiffMatcher { try { DOMResult result = new DOMResult(); - transformerHelper.transform(source, result); + this.transformerHelper.transform(source, result); return (Document) result.getNode(); } catch (TransformerException ex) { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java index a72c16dd..35d38a36 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java @@ -58,7 +58,7 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { protected void match(SoapMessage soapMessage) throws IOException, AssertionError { Document actualDocument = soapMessage.getDocument(); - Document expectedDocument = createDocumentFromSource(expected); + Document expectedDocument = createDocumentFromSource(this.expected); Diff diff = DiffBuilder.compare(expectedDocument) .ignoreWhitespace() .withTest(actualDocument) @@ -73,7 +73,7 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { try { DOMResult result = new DOMResult(); - transformerHelper.transform(source, result); + this.transformerHelper.transform(source, result); return (Document) result.getNode(); } catch (TransformerException ex) { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java index 3816db5e..72167fd3 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java @@ -29,14 +29,14 @@ public class MockWebServiceMessageSenderTest { @BeforeEach public void setUp() { - sender = new MockWebServiceMessageSender(); + this.sender = new MockWebServiceMessageSender(); } @Test public void noMoreExpectedConnections() { assertThatExceptionOfType(AssertionError.class) - .isThrownBy(() -> sender.createConnection(URI.create("http://localhost"))); + .isThrownBy(() -> this.sender.createConnection(URI.create("http://localhost"))); } @Test @@ -44,8 +44,8 @@ public class MockWebServiceMessageSenderTest { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { - sender.expectNewConnection(); - sender.verifyConnections(); + this.sender.expectNewConnection(); + this.sender.verifyConnections(); }); } @@ -54,10 +54,10 @@ public class MockWebServiceMessageSenderTest { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { - sender.expectNewConnection(); - sender.expectNewConnection(); - sender.createConnection(URI.create("http://localhost")); - sender.verifyConnections(); + this.sender.expectNewConnection(); + this.sender.expectNewConnection(); + this.sender.createConnection(URI.create("http://localhost")); + this.sender.verifyConnections(); }); } diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java index 55f5895d..2062c804 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java @@ -73,10 +73,10 @@ public class MockWebServiceServerTest { @BeforeEach public void setUp() { - template = new WebServiceTemplate(); - template.setDefaultUri("http://example.com"); + this.template = new WebServiceTemplate(); + this.template.setDefaultUri("http://example.com"); - server = MockWebServiceServer.createServer(template); + this.server = MockWebServiceServer.createServer(this.template); } @Test @@ -153,9 +153,9 @@ public class MockWebServiceServerTest { replay(requestMatcher1, requestMatcher2, responseCreator); - server.expect(requestMatcher1).andExpect(requestMatcher2).andRespond(responseCreator); - template.sendSourceAndReceiveToResult(uri.toString(), new StringSource(""), - new StringResult()); + this.server.expect(requestMatcher1).andExpect(requestMatcher2).andRespond(responseCreator); + this.template.sendSourceAndReceiveToResult(uri.toString(), + new StringSource(""), new StringResult()); verify(requestMatcher1, requestMatcher2, responseCreator); } @@ -166,10 +166,10 @@ public class MockWebServiceServerTest { Source request = new StringSource(""); Source response = new StringSource(""); - server.expect(payload(request)).andRespond(withPayload(response)); + this.server.expect(payload(request)).andRespond(withPayload(response)); StringResult result = new StringResult(); - template.sendSourceAndReceiveToResult(request, result); + this.template.sendSourceAndReceiveToResult(request, result); XmlAssert.assertThat(response.toString()).and(result.toString()).ignoreWhitespace().areSimilar(); } @@ -181,11 +181,11 @@ public class MockWebServiceServerTest { Source expected = new StringSource(""); - server.expect(payload(expected)); + this.server.expect(payload(expected)); StringResult result = new StringResult(); String actual = ""; - template.sendSourceAndReceiveToResult(new StringSource(actual), result); + this.template.sendSourceAndReceiveToResult(new StringSource(actual), result); }); } @@ -194,13 +194,14 @@ public class MockWebServiceServerTest { final QName soapHeaderName = new QName("http://example.com", "mySoapHeader"); - server.expect(soapHeader(soapHeaderName)); + this.server.expect(soapHeader(soapHeaderName)); - template.sendSourceAndReceiveToResult(new StringSource(""), message -> { + this.template.sendSourceAndReceiveToResult(new StringSource(""), + message -> { - SoapMessage soapMessage = (SoapMessage) message; - soapMessage.getSoapHeader().addHeaderElement(soapHeaderName); - }, new StringResult()); + SoapMessage soapMessage = (SoapMessage) message; + soapMessage.getSoapHeader().addHeaderElement(soapHeaderName); + }, new StringResult()); } @Test @@ -210,9 +211,9 @@ public class MockWebServiceServerTest { QName soapHeaderName = new QName("http://example.com", "mySoapHeader"); - server.expect(soapHeader(soapHeaderName)); + this.server.expect(soapHeader(soapHeaderName)); - template.sendSourceAndReceiveToResult(new StringSource(""), + this.template.sendSourceAndReceiveToResult(new StringSource(""), new StringResult()); }); } @@ -221,9 +222,9 @@ public class MockWebServiceServerTest { public void connectionMatch() { String uri = "http://example.com"; - server.expect(connectionTo(uri)); + this.server.expect(connectionTo(uri)); - template.sendSourceAndReceiveToResult(uri, new StringSource(""), + this.template.sendSourceAndReceiveToResult(uri, new StringSource(""), new StringResult()); } @@ -233,11 +234,11 @@ public class MockWebServiceServerTest { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { String expected = "http://expected.com"; - server.expect(connectionTo(expected)); + this.server.expect(connectionTo(expected)); String actual = "http://actual.com"; - template.sendSourceAndReceiveToResult(actual, new StringSource(""), - new StringResult()); + this.template.sendSourceAndReceiveToResult(actual, + new StringSource(""), new StringResult()); }); } @@ -249,10 +250,10 @@ public class MockWebServiceServerTest { Source request = new StringSource(""); Source response = new StringSource(""); - server.expect(payload(request)).andRespond(withPayload(response)); + this.server.expect(payload(request)).andRespond(withPayload(response)); - template.sendSourceAndReceiveToResult(request, new StringResult()); - template.sendSourceAndReceiveToResult(request, new StringResult()); + this.template.sendSourceAndReceiveToResult(request, new StringResult()); + this.template.sendSourceAndReceiveToResult(request, new StringResult()); }); } @@ -263,11 +264,11 @@ public class MockWebServiceServerTest { "" .getBytes()); - server.expect(validPayload(schema)); + this.server.expect(validPayload(schema)); StringResult result = new StringResult(); String actual = ""; - template.sendSourceAndReceiveToResult(new StringSource(actual), result); + this.template.sendSourceAndReceiveToResult(new StringSource(actual), result); } @Test @@ -279,11 +280,11 @@ public class MockWebServiceServerTest { "" .getBytes()); - server.expect(validPayload(schema)); + this.server.expect(validPayload(schema)); StringResult result = new StringResult(); String actual = ""; - template.sendSourceAndReceiveToResult(new StringSource(actual), result); + this.template.sendSourceAndReceiveToResult(new StringSource(actual), result); }); } @@ -292,9 +293,9 @@ public class MockWebServiceServerTest { final Map ns = Collections.singletonMap("ns", "http://example.com"); - server.expect(xpath("/ns:request", ns).exists()); + this.server.expect(xpath("/ns:request", ns).exists()); - template.sendSourceAndReceiveToResult(new StringSource(""), + this.template.sendSourceAndReceiveToResult(new StringSource(""), new StringResult()); } @@ -305,9 +306,9 @@ public class MockWebServiceServerTest { final Map ns = Collections.singletonMap("ns", "http://example.com"); - server.expect(xpath("/ns:foo", ns).exists()); + this.server.expect(xpath("/ns:foo", ns).exists()); - template.sendSourceAndReceiveToResult(new StringSource(""), + this.template.sendSourceAndReceiveToResult(new StringSource(""), new StringResult()); }); } @@ -318,14 +319,14 @@ public class MockWebServiceServerTest { Source request = new StringSource(""); Source response = new StringSource(""); - server.expect(anything()).andRespond(withPayload(response)); + this.server.expect(anything()).andRespond(withPayload(response)); StringResult result = new StringResult(); - template.sendSourceAndReceiveToResult(request, result); + this.template.sendSourceAndReceiveToResult(request, result); XmlAssert.assertThat(response.toString()).and(result.toString()).ignoreWhitespace().areSimilar(); - server.verify(); + this.server.verify(); } @Test @@ -336,15 +337,15 @@ public class MockWebServiceServerTest { Source request = new StringSource(""); Source response = new StringSource(""); - server.expect(anything()).andRespond(withPayload(response)); - server.expect(anything()).andRespond(withPayload(response)); + this.server.expect(anything()).andRespond(withPayload(response)); + this.server.expect(anything()).andRespond(withPayload(response)); StringResult result = new StringResult(); - template.sendSourceAndReceiveToResult(request, result); + this.template.sendSourceAndReceiveToResult(request, result); XmlAssert.assertThat(response.toString()).and(result.toString()).ignoreWhitespace().areSimilar(); - server.expect(anything()).andRespond(withPayload(response)); + this.server.expect(anything()).andRespond(withPayload(response)); }); } @@ -353,9 +354,9 @@ public class MockWebServiceServerTest { Jaxb2Marshaller marshaller = new Jaxb2Marshaller(); marshaller.setClassesToBeBound(EnvelopeMatcherRequest.class, EnvelopeMatcherResponse.class); - template = new WebServiceTemplate(marshaller); - template.setDefaultUri("https://example.com"); - server = MockWebServiceServer.createServer(template); + this.template = new WebServiceTemplate(marshaller); + this.template.setDefaultUri("https://example.com"); + this.server = MockWebServiceServer.createServer(this.template); Source expectedSoapRequest = new StringSource(""" @@ -375,12 +376,12 @@ public class MockWebServiceServerTest { """); - server.expect(soapEnvelope(expectedSoapRequest)).andRespond(withSoapEnvelope(soapResponse)); + this.server.expect(soapEnvelope(expectedSoapRequest)).andRespond(withSoapEnvelope(soapResponse)); EnvelopeMatcherRequest request = new EnvelopeMatcherRequest(); request.setMyData("123456"); assertThat(request.getMyData()).isEqualTo("123456"); - EnvelopeMatcherResponse response = (EnvelopeMatcherResponse) template.marshalSendAndReceive(request); + EnvelopeMatcherResponse response = (EnvelopeMatcherResponse) this.template.marshalSendAndReceive(request); assertThat(response.getMyData()).isEqualTo("654321"); } @@ -390,14 +391,14 @@ public class MockWebServiceServerTest { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { - server.expect(anything()); - server.verify(); + this.server.expect(anything()); + this.server.verify(); }); } @Test public void verifyOnly() { - server.verify(); + this.server.verify(); } @Test @@ -407,10 +408,10 @@ public class MockWebServiceServerTest { Source request = new StringSource(""); - server.expect(anything()).andRespond(withClientOrSenderFault("reason", Locale.ENGLISH)); + this.server.expect(anything()).andRespond(withClientOrSenderFault("reason", Locale.ENGLISH)); StringResult result = new StringResult(); - template.sendSourceAndReceiveToResult(request, result); + this.template.sendSourceAndReceiveToResult(request, result); }); } @@ -424,7 +425,7 @@ public class MockWebServiceServerTest { private String myData; public String getMyData() { - return myData; + return this.myData; } public void setMyData(String myData) { @@ -439,7 +440,7 @@ public class MockWebServiceServerTest { private String myData; public String getMyData() { - return myData; + return this.myData; } public void setMyData(String myData) { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java index 1a3e9e78..47d69e58 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java @@ -50,8 +50,8 @@ public class ResponseCreatorsTest { @BeforeEach public void createMessageFactory() { - messageFactory = new SaajSoapMessageFactory(); - messageFactory.afterPropertiesSet(); + this.messageFactory = new SaajSoapMessageFactory(); + this.messageFactory.afterPropertiesSet(); } @Test @@ -60,7 +60,7 @@ public class ResponseCreatorsTest { String payload = ""; ResponseCreator responseCreator = ResponseCreators.withPayload(new StringSource(payload)); - WebServiceMessage response = responseCreator.createResponse(null, null, messageFactory); + WebServiceMessage response = responseCreator.createResponse(null, null, this.messageFactory); XmlAssert.assertThat(getPayloadAsString(response)).and(payload).ignoreWhitespace().areSimilar(); } @@ -72,7 +72,7 @@ public class ResponseCreatorsTest { ResponseCreator responseCreator = ResponseCreators .withPayload(new ByteArrayResource(payload.getBytes(StandardCharsets.UTF_8))); - WebServiceMessage response = responseCreator.createResponse(null, null, messageFactory); + WebServiceMessage response = responseCreator.createResponse(null, null, this.messageFactory); XmlAssert.assertThat(getPayloadAsString(response)).and(payload).ignoreWhitespace().areSimilar(); } @@ -88,7 +88,7 @@ public class ResponseCreatorsTest { xmlBuilder.append(""); String envelope = xmlBuilder.toString(); ResponseCreator responseCreator = ResponseCreators.withSoapEnvelope(new StringSource(envelope)); - WebServiceMessage response = responseCreator.createResponse(null, null, messageFactory); + WebServiceMessage response = responseCreator.createResponse(null, null, this.messageFactory); XmlAssert.assertThat(getSoapEnvelopeAsString((SoapMessage) response)) .and(envelope) @@ -108,7 +108,7 @@ public class ResponseCreatorsTest { String envelope = xmlBuilder.toString(); ResponseCreator responseCreator = ResponseCreators .withSoapEnvelope(new ByteArrayResource(envelope.getBytes(StandardCharsets.UTF_8))); - WebServiceMessage response = responseCreator.createResponse(null, null, messageFactory); + WebServiceMessage response = responseCreator.createResponse(null, null, this.messageFactory); XmlAssert.assertThat(getSoapEnvelopeAsString((SoapMessage) response)) .and(envelope) @@ -182,7 +182,7 @@ public class ResponseCreatorsTest { private void testFault(ResponseCreator responseCreator, String faultString, QName faultCode) throws IOException { - SoapMessage response = (SoapMessage) responseCreator.createResponse(null, null, messageFactory); + SoapMessage response = (SoapMessage) responseCreator.createResponse(null, null, this.messageFactory); assertThat(response.hasFault()).isTrue(); @@ -196,7 +196,7 @@ public class ResponseCreatorsTest { private String getPayloadAsString(WebServiceMessage message) throws TransformerException { Result result = new StringResult(); - transformerHelper.transform(message.getPayloadSource(), result); + this.transformerHelper.transform(message.getPayloadSource(), result); return result.toString(); } @@ -204,7 +204,7 @@ public class ResponseCreatorsTest { DOMSource source = new DOMSource(message.getDocument()); Result result = new StringResult(); - transformerHelper.transform(source, result); + this.transformerHelper.transform(source, result); return result.toString(); } diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java index a5c8d6a8..d4b9fc9d 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java @@ -42,21 +42,21 @@ public class WebServiceMessageMatcherAdapterTest { @BeforeEach public void setUp() { - message = createMock(WebServiceMessage.class); - adaptee = createMock(WebServiceMessageMatcher.class); - adapter = new WebServiceMessageMatcherAdapter(adaptee); + this.message = createMock(WebServiceMessage.class); + this.adaptee = createMock(WebServiceMessageMatcher.class); + this.adapter = new WebServiceMessageMatcherAdapter(this.adaptee); } @Test public void match() throws IOException { - adaptee.match(message); + this.adaptee.match(this.message); - replay(message, adaptee); + replay(this.message, this.adaptee); - adapter.match(null, message); + this.adapter.match(null, this.message); - verify(message, adaptee); + verify(this.message, this.adaptee); } } diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java index e3644d58..b84221e9 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java @@ -49,7 +49,7 @@ public class ClientIntegrationTest { @BeforeEach public void createServer() { - mockServer = MockWebServiceServer.createServer(client); + this.mockServer = MockWebServiceServer.createServer(this.client); } @Test @@ -61,13 +61,13 @@ public class ClientIntegrationTest { Source responsePayload = new StringSource("" + "10" + ""); - mockServer.expect(payload(expectedRequestPayload)).andRespond(withPayload(responsePayload)); + this.mockServer.expect(payload(expectedRequestPayload)).andRespond(withPayload(responsePayload)); - int result = client.getCustomerCount(); + int result = this.client.getCustomerCount(); assertThat(result).isEqualTo(10); - mockServer.verify(); + this.mockServer.verify(); } } diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountRequest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountRequest.java index de3d0d01..f9d02481 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountRequest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountRequest.java @@ -26,7 +26,7 @@ public class CustomerCountRequest { @XmlElement(namespace = "http://springframework.org/spring-ws") public String getCustomerName() { - return customerName; + return this.customerName; } public void setCustomerName(String name) { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountResponse.java b/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountResponse.java index 9c313fa6..47f6de4c 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountResponse.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/integration/CustomerCountResponse.java @@ -26,7 +26,7 @@ public class CustomerCountResponse { @XmlElement(namespace = "http://springframework.org/spring-ws") public int getCustomerCount() { - return customerCount; + return this.customerCount; } public void setCustomerCount(int customerCount) { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java index be0b53a1..bbbb7b55 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java @@ -42,21 +42,21 @@ public class WebServiceMessageMatcherAdapterTest { @BeforeEach public void setUp() { - message = createMock(WebServiceMessage.class); - adaptee = createMock(WebServiceMessageMatcher.class); - adapter = new WebServiceMessageMatcherAdapter(adaptee); + this.message = createMock(WebServiceMessage.class); + this.adaptee = createMock(WebServiceMessageMatcher.class); + this.adapter = new WebServiceMessageMatcherAdapter(this.adaptee); } @Test public void match() throws IOException { - adaptee.match(message); + this.adaptee.match(this.message); - replay(message, adaptee); + replay(this.message, this.adaptee); - adapter.match(null, message); + this.adapter.match(null, this.message); - verify(message, adaptee); + verify(this.message, this.adaptee); } } diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java index faba6341..cc085bd8 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java @@ -46,7 +46,7 @@ public class ServerIntegrationTest { @BeforeEach public void createClient() { - mockClient = MockWebServiceClient.createClient(applicationContext); + this.mockClient = MockWebServiceClient.createClient(this.applicationContext); } @Test @@ -58,7 +58,7 @@ public class ServerIntegrationTest { "" + "42" + ""); - mockClient.sendRequest(withPayload(requestPayload)).andExpect(payload(expectedResponsePayload)); + this.mockClient.sendRequest(withPayload(requestPayload)).andExpect(payload(expectedResponsePayload)); } } diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java index fcb6c923..5026ffea 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java @@ -45,25 +45,25 @@ public class SchemaValidatingMatcherTest { @BeforeEach public void setUp() { - message = createMock(WebServiceMessage.class); - schema = new ClassPathResource("schemaValidatingMatcherTest.xsd", SchemaValidatingMatcherTest.class); - schema1 = new ClassPathResource("schemaValidatingMatcherTest-1.xsd", SchemaValidatingMatcherTest.class); - schema2 = new ClassPathResource("schemaValidatingMatcherTest-2.xsd", SchemaValidatingMatcherTest.class); + this.message = createMock(WebServiceMessage.class); + this.schema = new ClassPathResource("schemaValidatingMatcherTest.xsd", SchemaValidatingMatcherTest.class); + this.schema1 = new ClassPathResource("schemaValidatingMatcherTest-1.xsd", SchemaValidatingMatcherTest.class); + this.schema2 = new ClassPathResource("schemaValidatingMatcherTest-2.xsd", SchemaValidatingMatcherTest.class); } @Test public void singleSchemaMatch() throws IOException, AssertionError { - expect(message.getPayloadSource()).andReturn(new StringSource( + expect(this.message.getPayloadSource()).andReturn(new StringSource( "0text")); - SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(schema); + SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(this.schema); - replay(message); + replay(this.message); - matcher.match(message); + matcher.match(this.message); - verify(message); + verify(this.message); } @Test @@ -71,34 +71,34 @@ public class SchemaValidatingMatcherTest { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { - expect(message.getPayloadSource()) + expect(this.message.getPayloadSource()) .andReturn(new StringSource( "atext")) .times(2); - SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(schema); + SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(this.schema); - replay(message); + replay(this.message); - matcher.match(message); + matcher.match(this.message); - verify(message); + verify(this.message); }); } @Test public void multipleSchemaMatch() throws IOException, AssertionError { - expect(message.getPayloadSource()).andReturn(new StringSource( + expect(this.message.getPayloadSource()).andReturn(new StringSource( "0text")); - SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(schema1, schema2); + SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(this.schema1, this.schema2); - replay(message); + replay(this.message); - matcher.match(message); + matcher.match(this.message); - verify(message); + verify(this.message); } @Test @@ -106,18 +106,18 @@ public class SchemaValidatingMatcherTest { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { - expect(message.getPayloadSource()) + expect(this.message.getPayloadSource()) .andReturn(new StringSource( "atext")) .times(2); - SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(schema1, schema2); + SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(this.schema1, this.schema2); - replay(message); + replay(this.message); - matcher.match(message); + matcher.match(this.message); - verify(message); + verify(this.message); }); } @@ -126,18 +126,18 @@ public class SchemaValidatingMatcherTest { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { - expect(message.getPayloadSource()) + expect(this.message.getPayloadSource()) .andReturn(new StringSource( "atext")) .times(2); - SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(schema1, schema2); + SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(this.schema1, this.schema2); - replay(message); + replay(this.message); - matcher.match(message); + matcher.match(this.message); - verify(message); + verify(this.message); }); } @@ -146,18 +146,18 @@ public class SchemaValidatingMatcherTest { assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> { - expect(message.getPayloadSource()) + expect(this.message.getPayloadSource()) .andReturn(new StringSource( "atext")) .times(2); - SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(schema); + SchemaValidatingMatcher matcher = new SchemaValidatingMatcher(this.schema); - replay(message); + replay(this.message); - matcher.match(message); + matcher.match(this.message); - verify(message); + verify(this.message); }); } diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java index 0511f1c4..162065a0 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java @@ -39,8 +39,8 @@ public class SoapHeaderMatcherTest { @BeforeEach public void setUp() { - expectedHeaderName = new QName("http://example.com", "header"); - matcher = new SoapHeaderMatcher(expectedHeaderName); + this.expectedHeaderName = new QName("http://example.com", "header"); + this.matcher = new SoapHeaderMatcher(this.expectedHeaderName); } @Test @@ -48,10 +48,10 @@ public class SoapHeaderMatcherTest { MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage saajMessage = messageFactory.createMessage(); - saajMessage.getSOAPHeader().addHeaderElement(expectedHeaderName); + saajMessage.getSOAPHeader().addHeaderElement(this.expectedHeaderName); SoapMessage soapMessage = new SaajSoapMessage(saajMessage); - matcher.match(soapMessage); + this.matcher.match(soapMessage); } @Test @@ -63,7 +63,7 @@ public class SoapHeaderMatcherTest { SOAPMessage saajMessage = messageFactory.createMessage(); SoapMessage soapMessage = new SaajSoapMessage(saajMessage); - matcher.match(soapMessage); + this.matcher.match(soapMessage); }); } @@ -74,7 +74,7 @@ public class SoapHeaderMatcherTest { WebServiceMessage message = createMock(WebServiceMessage.class); - matcher.match(message); + this.matcher.match(message); }); } diff --git a/spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java b/spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java index 66fbe1b6..d6be6d1c 100644 --- a/spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java +++ b/spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java @@ -54,27 +54,27 @@ public class DomContentHandler implements ContentHandler { Assert.notNull(node, "node must not be null"); this.node = node; if (node instanceof Document) { - document = (Document) node; + this.document = (Document) node; } else { - document = node.getOwnerDocument(); + this.document = node.getOwnerDocument(); } - Assert.notNull(document, "document must not be null"); + Assert.notNull(this.document, "document must not be null"); } private Node getParent() { - if (!elements.isEmpty()) { - return elements.get(elements.size() - 1); + if (!this.elements.isEmpty()) { + return this.elements.get(this.elements.size() - 1); } else { - return node; + return this.node; } } @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { Node parent = getParent(); - Element element = document.createElementNS(uri, qName); + Element element = this.document.createElementNS(uri, qName); for (int i = 0; i < attributes.getLength(); i++) { String attrUri = attributes.getURI(i); String attrQname = attributes.getQName(i); @@ -84,12 +84,12 @@ public class DomContentHandler implements ContentHandler { } } element = (Element) parent.appendChild(element); - elements.add(element); + this.elements.add(element); } @Override public void endElement(String uri, String localName, String qName) throws SAXException { - elements.remove(elements.size() - 1); + this.elements.remove(this.elements.size() - 1); } @Override @@ -101,7 +101,7 @@ public class DomContentHandler implements ContentHandler { ((Text) lastChild).appendData(data); } else { - Text text = document.createTextNode(data); + Text text = this.document.createTextNode(data); parent.appendChild(text); } } @@ -109,7 +109,7 @@ public class DomContentHandler implements ContentHandler { @Override public void processingInstruction(String target, String data) throws SAXException { Node parent = getParent(); - ProcessingInstruction pi = document.createProcessingInstruction(target, data); + ProcessingInstruction pi = this.document.createProcessingInstruction(target, data); parent.appendChild(pi); } diff --git a/spring-xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java b/spring-xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java index cd973a63..11bfd279 100644 --- a/spring-xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java +++ b/spring-xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java @@ -52,8 +52,8 @@ public class SimpleNamespaceContext implements NamespaceContext { else if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix)) { return XMLConstants.XMLNS_ATTRIBUTE_NS_URI; } - else if (prefixToNamespaceUri.containsKey(prefix)) { - return prefixToNamespaceUri.get(prefix); + else if (this.prefixToNamespaceUri.containsKey(prefix)) { + return this.prefixToNamespaceUri.get(prefix); } return XMLConstants.NULL_NS_URI; } @@ -108,15 +108,15 @@ public class SimpleNamespaceContext implements NamespaceContext { + XMLConstants.XMLNS_ATTRIBUTE_NS_URI + "\")"); } else { - prefixToNamespaceUri.put(prefix, namespaceUri); + this.prefixToNamespaceUri.put(prefix, namespaceUri); getPrefixesInternal(namespaceUri).add(prefix); } } /** Removes all declared prefixes. */ public void clear() { - prefixToNamespaceUri.clear(); - namespaceUriToPrefixes.clear(); + this.prefixToNamespaceUri.clear(); + this.namespaceUriToPrefixes.clear(); } /** @@ -124,7 +124,7 @@ public class SimpleNamespaceContext implements NamespaceContext { * @return the declared prefixes */ public Iterator getBoundPrefixes() { - Set prefixes = new HashSet<>(prefixToNamespaceUri.keySet()); + Set prefixes = new HashSet<>(this.prefixToNamespaceUri.keySet()); prefixes.remove(XMLConstants.DEFAULT_NS_PREFIX); prefixes = Collections.unmodifiableSet(prefixes); return prefixes.iterator(); @@ -137,7 +137,7 @@ public class SimpleNamespaceContext implements NamespaceContext { else if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceUri)) { return Collections.singleton(XMLConstants.XMLNS_ATTRIBUTE); } - return namespaceUriToPrefixes.computeIfAbsent(namespaceUri, k -> new LinkedHashSet<>()); + return this.namespaceUriToPrefixes.computeIfAbsent(namespaceUri, k -> new LinkedHashSet<>()); } /** @@ -145,7 +145,7 @@ public class SimpleNamespaceContext implements NamespaceContext { * @param prefix the prefix to be removed */ public void removeBinding(String prefix) { - String namespaceUri = prefixToNamespaceUri.remove(prefix); + String namespaceUri = this.prefixToNamespaceUri.remove(prefix); if (namespaceUri != null) { Set prefixes = getPrefixesInternal(namespaceUri); prefixes.remove(prefix); @@ -153,7 +153,7 @@ public class SimpleNamespaceContext implements NamespaceContext { } public boolean hasBinding(String prefix) { - return prefixToNamespaceUri.containsKey(prefix); + return this.prefixToNamespaceUri.containsKey(prefix); } } diff --git a/spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java b/spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java index 29b79850..e48b2dc8 100644 --- a/spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java +++ b/spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java @@ -50,7 +50,7 @@ public abstract class AbstractXmlReader implements XMLReader { @Override public ContentHandler getContentHandler() { - return contentHandler; + return this.contentHandler; } @Override @@ -65,12 +65,12 @@ public abstract class AbstractXmlReader implements XMLReader { @Override public DTDHandler getDTDHandler() { - return dtdHandler; + return this.dtdHandler; } @Override public EntityResolver getEntityResolver() { - return entityResolver; + return this.entityResolver; } @Override @@ -80,7 +80,7 @@ public abstract class AbstractXmlReader implements XMLReader { @Override public ErrorHandler getErrorHandler() { - return errorHandler; + return this.errorHandler; } @Override @@ -89,7 +89,7 @@ public abstract class AbstractXmlReader implements XMLReader { } protected LexicalHandler getLexicalHandler() { - return lexicalHandler; + return this.lexicalHandler; } /** @@ -118,7 +118,7 @@ public abstract class AbstractXmlReader implements XMLReader { @Override public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException { if ("http://xml.org/sax/properties/lexical-handler".equals(name)) { - return lexicalHandler; + return this.lexicalHandler; } else { throw new SAXNotRecognizedException(name); @@ -133,7 +133,7 @@ public abstract class AbstractXmlReader implements XMLReader { @Override public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException { if ("http://xml.org/sax/properties/lexical-handler".equals(name)) { - lexicalHandler = (LexicalHandler) value; + this.lexicalHandler = (LexicalHandler) value; } else { throw new SAXNotRecognizedException(name); diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/StringSource.java b/spring-xml/src/main/java/org/springframework/xml/transform/StringSource.java index 15deff31..e2719253 100644 --- a/spring-xml/src/main/java/org/springframework/xml/transform/StringSource.java +++ b/spring-xml/src/main/java/org/springframework/xml/transform/StringSource.java @@ -47,7 +47,7 @@ public class StringSource extends StreamSource { @Override public Reader getReader() { - return new StringReader(content); + return new StringReader(this.content); } /** @@ -79,7 +79,7 @@ public class StringSource extends StreamSource { @Override public String toString() { - return content; + return this.content; } } diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java index 3216ad00..1a641ebb 100644 --- a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java +++ b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java @@ -95,12 +95,12 @@ public class TransformerHelper { * @return the transformer factory */ public TransformerFactory getTransformerFactory() { - TransformerFactory result = transformerFactory; + TransformerFactory result = this.transformerFactory; if (result == null) { synchronized (this) { - result = transformerFactory; + result = this.transformerFactory; if (result == null) { - transformerFactory = result = newTransformerFactory(transformerFactoryClass); + this.transformerFactory = result = newTransformerFactory(this.transformerFactoryClass); } } } diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java index e9dab71e..33e109f7 100644 --- a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java +++ b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java @@ -49,7 +49,7 @@ public abstract class TransformerObjectSupport { * Specify the {@code TransformerFactory} class to use. */ public void setTransformerFactoryClass(Class transformerFactoryClass) { - transformerHelper.setTransformerFactoryClass(transformerFactoryClass); + this.transformerHelper.setTransformerFactoryClass(transformerFactoryClass); } /** @@ -67,14 +67,14 @@ public abstract class TransformerObjectSupport { * @see #getTransformerFactory() */ protected TransformerFactory newTransformerFactory(Class transformerFactoryClass) { - return transformerHelper.newTransformerFactory(transformerFactoryClass); + return this.transformerHelper.newTransformerFactory(transformerFactoryClass); } /** * Returns the {@code TransformerFactory}. */ protected TransformerFactory getTransformerFactory() { - return transformerHelper.getTransformerFactory(); + return this.transformerHelper.getTransformerFactory(); } /** @@ -84,7 +84,7 @@ public abstract class TransformerObjectSupport { * @throws TransformerConfigurationException if thrown by JAXP methods */ protected final Transformer createTransformer() throws TransformerConfigurationException { - return transformerHelper.createTransformer(); + return this.transformerHelper.createTransformer(); } /** @@ -95,7 +95,7 @@ public abstract class TransformerObjectSupport { * @throws TransformerException if thrown by JAXP methods */ protected final void transform(Source source, Result result) throws TransformerException { - transformerHelper.transform(source, result); + this.transformerHelper.transform(source, result); } } diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java index 92c2dbdd..ae4d950e 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java @@ -66,7 +66,7 @@ abstract class Jaxp13ValidatorFactory { if (errorHandler == null) { errorHandler = new DefaultValidationErrorHandler(); } - Validator validator = schema.newValidator(); + Validator validator = this.schema.newValidator(); validator.setErrorHandler(errorHandler); try { validator.validate(source); @@ -88,7 +88,7 @@ abstract class Jaxp13ValidatorFactory { @Override public SAXParseException[] getErrors() { - return errors.toArray(new SAXParseException[0]); + return this.errors.toArray(new SAXParseException[0]); } @Override @@ -97,12 +97,12 @@ abstract class Jaxp13ValidatorFactory { @Override public void error(SAXParseException ex) throws SAXException { - errors.add(ex); + this.errors.add(ex); } @Override public void fatalError(SAXParseException ex) throws SAXException { - errors.add(ex); + this.errors.add(ex); } } diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java index bdb23929..626b7d8d 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java @@ -74,7 +74,7 @@ abstract class Jaxp15ValidatorFactory { if (errorHandler == null) { errorHandler = new DefaultValidationErrorHandler(); } - Validator validator = schema.newValidator(); + Validator validator = this.schema.newValidator(); try { validator.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, ""); @@ -117,7 +117,7 @@ abstract class Jaxp15ValidatorFactory { @Override public SAXParseException[] getErrors() { - return errors.toArray(new SAXParseException[0]); + return this.errors.toArray(new SAXParseException[0]); } @Override @@ -126,12 +126,12 @@ abstract class Jaxp15ValidatorFactory { @Override public void error(SAXParseException ex) throws SAXException { - errors.add(ex); + this.errors.add(ex); } @Override public void fatalError(SAXParseException ex) throws SAXException { - errors.add(ex); + this.errors.add(ex); } } diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java index 4037aacb..49f967a5 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java @@ -42,7 +42,7 @@ public abstract class AbstractXPathTemplate extends TransformerObjectSupport imp /** Returns namespaces used in the XPath expression. */ public Map getNamespaces() { - return namespaces; + return this.namespaces; } /** Sets namespaces used in the XPath expression. Maps prefixes to namespaces. */ @@ -70,7 +70,7 @@ public abstract class AbstractXPathTemplate extends TransformerObjectSupport imp @Override public Object mapNode(Node node, int nodeNum) throws DOMException { - callbackHandler.processNode(node); + this.callbackHandler.processNode(node); return null; } diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java index e91505e3..25725d98 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java @@ -88,46 +88,50 @@ abstract class JaxenXPathExpressionFactory { @Override public String toString() { - return expression; + return this.expression; } @Override public Node evaluateAsNode(Node node) { try { - return (Node) xpath.selectSingleNode(node); + return (Node) this.xpath.selectSingleNode(node); } catch (JaxenException ex) { - throw new XPathException("Could not evaluate XPath expression [" + xpath + "] :" + ex.getMessage(), ex); + throw new XPathException("Could not evaluate XPath expression [" + this.xpath + "] :" + ex.getMessage(), + ex); } } @Override public boolean evaluateAsBoolean(Node node) { try { - return xpath.booleanValueOf(node); + return this.xpath.booleanValueOf(node); } catch (JaxenException ex) { - throw new XPathException("Could not evaluate XPath expression [" + xpath + "] :" + ex.getMessage(), ex); + throw new XPathException("Could not evaluate XPath expression [" + this.xpath + "] :" + ex.getMessage(), + ex); } } @Override public double evaluateAsNumber(Node node) { try { - return xpath.numberValueOf(node).doubleValue(); + return this.xpath.numberValueOf(node).doubleValue(); } catch (JaxenException ex) { - throw new XPathException("Could not evaluate XPath expression [" + xpath + "] :" + ex.getMessage(), ex); + throw new XPathException("Could not evaluate XPath expression [" + this.xpath + "] :" + ex.getMessage(), + ex); } } @Override public String evaluateAsString(Node node) { try { - return xpath.stringValueOf(node); + return this.xpath.stringValueOf(node); } catch (JaxenException ex) { - throw new XPathException("Could not evaluate XPath expression [" + xpath + "] :" + ex.getMessage(), ex); + throw new XPathException("Could not evaluate XPath expression [" + this.xpath + "] :" + ex.getMessage(), + ex); } } @@ -135,17 +139,18 @@ abstract class JaxenXPathExpressionFactory { @SuppressWarnings("unchecked") public List evaluateAsNodeList(Node node) { try { - return xpath.selectNodes(node); + return this.xpath.selectNodes(node); } catch (JaxenException ex) { - throw new XPathException("Could not evaluate XPath expression [" + xpath + "] :" + ex.getMessage(), ex); + throw new XPathException("Could not evaluate XPath expression [" + this.xpath + "] :" + ex.getMessage(), + ex); } } @Override public T evaluateAsObject(Node context, NodeMapper nodeMapper) throws XPathException { try { - Node result = (Node) xpath.selectSingleNode(context); + Node result = (Node) this.xpath.selectSingleNode(context); if (result != null) { try { return nodeMapper.mapNode(result, 0); @@ -159,14 +164,15 @@ abstract class JaxenXPathExpressionFactory { } } catch (JaxenException ex) { - throw new XPathException("Could not evaluate XPath expression [" + xpath + "] :" + ex.getMessage(), ex); + throw new XPathException("Could not evaluate XPath expression [" + this.xpath + "] :" + ex.getMessage(), + ex); } } @Override public List evaluate(Node context, NodeMapper nodeMapper) throws XPathException { try { - List nodes = xpath.selectNodes(context); + List nodes = this.xpath.selectNodes(context); List results = new ArrayList<>(nodes.size()); for (int i = 0; i < nodes.size(); i++) { Node node = (Node) nodes.get(i); @@ -180,7 +186,8 @@ abstract class JaxenXPathExpressionFactory { return results; } catch (JaxenException ex) { - throw new XPathException("Could not evaluate XPath expression [" + xpath + "] :" + ex.getMessage(), ex); + throw new XPathException("Could not evaluate XPath expression [" + this.xpath + "] :" + ex.getMessage(), + ex); } } diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java index a2056637..52315c4a 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java @@ -103,7 +103,7 @@ abstract class Jaxp13XPathExpressionFactory { @Override public String toString() { - return expression; + return this.expression; } @Override @@ -120,8 +120,8 @@ abstract class Jaxp13XPathExpressionFactory { private Object evaluate(Node node, QName returnType) { try { // XPathExpression is not thread-safe - synchronized (xpathExpression) { - return xpathExpression.evaluate(node, returnType); + synchronized (this.xpathExpression) { + return this.xpathExpression.evaluate(node, returnType); } } catch (XPathExpressionException ex) { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java index f5b967ed..f8076676 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java @@ -67,7 +67,7 @@ public class Jaxp13XPathTemplate extends AbstractXPathTemplate { public Jaxp13XPathTemplate(String xpathFactoryUri) { try { - xpathFactory = XPathFactory.newInstance(xpathFactoryUri); + this.xpathFactory = XPathFactory.newInstance(xpathFactoryUri); } catch (XPathFactoryConfigurationException ex) { throw new XPathException("Could not create XPathFactory", ex); @@ -161,7 +161,7 @@ public class Jaxp13XPathTemplate extends AbstractXPathTemplate { } private synchronized XPath createXPath() { - return xpathFactory.newXPath(); + return this.xpathFactory.newXPath(); } private static class EvaluationCallback implements TraxUtils.SourceCallback { @@ -184,7 +184,7 @@ public class Jaxp13XPathTemplate extends AbstractXPathTemplate { @Override public void domSource(Node node) throws XPathExpressionException { - result = xpath.evaluate(expression, node, returnType); + this.result = this.xpath.evaluate(this.expression, node, this.returnType); } @Override @@ -221,12 +221,12 @@ public class Jaxp13XPathTemplate extends AbstractXPathTemplate { } private void inputSource(InputSource inputSource) throws XPathExpressionException { - result = xpath.evaluate(expression, inputSource, returnType); + this.result = this.xpath.evaluate(this.expression, inputSource, this.returnType); } private Element getRootElement(Source source) throws TransformerException { DOMResult domResult = new DOMResult(); - transformerHelper.transform(source, domResult); + this.transformerHelper.transform(source, domResult); Document document = (Document) domResult.getNode(); return document.getDocumentElement(); } diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java index 52c1c9d1..0098135a 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java @@ -44,7 +44,7 @@ public class XPathExpressionFactoryBean implements FactoryBean, /** Sets the XPath expression. Setting this property is required. */ public void setExpression(String expression) { - expressionString = expression; + this.expressionString = expression; } /** @@ -57,18 +57,18 @@ public class XPathExpressionFactoryBean implements FactoryBean, @Override public void afterPropertiesSet() throws IllegalStateException, XPathParseException { - Assert.notNull(expressionString, "expression is required"); - if (CollectionUtils.isEmpty(namespaces)) { - expression = XPathExpressionFactory.createXPathExpression(expressionString); + Assert.notNull(this.expressionString, "expression is required"); + if (CollectionUtils.isEmpty(this.namespaces)) { + this.expression = XPathExpressionFactory.createXPathExpression(this.expressionString); } else { - expression = XPathExpressionFactory.createXPathExpression(expressionString, namespaces); + this.expression = XPathExpressionFactory.createXPathExpression(this.expressionString, this.namespaces); } } @Override public XPathExpression getObject() throws Exception { - return expression; + return this.expression; } @Override diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java b/spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java index d749b770..0450f2c0 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java +++ b/spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java @@ -96,21 +96,21 @@ public class SimpleXsdSchema implements XsdSchema, InitializingBean { @Override public String getTargetNamespace() { - Assert.notNull(schemaElement, + Assert.notNull(this.schemaElement, "schemaElement must not be null! Did you run afterPropertiesSet() or register this as a Spring bean?"); - return schemaElement.getAttribute("targetNamespace"); + return this.schemaElement.getAttribute("targetNamespace"); } @Override public Source getSource() { - return new DOMSource(schemaElement); + return new DOMSource(this.schemaElement); } @Override public XmlValidator createValidator() { try { - return XmlValidatorFactory.createValidator(xsdResource, XmlValidatorFactory.SCHEMA_W3C_XML); + return XmlValidatorFactory.createValidator(this.xsdResource, XmlValidatorFactory.SCHEMA_W3C_XML); } catch (IOException ex) { throw new XsdSchemaException(ex.getMessage(), ex); @@ -119,21 +119,21 @@ public class SimpleXsdSchema implements XsdSchema, InitializingBean { @Override public void afterPropertiesSet() throws ParserConfigurationException, IOException, SAXException { - Assert.notNull(xsdResource, "'xsd' is required"); + Assert.notNull(this.xsdResource, "'xsd' is required"); Assert.isTrue(this.xsdResource.exists(), "xsd '" + this.xsdResource + "' does not exist"); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); loadSchema(documentBuilder); } private void loadSchema(DocumentBuilder documentBuilder) throws SAXException, IOException { - Document schemaDocument = documentBuilder.parse(SaxUtils.createInputSource(xsdResource)); - schemaElement = schemaDocument.getDocumentElement(); - Assert.isTrue(SCHEMA_NAME.getLocalPart().equals(schemaElement.getLocalName()), - xsdResource + " has invalid root element : [" + schemaElement.getLocalName() + "] instead of [schema]"); - Assert.isTrue(SCHEMA_NAME.getNamespaceURI().equals(schemaElement.getNamespaceURI()), - xsdResource + " has invalid root element: [" + schemaElement.getNamespaceURI() + "] instead of [" - + SCHEMA_NAME.getNamespaceURI() + "]"); - Assert.hasText(getTargetNamespace(), xsdResource + " has no targetNamespace"); + Document schemaDocument = documentBuilder.parse(SaxUtils.createInputSource(this.xsdResource)); + this.schemaElement = schemaDocument.getDocumentElement(); + Assert.isTrue(SCHEMA_NAME.getLocalPart().equals(this.schemaElement.getLocalName()), this.xsdResource + + " has invalid root element : [" + this.schemaElement.getLocalName() + "] instead of [schema]"); + Assert.isTrue(SCHEMA_NAME.getNamespaceURI().equals(this.schemaElement.getNamespaceURI()), + this.xsdResource + " has invalid root element: [" + this.schemaElement.getNamespaceURI() + + "] instead of [" + SCHEMA_NAME.getNamespaceURI() + "]"); + Assert.hasText(getTargetNamespace(), this.xsdResource + " has no targetNamespace"); } public String toString() { diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java index 1f00b50a..a057b14f 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java +++ b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java @@ -82,11 +82,11 @@ public class CommonsXsdSchema implements XsdSchema { @Override public String getTargetNamespace() { - return schema.getTargetNamespace(); + return this.schema.getTargetNamespace(); } public QName[] getElementNames() { - List result = new ArrayList<>(schema.getElements().keySet()); + List result = new ArrayList<>(this.schema.getElements().keySet()); return result.toArray(new QName[0]); } @@ -96,10 +96,10 @@ public class CommonsXsdSchema implements XsdSchema { // stream-based version try { XmlSchemaSerializer serializer = BeanUtils.instantiateClass(XmlSchemaSerializer.class); - if (collection != null) { - serializer.setExtReg(collection.getExtReg()); + if (this.collection != null) { + serializer.setExtReg(this.collection.getExtReg()); } - Document[] serializedSchemas = serializer.serializeSchema(schema, false); + Document[] serializedSchemas = serializer.serializeSchema(this.schema, false); return new DOMSource(serializedSchemas[0]); } catch (BeanInstantiationException | XmlSchemaSerializer.XmlSchemaSerializerException ex) { @@ -107,7 +107,7 @@ public class CommonsXsdSchema implements XsdSchema { } ByteArrayOutputStream bos = new ByteArrayOutputStream(); try { - schema.write(bos); + this.schema.write(bos); } catch (UnsupportedEncodingException ex) { throw new CommonsXsdSchemaException(ex.getMessage(), ex); @@ -119,7 +119,7 @@ public class CommonsXsdSchema implements XsdSchema { @Override public XmlValidator createValidator() { try { - Resource resource = new UrlResource(schema.getSourceURI()); + Resource resource = new UrlResource(this.schema.getSourceURI()); return XmlValidatorFactory.createValidator(resource, XmlValidatorFactory.SCHEMA_W3C_XML); } catch (IOException ex) { @@ -129,7 +129,7 @@ public class CommonsXsdSchema implements XsdSchema { /** Returns the wrapped Commons {@code XmlSchema} object. */ public XmlSchema getSchema() { - return schema; + return this.schema; } public String toString() { diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java index 2377a1f0..99d58c3d 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java +++ b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java @@ -128,20 +128,20 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali @Override public void afterPropertiesSet() throws IOException { - Assert.notEmpty(xsdResources, "'xsds' must not be empty"); + Assert.notEmpty(this.xsdResources, "'xsds' must not be empty"); - schemaCollection.setSchemaResolver(uriResolver); + this.schemaCollection.setSchemaResolver(this.uriResolver); Set processedIncludes = new HashSet<>(); Set processedImports = new HashSet<>(); - for (Resource xsdResource : xsdResources) { + for (Resource xsdResource : this.xsdResources) { Assert.isTrue(xsdResource.exists(), xsdResource + " does not exist"); try { - XmlSchema xmlSchema = schemaCollection.read(SaxUtils.createInputSource(xsdResource)); - xmlSchemas.add(xmlSchema); + XmlSchema xmlSchema = this.schemaCollection.read(SaxUtils.createInputSource(xsdResource)); + this.xmlSchemas.add(xmlSchema); - if (inline) { + if (this.inline) { inlineIncludes(xmlSchema, processedIncludes, processedImports); findImports(xmlSchema, processedImports, processedIncludes); } @@ -151,17 +151,17 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali } } if (logger.isInfoEnabled()) { - logger.info("Loaded " + StringUtils.arrayToCommaDelimitedString(xsdResources)); + logger.info("Loaded " + StringUtils.arrayToCommaDelimitedString(this.xsdResources)); } } @Override public XsdSchema[] getXsdSchemas() { - XsdSchema[] result = new XsdSchema[xmlSchemas.size()]; - for (int i = 0; i < xmlSchemas.size(); i++) { - XmlSchema xmlSchema = xmlSchemas.get(i); - result[i] = new CommonsXsdSchema(xmlSchema, schemaCollection); + XsdSchema[] result = new XsdSchema[this.xmlSchemas.size()]; + for (int i = 0; i < this.xmlSchemas.size(); i++) { + XmlSchema xmlSchema = this.xmlSchemas.get(i); + result[i] = new CommonsXsdSchema(xmlSchema, this.schemaCollection); } return result; } @@ -169,9 +169,9 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali @Override public XmlValidator createValidator() { try { - Resource[] resources = new Resource[xmlSchemas.size()]; - for (int i = xmlSchemas.size() - 1; i >= 0; i--) { - XmlSchema xmlSchema = xmlSchemas.get(i); + Resource[] resources = new Resource[this.xmlSchemas.size()]; + for (int i = this.xmlSchemas.size() - 1; i >= 0; i--) { + XmlSchema xmlSchema = this.xmlSchemas.get(i); String sourceUri = xmlSchema.getSourceURI(); if (StringUtils.hasLength(sourceUri)) { resources[i] = new UrlResource(sourceUri); @@ -214,7 +214,7 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali && importedSchema != null && !processedImports.contains(importedSchema)) { inlineIncludes(importedSchema, processedIncludes, processedImports); findImports(importedSchema, processedImports, processedIncludes); - xmlSchemas.add(importedSchema); + this.xmlSchemas.add(importedSchema); } // remove the schemaLocation external.setSchemaLocation(null); @@ -225,10 +225,10 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali public String toString() { StringBuilder builder = new StringBuilder("CommonsXsdSchemaCollection"); builder.append('{'); - for (int i = 0; i < xmlSchemas.size(); i++) { - XmlSchema schema = xmlSchemas.get(i); + for (int i = 0; i < this.xmlSchemas.size(); i++) { + XmlSchema schema = this.xmlSchemas.get(i); builder.append(schema.getTargetNamespace()); - if (i < xmlSchemas.size() - 1) { + if (i < this.xmlSchemas.size() - 1) { builder.append(','); } } @@ -240,8 +240,8 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali @Override public InputSource resolveEntity(String namespace, String schemaLocation, String baseUri) { - if (resourceLoader != null) { - Resource resource = resourceLoader.getResource(schemaLocation); + if (CommonsXsdSchemaCollection.this.resourceLoader != null) { + Resource resource = CommonsXsdSchemaCollection.this.resourceLoader.getResource(schemaLocation); if (resource.exists()) { return createInputSource(resource); } @@ -260,7 +260,7 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali } // let's try and find it on the classpath, see SWS-362 String classpathLocation = ResourceLoader.CLASSPATH_URL_PREFIX + "/" + schemaLocation; - resource = resourceLoader.getResource(classpathLocation); + resource = CommonsXsdSchemaCollection.this.resourceLoader.getResource(classpathLocation); if (resource.exists()) { return createInputSource(resource); } diff --git a/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java b/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java index ab9a3677..d9c182ca 100644 --- a/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java @@ -61,47 +61,47 @@ public class DomContentHandlerTest { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); - documentBuilder = documentBuilderFactory.newDocumentBuilder(); - result = documentBuilder.newDocument(); + this.documentBuilder = documentBuilderFactory.newDocumentBuilder(); + this.result = this.documentBuilder.newDocument(); SAXParserFactory parserFactory = SAXParserFactory.newInstance(); parserFactory.setNamespaceAware(true); - xmlReader = parserFactory.newSAXParser().getXMLReader(); + this.xmlReader = parserFactory.newSAXParser().getXMLReader(); } @Test public void testContentHandlerDocumentNamespacePrefixes() throws Exception { - xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); - handler = new DomContentHandler(result); - expected = documentBuilder.parse(new InputSource(new StringReader(XML_1))); - xmlReader.setContentHandler(handler); - xmlReader.parse(new InputSource(new StringReader(XML_1))); + this.xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); + this.handler = new DomContentHandler(this.result); + this.expected = this.documentBuilder.parse(new InputSource(new StringReader(XML_1))); + this.xmlReader.setContentHandler(this.handler); + this.xmlReader.parse(new InputSource(new StringReader(XML_1))); - assertThat(result).and(expected).areSimilar(); + assertThat(this.result).and(this.expected).areSimilar(); } @Test public void testContentHandlerDocumentNoNamespacePrefixes() throws Exception { - handler = new DomContentHandler(result); - expected = documentBuilder.parse(new InputSource(new StringReader(XML_1))); - xmlReader.setContentHandler(handler); - xmlReader.parse(new InputSource(new StringReader(XML_1))); + this.handler = new DomContentHandler(this.result); + this.expected = this.documentBuilder.parse(new InputSource(new StringReader(XML_1))); + this.xmlReader.setContentHandler(this.handler); + this.xmlReader.parse(new InputSource(new StringReader(XML_1))); - assertThat(result).and(expected).areSimilar(); + assertThat(this.result).and(this.expected).areSimilar(); } @Test public void testContentHandlerElement() throws Exception { - Element rootElement = result.createElementNS("namespace", "root"); - result.appendChild(rootElement); - handler = new DomContentHandler(rootElement); - expected = documentBuilder.parse(new InputSource(new StringReader(XML_2_EXPECTED))); - xmlReader.setContentHandler(handler); - xmlReader.parse(new InputSource(new StringReader(XML_2_SNIPPET))); + Element rootElement = this.result.createElementNS("namespace", "root"); + this.result.appendChild(rootElement); + this.handler = new DomContentHandler(rootElement); + this.expected = this.documentBuilder.parse(new InputSource(new StringReader(XML_2_EXPECTED))); + this.xmlReader.setContentHandler(this.handler); + this.xmlReader.parse(new InputSource(new StringReader(XML_2_SNIPPET))); - assertThat(result).and(expected).areSimilar(); + assertThat(this.result).and(this.expected).areSimilar(); } } diff --git a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java index c181f711..eabe3c4a 100644 --- a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java @@ -30,7 +30,7 @@ public class QNameEditorTest { @BeforeEach public void setUp() { - editor = new QNameEditor(); + this.editor = new QNameEditor(); } @Test @@ -56,14 +56,14 @@ public class QNameEditorTest { private void doTest(QName qname) { - editor.setValue(qname); + this.editor.setValue(qname); - String text = editor.getAsText(); + String text = this.editor.getAsText(); assertThat(text).isNotNull(); - editor.setAsText(text); - QName result = (QName) editor.getValue(); + this.editor.setAsText(text); + QName result = (QName) this.editor.getValue(); assertThat(result).isNotNull(); assertThat(result.getLocalPart()).isEqualTo(qname.getLocalPart()); diff --git a/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java index 6c413a12..f6dfbde2 100644 --- a/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java @@ -35,46 +35,46 @@ class SimpleNamespaceContextTest { @BeforeEach void setUp() { - context = new SimpleNamespaceContext(); - context.bindNamespaceUri("prefix", "namespaceURI"); + this.context = new SimpleNamespaceContext(); + this.context.bindNamespaceUri("prefix", "namespaceURI"); } @Test void testGetNamespaceURI() { - assertThat(context.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX)).isEmpty(); + assertThat(this.context.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX)).isEmpty(); String defaultNamespaceUri = "defaultNamespace"; - context.bindNamespaceUri(XMLConstants.DEFAULT_NS_PREFIX, defaultNamespaceUri); + this.context.bindNamespaceUri(XMLConstants.DEFAULT_NS_PREFIX, defaultNamespaceUri); - assertThat(context.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX)).isEqualTo(defaultNamespaceUri); - assertThat(context.getNamespaceURI("prefix")).isEqualTo("namespaceURI"); - assertThat(context.getNamespaceURI("unbound")).isEmpty(); - assertThat(context.getNamespaceURI(XMLConstants.XML_NS_PREFIX)).isEqualTo(XMLConstants.XML_NS_URI); - assertThat(context.getNamespaceURI(XMLConstants.XMLNS_ATTRIBUTE)) + assertThat(this.context.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX)).isEqualTo(defaultNamespaceUri); + assertThat(this.context.getNamespaceURI("prefix")).isEqualTo("namespaceURI"); + assertThat(this.context.getNamespaceURI("unbound")).isEmpty(); + assertThat(this.context.getNamespaceURI(XMLConstants.XML_NS_PREFIX)).isEqualTo(XMLConstants.XML_NS_URI); + assertThat(this.context.getNamespaceURI(XMLConstants.XMLNS_ATTRIBUTE)) .isEqualTo(XMLConstants.XMLNS_ATTRIBUTE_NS_URI); } @Test void testGetPrefix() { - context.bindDefaultNamespaceUri("defaultNamespaceURI"); + this.context.bindDefaultNamespaceUri("defaultNamespaceURI"); - assertThat(context.getPrefix("defaultNamespaceURI")).isEqualTo(XMLConstants.DEFAULT_NS_PREFIX); - assertThat(context.getPrefix("namespaceURI")).isEqualTo("prefix"); - assertThat(context.getPrefix("unbound")).isNull(); - assertThat(context.getPrefix(XMLConstants.XML_NS_URI)).isEqualTo(XMLConstants.XML_NS_PREFIX); - assertThat(context.getPrefix(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)).isEqualTo(XMLConstants.XMLNS_ATTRIBUTE); + assertThat(this.context.getPrefix("defaultNamespaceURI")).isEqualTo(XMLConstants.DEFAULT_NS_PREFIX); + assertThat(this.context.getPrefix("namespaceURI")).isEqualTo("prefix"); + assertThat(this.context.getPrefix("unbound")).isNull(); + assertThat(this.context.getPrefix(XMLConstants.XML_NS_URI)).isEqualTo(XMLConstants.XML_NS_PREFIX); + assertThat(this.context.getPrefix(XMLConstants.XMLNS_ATTRIBUTE_NS_URI)).isEqualTo(XMLConstants.XMLNS_ATTRIBUTE); } @Test void testGetPrefixes() { - context.bindDefaultNamespaceUri("defaultNamespaceURI"); + this.context.bindDefaultNamespaceUri("defaultNamespaceURI"); assertPrefixes("defaultNamespaceURI", XMLConstants.DEFAULT_NS_PREFIX); assertPrefixes("namespaceURI", "prefix"); - assertThat(context.getPrefixes("unbound").hasNext()).isFalse(); + assertThat(this.context.getPrefixes("unbound").hasNext()).isFalse(); assertPrefixes(XMLConstants.XML_NS_URI, XMLConstants.XML_NS_PREFIX); assertPrefixes(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, XMLConstants.XMLNS_ATTRIBUTE); } @@ -82,10 +82,10 @@ class SimpleNamespaceContextTest { @Test void unmodifiableGetPrefixes() { String namespaceUri = "namespaceUri"; - context.bindNamespaceUri("prefix1", namespaceUri); - context.bindNamespaceUri("prefix2", namespaceUri); + this.context.bindNamespaceUri("prefix1", namespaceUri); + this.context.bindNamespaceUri("prefix2", namespaceUri); - Iterator prefixes = context.getPrefixes(namespaceUri); + Iterator prefixes = this.context.getPrefixes(namespaceUri); prefixes.next(); assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(prefixes::remove); } @@ -93,10 +93,10 @@ class SimpleNamespaceContextTest { @Test void testMultiplePrefixes() { - context.bindNamespaceUri("prefix1", "namespace"); - context.bindNamespaceUri("prefix2", "namespace"); + this.context.bindNamespaceUri("prefix1", "namespace"); + this.context.bindNamespaceUri("prefix2", "namespace"); - Iterator iterator = context.getPrefixes("namespace"); + Iterator iterator = this.context.getPrefixes("namespace"); assertThat(iterator).isNotNull(); assertThat(iterator.hasNext()).isTrue(); @@ -116,7 +116,7 @@ class SimpleNamespaceContextTest { private void assertPrefixes(String namespaceUri, String prefix) { - Iterator iterator = context.getPrefixes(namespaceUri); + Iterator iterator = this.context.getPrefixes(namespaceUri); assertThat(iterator).isNotNull(); assertThat(iterator.hasNext()).isTrue(); @@ -130,7 +130,7 @@ class SimpleNamespaceContextTest { @Test void testGetBoundPrefixes() { - Iterator iterator = context.getBoundPrefixes(); + Iterator iterator = this.context.getBoundPrefixes(); assertThat(iterator).isNotNull(); assertThat(iterator.hasNext()).isTrue(); @@ -144,47 +144,47 @@ class SimpleNamespaceContextTest { @Test void testSetBindings() { - context.setBindings(Collections.singletonMap("prefix", "namespace")); + this.context.setBindings(Collections.singletonMap("prefix", "namespace")); - assertThat(context.getNamespaceURI("prefix")).isEqualTo("namespace"); + assertThat(this.context.getNamespaceURI("prefix")).isEqualTo("namespace"); } @Test void testRemoveBinding() { - context.clear(); + this.context.clear(); String prefix1 = "prefix1"; String prefix2 = "prefix2"; String namespaceUri = "namespaceUri"; - context.bindNamespaceUri(prefix1, namespaceUri); - context.bindNamespaceUri(prefix2, namespaceUri); + this.context.bindNamespaceUri(prefix1, namespaceUri); + this.context.bindNamespaceUri(prefix2, namespaceUri); - assertThat(IteratorUtils.toList(context.getPrefixes(namespaceUri))).containsExactly(prefix1, prefix2); + assertThat(IteratorUtils.toList(this.context.getPrefixes(namespaceUri))).containsExactly(prefix1, prefix2); - context.removeBinding(prefix1); + this.context.removeBinding(prefix1); - assertThat(IteratorUtils.toList(context.getPrefixes(namespaceUri))).containsExactly(prefix2); + assertThat(IteratorUtils.toList(this.context.getPrefixes(namespaceUri))).containsExactly(prefix2); - context.removeBinding(prefix2); + this.context.removeBinding(prefix2); - assertThat(context.getPrefixes(namespaceUri).hasNext()).isFalse(); + assertThat(this.context.getPrefixes(namespaceUri).hasNext()).isFalse(); } @Test void testHasBinding() { - context.clear(); + this.context.clear(); String prefix = "prefix"; - assertThat(context.hasBinding(prefix)).isFalse(); + assertThat(this.context.hasBinding(prefix)).isFalse(); String namespaceUri = "namespaceUri"; - context.bindNamespaceUri(prefix, namespaceUri); + this.context.bindNamespaceUri(prefix, namespaceUri); - assertThat(context.hasBinding(prefix)).isTrue(); + assertThat(this.context.hasBinding(prefix)).isTrue(); } @Test @@ -192,12 +192,12 @@ class SimpleNamespaceContextTest { String defaultNamespace = "http://springframework.org/spring-ws"; - context.bindDefaultNamespaceUri(defaultNamespace); - context.bindNamespaceUri("prefix", defaultNamespace); + this.context.bindDefaultNamespaceUri(defaultNamespace); + this.context.bindNamespaceUri("prefix", defaultNamespace); - assertThat(context.getPrefix(defaultNamespace)).isEqualTo(XMLConstants.DEFAULT_NS_PREFIX); + assertThat(this.context.getPrefix(defaultNamespace)).isEqualTo(XMLConstants.DEFAULT_NS_PREFIX); - Iterator iterator = context.getPrefixes(defaultNamespace); + Iterator iterator = this.context.getPrefixes(defaultNamespace); assertThat(iterator).isNotNull(); assertThat(iterator.hasNext()).isTrue(); diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java index 863a7a58..eece1184 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java @@ -36,8 +36,8 @@ public class TransformerHelperTest { @BeforeEach public void setUp() { - helper = new TransformerHelper(); - transformer = mock(Transformer.class); + this.helper = new TransformerHelper(); + this.transformer = mock(Transformer.class); } @Test @@ -47,7 +47,7 @@ public class TransformerHelperTest { Source source = new StringSource(xml); Result result = new StringResult(); - helper.transform(source, result); + this.helper.transform(source, result); assertThat(result.toString()).and(xml).ignoreWhitespace().areIdentical(); } diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java index cb87ab7b..6d4e0b53 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java @@ -51,16 +51,16 @@ public abstract class AbstractValidatorFactoryTest { Resource[] schemaResource = new Resource[] { new ClassPathResource("schema.xsd", AbstractValidatorFactoryTest.class) }; - validator = createValidator(schemaResource, XmlValidatorFactory.SCHEMA_W3C_XML); - validInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("validDocument.xml"); - invalidInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("invalidDocument.xml"); + this.validator = createValidator(schemaResource, XmlValidatorFactory.SCHEMA_W3C_XML); + this.validInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("validDocument.xml"); + this.invalidInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("invalidDocument.xml"); } @AfterEach public void tearDown() throws Exception { - validInputStream.close(); - invalidInputStream.close(); + this.validInputStream.close(); + this.invalidInputStream.close(); } protected abstract XmlValidator createValidator(Resource[] schemaResources, String schemaLanguage) throws Exception; @@ -68,7 +68,7 @@ public abstract class AbstractValidatorFactoryTest { @Test public void testHandleValidMessageStream() throws Exception { - SAXParseException[] errors = validator.validate(new StreamSource(validInputStream)); + SAXParseException[] errors = this.validator.validate(new StreamSource(this.validInputStream)); assertThat(errors).isEmpty(); } @@ -76,15 +76,15 @@ public abstract class AbstractValidatorFactoryTest { @Test public void testValidateTwice() throws Exception { - validator.validate(new StreamSource(validInputStream)); - validInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("validDocument.xml"); - validator.validate(new StreamSource(validInputStream)); + this.validator.validate(new StreamSource(this.validInputStream)); + this.validInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("validDocument.xml"); + this.validator.validate(new StreamSource(this.validInputStream)); } @Test public void testHandleInvalidMessageStream() throws Exception { - SAXParseException[] errors = validator.validate(new StreamSource(invalidInputStream)); + SAXParseException[] errors = this.validator.validate(new StreamSource(this.invalidInputStream)); assertThat(errors).hasSize(3); } @@ -92,7 +92,7 @@ public abstract class AbstractValidatorFactoryTest { @Test public void testHandleValidMessageSax() throws Exception { - SAXParseException[] errors = validator.validate(new SAXSource(new InputSource(validInputStream))); + SAXParseException[] errors = this.validator.validate(new SAXSource(new InputSource(this.validInputStream))); assertThat(errors).isEmpty(); } @@ -100,7 +100,7 @@ public abstract class AbstractValidatorFactoryTest { @Test public void testHandleInvalidMessageSax() throws Exception { - SAXParseException[] errors = validator.validate(new SAXSource(new InputSource(invalidInputStream))); + SAXParseException[] errors = this.validator.validate(new SAXSource(new InputSource(this.invalidInputStream))); assertThat(errors).hasSize(3); } @@ -110,8 +110,8 @@ public abstract class AbstractValidatorFactoryTest { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); - Document document = documentBuilderFactory.newDocumentBuilder().parse(new InputSource(validInputStream)); - SAXParseException[] errors = validator.validate(new DOMSource(document)); + Document document = documentBuilderFactory.newDocumentBuilder().parse(new InputSource(this.validInputStream)); + SAXParseException[] errors = this.validator.validate(new DOMSource(document)); assertThat(errors).isEmpty(); } @@ -121,8 +121,8 @@ public abstract class AbstractValidatorFactoryTest { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); - Document document = documentBuilderFactory.newDocumentBuilder().parse(new InputSource(invalidInputStream)); - SAXParseException[] errors = validator.validate(new DOMSource(document)); + Document document = documentBuilderFactory.newDocumentBuilder().parse(new InputSource(this.invalidInputStream)); + SAXParseException[] errors = this.validator.validate(new DOMSource(document)); assertThat(errors).hasSize(3); } @@ -133,18 +133,18 @@ public abstract class AbstractValidatorFactoryTest { Resource[] schemaResources = new Resource[] { new ClassPathResource("multipleSchemas1.xsd", AbstractValidatorFactoryTest.class), new ClassPathResource("multipleSchemas2.xsd", AbstractValidatorFactoryTest.class) }; - validator = createValidator(schemaResources, XmlValidatorFactory.SCHEMA_W3C_XML); + this.validator = createValidator(schemaResources, XmlValidatorFactory.SCHEMA_W3C_XML); Source document = new ResourceSource( new ClassPathResource("multipleSchemas1.xml", AbstractValidatorFactoryTest.class)); - SAXParseException[] errors = validator.validate(document); + SAXParseException[] errors = this.validator.validate(document); assertThat(errors).isEmpty(); - validator = createValidator(schemaResources, XmlValidatorFactory.SCHEMA_W3C_XML); + this.validator = createValidator(schemaResources, XmlValidatorFactory.SCHEMA_W3C_XML); document = new ResourceSource( new ClassPathResource("multipleSchemas2.xml", AbstractValidatorFactoryTest.class)); - errors = validator.validate(document); + errors = this.validator.validate(document); assertThat(errors).isEmpty(); } @@ -167,7 +167,7 @@ public abstract class AbstractValidatorFactoryTest { } }; - SAXParseException[] errors = validator.validate(new StreamSource(invalidInputStream), myHandler); + SAXParseException[] errors = this.validator.validate(new StreamSource(this.invalidInputStream), myHandler); assertThat(errors).isEmpty(); } diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java index dd606611..dd2df903 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java @@ -46,8 +46,8 @@ public abstract class AbstractXPathExpressionFactoryTest { @BeforeEach public void setUp() throws Exception { - namespaces.put("prefix1", "namespace1"); - namespaces.put("prefix2", "namespace2"); + this.namespaces.put("prefix1", "namespace1"); + this.namespaces.put("prefix2", "namespace2"); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); @@ -56,7 +56,7 @@ public abstract class AbstractXPathExpressionFactoryTest { InputStream inputStream = getClass().getResourceAsStream("nonamespaces.xml"); try { - noNamespacesDocument = documentBuilder.parse(inputStream); + this.noNamespacesDocument = documentBuilder.parse(inputStream); } finally { inputStream.close(); @@ -64,7 +64,7 @@ public abstract class AbstractXPathExpressionFactoryTest { inputStream = getClass().getResourceAsStream("namespaces.xml"); try { - namespacesDocument = documentBuilder.parse(inputStream); + this.namespacesDocument = documentBuilder.parse(inputStream); } finally { inputStream.close(); @@ -74,7 +74,7 @@ public abstract class AbstractXPathExpressionFactoryTest { @Test public void testThatToStringReturnsOriginalXpathExpression() { - XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", namespaces); + XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); assertThat("/prefix1:root/prefix2:otherchild").isEqualTo(expression.toString()); } @@ -82,8 +82,8 @@ public abstract class AbstractXPathExpressionFactoryTest { @Test public void testEvaluateAsBooleanInvalidNamespaces() { - XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", namespaces); - boolean result = expression.evaluateAsBoolean(namespacesDocument); + XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); + boolean result = expression.evaluateAsBoolean(this.namespacesDocument); assertThat(result).isFalse(); } @@ -92,7 +92,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsBooleanInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); - boolean result = expression.evaluateAsBoolean(noNamespacesDocument); + boolean result = expression.evaluateAsBoolean(this.noNamespacesDocument); assertThat(result).isFalse(); } @@ -101,8 +101,8 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsBooleanNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/prefix2:boolean/text()", - namespaces); - boolean result = expression.evaluateAsBoolean(namespacesDocument); + this.namespaces); + boolean result = expression.evaluateAsBoolean(this.namespacesDocument); assertThat(result).isTrue(); } @@ -111,7 +111,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsBooleanNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/boolean/text()"); - boolean result = expression.evaluateAsBoolean(noNamespacesDocument); + boolean result = expression.evaluateAsBoolean(this.noNamespacesDocument); assertThat(result).isTrue(); } @@ -119,8 +119,8 @@ public abstract class AbstractXPathExpressionFactoryTest { @Test public void testEvaluateAsDoubleInvalidNamespaces() { - XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", namespaces); - double result = expression.evaluateAsNumber(noNamespacesDocument); + XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); + double result = expression.evaluateAsNumber(this.noNamespacesDocument); assertThat(result).isNaN(); } @@ -129,7 +129,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsDoubleInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); - double result = expression.evaluateAsNumber(noNamespacesDocument); + double result = expression.evaluateAsNumber(this.noNamespacesDocument); assertThat(result).isNaN(); } @@ -138,8 +138,8 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsDoubleNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/prefix2:number/text()", - namespaces); - double result = expression.evaluateAsNumber(namespacesDocument); + this.namespaces); + double result = expression.evaluateAsNumber(this.namespacesDocument); assertThat(result).isEqualTo(42.0D); } @@ -148,7 +148,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsDoubleNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/number/text()"); - double result = expression.evaluateAsNumber(noNamespacesDocument); + double result = expression.evaluateAsNumber(this.noNamespacesDocument); assertThat(result).isEqualTo(42.0D); } @@ -156,8 +156,8 @@ public abstract class AbstractXPathExpressionFactoryTest { @Test public void testEvaluateAsNodeInvalidNamespaces() { - XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", namespaces); - Node result = expression.evaluateAsNode(namespacesDocument); + XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); + Node result = expression.evaluateAsNode(this.namespacesDocument); assertThat(result).isNull(); } @@ -166,7 +166,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsNodeInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); - Node result = expression.evaluateAsNode(noNamespacesDocument); + Node result = expression.evaluateAsNode(this.noNamespacesDocument); assertThat(result).isNull(); } @@ -174,8 +174,8 @@ public abstract class AbstractXPathExpressionFactoryTest { @Test public void testEvaluateAsNodeNamespaces() { - XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child", namespaces); - Node result = expression.evaluateAsNode(namespacesDocument); + XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child", this.namespaces); + Node result = expression.evaluateAsNode(this.namespacesDocument); assertThat(result).isNotNull(); assertThat(result.getLocalName()).isEqualTo("child"); @@ -185,7 +185,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsNodeNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child"); - Node result = expression.evaluateAsNode(noNamespacesDocument); + Node result = expression.evaluateAsNode(this.noNamespacesDocument); assertThat(result).isNotNull(); assertThat(result.getLocalName()).isEqualTo("child"); @@ -194,8 +194,8 @@ public abstract class AbstractXPathExpressionFactoryTest { @Test public void testEvaluateAsNodeListNamespaces() { - XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/*", namespaces); - List results = expression.evaluateAsNodeList(namespacesDocument); + XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/*", this.namespaces); + List results = expression.evaluateAsNodeList(this.namespacesDocument); assertThat(results).isNotNull(); assertThat(results).hasSize(3); @@ -205,7 +205,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsNodeListNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/*"); - List results = expression.evaluateAsNodeList(noNamespacesDocument); + List results = expression.evaluateAsNodeList(this.noNamespacesDocument); assertThat(results).isNotNull(); assertThat(results).hasSize(3); @@ -214,8 +214,8 @@ public abstract class AbstractXPathExpressionFactoryTest { @Test public void testEvaluateAsStringInvalidNamespaces() { - XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", namespaces); - String result = expression.evaluateAsString(namespacesDocument); + XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", this.namespaces); + String result = expression.evaluateAsString(this.namespacesDocument); assertThat(result).isEmpty(); } @@ -224,7 +224,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsStringInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); - String result = expression.evaluateAsString(noNamespacesDocument); + String result = expression.evaluateAsString(this.noNamespacesDocument); assertThat(result).isEmpty(); } @@ -233,8 +233,8 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsStringNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/prefix2:text/text()", - namespaces); - String result = expression.evaluateAsString(namespacesDocument); + this.namespaces); + String result = expression.evaluateAsString(this.namespacesDocument); assertThat(result).isEqualTo("text"); } @@ -243,7 +243,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsStringNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/text/text()"); - String result = expression.evaluateAsString(noNamespacesDocument); + String result = expression.evaluateAsString(this.noNamespacesDocument); assertThat(result).isEqualTo("text"); } @@ -252,7 +252,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsObject() { XPathExpression expression = createXPathExpression("/root/child"); - String result = expression.evaluateAsObject(noNamespacesDocument, new NodeMapper<>() { + String result = expression.evaluateAsObject(this.noNamespacesDocument, new NodeMapper<>() { public String mapNode(Node node, int nodeNum) throws DOMException { return node.getLocalName(); } @@ -266,7 +266,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluate() throws Exception { XPathExpression expression = createXPathExpression("/root/child/*"); - List results = expression.evaluate(noNamespacesDocument, new NodeMapper<>() { + List results = expression.evaluate(this.noNamespacesDocument, new NodeMapper<>() { public String mapNode(Node node, int nodeNum) throws DOMException { return node.getLocalName(); } diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java index 500ad54c..a5e8f5fe 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java @@ -58,9 +58,10 @@ public abstract class AbstractXPathTemplateTest { @BeforeEach public final void setUp() throws Exception { - template = createTemplate(); - namespaces = new ResourceSource(new ClassPathResource("namespaces.xml", AbstractXPathTemplateTest.class)); - nonamespaces = new ResourceSource(new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTest.class)); + this.template = createTemplate(); + this.namespaces = new ResourceSource(new ClassPathResource("namespaces.xml", AbstractXPathTemplateTest.class)); + this.nonamespaces = new ResourceSource( + new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTest.class)); } protected abstract XPathOperations createTemplate() throws Exception; @@ -68,7 +69,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsBoolean() { - boolean result = template.evaluateAsBoolean("/root/child/boolean", nonamespaces); + boolean result = this.template.evaluateAsBoolean("/root/child/boolean", this.nonamespaces); assertThat(result).isTrue(); } @@ -76,7 +77,8 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsBooleanNamespaces() { - boolean result = template.evaluateAsBoolean("/prefix1:root/prefix2:child/prefix2:boolean", namespaces); + boolean result = this.template.evaluateAsBoolean("/prefix1:root/prefix2:child/prefix2:boolean", + this.namespaces); assertThat(result).isTrue(); } @@ -84,7 +86,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsDouble() { - double result = template.evaluateAsDouble("/root/child/number", nonamespaces); + double result = this.template.evaluateAsDouble("/root/child/number", this.nonamespaces); assertThat(result).isEqualTo(42D); } @@ -92,7 +94,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsDoubleNamespaces() { - double result = template.evaluateAsDouble("/prefix1:root/prefix2:child/prefix2:number", namespaces); + double result = this.template.evaluateAsDouble("/prefix1:root/prefix2:child/prefix2:number", this.namespaces); assertThat(result).isEqualTo(42D); } @@ -100,7 +102,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsNode() { - Node result = template.evaluateAsNode("/root/child", nonamespaces); + Node result = this.template.evaluateAsNode("/root/child", this.nonamespaces); assertThat(result).isNotNull(); assertThat(result.getLocalName()).isEqualTo("child"); @@ -109,7 +111,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsNodeNamespaces() { - Node result = template.evaluateAsNode("/prefix1:root/prefix2:child", namespaces); + Node result = this.template.evaluateAsNode("/prefix1:root/prefix2:child", this.namespaces); assertThat(result).isNotNull(); assertThat(result.getLocalName()).isEqualTo("child"); @@ -118,7 +120,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsNodes() { - List results = template.evaluateAsNodeList("/root/child/*", nonamespaces); + List results = this.template.evaluateAsNodeList("/root/child/*", this.nonamespaces); assertThat(results).isNotNull(); assertThat(results).hasSize(3); @@ -127,7 +129,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsNodesNamespaces() { - List results = template.evaluateAsNodeList("/prefix1:root/prefix2:child/*", namespaces); + List results = this.template.evaluateAsNodeList("/prefix1:root/prefix2:child/*", this.namespaces); assertThat(results).isNotNull(); assertThat(results).hasSize(3); @@ -136,7 +138,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsStringNamespaces() throws IOException, SAXException { - String result = template.evaluateAsString("/prefix1:root/prefix2:child/prefix2:text", namespaces); + String result = this.template.evaluateAsString("/prefix1:root/prefix2:child/prefix2:text", this.namespaces); assertThat(result).isEqualTo("text"); } @@ -144,7 +146,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsString() throws IOException, SAXException { - String result = template.evaluateAsString("/root/child/text", nonamespaces); + String result = this.template.evaluateAsString("/root/child/text", this.nonamespaces); assertThat(result).isEqualTo("text"); } @@ -158,7 +160,7 @@ public abstract class AbstractXPathTemplateTest { Document document = documentBuilder.parse( SaxUtils.createInputSource(new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTest.class))); - String result = template.evaluateAsString("/root/child/text", new DOMSource(document)); + String result = this.template.evaluateAsString("/root/child/text", new DOMSource(document)); assertThat(result).isEqualTo("text"); } @@ -168,7 +170,7 @@ public abstract class AbstractXPathTemplateTest { InputStream in = AbstractXPathTemplateTest.class.getResourceAsStream("nonamespaces.xml"); SAXSource source = new SAXSource(new InputSource(in)); - String result = template.evaluateAsString("/root/child/text", source); + String result = this.template.evaluateAsString("/root/child/text", source); assertThat(result).isEqualTo("text"); } @@ -179,7 +181,7 @@ public abstract class AbstractXPathTemplateTest { InputStream in = AbstractXPathTemplateTest.class.getResourceAsStream("nonamespaces.xml"); XMLStreamReader streamReader = XMLInputFactory.newFactory().createXMLStreamReader(in); StAXSource source = new StAXSource(streamReader); - String result = template.evaluateAsString("/root/child/text", source); + String result = this.template.evaluateAsString("/root/child/text", source); assertThat(result).isEqualTo("text"); } @@ -189,7 +191,7 @@ public abstract class AbstractXPathTemplateTest { InputStream in = AbstractXPathTemplateTest.class.getResourceAsStream("nonamespaces.xml"); StreamSource source = new StreamSource(in); - String result = template.evaluateAsString("/root/child/text", source); + String result = this.template.evaluateAsString("/root/child/text", source); assertThat(result).isEqualTo("text"); } @@ -198,20 +200,21 @@ public abstract class AbstractXPathTemplateTest { public void testEvaluateStreamSourceSystemId() throws IOException, SAXException, ParserConfigurationException { URL url = AbstractXPathTemplateTest.class.getResource("nonamespaces.xml"); - String result = template.evaluateAsString("/root/child/text", new StreamSource(url.toString())); + String result = this.template.evaluateAsString("/root/child/text", new StreamSource(url.toString())); assertThat(result).isEqualTo("text"); } @Test public void testInvalidExpression() { - assertThatExceptionOfType(XPathException.class).isThrownBy(() -> template.evaluateAsBoolean("\\", namespaces)); + assertThatExceptionOfType(XPathException.class) + .isThrownBy(() -> this.template.evaluateAsBoolean("\\", this.namespaces)); } @Test public void testEvaluateAsObject() throws Exception { - String result = template.evaluateAsObject("/root/child", nonamespaces, new NodeMapper<>() { + String result = this.template.evaluateAsObject("/root/child", this.nonamespaces, new NodeMapper<>() { public String mapNode(Node node, int nodeNum) throws DOMException { return node.getLocalName(); } @@ -224,7 +227,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluate() throws Exception { - List results = template.evaluate("/root/child/*", nonamespaces, new NodeMapper<>() { + List results = this.template.evaluate("/root/child/*", this.nonamespaces, new NodeMapper<>() { public String mapNode(Node node, int nodeNum) throws DOMException { return node.getLocalName(); } diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java index bac309db..f0a6e3e7 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java @@ -27,20 +27,20 @@ public class XPathExpressionFactoryBeanTest { @BeforeEach public void setUp() { - factoryBean = new XPathExpressionFactoryBean(); + this.factoryBean = new XPathExpressionFactoryBean(); } @Test public void testFactoryBean() throws Exception { - factoryBean.setExpression("/root"); - factoryBean.afterPropertiesSet(); - Object result = factoryBean.getObject(); + this.factoryBean.setExpression("/root"); + this.factoryBean.afterPropertiesSet(); + Object result = this.factoryBean.getObject(); assertThat(result).isNotNull(); assertThat(result).isInstanceOf(XPathExpression.class); - assertThat(factoryBean.isSingleton()).isTrue(); - assertThat(factoryBean.getObject()).isInstanceOf(XPathExpression.class); + assertThat(this.factoryBean.isSingleton()).isTrue(); + assertThat(this.factoryBean.getObject()).isInstanceOf(XPathExpression.class); } } diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java index 65725d66..9a48ab20 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java @@ -47,9 +47,9 @@ public abstract class AbstractXsdSchemaTest { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); - documentBuilder = documentBuilderFactory.newDocumentBuilder(); + this.documentBuilder = documentBuilderFactory.newDocumentBuilder(); TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); - transformer = transformerFactory.newTransformer(); + this.transformer = transformerFactory.newTransformer(); } @Test @@ -61,9 +61,9 @@ public abstract class AbstractXsdSchemaTest { assertThat(single.getTargetNamespace()).isEqualTo("http://www.springframework.org/spring-ws/single/schema"); resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); - Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); + Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); - transformer.transform(single.getSource(), domResult); + this.transformer.transform(single.getSource(), domResult); Document result = (Document) domResult.getNode(); XmlAssert.assertThat(result).and(expected).ignoreWhitespace().areIdentical(); @@ -78,9 +78,9 @@ public abstract class AbstractXsdSchemaTest { assertThat(including.getTargetNamespace()).isEqualTo("http://www.springframework.org/spring-ws/include/schema"); resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTest.class); - Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); + Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); - transformer.transform(including.getSource(), domResult); + this.transformer.transform(including.getSource(), domResult); Document result = (Document) domResult.getNode(); XmlAssert.assertThat(result).and(expected).ignoreWhitespace().areIdentical(); @@ -96,9 +96,9 @@ public abstract class AbstractXsdSchemaTest { .isEqualTo("http://www.springframework.org/spring-ws/importing/schema"); resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTest.class); - Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); + Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); - transformer.transform(importing.getSource(), domResult); + this.transformer.transform(importing.getSource(), domResult); Document result = (Document) domResult.getNode(); XmlAssert.assertThat(result).and(expected).ignoreWhitespace().areIdentical(); @@ -113,9 +113,9 @@ public abstract class AbstractXsdSchemaTest { assertThat(importing.getTargetNamespace()).isEqualTo("http://www.springframework.org/spring-ws/xmlNamespace"); resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTest.class); - Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); + Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); - transformer.transform(importing.getSource(), domResult); + this.transformer.transform(importing.getSource(), domResult); Document result = (Document) domResult.getNode(); XmlAssert.assertThat(result).and(expected).ignoreWhitespace().areIdentical(); diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java index 682ff255..60e4d273 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java @@ -50,40 +50,40 @@ public class CommonsXsdSchemaCollectionTest { @BeforeEach public void setUp() throws Exception { - collection = new CommonsXsdSchemaCollection(); + this.collection = new CommonsXsdSchemaCollection(); TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); - transformer = transformerFactory.newTransformer(); + this.transformer = transformerFactory.newTransformer(); DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); - documentBuilder = documentBuilderFactory.newDocumentBuilder(); + this.documentBuilder = documentBuilderFactory.newDocumentBuilder(); } @Test public void testSingle() throws Exception { Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); - collection.setXsds(resource); - collection.afterPropertiesSet(); + this.collection.setXsds(resource); + this.collection.afterPropertiesSet(); - assertThat(collection.getXsdSchemas()).hasSize(1); + assertThat(this.collection.getXsdSchemas()).hasSize(1); } @Test public void testInlineComplex() throws Exception { Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTest.class); - collection.setXsds(a); - collection.setInline(true); - collection.afterPropertiesSet(); - XsdSchema[] schemas = collection.getXsdSchemas(); + this.collection.setXsds(a); + this.collection.setInline(true); + this.collection.afterPropertiesSet(); + XsdSchema[] schemas = this.collection.getXsdSchemas(); assertThat(schemas).hasSize(2); assertThat(schemas[0].getTargetNamespace()).isEqualTo("urn:1"); Resource abc = new ClassPathResource("ABC.xsd", AbstractXsdSchemaTest.class); - Document expected = documentBuilder.parse(SaxUtils.createInputSource(abc)); + Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(abc)); DOMResult domResult = new DOMResult(); - transformer.transform(schemas[0].getSource(), domResult); + this.transformer.transform(schemas[0].getSource(), domResult); XmlAssert.assertThat(domResult.getNode()) .and(expected) // @@ -92,9 +92,9 @@ public class CommonsXsdSchemaCollectionTest { assertThat(schemas[1].getTargetNamespace()).isEqualTo("urn:2"); Resource cd = new ClassPathResource("CD.xsd", AbstractXsdSchemaTest.class); - expected = documentBuilder.parse(SaxUtils.createInputSource(cd)); + expected = this.documentBuilder.parse(SaxUtils.createInputSource(cd)); domResult = new DOMResult(); - transformer.transform(schemas[1].getSource(), domResult); + this.transformer.transform(schemas[1].getSource(), domResult); XmlAssert.assertThat(domResult.getNode()) .and(expected) // @@ -106,10 +106,10 @@ public class CommonsXsdSchemaCollectionTest { public void testCircular() throws Exception { Resource resource = new ClassPathResource("circular-1.xsd", AbstractXsdSchemaTest.class); - collection.setXsds(resource); - collection.setInline(true); - collection.afterPropertiesSet(); - XsdSchema[] schemas = collection.getXsdSchemas(); + this.collection.setXsds(resource); + this.collection.setInline(true); + this.collection.afterPropertiesSet(); + XsdSchema[] schemas = this.collection.getXsdSchemas(); assertThat(schemas).hasSize(1); } @@ -118,10 +118,10 @@ public class CommonsXsdSchemaCollectionTest { public void testXmlNamespace() throws Exception { Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTest.class); - collection.setXsds(resource); - collection.setInline(true); - collection.afterPropertiesSet(); - XsdSchema[] schemas = collection.getXsdSchemas(); + this.collection.setXsds(resource); + this.collection.setInline(true); + this.collection.afterPropertiesSet(); + XsdSchema[] schemas = this.collection.getXsdSchemas(); assertThat(schemas).hasSize(1); } @@ -130,11 +130,11 @@ public class CommonsXsdSchemaCollectionTest { public void testCreateValidator() throws Exception { Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTest.class); - collection.setXsds(a); - collection.setInline(true); - collection.afterPropertiesSet(); + this.collection.setXsds(a); + this.collection.setInline(true); + this.collection.afterPropertiesSet(); - XmlValidator validator = collection.createValidator(); + XmlValidator validator = this.collection.createValidator(); assertThat(validator).isNotNull(); } @@ -143,36 +143,37 @@ public class CommonsXsdSchemaCollectionTest { public void testInvalidSchema() { Resource invalid = new ClassPathResource("invalid.xsd", AbstractXsdSchemaTest.class); - collection.setXsds(invalid); + this.collection.setXsds(invalid); - assertThatExceptionOfType(CommonsXsdSchemaException.class).isThrownBy(() -> collection.afterPropertiesSet()); + assertThatExceptionOfType(CommonsXsdSchemaException.class) + .isThrownBy(() -> this.collection.afterPropertiesSet()); } @Test public void testIncludesAndImports() throws Exception { Resource hr = new ClassPathResource("hr.xsd", getClass()); - collection.setXsds(hr); - collection.setInline(true); - collection.afterPropertiesSet(); + this.collection.setXsds(hr); + this.collection.setInline(true); + this.collection.afterPropertiesSet(); - XsdSchema[] schemas = collection.getXsdSchemas(); + XsdSchema[] schemas = this.collection.getXsdSchemas(); assertThat(schemas).hasSize(2); assertThat(schemas[0].getTargetNamespace()).isEqualTo("http://mycompany.com/hr/schemas"); Resource hr_employee = new ClassPathResource("hr_employee.xsd", getClass()); - Document expected = documentBuilder.parse(SaxUtils.createInputSource(hr_employee)); + Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(hr_employee)); DOMResult domResult = new DOMResult(); - transformer.transform(schemas[0].getSource(), domResult); + this.transformer.transform(schemas[0].getSource(), domResult); XmlAssert.assertThat(domResult.getNode()).and(expected).ignoreWhitespace().areIdentical(); assertThat(schemas[1].getTargetNamespace()).isEqualTo("http://mycompany.com/hr/schemas/holiday"); Resource holiday = new ClassPathResource("holiday.xsd", getClass()); - expected = documentBuilder.parse(SaxUtils.createInputSource(holiday)); + expected = this.documentBuilder.parse(SaxUtils.createInputSource(holiday)); domResult = new DOMResult(); - transformer.transform(schemas[1].getSource(), domResult); + this.transformer.transform(schemas[1].getSource(), domResult); XmlAssert.assertThat(domResult.getNode()).and(expected).ignoreWhitespace().areIdentical(); } From 360f52379bab5d6fcc23f5b7acbd179105854c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 7 Mar 2025 11:53:13 +0100 Subject: [PATCH 03/10] Add new line between header and package statement See gh-1479 --- .../ws/client/support/interceptor/ClientInterceptorAdapter.java | 1 + .../src/main/java/org/springframework/ws/support/WebUtils.java | 1 + .../ws/transport/HeadersAwareReceiverWebServiceConnection.java | 1 + .../ws/transport/HeadersAwareSenderWebServiceConnection.java | 1 + .../client/support/interceptor/ClientInterceptorAdapterTest.java | 1 + .../java/org/springframework/ws/support/ChangelogCreator.java | 1 + .../org/springframework/ws/transport/jms/JmsIntegrationTest.java | 1 + .../org/springframework/xml/DocumentBuilderFactoryUtils.java | 1 + .../main/java/org/springframework/xml/XMLInputFactoryUtils.java | 1 + .../springframework/xml/transform/TransformerFactoryUtils.java | 1 + .../org/springframework/xml/validation/SchemaFactoryUtils.java | 1 + .../springframework/xml/validation/XMLReaderFactoryUtils.java | 1 + 12 files changed, 12 insertions(+) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java index c5fcf4e3..1136392e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.client.support.interceptor; import org.apache.commons.logging.Log; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/support/WebUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/support/WebUtils.java index 055e0452..29b395a2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/support/WebUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/support/WebUtils.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.support; /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareReceiverWebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareReceiverWebServiceConnection.java index 5294071b..38fde0f2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareReceiverWebServiceConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareReceiverWebServiceConnection.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.transport; import java.io.IOException; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareSenderWebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareSenderWebServiceConnection.java index e088fbd1..00e28dc3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareSenderWebServiceConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareSenderWebServiceConnection.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.transport; import java.io.IOException; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java index 1afa3742..d7dbad5e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.client.support.interceptor; import java.util.ArrayList; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/support/ChangelogCreator.java b/spring-ws-core/src/test/java/org/springframework/ws/support/ChangelogCreator.java index ce26e237..d6a81e14 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/support/ChangelogCreator.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/support/ChangelogCreator.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.support; import java.time.Duration; diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java index 02a10256..b86b415a 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.ws.transport.jms; import org.junit.jupiter.api.Test; diff --git a/spring-xml/src/main/java/org/springframework/xml/DocumentBuilderFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/DocumentBuilderFactoryUtils.java index 7fc8da1c..4912f5db 100644 --- a/spring-xml/src/main/java/org/springframework/xml/DocumentBuilderFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/DocumentBuilderFactoryUtils.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.xml; import javax.xml.XMLConstants; diff --git a/spring-xml/src/main/java/org/springframework/xml/XMLInputFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/XMLInputFactoryUtils.java index 5569a048..4aa191ef 100644 --- a/spring-xml/src/main/java/org/springframework/xml/XMLInputFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/XMLInputFactoryUtils.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.xml; import javax.xml.stream.XMLInputFactory; diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerFactoryUtils.java index 10b44f0f..d8e8b92b 100644 --- a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerFactoryUtils.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.xml.transform; import java.lang.reflect.InvocationTargetException; diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/SchemaFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/validation/SchemaFactoryUtils.java index 7fbf11ae..dd541921 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/SchemaFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/SchemaFactoryUtils.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.xml.validation; import javax.xml.XMLConstants; diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/XMLReaderFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/validation/XMLReaderFactoryUtils.java index af4ca21c..fd3250b3 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/XMLReaderFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/XMLReaderFactoryUtils.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.xml.validation; import javax.xml.parsers.ParserConfigurationException; From 00e1e68062965d82f1992d5e4dcb9ab235333373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 7 Mar 2025 13:04:48 +0100 Subject: [PATCH 04/10] Mark private classes final See gh-1479 --- .../ws/client/core/WebServiceTemplate.java | 5 +++-- .../ws/config/annotation/DelegatingWsConfiguration.java | 2 +- .../org/springframework/ws/mime/AbstractMimeMessage.java | 2 +- .../server/endpoint/AbstractStaxEventPayloadEndpoint.java | 2 +- .../endpoint/AbstractStaxStreamPayloadEndpoint.java | 2 +- .../ws/server/endpoint/AbstractXomPayloadEndpoint.java | 6 +++--- .../adapter/method/SourcePayloadMethodProcessor.java | 4 ++-- .../method/jaxb/AbstractJaxb2PayloadMethodProcessor.java | 8 ++++---- .../ws/server/endpoint/support/PayloadRootUtils.java | 2 +- .../springframework/ws/soap/saaj/SaajSoapFaultDetail.java | 2 +- .../org/springframework/ws/soap/saaj/SaajSoapMessage.java | 2 +- .../org/springframework/ws/support/MarshallingUtils.java | 2 +- .../ws/transport/AbstractReceiverConnection.java | 4 ++-- .../ws/transport/context/TransportContextHolder.java | 2 +- .../org/springframework/ws/MockWebServiceMessage.java | 2 +- .../AbstractSoap11WebServiceTemplateIntegrationTest.java | 2 +- .../ws/config/annotation/DefaultWsConfigurationTest.java | 2 +- .../server/endpoint/MarshallingPayloadEndpointTest.java | 2 +- .../ws/server/endpoint/SaxPayloadEndpointTest.java | 2 +- .../GenericMarshallingMethodEndpointAdapterTest.java | 4 ++-- .../adapter/MarshallingMethodEndpointAdapterTest.java | 2 +- .../ws/server/endpoint/mapping/EndpointMappingTest.java | 4 ++-- .../endpoint/mapping/MapBasedSoapEndpointMappingTest.java | 2 +- .../endpoint/mapping/SimpleMethodEndpointMappingTest.java | 2 +- .../server/AnnotationActionMethodEndpointMappingTest.java | 6 +++--- .../server/SimpleActionEndpointMappingTest.java | 4 ++-- ...tCreatingValidatingMarshallingPayloadEndpointTest.java | 6 +++--- .../SoapActionAnnotationMethodEndpointMappingTest.java | 2 +- .../ws/support/DefaultStrategiesHelperTest.java | 4 ++-- .../ws/transport/http/MessageDispatcherServletTest.java | 4 ++-- .../WebServiceMessageReceiverObjectSupportTest.java | 2 +- .../security/wss4j2/Wss4jMessageInterceptorSamlTest.java | 2 +- .../ws/transport/mail/MailMessageReceiver.java | 4 ++-- .../ws/transport/mail/MailReceiverConnection.java | 2 +- .../ws/transport/mail/MailSenderConnection.java | 2 +- .../ws/transport/xmpp/XmppMessageReceiver.java | 2 +- .../springframework/ws/test/client/ResponseCreators.java | 2 +- .../ws/test/server/MockWebServiceClient.java | 2 +- .../springframework/ws/test/server/RequestCreators.java | 2 +- .../ws/test/client/MockWebServiceServerTest.java | 4 ++-- .../xml/validation/Jaxp13ValidatorFactory.java | 4 ++-- .../xml/validation/Jaxp15ValidatorFactory.java | 4 ++-- .../springframework/xml/xpath/AbstractXPathTemplate.java | 2 +- .../xml/xpath/JaxenXPathExpressionFactory.java | 2 +- .../xml/xpath/Jaxp13XPathExpressionFactory.java | 2 +- .../springframework/xml/xpath/Jaxp13XPathTemplate.java | 2 +- .../xml/xsd/commons/CommonsXsdSchemaCollection.java | 2 +- .../xml/validation/XmlValidatorFactoryTest.java | 2 +- 48 files changed, 70 insertions(+), 69 deletions(-) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java index ce0145a4..68477da5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java @@ -852,7 +852,8 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * Adapter to enable use of a WebServiceMessageCallback inside a * WebServiceMessageExtractor. */ - private static class WebServiceMessageCallbackMessageExtractor implements WebServiceMessageExtractor { + private static final class WebServiceMessageCallbackMessageExtractor + implements WebServiceMessageExtractor { private final WebServiceMessageCallback callback; @@ -869,7 +870,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService } /** Adapter to enable use of a SourceExtractor inside a WebServiceMessageExtractor. */ - private static class SourceExtractorMessageExtractor implements WebServiceMessageExtractor { + private static final class SourceExtractorMessageExtractor implements WebServiceMessageExtractor { private final SourceExtractor sourceExtractor; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/DelegatingWsConfiguration.java b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/DelegatingWsConfiguration.java index d84568c9..dba0706d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/DelegatingWsConfiguration.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/DelegatingWsConfiguration.java @@ -69,7 +69,7 @@ public class DelegatingWsConfiguration extends WsConfigurationSupport { this.configurers.addReturnValueHandlers(returnValueHandlers); } - private static class WsConfigurers implements WsConfigurer { + private static final class WsConfigurers implements WsConfigurer { private final Supplier> delegates; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java index b41dd434..630a018c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java @@ -65,7 +65,7 @@ public abstract class AbstractMimeMessage implements MimeMessage { * @author Arjen Poutsma * @since 1.0.0 */ - private static class InputStreamSourceDataSource implements DataSource { + private static final class InputStreamSourceDataSource implements DataSource { private final InputStreamSource inputStreamSource; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java index 63325a14..23d66ea8 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java @@ -151,7 +151,7 @@ public abstract class AbstractStaxEventPayloadEndpoint extends AbstractStaxPaylo * {@code WebServiceMessage} as soon as any method is called, thus lazily creating the * response. */ - private class ResponseCreatingEventWriter implements XMLEventWriter { + private final class ResponseCreatingEventWriter implements XMLEventWriter { private XMLEventWriter eventWriter; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java index 21bc0e84..571d879e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java @@ -126,7 +126,7 @@ public abstract class AbstractStaxStreamPayloadEndpoint extends AbstractStaxPayl * {@code WebServiceMessage} as soon as any method is called, thus lazily creating the * response. */ - private class ResponseCreatingStreamWriter implements XMLStreamWriter { + private final class ResponseCreatingStreamWriter implements XMLStreamWriter { private MessageContext messageContext; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java index 0e71ef69..d13467b0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java @@ -116,7 +116,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor */ protected abstract Element invokeInternal(Element requestElement) throws Exception; - private static class XomSourceCallback implements TraxUtils.SourceCallback { + private static final class XomSourceCallback implements TraxUtils.SourceCallback { private Element element; @@ -206,7 +206,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor } @SuppressWarnings("serial") - private static class XomParsingException extends NestedRuntimeException { + private static final class XomParsingException extends NestedRuntimeException { private XomParsingException(ParsingException ex) { super(ex.getMessage(), ex); @@ -214,7 +214,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor } - private static class StaxStreamConverter { + private static final class StaxStreamConverter { private static Document convert(XMLStreamReader streamReader) throws XMLStreamException { NodeFactory nodeFactory = new NodeFactory(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java index 7a540a7b..f4db1fe0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java @@ -129,7 +129,7 @@ public class SourcePayloadMethodProcessor extends AbstractPayloadSourceMethodPro } /** Inner class to avoid a static JAXP 1.4 dependency. */ - private static class Jaxp14StaxHandler { + private static final class Jaxp14StaxHandler { private static boolean isStaxSource(Class clazz) { return StAXSource.class.isAssignableFrom(clazz); @@ -141,7 +141,7 @@ public class SourcePayloadMethodProcessor extends AbstractPayloadSourceMethodPro } - private static class SystemIdStreamReaderDelegate extends StreamReaderDelegate { + private static final class SystemIdStreamReaderDelegate extends StreamReaderDelegate { private final String systemId; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java index 33190cac..cf9ace90 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java @@ -233,7 +233,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa // Callbacks - private class Jaxb2SourceCallback implements TraxUtils.SourceCallback { + private final class Jaxb2SourceCallback implements TraxUtils.SourceCallback { private final Unmarshaller unmarshaller; @@ -301,7 +301,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa } - private class JaxbElementSourceCallback implements TraxUtils.SourceCallback { + private final class JaxbElementSourceCallback implements TraxUtils.SourceCallback { private final Unmarshaller unmarshaller; @@ -351,7 +351,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa } - private class Jaxb2ResultCallback implements TraxUtils.ResultCallback { + private final class Jaxb2ResultCallback implements TraxUtils.ResultCallback { private final Marshaller marshaller; @@ -399,7 +399,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa } - private class JaxbStreamingPayload implements StreamingPayload { + private final class JaxbStreamingPayload implements StreamingPayload { private final Object jaxbElement; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java index ed3fbc1f..de6dcc94 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/PayloadRootUtils.java @@ -89,7 +89,7 @@ public abstract class PayloadRootUtils { } } - private static class PayloadRootSourceCallback implements TraxUtils.SourceCallback { + private static final class PayloadRootSourceCallback implements TraxUtils.SourceCallback { private QName result; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java index f55acc48..e08884c2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java @@ -71,7 +71,7 @@ class SaajSoapFaultDetail extends SaajSoapElement implements S return (Detail) getSaajElement(); } - private static class SaajSoapFaultDetailElementIterator implements Iterator { + private static final class SaajSoapFaultDetailElementIterator implements Iterator { private final Iterator iterator; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java index e273a9bf..bfa0247d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java @@ -364,7 +364,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { return builder.toString(); } - private static class SaajAttachmentIterator implements Iterator { + private static final class SaajAttachmentIterator implements Iterator { private final Iterator saajIterator; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java index f5c7ae32..24febb7f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java @@ -86,7 +86,7 @@ public abstract class MarshallingUtils { } } - private static class MimeMessageContainer implements MimeContainer { + private static final class MimeMessageContainer implements MimeContainer { private final MimeMessage mimeMessage; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java index 22dd9583..4943f11d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/AbstractReceiverConnection.java @@ -67,7 +67,7 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne protected abstract OutputStream getResponseOutputStream() throws IOException; /** Implementation of {@code TransportInputStream} for receiving-side connections. */ - private class RequestTransportInputStream extends TransportInputStream { + private final class RequestTransportInputStream extends TransportInputStream { @Override protected InputStream createInputStream() throws IOException { @@ -87,7 +87,7 @@ public abstract class AbstractReceiverConnection extends AbstractWebServiceConne } /** Implementation of {@code TransportOutputStream} for sending-side connections. */ - private class ResponseTransportOutputStream extends TransportOutputStream { + private final class ResponseTransportOutputStream extends TransportOutputStream { @Override public void addHeader(String name, String value) throws IOException { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java index ca5f3d16..53f678e1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java @@ -46,7 +46,7 @@ public abstract class TransportContextHolder { return transportContextHolder.get(); } - private static class TransportThreadLocal extends ThreadLocal { + private static final class TransportThreadLocal extends ThreadLocal { public String toString() { return "Transport State"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java b/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java index 7ef5a4df..75a65504 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/MockWebServiceMessage.java @@ -171,7 +171,7 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { return builder.toString(); } - private class StringBufferWriter extends Writer { + private final class StringBufferWriter extends Writer { private StringBufferWriter() { super(MockWebServiceMessage.this.content); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java index a9c89eb9..90ff6ebc 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java @@ -288,7 +288,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { /** Servlet that returns and error message for a given status code. */ @SuppressWarnings("serial") - private static class ErrorServlet extends HttpServlet { + private static final class ErrorServlet extends HttpServlet { private int sc; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java index 6095a280..5d1e59dd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java @@ -97,7 +97,7 @@ public class DefaultWsConfigurationTest { } @Endpoint - private static class TestEndpoint { + private static final class TestEndpoint { @SoapAction("handle") public void handle() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java index 88b9235b..44e787c3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java @@ -258,7 +258,7 @@ public class MarshallingPayloadEndpointTest { verify(this.factoryMock, unmarshaller, marshaller, request, response); } - private static class SimpleMarshaller implements Marshaller, Unmarshaller { + static class SimpleMarshaller implements Marshaller, Unmarshaller { @Override public void marshal(Object graph, Result result) throws XmlMappingException { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java index c044d6ab..252f4ce3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java @@ -83,7 +83,7 @@ public class SaxPayloadEndpointTest extends AbstractPayloadEndpointTest { }; } - private static class TestContentHandler extends DefaultHandler { + private static final class TestContentHandler extends DefaultHandler { @Override public void endElement(String uri, String localName, String qName) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java index 9ce544e7..42d4043c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java @@ -224,11 +224,11 @@ public class GenericMarshallingMethodEndpointAdapterTest { return s; } - private static class MyType { + private static final class MyType { } - private static class MyGenericType { + private static final class MyGenericType { } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java index ab22d852..dafa63d2 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java @@ -208,7 +208,7 @@ public class MarshallingMethodEndpointAdapterTest { return s; } - private static class MyType { + private static final class MyType { } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java index 1d044da5..e92e1974 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java @@ -192,7 +192,7 @@ public class EndpointMappingTest { assertThat(MyEndpoint.constructorCount).isEqualTo(2); } - private static class MyEndpoint { + private static final class MyEndpoint { private static int constructorCount; @@ -202,7 +202,7 @@ public class EndpointMappingTest { } - private static class MySmartEndpointInterceptor extends DelegatingSmartEndpointInterceptor { + private static final class MySmartEndpointInterceptor extends DelegatingSmartEndpointInterceptor { private MySmartEndpointInterceptor() { super(new EndpointInterceptorAdapter()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java index 25ac5c15..b6d3e773 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java @@ -102,7 +102,7 @@ public class MapBasedSoapEndpointMappingTest { assertThat(mapping.getEndpointInternal(null)).isNull(); } - private static class MyMapBasedEndpointMapping extends AbstractMapBasedEndpointMapping { + private static final class MyMapBasedEndpointMapping extends AbstractMapBasedEndpointMapping { private String key; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java index 4161ff64..0a204990 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java @@ -69,7 +69,7 @@ public class SimpleMethodEndpointMappingTest { assertThat(this.mapping.getLookupKeyForMessage(messageContext)).isEqualTo("MyRequest"); } - private static class MyBean { + private static final class MyBean { public void prefixMyRequestSuffix() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java index 1244d75e..f8ce00bd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java @@ -100,7 +100,7 @@ public class AnnotationActionMethodEndpointMappingTest { @Endpoint @Address("mailto:joe@fabrikam123.example") - private static class MyEndpoint { + private static final class MyEndpoint { @Action("http://fabrikam123.example/mail/Delete") public void doIt() { @@ -109,7 +109,7 @@ public class AnnotationActionMethodEndpointMappingTest { } - private static class MyInterceptor extends DelegatingSmartEndpointInterceptor { + private static final class MyInterceptor extends DelegatingSmartEndpointInterceptor { public MyInterceptor() { super(new PayloadLoggingInterceptor()); @@ -117,7 +117,7 @@ public class AnnotationActionMethodEndpointMappingTest { } - private static class MySmartInterceptor extends DelegatingSmartEndpointInterceptor { + private static final class MySmartInterceptor extends DelegatingSmartEndpointInterceptor { public MySmartInterceptor() { super(new PayloadLoggingInterceptor()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java index 92c22c0e..14576ff5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java @@ -92,11 +92,11 @@ public class SimpleActionEndpointMappingTest extends AbstractWsAddressingTest { assertThat(endpoint).isNull(); } - private static class Endpoint1 { + private static final class Endpoint1 { } - private static class Endpoint2 { + private static final class Endpoint2 { } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java index a182dcbb..22782c87 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java @@ -143,7 +143,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { assertThat(response.getSOAPBody().hasFault()).isFalse(); } - private static class PersonValidator implements Validator { + private static final class PersonValidator implements Validator { @Override public boolean supports(Class clazz) { @@ -166,7 +166,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { } - private static class Person { + private static final class Person { private String name; @@ -200,7 +200,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { } - private static class PersonMarshaller implements Unmarshaller, Marshaller { + private static final class PersonMarshaller implements Unmarshaller, Marshaller { private final Person person; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java index 70f747a2..c3e3118d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java @@ -128,7 +128,7 @@ public class SoapActionAnnotationMethodEndpointMappingTest { } @Endpoint - private static class MyEndpoint { + private static final class MyEndpoint { @SoapAction("http://springframework.org/spring-ws/SoapAction") public void doIt() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java index 71c98a68..277bb6a4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java @@ -105,11 +105,11 @@ public class DefaultStrategiesHelperTest { } - private static class StrategyImpl implements Strategy { + private static final class StrategyImpl implements Strategy { } - private static class ContextAwareStrategyImpl implements Strategy, ApplicationContextAware { + private static final class ContextAwareStrategyImpl implements Strategy, ApplicationContextAware { private ApplicationContext applicationContext; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java index 185a587d..96db8e73 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java @@ -109,7 +109,7 @@ public class MessageDispatcherServletTest { XmlAssert.assertThat(result).and(expected).ignoreWhitespace().areIdentical(); } - private static class DetectWebApplicationContext extends StaticWebApplicationContext { + private static final class DetectWebApplicationContext extends StaticWebApplicationContext { @Override public void refresh() throws BeansException, IllegalStateException { @@ -123,7 +123,7 @@ public class MessageDispatcherServletTest { } - private static class WsdlDefinitionWebApplicationContext extends StaticWebApplicationContext { + private static final class WsdlDefinitionWebApplicationContext extends StaticWebApplicationContext { @Override public void refresh() throws BeansException, IllegalStateException { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java index 29558576..4be0821a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupportTest.java @@ -122,7 +122,7 @@ public class WebServiceMessageReceiverObjectSupportTest { verify(this.connectionMock).receive(this.messageFactory); } - private static class MyReceiverSupport extends WebServiceMessageReceiverObjectSupport { + private static final class MyReceiverSupport extends WebServiceMessageReceiverObjectSupport { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java index 784fdf3c..40a47275 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java @@ -87,7 +87,7 @@ public abstract class Wss4jMessageInterceptorSamlTest extends Wss4jTest { return new SamlCallbackHandler(crypto, userCert); } - private static class SamlCallbackHandler implements CallbackHandler { + private static final class SamlCallbackHandler implements CallbackHandler { private Crypto crypto; diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java index 3ce12332..8e2e3dc3 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java @@ -219,7 +219,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver MailTransportUtils.closeService(this.store); } - private class MonitoringRunnable implements SchedulingAwareRunnable { + private final class MonitoringRunnable implements SchedulingAwareRunnable { @Override public void run() { @@ -261,7 +261,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver } - private class MessageHandler implements SchedulingAwareRunnable { + private final class MessageHandler implements SchedulingAwareRunnable { private final Message message; diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java index 6b4a485b..6d6315d9 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java @@ -229,7 +229,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { } } - private static class ByteArrayDataSource implements DataSource { + private static final class ByteArrayDataSource implements DataSource { private byte[] data; diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java index 996d20bf..5844ba27 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java @@ -307,7 +307,7 @@ public class MailSenderConnection extends AbstractSenderConnection { MailTransportUtils.closeService(this.store); } - private static class ByteArrayDataSource implements DataSource { + private static final class ByteArrayDataSource implements DataSource { private byte[] data; diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java index 2c101d3d..39455f5d 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java @@ -106,7 +106,7 @@ public class XmppMessageReceiver extends AbstractStandaloneMessageReceiver { } } - private class WebServicePacketListener implements StanzaListener { + private final class WebServicePacketListener implements StanzaListener { @Override public void processStanza(Stanza packet) { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java index 80ff7e4e..045bdfcb 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/ResponseCreators.java @@ -194,7 +194,7 @@ public abstract class ResponseCreators { /** * Adapts a {@link WebServiceMessageCreator} to the {@link ResponseCreator} contract. */ - private static class WebServiceMessageCreatorAdapter implements ResponseCreator { + private static final class WebServiceMessageCreatorAdapter implements ResponseCreator { private final WebServiceMessageCreator adaptee; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java index 4484ac88..3c7b61b6 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java @@ -193,7 +193,7 @@ public class MockWebServiceClient { // ResponseActions - private static class MockWebServiceClientResponseActions implements ResponseActions { + private static final class MockWebServiceClientResponseActions implements ResponseActions { private final MessageContext messageContext; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java index 41713e74..d604af1c 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreators.java @@ -90,7 +90,7 @@ public abstract class RequestCreators { /** * Adapts a {@link WebServiceMessageCreator} to the {@link RequestCreator} contract. */ - private static class WebServiceMessageCreatorAdapter implements RequestCreator { + private static final class WebServiceMessageCreatorAdapter implements RequestCreator { private final WebServiceMessageCreator adaptee; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java index 2062c804..825e50bd 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java @@ -420,7 +420,7 @@ public class MockWebServiceServerTest { } @XmlRootElement(name = "EnvelopeMatcherRequest") - private static class EnvelopeMatcherRequest { + private static final class EnvelopeMatcherRequest { private String myData; @@ -435,7 +435,7 @@ public class MockWebServiceServerTest { } @XmlRootElement(name = "EnvelopeMatcherResponse") - private static class EnvelopeMatcherResponse { + private static final class EnvelopeMatcherResponse { private String myData; diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java index ae4d950e..351e63ab 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java @@ -48,7 +48,7 @@ abstract class Jaxp13ValidatorFactory { } } - private static class Jaxp13Validator implements XmlValidator { + private static final class Jaxp13Validator implements XmlValidator { private Schema schema; @@ -82,7 +82,7 @@ abstract class Jaxp13ValidatorFactory { /** * {@code ErrorHandler} implementation that stores errors and fatal errors in a list. */ - private static class DefaultValidationErrorHandler implements ValidationErrorHandler { + private static final class DefaultValidationErrorHandler implements ValidationErrorHandler { private List errors = new ArrayList<>(); diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java index 626b7d8d..bfa20265 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java @@ -56,7 +56,7 @@ abstract class Jaxp15ValidatorFactory { } } - private static class Jaxp15Validator implements XmlValidator { + private static final class Jaxp15Validator implements XmlValidator { private Schema schema; @@ -111,7 +111,7 @@ abstract class Jaxp15ValidatorFactory { /** * {@code ErrorHandler} implementation that stores errors and fatal errors in a list. */ - private static class DefaultValidationErrorHandler implements ValidationErrorHandler { + private static final class DefaultValidationErrorHandler implements ValidationErrorHandler { private List errors = new ArrayList<>(); diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java index 49f967a5..2dcdfe34 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java @@ -60,7 +60,7 @@ public abstract class AbstractXPathTemplate extends TransformerObjectSupport imp * Static inner class that adapts a {@link NodeCallbackHandler} to the interface of * {@link NodeMapper}. */ - private static class NodeCallbackHandlerNodeMapper implements NodeMapper { + private static final class NodeCallbackHandlerNodeMapper implements NodeMapper { private final NodeCallbackHandler callbackHandler; diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java index 25725d98..95aace09 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java @@ -75,7 +75,7 @@ abstract class JaxenXPathExpressionFactory { } /** Jaxen implementation of the {@code XPathExpression} interface. */ - private static class JaxenXpathExpression implements XPathExpression { + private static final class JaxenXpathExpression implements XPathExpression { private XPath xpath; diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java index 52315c4a..7cfa6051 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java @@ -90,7 +90,7 @@ abstract class Jaxp13XPathExpressionFactory { } /** JAXP 1.3 implementation of the {@code XPathExpression} interface. */ - private static class Jaxp13XPathExpression implements XPathExpression { + private static final class Jaxp13XPathExpression implements XPathExpression { private final javax.xml.xpath.XPathExpression xpathExpression; diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java index f8076676..1f5c059a 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java @@ -164,7 +164,7 @@ public class Jaxp13XPathTemplate extends AbstractXPathTemplate { return this.xpathFactory.newXPath(); } - private static class EvaluationCallback implements TraxUtils.SourceCallback { + private static final class EvaluationCallback implements TraxUtils.SourceCallback { private final XPath xpath; diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java index 99d58c3d..dc2859b3 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java +++ b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java @@ -236,7 +236,7 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali return builder.toString(); } - private class ClasspathUriResolver extends DefaultURIResolver { + private final class ClasspathUriResolver extends DefaultURIResolver { @Override public InputSource resolveEntity(String namespace, String schemaLocation, String baseUri) { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java index bcbaff13..ad8329e8 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java @@ -56,7 +56,7 @@ public class XmlValidatorFactoryTest { .createValidator(new ClassPathResource("schema.xsd", AbstractValidatorFactoryTest.class), "bla")); } - private static class NonExistentResource extends AbstractResource { + private static final class NonExistentResource extends AbstractResource { @Override public Resource createRelative(String relativePath) throws IOException { From ae5b46018fbc89c57743a5205d387b07f5783f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 7 Mar 2025 11:50:06 +0100 Subject: [PATCH 05/10] Reorder Javadoc tags consistently See gh-1479 --- .../org/springframework/ws/FaultAwareWebServiceMessage.java | 2 +- .../main/java/org/springframework/ws/WebServiceMessage.java | 2 +- .../java/org/springframework/ws/WebServiceMessageFactory.java | 2 +- .../ws/client/core/SimpleFaultMessageResolver.java | 2 +- .../org/springframework/ws/client/core/SourceExtractor.java | 2 +- .../springframework/ws/client/core/WebServiceOperations.java | 2 +- .../ws/client/core/support/WebServiceGatewaySupport.java | 2 +- .../springframework/ws/client/support/WebServiceAccessor.java | 2 +- .../ws/client/support/destination/DestinationProvider.java | 2 +- .../support/interceptor/AbstractValidatingInterceptor.java | 2 +- .../ws/client/support/interceptor/ClientInterceptor.java | 2 +- .../support/interceptor/PayloadValidatingInterceptor.java | 2 +- .../org/springframework/ws/config/annotation/EnableWs.java | 4 ++-- .../ws/config/annotation/WsConfigurationSupport.java | 4 ++-- .../src/main/java/org/springframework/ws/mime/Attachment.java | 2 +- .../java/org/springframework/ws/mime/AttachmentException.java | 2 +- .../java/org/springframework/ws/pox/dom/DomPoxMessage.java | 2 +- .../java/org/springframework/ws/server/EndpointAdapter.java | 2 +- .../org/springframework/ws/server/EndpointInterceptor.java | 2 +- .../springframework/ws/server/EndpointInvocationChain.java | 2 +- .../java/org/springframework/ws/server/EndpointMapping.java | 2 +- .../java/org/springframework/ws/server/MessageDispatcher.java | 2 +- .../ws/server/endpoint/AbstractDom4jPayloadEndpoint.java | 2 +- .../ws/server/endpoint/AbstractDomPayloadEndpoint.java | 2 +- .../server/endpoint/AbstractMarshallingPayloadEndpoint.java | 2 +- .../ws/server/endpoint/AbstractSaxPayloadEndpoint.java | 2 +- .../ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java | 2 +- .../ws/server/endpoint/AbstractStaxPayloadEndpoint.java | 2 +- .../ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java | 2 +- .../ws/server/endpoint/AbstractXomPayloadEndpoint.java | 2 +- .../springframework/ws/server/endpoint/MessageEndpoint.java | 2 +- .../endpoint/adapter/MarshallingMethodEndpointAdapter.java | 2 +- .../ws/server/endpoint/adapter/MessageEndpointAdapter.java | 2 +- .../ws/server/endpoint/adapter/PayloadEndpointAdapter.java | 2 +- .../ws/server/endpoint/annotation/Endpoint.java | 2 +- .../ws/server/endpoint/annotation/Namespace.java | 2 +- .../ws/server/endpoint/annotation/Namespaces.java | 2 +- .../ws/server/endpoint/annotation/PayloadRoot.java | 2 +- .../ws/server/endpoint/annotation/PayloadRoots.java | 2 +- .../ws/server/endpoint/annotation/RequestPayload.java | 2 +- .../ws/server/endpoint/annotation/ResponsePayload.java | 2 +- .../ws/server/endpoint/annotation/XPathParam.java | 2 +- .../endpoint/interceptor/AbstractValidatingInterceptor.java | 2 +- .../endpoint/interceptor/PayloadLoggingInterceptor.java | 2 +- .../endpoint/interceptor/PayloadTransformingInterceptor.java | 2 +- .../ws/server/endpoint/mapping/AbstractEndpointMapping.java | 2 +- .../endpoint/mapping/PayloadRootQNameEndpointMapping.java | 2 +- .../server/endpoint/mapping/SimpleMethodEndpointMapping.java | 2 +- .../server/endpoint/mapping/XPathPayloadEndpointMapping.java | 2 +- .../src/main/java/org/springframework/ws/soap/SoapBody.java | 2 +- .../main/java/org/springframework/ws/soap/SoapElement.java | 2 +- .../java/org/springframework/ws/soap/SoapFaultDetail.java | 2 +- .../org/springframework/ws/soap/SoapFaultDetailElement.java | 2 +- .../src/main/java/org/springframework/ws/soap/SoapHeader.java | 2 +- .../java/org/springframework/ws/soap/SoapHeaderElement.java | 2 +- .../main/java/org/springframework/ws/soap/SoapMessage.java | 2 +- .../main/java/org/springframework/ws/soap/SoapVersion.java | 2 +- .../ws/soap/addressing/core/EndpointReference.java | 2 +- .../ws/soap/addressing/core/MessageAddressingProperties.java | 2 +- .../addressing/server/AnnotationActionEndpointMapping.java | 2 +- .../soap/addressing/server/SimpleActionEndpointMapping.java | 2 +- .../ws/soap/addressing/version/Addressing10.java | 3 +-- .../ws/soap/addressing/version/Addressing200408.java | 2 +- .../ws/soap/client/core/SoapFaultMessageResolver.java | 2 +- .../org/springframework/ws/soap/saaj/SaajSoapMessage.java | 2 +- .../springframework/ws/soap/saaj/SaajSoapMessageFactory.java | 2 +- .../ws/soap/saaj/support/SaajContentHandler.java | 2 +- .../org/springframework/ws/soap/saaj/support/SaajUtils.java | 2 +- .../springframework/ws/soap/saaj/support/SaajXmlReader.java | 2 +- .../ws/soap/server/SoapEndpointInvocationChain.java | 2 +- .../springframework/ws/soap/server/SoapMessageDispatcher.java | 2 +- .../AbstractSoapFaultDefinitionExceptionResolver.java | 2 +- .../ws/soap/server/endpoint/SoapFaultDefinition.java | 2 +- .../ws/soap/server/endpoint/SoapFaultDefinitionEditor.java | 2 +- .../method/SoapHeaderElementMethodArgumentResolver.java | 2 +- .../ws/soap/server/endpoint/annotation/SoapAction.java | 2 +- .../ws/soap/server/endpoint/annotation/SoapActions.java | 2 +- .../ws/soap/server/endpoint/annotation/SoapFault.java | 2 +- .../AbstractFaultCreatingValidatingInterceptor.java | 2 +- .../endpoint/interceptor/PayloadValidatingInterceptor.java | 2 +- .../endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java | 2 +- .../endpoint/mapping/DelegatingSoapEndpointMapping.java | 2 +- .../java/org/springframework/ws/soap/soap11/Soap11Body.java | 2 +- .../java/org/springframework/ws/stream/StreamingPayload.java | 2 +- .../springframework/ws/stream/StreamingWebServiceMessage.java | 2 +- .../ws/transport/EndpointAwareWebServiceConnection.java | 2 +- .../springframework/ws/transport/TransportInputStream.java | 2 +- .../springframework/ws/transport/TransportOutputStream.java | 2 +- .../springframework/ws/transport/WebServiceConnection.java | 2 +- .../springframework/ws/transport/WebServiceMessageSender.java | 2 +- .../ws/transport/context/TransportContextHolder.java | 2 +- .../ws/transport/http/CommonsHttpMessageSender.java | 2 +- .../ws/transport/http/HttpComponents5ClientFactory.java | 2 +- .../ws/transport/http/HttpComponents5MessageSender.java | 2 +- .../ws/transport/http/HttpComponentsMessageSender.java | 2 +- .../ws/transport/http/HttpUrlConnectionMessageSender.java | 2 +- .../ws/transport/http/JdkHttpClientConnection.java | 2 +- .../ws/transport/http/JdkHttpClientMessageSender.java | 2 +- .../ws/transport/http/MessageDispatcherServlet.java | 2 +- .../http/WebServiceMessageReceiverHandlerAdapter.java | 2 +- .../ws/transport/http/WsdlDefinitionHandlerAdapter.java | 2 +- .../ws/transport/http/XsdSchemaHandlerAdapter.java | 2 +- .../support/WebServiceMessageReceiverObjectSupport.java | 2 +- .../ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java | 2 +- .../org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java | 2 +- .../org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java | 2 +- .../ws/soap/security/support/KeyManagersFactoryBean.java | 2 +- .../ws/soap/security/support/KeyStoreFactoryBean.java | 2 +- .../ws/soap/security/support/TrustManagersFactoryBean.java | 2 +- .../ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java | 2 +- .../security/wss4j2/callback/KeyStoreCallbackHandler.java | 2 +- .../callback/SimplePasswordValidationCallbackHandler.java | 2 +- .../wss4j2/callback/UsernameTokenPrincipalCallback.java | 2 +- .../ws/soap/security/wss4j2/support/CryptoFactoryBean.java | 2 +- .../springframework/ws/transport/jms/JmsMessageSender.java | 2 +- .../ws/transport/jms/WebServiceMessageListener.java | 2 +- .../springframework/ws/transport/mail/MailMessageSender.java | 2 +- .../support/SimpleWebServiceMessageReceiverObjectSupport.java | 2 +- .../ws/transport/xmpp/XmppMessageReceiver.java | 2 +- .../ws/test/client/RequestXPathExpectations.java | 2 +- .../org/springframework/ws/test/server/RequestCreator.java | 2 +- .../ws/test/server/ResponseXPathExpectations.java | 2 +- .../java/org/springframework/xml/dom/DomContentHandler.java | 2 +- .../java/org/springframework/xml/namespace/QNameEditor.java | 2 +- .../java/org/springframework/xml/namespace/QNameUtils.java | 2 +- .../java/org/springframework/xml/sax/AbstractXmlReader.java | 2 +- .../java/org/springframework/xml/transform/StringResult.java | 2 +- .../xml/transform/TransformerObjectSupport.java | 2 +- .../java/org/springframework/xml/validation/XmlValidator.java | 2 +- .../springframework/xml/validation/XmlValidatorFactory.java | 2 +- .../xml/xpath/JaxenXPathExpressionFactory.java | 2 +- .../org/springframework/xml/xpath/JaxenXPathTemplate.java | 2 +- .../xml/xpath/Jaxp13XPathExpressionFactory.java | 2 +- .../org/springframework/xml/xpath/Jaxp13XPathTemplate.java | 2 +- .../org/springframework/xml/xpath/NodeCallbackHandler.java | 2 +- .../main/java/org/springframework/xml/xpath/NodeMapper.java | 2 +- .../org/springframework/xml/xpath/XPathExpressionFactory.java | 2 +- .../springframework/xml/xpath/XPathExpressionFactoryBean.java | 2 +- .../java/org/springframework/xml/xpath/XPathOperations.java | 2 +- .../org/springframework/xml/xsd/commons/CommonsXsdSchema.java | 2 +- .../xml/xsd/commons/CommonsXsdSchemaCollection.java | 2 +- 141 files changed, 143 insertions(+), 144 deletions(-) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/FaultAwareWebServiceMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/FaultAwareWebServiceMessage.java index 7f83e9e5..bbea7534 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/FaultAwareWebServiceMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/FaultAwareWebServiceMessage.java @@ -24,8 +24,8 @@ import javax.xml.namespace.QName; * often require different processing rules. * * @author Arjen Poutsma - * @see org.springframework.ws.soap.SoapMessage * @since 1.0.0 + * @see org.springframework.ws.soap.SoapMessage */ public interface FaultAwareWebServiceMessage extends WebServiceMessage { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessage.java index 677427e7..c575ee52 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessage.java @@ -28,9 +28,9 @@ import javax.xml.transform.Source; * Contains methods that provide access to the payload of the message. * * @author Arjen Poutsma + * @since 1.0.0 * @see org.springframework.ws.soap.SoapMessage * @see WebServiceMessageFactory - * @since 1.0.0 */ public interface WebServiceMessage { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java index 031c6aac..e4d3862b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/WebServiceMessageFactory.java @@ -26,8 +26,8 @@ import java.io.InputStream; * Allows the creation of empty messages, or messages based on {@code InputStream}s. * * @author Arjen Poutsma - * @see org.springframework.ws.WebServiceMessage * @since 1.0.0 + * @see org.springframework.ws.WebServiceMessage */ public interface WebServiceMessageFactory { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/SimpleFaultMessageResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/SimpleFaultMessageResolver.java index 131c0420..d2056de9 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/SimpleFaultMessageResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/SimpleFaultMessageResolver.java @@ -25,8 +25,8 @@ import org.springframework.ws.client.WebServiceFaultException; * fault occurs. * * @author Arjen Poutsma - * @see WebServiceFaultException * @since 1.0.0 + * @see WebServiceFaultException */ public class SimpleFaultMessageResolver implements FaultMessageResolver { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java index ea732050..878b8e9a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java @@ -35,8 +35,8 @@ import javax.xml.transform.TransformerException; * don't need to worry about exception handling, or resource handling. * * @author Arjen Poutsma - * @see org.springframework.ws.client.core.WebServiceTemplate * @since 1.0.0 + * @see org.springframework.ws.client.core.WebServiceTemplate */ public interface SourceExtractor { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceOperations.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceOperations.java index 8ee2171e..bb51dcf2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceOperations.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceOperations.java @@ -28,8 +28,8 @@ import org.springframework.ws.client.WebServiceClientException; * testability, as it can easily be mocked or stubbed. * * @author Arjen Poutsma - * @see WebServiceTemplate * @since 1.0.0 + * @see WebServiceTemplate */ public interface WebServiceOperations { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java index e4dc606e..f8fa0a37 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java @@ -50,10 +50,10 @@ import org.springframework.ws.transport.WebServiceMessageSender; * directly. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setMessageFactory(WebServiceMessageFactory) * @see WebServiceTemplate * @see #setMarshaller(Marshaller) - * @since 1.0.0 */ public abstract class WebServiceGatewaySupport implements InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java index 8256d66f..bba24478 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java @@ -36,8 +36,8 @@ import org.springframework.xml.transform.TransformerObjectSupport; * {@link org.springframework.ws.client.core.WebServiceTemplate}. * * @author Arjen Poutsma - * @see org.springframework.ws.client.core.WebServiceTemplate * @since 1.0.0 + * @see org.springframework.ws.client.core.WebServiceTemplate */ public abstract class WebServiceAccessor extends TransformerObjectSupport implements InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvider.java index 74cebf3b..dcb69dd0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/DestinationProvider.java @@ -27,8 +27,8 @@ import java.net.URI; * to determine the destination URI. * * @author Arjen Poutsma - * @see org.springframework.ws.client.core.WebServiceTemplate#setDestinationProvider(DestinationProvider) * @since 1.5.4 + * @see org.springframework.ws.client.core.WebServiceTemplate#setDestinationProvider(DestinationProvider) */ public interface DestinationProvider { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java index 40c6e868..f1805793 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java @@ -47,9 +47,9 @@ import org.springframework.xml.xsd.XsdSchemaCollection; * using the {@code validateRequest} and {@code validateResponse} properties. * * @author Arjen Poutsma + * @since 1.5.4 * @see #getValidationRequestSource(WebServiceMessage) * @see #getValidationResponseSource(WebServiceMessage) - * @since 1.5.4 */ public abstract class AbstractValidatingInterceptor extends TransformerObjectSupport implements ClientInterceptor, InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptor.java index 58355b79..77648a64 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptor.java @@ -43,8 +43,8 @@ import org.springframework.ws.transport.WebServiceConnection; * * @author Giovanni Cuccu * @author Arjen Poutsma - * @see org.springframework.ws.client.core.WebServiceTemplate#setInterceptors(ClientInterceptor[]) * @since 1.5.0 + * @see org.springframework.ws.client.core.WebServiceTemplate#setInterceptors(ClientInterceptor[]) */ public interface ClientInterceptor { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java index 3e268b79..f909c890 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptor.java @@ -34,11 +34,11 @@ import org.springframework.ws.WebServiceMessage; * * @author Stefan Schmidt * @author Arjen Poutsma + * @since 1.5.4 * @see #setSchema(org.springframework.core.io.Resource) * @see #setSchemas(org.springframework.core.io.Resource[]) * @see #setValidateRequest(boolean) * @see #setValidateResponse(boolean) - * @since 1.5.4 */ public class PayloadValidatingInterceptor extends AbstractValidatingInterceptor { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/EnableWs.java b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/EnableWs.java index 9cb93ec2..9761922a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/EnableWs.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/EnableWs.java @@ -83,11 +83,11 @@ import org.springframework.context.annotation.Import; * } * } * + * @author Arjen Poutsma + * @since 2.2 * @see WsConfigurer * @see WsConfigurerAdapter * @see WsConfigurationSupport - * @author Arjen Poutsma - * @since 2.2 */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurationSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurationSupport.java index c34279ad..93c79ba9 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurationSupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurationSupport.java @@ -71,11 +71,11 @@ import org.springframework.ws.soap.server.endpoint.mapping.SoapActionAnnotationM *
  • {@link SimpleSoapExceptionResolver} for creating default exceptions. * * + * @author Arjen Poutsma + * @since 2.2 * @see EnableWs * @see WsConfigurer * @see WsConfigurerAdapter - * @author Arjen Poutsma - * @since 2.2 */ public class WsConfigurationSupport { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java index 9079c10c..627e0c62 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java @@ -25,9 +25,9 @@ import jakarta.activation.DataHandler; * Represents an attachment to a {@link org.springframework.ws.mime.MimeMessage} * * @author Arjen Poutsma + * @since 1.0.0 * @see MimeMessage#getAttachments() * @see MimeMessage#addAttachment - * @since 1.0.0 */ public interface Attachment { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/mime/AttachmentException.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/AttachmentException.java index 216b9d85..c560f91e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/mime/AttachmentException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/mime/AttachmentException.java @@ -22,8 +22,8 @@ import org.springframework.ws.WebServiceMessageException; * Exception thrown when a MIME attachment could not be accessed. * * @author Arjen Poutsma - * @see Attachment * @since 1.0.0 + * @see Attachment */ @SuppressWarnings("serial") public class AttachmentException extends WebServiceMessageException { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java index 709bb873..ff2cd622 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java @@ -41,8 +41,8 @@ import org.springframework.xml.namespace.QNameUtils; * Implementation of the {@code PoxMessage} interface that is based on a DOM Document. * * @author Arjen Poutsma - * @see Document * @since 1.0.0 + * @see Document */ public class DomPoxMessage implements PoxMessage { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointAdapter.java index bd0c577f..d2dfbe9b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointAdapter.java @@ -28,8 +28,8 @@ import org.springframework.ws.context.MessageContext; * who want to develop their own message flow. * * @author Arjen Poutsma - * @see MessageDispatcher * @since 1.0.0 + * @see MessageDispatcher */ public interface EndpointAdapter { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java index 995d1339..380dcaf4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java @@ -38,10 +38,10 @@ import org.springframework.ws.context.MessageContext; * <list> of <ref>). * * @author Arjen Poutsma + * @since 1.0.0 * @see EndpointInvocationChain#getInterceptors() * @see org.springframework.ws.server.endpoint.interceptor.EndpointInterceptorAdapter * @see org.springframework.ws.server.endpoint.mapping.AbstractEndpointMapping#setInterceptors(EndpointInterceptor[]) - * @since 1.0.0 */ public interface EndpointInterceptor { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java index 547663f2..51d1d5a2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java @@ -21,8 +21,8 @@ package org.springframework.ws.server; * interceptors. * * @author Arjen Poutsma - * @see EndpointInterceptor * @since 1.0.0 + * @see EndpointInterceptor */ public class EndpointInvocationChain { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointMapping.java index eea56930..1aa66949 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointMapping.java @@ -33,10 +33,10 @@ import org.springframework.ws.context.MessageContext; * if all {@code handlerRequest} methods have returned {@code true}. * * @author Arjen Poutsma + * @since 1.0.0 * @see org.springframework.ws.server.endpoint.mapping.AbstractEndpointMapping * @see org.springframework.ws.server.endpoint.mapping.PayloadRootQNameEndpointMapping * @see org.springframework.ws.soap.server.endpoint.mapping.SoapActionEndpointMapping - * @since 1.0.0 */ public interface EndpointMapping { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java b/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java index 86b6e2fa..f2441b0d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java @@ -75,11 +75,11 @@ import org.springframework.ws.transport.WebServiceMessageReceiver; * * * @author Arjen Poutsma + * @since 1.0.0 * @see EndpointMapping * @see EndpointAdapter * @see EndpointExceptionResolver * @see org.springframework.web.servlet.DispatcherServlet - * @since 1.0.0 */ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAware, ApplicationContextAware { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java index 7f43e653..e3c85e6c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java @@ -39,8 +39,8 @@ import org.springframework.xml.transform.TransformerObjectSupport; * payload elements are not in accordance with WS-I. * * @author Arjen Poutsma - * @see org.dom4j.Element * @since 1.0.0 + * @see org.dom4j.Element * @deprecated as of Spring Web Services 2.0, in favor of annotated endpoints */ @Deprecated diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java index 0a73582b..3c9911ba 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java @@ -42,8 +42,8 @@ import org.springframework.xml.transform.TransformerObjectSupport; * * @author Arjen Poutsma * @author Alef Arendsen - * @see #invokeInternal(org.w3c.dom.Element,org.w3c.dom.Document) * @since 1.0.0 + * @see #invokeInternal(org.w3c.dom.Element,org.w3c.dom.Document) * @deprecated as of Spring Web Services 2.0, in favor of annotated endpoints */ @Deprecated diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java index 8d0f14a8..1c891eb0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractMarshallingPayloadEndpoint.java @@ -36,12 +36,12 @@ import org.springframework.ws.support.MarshallingUtils; * parameter, and allows for a response object to be returned. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setMarshaller(org.springframework.oxm.Marshaller) * @see Marshaller * @see #setUnmarshaller(org.springframework.oxm.Unmarshaller) * @see Unmarshaller * @see #invokeInternal(Object) - * @since 1.0.0 * @deprecated as of Spring Web Services 2.0, in favor of annotated endpoints */ @Deprecated diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java index 4d77b618..fd38bcaa 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractSaxPayloadEndpoint.java @@ -33,9 +33,9 @@ import org.springframework.xml.transform.TransformerObjectSupport; * to {@code createResponse}, so it can be used for holding request-specific state. * * @author Arjen Poutsma + * @since 1.0.0 * @see #createContentHandler() * @see #getResponse(org.xml.sax.ContentHandler) - * @since 1.0.0 * @deprecated as of Spring Web Services 2.0, in favor of annotated endpoints */ @Deprecated diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java index 23d66ea8..b7fa3c1b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java @@ -43,11 +43,11 @@ import org.springframework.ws.context.MessageContext; * create a response using a {@code XMLEventWriter}. * * @author Arjen Poutsma + * @since 1.0.0 * @see #invokeInternal(javax.xml.stream.XMLEventReader,javax.xml.stream.util.XMLEventConsumer, * javax.xml.stream.XMLEventFactory) * @see XMLEventReader * @see XMLEventWriter - * @since 1.0.0 * @deprecated as of Spring Web Services 2.0, in favor of annotated endpoints */ @Deprecated diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java index 62692996..65e544e4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxPayloadEndpoint.java @@ -27,9 +27,9 @@ import org.springframework.xml.transform.TransformerObjectSupport; * {@code XMLOutputFactory}. * * @author Arjen Poutsma + * @since 1.0.0 * @see XMLInputFactory * @see XMLOutputFactory - * @since 1.0.0 * @deprecated as of Spring Web Services 2.0, in favor of annotated endpoints */ @Deprecated diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java index 571d879e..edbf5a91 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java @@ -40,10 +40,10 @@ import org.springframework.ws.context.MessageContext; * response using a {@code XMLStreamWriter}. * * @author Arjen Poutsma + * @since 1.0.0 * @see #invokeInternal(javax.xml.stream.XMLStreamReader,javax.xml.stream.XMLStreamWriter) * @see XMLStreamReader * @see XMLStreamWriter - * @since 1.0.0 * @deprecated as of Spring Web Services 2.0, in favor of annotated endpoints */ @Deprecated diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java index d13467b0..0689393e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java @@ -59,8 +59,8 @@ import org.springframework.xml.transform.TraxUtils; * elements are not in accordance with WS-I. * * @author Arjen Poutsma - * @see Element * @since 1.0.0 + * @see Element * @deprecated as of Spring Web Services 2.0, in favor of annotated endpoints */ @Deprecated diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java index 19850255..3c1cefa4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/MessageEndpoint.java @@ -26,8 +26,8 @@ import org.springframework.ws.context.MessageContext; * and can be used to create a response. * * @author Arjen Poutsma - * @see org.springframework.ws.server.endpoint.PayloadEndpoint * @since 1.0.0 + * @see org.springframework.ws.server.endpoint.PayloadEndpoint */ public interface MessageEndpoint { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java index 3056c6de..a7cd1f18 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java @@ -47,9 +47,9 @@ import org.springframework.ws.support.MarshallingUtils; * set using properties. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setMarshaller(org.springframework.oxm.Marshaller) * @see #setUnmarshaller(org.springframework.oxm.Unmarshaller) - * @since 1.0.0 * @deprecated as of Spring Web Services 2.0, in favor of * {@link DefaultMethodEndpointAdapter} and * {@link org.springframework.ws.server.endpoint.adapter.method.MarshallingPayloadMethodProcessor diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java index f40c9ae4..c2992423 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapter.java @@ -30,8 +30,8 @@ import org.springframework.ws.soap.server.SoapMessageDispatcher; * {@link SoapMessageDispatcher}. * * @author Arjen Poutsma - * @see org.springframework.ws.server.EndpointInvocationChain * @since 1.0.0 + * @see org.springframework.ws.server.EndpointInvocationChain */ public class MessageEndpointAdapter implements EndpointAdapter { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java index debe0bbf..0a40ef0c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapter.java @@ -34,9 +34,9 @@ import org.springframework.xml.transform.TransformerObjectSupport; * {@link SoapMessageDispatcher}. * * @author Arjen Poutsma + * @since 1.0.0 * @see org.springframework.ws.server.endpoint.PayloadEndpoint * @see org.springframework.ws.server.EndpointInvocationChain - * @since 1.0.0 */ public class PayloadEndpointAdapter extends TransformerObjectSupport implements EndpointAdapter { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java index 3c39378b..e1e96ac1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Endpoint.java @@ -36,8 +36,8 @@ import org.springframework.ws.soap.server.endpoint.mapping.SoapActionAnnotationM * {@link SoapActionAnnotationMethodEndpointMapping}. * * @author Arjen Poutsma - * @see org.springframework.context.annotation.ClassPathBeanDefinitionScanner * @since 1.0.0 + * @see org.springframework.context.annotation.ClassPathBeanDefinitionScanner */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespace.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespace.java index e454e57e..4521425d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespace.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespace.java @@ -32,9 +32,9 @@ import javax.xml.XMLConstants; * {@link PayloadRoot @PayloadRoot}. * * @author Arjen Poutsma + * @since 2.0 * @see XPathParam * @see PayloadRoot - * @since 2.0 */ @Documented @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespaces.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespaces.java index a945ed3d..ee8b6b6e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespaces.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/Namespaces.java @@ -27,8 +27,8 @@ import java.lang.annotation.Target; * package. * * @author Arjen Poutsma - * @see Namespace * @since 2.0 + * @see Namespace */ @Documented @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java index e375e6d5..2e1fc573 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoot.java @@ -28,8 +28,8 @@ import java.lang.annotation.Target; * signify the request payload root element that is handled by the method. * * @author Arjen Poutsma - * @see org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping * @since 1.0.0 + * @see org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoots.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoots.java index cc64f31d..558e916e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoots.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/PayloadRoots.java @@ -26,8 +26,8 @@ import java.lang.annotation.Target; * Marks an endpoint method as containing multiple {@link PayloadRoot PayloadRoots}. * * @author Arjen Poutsma - * @see org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping * @since 2.2 + * @see org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMapping */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/RequestPayload.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/RequestPayload.java index 4ccba100..278c2f68 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/RequestPayload.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/RequestPayload.java @@ -28,8 +28,8 @@ import java.lang.annotation.Target; * payload}. Supported for annotated endpoint methods. * * @author Arjen Poutsma - * @see ResponsePayload * @since 2.0 + * @see ResponsePayload */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/ResponsePayload.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/ResponsePayload.java index 4f10655f..132b2ce6 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/ResponsePayload.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/ResponsePayload.java @@ -28,8 +28,8 @@ import java.lang.annotation.Target; * payload}. Supported for annotated endpoint methods. * * @author Arjen Poutsma - * @see RequestPayload * @since 2.0 + * @see RequestPayload */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java index 81c306b8..136ba13a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/annotation/XPathParam.java @@ -35,8 +35,8 @@ import java.lang.annotation.Target; * * * @author Arjen Poutsma - * @see org.springframework.ws.server.endpoint.adapter.method.XPathParamMethodArgumentResolver * @since 1.0.0 + * @see org.springframework.ws.server.endpoint.adapter.method.XPathParamMethodArgumentResolver */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java index bc51bc7e..e397c30a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java @@ -51,9 +51,9 @@ import org.springframework.xml.xsd.XsdSchemaCollection; * using the {@code validateRequest} and {@code validateResponse} properties. * * @author Arjen Poutsma + * @since 1.0.0 * @see #getValidationRequestSource(org.springframework.ws.WebServiceMessage) * @see #getValidationResponseSource(org.springframework.ws.WebServiceMessage) - * @since 1.0.0 */ public abstract class AbstractValidatingInterceptor extends TransformerObjectSupport implements EndpointInterceptor, InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java index 1bf2d7f4..15b0e851 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java @@ -30,9 +30,9 @@ import org.springframework.ws.server.endpoint.AbstractLoggingInterceptor; * {@link #setLogResponse(boolean) logResponse} properties. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setLogRequest(boolean) * @see #setLogResponse(boolean) - * @since 1.0.0 */ public class PayloadLoggingInterceptor extends AbstractLoggingInterceptor { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java index 63d37f75..32a79d6d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptor.java @@ -52,9 +52,9 @@ import org.springframework.xml.transform.TransformerObjectSupport; * simply not transformed. Setting one of the two is required, though. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setRequestXslt(org.springframework.core.io.Resource) * @see #setResponseXslt(org.springframework.core.io.Resource) - * @since 1.0.0 */ public class PayloadTransformingInterceptor extends TransformerObjectSupport implements EndpointInterceptor, InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java index 64b13f0e..ab712d80 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractEndpointMapping.java @@ -36,9 +36,9 @@ import org.springframework.ws.server.SmartEndpointInterceptor; * and endpoint interceptors. * * @author Arjen Poutsma + * @since 1.0.0 * @see #getEndpointInternal(org.springframework.ws.context.MessageContext) * @see org.springframework.ws.server.EndpointInterceptor - * @since 1.0.0 */ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport implements EndpointMapping, Ordered { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java index aab60bca..d69bff34 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java @@ -44,8 +44,8 @@ import org.springframework.xml.transform.TransformerFactoryUtils; * described in {@code QNameEditor}. * * @author Arjen Poutsma - * @see org.springframework.xml.namespace.QNameEditor * @since 1.0.0 + * @see org.springframework.xml.namespace.QNameEditor */ public class PayloadRootQNameEndpointMapping extends AbstractQNameEndpointMapping { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java index a3ad1553..ca22934d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMapping.java @@ -50,8 +50,8 @@ import org.springframework.xml.transform.TransformerFactoryUtils; * local name. * * @author Arjen Poutsma - * @see #setEndpoints(Object[]) * @since 1.0.0 + * @see #setEndpoints(Object[]) */ public class SimpleMethodEndpointMapping extends AbstractMethodEndpointMapping implements InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java index 7dfe943e..2ef9173c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMapping.java @@ -58,9 +58,9 @@ import org.springframework.xml.xpath.XPathExpressionFactory; * XPath expression for the incoming message, the value is the name of the endpoint. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setExpression(String) * @see #setNamespaces(java.util.Map) - * @since 1.0.0 */ public class XPathPayloadEndpointMapping extends AbstractMapBasedEndpointMapping implements InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapBody.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapBody.java index 1555ba02..22ee5ad4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapBody.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapBody.java @@ -32,11 +32,11 @@ import org.springframework.ws.WebServiceMessage; * itself. For the contents of the body, use {@code getPayloadSource()}. * * @author Arjen Poutsma + * @since 1.0.0 * @see SoapEnvelope#getBody() * @see #getPayloadSource() * @see #getPayloadResult() * @see SoapFault - * @since 1.0.0 */ public interface SoapBody extends SoapElement { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapElement.java index 86db4dec..54213317 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapElement.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapElement.java @@ -25,8 +25,8 @@ import javax.xml.transform.Source; * The base interface for all elements that are contained in a SOAP message. * * @author Arjen Poutsma - * @see SoapMessage * @since 1.0.0 + * @see SoapMessage */ public interface SoapElement { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetail.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetail.java index 61b3d7b2..c8bc905a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetail.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetail.java @@ -26,8 +26,8 @@ import javax.xml.transform.Result; * {@code SoapFaultDetailElement}s, which represent the individual details. * * @author Arjen Poutsma - * @see SoapFaultDetailElement * @since 1.0.0 + * @see SoapFaultDetailElement */ public interface SoapFaultDetail extends SoapElement { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetailElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetailElement.java index 267ecc35..6573dd3b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetailElement.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapFaultDetailElement.java @@ -23,8 +23,8 @@ import javax.xml.transform.Result; * {@code SoapFaultDetailElement}s are contained in a {@code SoapDetail}. * * @author Arjen Poutsma - * @see SoapFaultDetail * @since 1.0.0 + * @see SoapFaultDetail */ public interface SoapFaultDetailElement extends SoapElement { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java index 29c40149..d637f7e6 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java @@ -26,9 +26,9 @@ import javax.xml.transform.Result; * {@code SoapHeaderElement}s, which represent the individual headers. * * @author Arjen Poutsma + * @since 1.0.0 * @see SoapHeaderElement * @see SoapEnvelope#getHeader() - * @since 1.0.0 */ public interface SoapHeader extends SoapElement { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeaderElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeaderElement.java index aeb4fce3..a9c8c90d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeaderElement.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeaderElement.java @@ -23,8 +23,8 @@ import javax.xml.transform.Result; * {@code SoapHeaderElement}s are contained in a {@code SoapHeader}. * * @author Arjen Poutsma - * @see SoapHeader * @since 1.0.0 + * @see SoapHeader */ public interface SoapHeaderElement extends SoapElement { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessage.java index 1359195e..a27140f4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapMessage.java @@ -28,10 +28,10 @@ import org.springframework.ws.mime.MimeMessage; * {@code WebServiceMessage}, the super-interface of this interface. * * @author Arjen Poutsma + * @since 1.0.0 * @see #getPayloadSource() * @see #getPayloadResult() * @see #getEnvelope() - * @since 1.0.0 */ public interface SoapMessage extends MimeMessage, FaultAwareWebServiceMessage { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapVersion.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapVersion.java index a4408bb2..e9965b78 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapVersion.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapVersion.java @@ -23,9 +23,9 @@ import javax.xml.namespace.QName; * properties for elements that make up a soap envelope. * * @author Arjen Poutsma + * @since 1.0.0 * @see #SOAP_11 * @see #SOAP_12 - * @since 1.0.0 */ public interface SoapVersion { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/EndpointReference.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/EndpointReference.java index 672744de..d80550c8 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/EndpointReference.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/EndpointReference.java @@ -30,8 +30,8 @@ import org.springframework.util.Assert; * Represents an Endpoint Reference, as defined in the WS-Addressing specification. * * @author Arjen Poutsma - * @see Endpoint References * @since 1.5.0 + * @see Endpoint References */ public final class EndpointReference implements Serializable { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java index f21b8134..dbe801bd 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/MessageAddressingProperties.java @@ -32,9 +32,9 @@ import org.w3c.dom.Node; * Headers. * * @author Arjen Poutsma + * @since 1.5.0 * @see Message Addressing * Properties - * @since 1.5.0 */ public final class MessageAddressingProperties implements Serializable { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java index 6547b24a..f0a11d8d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java @@ -55,9 +55,9 @@ import org.springframework.ws.soap.addressing.server.annotation.Address; * * @author Arjen Poutsma * @author Corneil du Plessis (with thanks to Chris Bono) + * @since 1.5.0 * @see Action * @see Address - * @since 1.5.0 */ public class AnnotationActionEndpointMapping extends AbstractActionMethodEndpointMapping implements SmartInitializingSingleton { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java index 3179be0a..b813a41e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java @@ -49,8 +49,8 @@ import org.springframework.beans.BeansException; * bean definitions with different {@code address} property values. * * @author Arjen Poutsma - * @see org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getAction() * @since 1.5.0 + * @see org.springframework.ws.soap.addressing.core.MessageAddressingProperties#getAction() */ public class SimpleActionEndpointMapping extends AbstractActionEndpointMapping { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java index fac84db2..bf6952c0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing10.java @@ -31,11 +31,10 @@ import org.springframework.ws.soap.addressing.core.MessageAddressingProperties; * * @author Arjen Poutsma * @author Leandro Quiroga + * @since 1.5.0 * @see Web Services * Addressing 1.0, May 2006 - * @since 1.5.0 */ - public class Addressing10 extends AbstractAddressingVersion { private static final String NAMESPACE_URI = "http://www.w3.org/2005/08/addressing"; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java index f3550bbc..b59830de 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/Addressing200408.java @@ -32,9 +32,9 @@ import org.springframework.ws.soap.addressing.core.MessageAddressingProperties; * * @author Arjen Poutsma * @author Leandro Quiroga + * @since 1.5.0 * @see Web * Services Addressing, August 2004 - * @since 1.5.0 */ public class Addressing200408 extends AbstractAddressingVersion { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapFaultMessageResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapFaultMessageResolver.java index bfa9666e..68a4ddef 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapFaultMessageResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapFaultMessageResolver.java @@ -28,8 +28,8 @@ import org.springframework.ws.soap.client.SoapFaultClientException; * fault occurs. * * @author Arjen Poutsma - * @see SoapFaultClientException * @since 1.0.0 + * @see SoapFaultClientException */ public class SoapFaultMessageResolver implements FaultMessageResolver { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java index bfa0247d..194e188b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java @@ -58,8 +58,8 @@ import org.springframework.ws.transport.TransportOutputStream; * * @author Arjen Poutsma * @author Greg Turnquist - * @see SOAPMessage * @since 1.0.0 + * @see SOAPMessage */ public class SaajSoapMessage extends AbstractSoapMessage { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java index 00f43d20..5bdb35f3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java @@ -60,8 +60,8 @@ import org.springframework.ws.transport.TransportInputStream; * @author Arjen Poutsma * @author Greg Turnquist * @author Corneil du Plessis - * @see org.springframework.ws.soap.saaj.SaajSoapMessage * @since 1.0.0 + * @see org.springframework.ws.soap.saaj.SaajSoapMessage */ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java index 4076e383..a78aa384 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java @@ -36,9 +36,9 @@ import org.springframework.util.StringUtils; * {@code Node}s and {@code SOAPElement}s. * * @author Arjen Poutsma + * @since 1.0.0 * @see jakarta.xml.soap.Node * @see jakarta.xml.soap.SOAPElement - * @since 1.0.0 */ public class SaajContentHandler implements ContentHandler { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java index 879e1901..6f8d056a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java @@ -41,9 +41,9 @@ import org.springframework.ws.transport.TransportConstants; * {@link Name} objects to {@link QName}s and vice-versa, and SAAJ version checking. * * @author Arjen Poutsma + * @since 1.0.0 * @see Name * @see QName - * @since 1.0.0 */ public abstract class SaajUtils { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java index a91c2153..a6d7bd8f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java @@ -38,9 +38,9 @@ import org.springframework.xml.sax.AbstractXmlReader; * interfaces. * * @author Arjen Poutsma + * @since 1.0.0 * @see jakarta.xml.soap.Node * @see jakarta.xml.soap.SOAPElement - * @since 1.0.0 */ public class SaajXmlReader extends AbstractXmlReader { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java index d5f47dab..1625cb9b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapEndpointInvocationChain.java @@ -25,9 +25,9 @@ import org.springframework.ws.server.EndpointInvocationChain; * the MustUnderstand headers for particular endpoint. * * @author Arjen Poutsma + * @since 1.0.0 * @see #getActorsOrRoles() * @see SoapMessageDispatcher - * @since 1.0.0 */ public class SoapEndpointInvocationChain extends EndpointInvocationChain { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java index db135d1d..d45c2165 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/SoapMessageDispatcher.java @@ -43,9 +43,9 @@ import org.springframework.ws.soap.soap12.Soap12Header; * {@link SoapEndpointInterceptor} objects. * * @author Arjen Poutsma + * @since 1.0.0 * @see org.springframework.ws.soap.SoapMessage * @see SoapEndpointInterceptor - * @since 1.0.0 */ public class SoapMessageDispatcher extends MessageDispatcher { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java index 6c74f806..70ceb84a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java @@ -34,9 +34,9 @@ import org.springframework.ws.soap.soap12.Soap12Fault; * template method that provides the definition for a given exception. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setDefaultFault(SoapFaultDefinition) * @see #getFaultDefinition(Object,Exception) - * @since 1.0.0 */ public abstract class AbstractSoapFaultDefinitionExceptionResolver extends AbstractEndpointExceptionResolver { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java index c35c4930..2a687d8c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinition.java @@ -25,9 +25,9 @@ import javax.xml.namespace.QName; * the {@code SoapFaultMappingExceptionResolver}. * * @author Arjen Poutsma + * @since 1.0.0 * @see SoapFaultDefinitionEditor * @see SoapFaultMappingExceptionResolver - * @since 1.0.0 */ public class SoapFaultDefinition { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java index bee64241..977dc420 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java @@ -46,6 +46,7 @@ import org.springframework.xml.namespace.QNameEditor; * * * @author Arjen Poutsma + * @since 1.0.0 * @see javax.xml.namespace.QName#toString() * @see org.springframework.xml.namespace.QNameEditor * @see SoapFaultDefinition#RECEIVER @@ -53,7 +54,6 @@ import org.springframework.xml.namespace.QNameEditor; * @see SoapFaultDefinition#SENDER * @see SoapFaultDefinition#CLIENT * @see org.springframework.ws.soap.SoapFault#getFaultCode() - * @since 1.0.0 */ public class SoapFaultDefinitionEditor extends PropertyEditorSupport { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java index c06471db..357e5388 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java @@ -49,8 +49,8 @@ import org.springframework.xml.namespace.QNameUtils; * * @author Tareq Abedrabbo * @author Arjen Poutsma - * @see SoapHeader * @since 2.0 + * @see SoapHeader */ public class SoapHeaderElementMethodArgumentResolver implements MethodArgumentResolver { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java index 1e3b4238..17458747 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapAction.java @@ -29,8 +29,8 @@ import java.lang.annotation.Target; * method. * * @author Arjen Poutsma - * @see org.springframework.ws.soap.server.endpoint.mapping.SoapActionAnnotationMethodEndpointMapping * @since 1.0.0 + * @see org.springframework.ws.soap.server.endpoint.mapping.SoapActionAnnotationMethodEndpointMapping */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapActions.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapActions.java index b875f738..fea29c01 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapActions.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapActions.java @@ -26,8 +26,8 @@ import java.lang.annotation.Target; * Marks an endpoint method as containing multiple {@link SoapAction SoapActions}. * * @author Arjen Poutsma - * @see org.springframework.ws.soap.server.endpoint.mapping.SoapActionAnnotationMethodEndpointMapping * @since 2.2.1 + * @see org.springframework.ws.soap.server.endpoint.mapping.SoapActionAnnotationMethodEndpointMapping */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java index 30eb36be..7c204d41 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/annotation/SoapFault.java @@ -30,8 +30,8 @@ import javax.xml.namespace.QName; * exception is thrown. * * @author Arjen Poutsma - * @see org.springframework.ws.soap.server.endpoint.SoapFaultAnnotationExceptionResolver * @since 1.0.0 + * @see org.springframework.ws.soap.server.endpoint.SoapFaultAnnotationExceptionResolver */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java index d5389488..6f697afd 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/AbstractFaultCreatingValidatingInterceptor.java @@ -39,13 +39,13 @@ import org.springframework.ws.soap.SoapMessage; * overriding {@code handleRequestValidationErrors}. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setAddValidationErrorDetail(boolean) * @see #setFaultStringOrReason(String) * @see #DEFAULT_FAULTSTRING_OR_REASON * @see #setDetailElementName(javax.xml.namespace.QName) * @see #DEFAULT_DETAIL_ELEMENT_NAME * @see #handleResponseValidationErrors(org.springframework.ws.context.MessageContext,org.xml.sax.SAXParseException[]) - * @since 1.0.0 */ public abstract class AbstractFaultCreatingValidatingInterceptor extends AbstractValidatingInterceptor { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java index 31b3ca9d..16869dd2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptor.java @@ -34,11 +34,11 @@ import org.springframework.ws.WebServiceMessage; * properties. Responses that contains faults are not validated. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setSchema(org.springframework.core.io.Resource) * @see #setSchemas(org.springframework.core.io.Resource[]) * @see #setValidateRequest(boolean) * @see #setValidateResponse(boolean) - * @since 1.0.0 */ public class PayloadValidatingInterceptor extends AbstractFaultCreatingValidatingInterceptor { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java index 6ad06e72..73f63f21 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapEnvelopeLoggingInterceptor.java @@ -32,10 +32,10 @@ import org.springframework.ws.soap.server.SoapEndpointInterceptor; * {@code logResponse}, {@code logFault} properties. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setLogRequest(boolean) * @see #setLogResponse(boolean) * @see #setLogFault(boolean) - * @since 1.0.0 */ public class SoapEnvelopeLoggingInterceptor extends AbstractLoggingInterceptor implements SoapEndpointInterceptor { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java index 205e0bfd..a78f465a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMapping.java @@ -38,9 +38,9 @@ import org.springframework.ws.soap.server.SoapEndpointMapping; * endpoint, as described in the SOAP specificication, this mapping is useful. * * @author Arjen Poutsma + * @since 1.0.0 * @see org.springframework.ws.soap.SoapHeader#examineMustUnderstandHeaderElements(String) * @see org.springframework.ws.soap.SoapVersion#getNextActorOrRoleUri() - * @since 1.0.0 */ public class DelegatingSoapEndpointMapping implements InitializingBean, SoapEndpointMapping { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java index b7461e7d..063d6a5e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java @@ -28,8 +28,8 @@ import org.springframework.ws.soap.SoapFaultException; * SOAP 1.1 differs from SOAP 1.2 with respect to SOAP Faults. * * @author Arjen Poutsma - * @see Soap11Fault * @since 1.0.0 + * @see Soap11Fault */ public interface Soap11Body extends SoapBody { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingPayload.java b/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingPayload.java index 70a7139e..515bf941 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingPayload.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingPayload.java @@ -25,8 +25,8 @@ import javax.xml.stream.XMLStreamWriter; * {@link XMLStreamWriter}. * * @author Arjen Poutsma - * @see StreamingWebServiceMessage * @since 2.0 + * @see StreamingWebServiceMessage */ public interface StreamingPayload { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingWebServiceMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingWebServiceMessage.java index 548eb5d5..d15512b7 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingWebServiceMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/stream/StreamingWebServiceMessage.java @@ -22,8 +22,8 @@ import org.springframework.ws.WebServiceMessage; * Sub-interface of {@link WebServiceMessage} that allows for setting a streaming payload. * * @author Arjen Poutsma - * @see StreamingPayload * @since 2.0 + * @see StreamingPayload */ public interface StreamingWebServiceMessage extends WebServiceMessage { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/EndpointAwareWebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/EndpointAwareWebServiceConnection.java index 3d1d24ca..8de2ced7 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/EndpointAwareWebServiceConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/EndpointAwareWebServiceConnection.java @@ -24,8 +24,8 @@ import org.springframework.ws.NoEndpointFoundException; * codes. * * @author Arjen Poutsma - * @see NoEndpointFoundException * @since 1.0.0 + * @see NoEndpointFoundException */ public interface EndpointAwareWebServiceConnection extends WebServiceConnection { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java index 7b08b683..0a563697 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java @@ -28,9 +28,9 @@ import org.springframework.util.Assert; * transport. * * @author Arjen Poutsma + * @since 1.0.0 * @see #getHeaderNames() * @see #getHeaders(String) - * @since 1.0.0 */ public abstract class TransportInputStream extends InputStream { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java index 61c4b398..f342c178 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportOutputStream.java @@ -27,8 +27,8 @@ import org.springframework.util.Assert; * transport. * * @author Arjen Poutsma - * @see #addHeader(String,String) * @since 1.0.0 + * @see #addHeader(String,String) */ public abstract class TransportOutputStream extends OutputStream { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java index fcf6f85a..0c409b66 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceConnection.java @@ -30,8 +30,8 @@ import org.springframework.ws.WebServiceMessageFactory; * A {@code WebServiceConnection} can be obtained using a {@link WebServiceMessageSender}. * * @author Arjen Poutsma - * @see WebServiceMessageSender#createConnection(URI) * @since 1.0.0 + * @see WebServiceMessageSender#createConnection(URI) */ public interface WebServiceConnection extends AutoCloseable { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java index 5a306a99..913a543a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/WebServiceMessageSender.java @@ -29,8 +29,8 @@ import org.springframework.ws.WebServiceMessage; * {@link WebServiceConnection} objects. * * @author Arjen Poutsma - * @see WebServiceConnection * @since 1.0.0 + * @see WebServiceConnection */ public interface WebServiceMessageSender { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java index 53f678e1..a4215c4f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/context/TransportContextHolder.java @@ -22,8 +22,8 @@ package org.springframework.ws.transport.context; * spawned by the current thread. * * @author Arjen Poutsma - * @see TransportContext * @since 1.0.0 + * @see TransportContext */ public abstract class TransportContextHolder { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java index 8ecd061b..40fbcd44 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java @@ -48,10 +48,10 @@ import org.springframework.ws.transport.WebServiceConnection; * {@link Credentials} instance (such as the {@link UsernamePasswordCredentials}). * * @author Arjen Poutsma + * @since 1.0.0 * @see HttpUrlConnectionMessageSender * @see HttpClient * @see #setCredentials(Credentials) - * @since 1.0.0 * @deprecated In favor of {@link HttpComponents5MessageSender} */ @Deprecated diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java index 4eac4273..b5ff4e19 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java @@ -40,9 +40,9 @@ import org.springframework.ws.client.support.interceptor.ClientInterceptor; * {@link FactoryBean} to set up a {@link CloseableHttpClient} using HttpComponents * HttpClient 5. * - * @see HttpComponents * @author Lars Uffmann * @since 4.0.5 + * @see HttpComponents */ public class HttpComponents5ClientFactory implements FactoryBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5MessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5MessageSender.java index 9def612e..1a1069b4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5MessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5MessageSender.java @@ -55,8 +55,8 @@ import org.springframework.ws.transport.WebServiceConnection; * @author Arjen Poutsma * @author Greg Turnquist * @author Lars Uffmann - * @see HttpClient * @since 4.0.5 + * @see HttpClient */ public class HttpComponents5MessageSender extends AbstractHttpWebServiceMessageSender implements InitializingBean, DisposableBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java index ca820735..b5316dba 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponentsMessageSender.java @@ -53,8 +53,8 @@ import org.springframework.ws.transport.WebServiceConnection; * @author Barry Pitman * @author Arjen Poutsma * @author Greg Turnquist - * @see HttpClient * @since 2.1.0 + * @see HttpClient */ @SuppressWarnings("deprecation") public class HttpComponentsMessageSender extends AbstractHttpWebServiceMessageSender diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java index 643ffc0a..bb506476 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java @@ -35,8 +35,8 @@ import org.springframework.ws.transport.WebServiceConnection; * * @author Arjen Poutsma * @author Kazuki Shimizu - * @see java.net.HttpURLConnection * @since 1.0.0 + * @see java.net.HttpURLConnection */ public class HttpUrlConnectionMessageSender extends AbstractHttpWebServiceMessageSender { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java index 4944256c..c22221b8 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java @@ -45,9 +45,9 @@ import org.springframework.ws.transport.WebServiceConnection; * {@link HttpClient}. * * @author Marten Deinum + * @since 4.0 * @see java.net.http.HttpClient * @see java.net.http.HttpRequest - * @since 4.0 */ public class JdkHttpClientConnection extends AbstractHttpSenderConnection { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java index 7a30f554..13e606aa 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientMessageSender.java @@ -34,8 +34,8 @@ import org.springframework.ws.transport.WebServiceConnection; * with a pre-configured {@code HttpClient}. * * @author Marten Deinum - * @see java.net.http.HttpClient * @since 4.0 + * @see java.net.http.HttpClient */ public class JdkHttpClientMessageSender extends AbstractHttpWebServiceMessageSender implements InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java index 8038d2f3..e8787c13 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/MessageDispatcherServlet.java @@ -61,10 +61,10 @@ import org.springframework.xml.xsd.XsdSchema; * definitions will reflect the URL of the incoming request. * * @author Arjen Poutsma + * @since 1.0.0 * @see org.springframework.web.servlet.DispatcherServlet * @see org.springframework.ws.server.MessageDispatcher * @see org.springframework.ws.transport.http.WebServiceMessageReceiverHandlerAdapter - * @since 1.0.0 */ @SuppressWarnings("serial") public class MessageDispatcherServlet extends FrameworkServlet { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java index 0ffd5bca..f84f4016 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapter.java @@ -39,11 +39,11 @@ import org.springframework.ws.transport.support.WebServiceMessageReceiverObjectS * gateway to further message handling logic. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setMessageFactory(org.springframework.ws.WebServiceMessageFactory) * @see org.springframework.ws.transport.WebServiceMessageReceiver * @see org.springframework.ws.WebServiceMessageFactory * @see org.springframework.ws.server.MessageDispatcher - * @since 1.0.0 */ public class WebServiceMessageReceiverHandlerAdapter extends WebServiceMessageReceiverObjectSupport implements HandlerAdapter { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java index 8ff977f9..a182e24d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java @@ -65,11 +65,11 @@ import org.springframework.xml.xpath.XPathExpressionFactory; * attributes to change. * * @author Arjen Poutsma + * @since 1.0.0 * @see WsdlDefinition * @see #setTransformLocations(boolean) * @see #setLocationExpression(String) * @see #transformLocation(String,jakarta.servlet.http.HttpServletRequest) - * @since 1.0.0 */ public class WsdlDefinitionHandlerAdapter extends LocationTransformerObjectSupport implements HandlerAdapter, InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java index dcae2dea..cad8f3a0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java @@ -45,9 +45,9 @@ import org.springframework.xml.xsd.XsdSchema; * subclasses. * * @author Arjen Poutsma + * @since 1.5.3 * @see XsdSchema * @see #getSchemaSource(XsdSchema) - * @since 1.5.3 */ public class XsdSchemaHandlerAdapter extends LocationTransformerObjectSupport implements HandlerAdapter, InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java index 41327b53..38f2c59d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java @@ -43,8 +43,8 @@ import org.springframework.ws.transport.context.TransportContextHolder; * {@link WebServiceConnection}s. * * @author Arjen Poutsma - * @see #handleConnection * @since 1.0.0 + * @see #handleConnection */ public abstract class WebServiceMessageReceiverObjectSupport implements InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java index 5d9a8c0d..dd0298f5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/ProviderBasedWsdl4jDefinition.java @@ -49,13 +49,13 @@ import org.springframework.ws.wsdl.wsdl11.provider.TypesProvider; * {@link #setTargetNamespace(String)} * * @author Arjen Poutsma + * @since 1.5.0 * @see #setImportsProvider(ImportsProvider) * @see #setTypesProvider(TypesProvider) * @see #setMessagesProvider(MessagesProvider) * @see #setPortTypesProvider(PortTypesProvider) * @see #setBindingsProvider(BindingsProvider) * @see #setServicesProvider(ServicesProvider) - * @since 1.5.0 */ public class ProviderBasedWsdl4jDefinition extends Wsdl4jDefinition implements InitializingBean { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java index f2aa102c..d7958051 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl11Definition.java @@ -24,8 +24,8 @@ import org.springframework.ws.wsdl.WsdlDefinition; * Just a marker interface at the moment. * * @author Arjen Poutsma - * @see DefaultWsdl11Definition * @since 1.0.0 + * @see DefaultWsdl11Definition */ public interface Wsdl11Definition extends WsdlDefinition { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java index 9b7a3f23..fb7d616d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinition.java @@ -36,9 +36,9 @@ import org.springframework.ws.wsdl.WsdlDefinitionException; * * @author Arjen Poutsma * @author Greg Turnquist + * @since 1.0.0 * @see #Wsdl4jDefinition(javax.wsdl.Definition) * @see #setDefinition(javax.wsdl.Definition) - * @since 1.0.0 */ public class Wsdl4jDefinition implements Wsdl11Definition { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java index 904ed0b9..a19b3cef 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBean.java @@ -32,9 +32,9 @@ import org.springframework.util.StringUtils; * * @author Stephen More * @author Arjen Poutsma + * @since 2.1.2 * @see KeyManager * @see KeyManagerFactory - * @since 2.1.2 */ public class KeyManagersFactoryBean implements FactoryBean, InitializingBean { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java index 249d4571..b1697543 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreFactoryBean.java @@ -37,9 +37,9 @@ import org.springframework.util.StringUtils; * you want. * * @author Arjen Poutsma + * @since 1.0.0 * @see #setLocation(org.springframework.core.io.Resource) * @see KeyStore - * @since 1.0.0 */ public class KeyStoreFactoryBean implements FactoryBean, InitializingBean { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBean.java index 6972c140..354fd3fa 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBean.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBean.java @@ -31,9 +31,9 @@ import org.springframework.util.StringUtils; * Uses the {@link TrustManagerFactory} to create the {@code TrustManager}s. * * @author Arjen Poutsma + * @since 2.2 * @see TrustManager * @see TrustManagerFactory - * @since 2.2 */ public class TrustManagersFactoryBean implements FactoryBean, InitializingBean { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java index 6cbd60c0..bf40586c 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java @@ -142,8 +142,8 @@ import org.springframework.ws.soap.security.wss4j2.callback.UsernameTokenPrincip * @author Jamin Hitchcock * @author Rob Leland * @author Lars Uffmann - * @see Apache WSS4J 2.0 * @since 2.3.0 + * @see Apache WSS4J 2.0 */ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor implements InitializingBean { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java index 9c8d2002..84aa2687 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java @@ -38,8 +38,8 @@ import org.springframework.ws.soap.security.support.KeyStoreUtils; * @author Tareq Abed Rabbo * @author Arjen Poutsma * @author Jamin Hitchcock - * @see org.springframework.ws.soap.security.support.KeyStoreFactoryBean * @since 2.3.0 + * @see org.springframework.ws.soap.security.support.KeyStoreFactoryBean */ public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler implements InitializingBean { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SimplePasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SimplePasswordValidationCallbackHandler.java index 25cf5ec3..cb3697a1 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SimplePasswordValidationCallbackHandler.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/SimplePasswordValidationCallbackHandler.java @@ -35,8 +35,8 @@ import org.springframework.util.Assert; * @author Tareq Abed Rabbo * @author Arjen Poutsma * @author Jamin Hitchcock - * @see #setUsers(java.util.Properties) * @since 2.3.0 + * @see #setUsers(java.util.Properties) */ public class SimplePasswordValidationCallbackHandler extends AbstractWsPasswordCallbackHandler implements InitializingBean { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/UsernameTokenPrincipalCallback.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/UsernameTokenPrincipalCallback.java index 3b83b5f0..2eaae3d7 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/UsernameTokenPrincipalCallback.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/UsernameTokenPrincipalCallback.java @@ -30,8 +30,8 @@ import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl; * * @author Arjen Poutsma * @author Jamin Hitchcock - * @see WSUsernameTokenPrincipalImpl * @since 2.3.0 + * @see WSUsernameTokenPrincipalImpl */ public class UsernameTokenPrincipalCallback implements Callback, Serializable { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java index 81c18d67..da85248f 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java @@ -39,8 +39,8 @@ import org.springframework.util.Assert; * @author Tareq Abed Rabbo * @author Arjen Poutsma * @author Jamin Hitchcock - * @see Crypto * @since 2.3.0 + * @see Crypto */ public class CryptoFactoryBean implements FactoryBean, InitializingBean { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java index 09e5367b..06e16c9b 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java @@ -95,9 +95,9 @@ import org.springframework.ws.transport.jms.support.JmsTransportUtils; * {@code jms:Queue?messageType=TEXT_MESSAGE} * * @author Arjen Poutsma + * @since 1.5.0 * @see IRI Scheme for Java(tm) Message * Service 1.0 - * @since 1.5.0 */ public class JmsMessageSender extends JmsDestinationAccessor implements WebServiceMessageSender { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java index da84568e..4f61bd74 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java @@ -35,9 +35,9 @@ import org.springframework.ws.transport.WebServiceMessageReceiver; * {@link #setMessageReceiver(WebServiceMessageReceiver) registered}. * * @author Arjen Poutsma + * @since 1.5.0 * @see #setMessageFactory(org.springframework.ws.WebServiceMessageFactory) * @see #setMessageReceiver(org.springframework.ws.transport.WebServiceMessageReceiver) - * @since 1.5.0 */ public class WebServiceMessageListener extends JmsMessageReceiver implements SessionAwareMessageListener { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java index b8b2b32d..4f56c3f8 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java @@ -68,8 +68,8 @@ import org.springframework.ws.transport.mail.support.MailTransportUtils; * {@code mailto:john@example.com@?subject=SOAP%20Test}
    * * @author Arjen Poutsma - * @see The mailto URL scheme * @since 1.5.0 + * @see The mailto URL scheme */ public class MailMessageSender implements WebServiceMessageSender, InitializingBean { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java index 9edf9de8..46e608d7 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/SimpleWebServiceMessageReceiverObjectSupport.java @@ -26,8 +26,8 @@ import org.springframework.ws.transport.WebServiceMessageReceiver; * {@link WebServiceMessageReceiver}. * * @author Arjen Poutsma - * @see #handleConnection(WebServiceConnection) * @since 1.5.0 + * @see #handleConnection(WebServiceConnection) */ public abstract class SimpleWebServiceMessageReceiverObjectSupport extends WebServiceMessageReceiverObjectSupport implements InitializingBean { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java index 39455f5d..26fe593d 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java @@ -40,8 +40,8 @@ import org.springframework.ws.transport.support.AbstractStandaloneMessageReceive * @author Gildas Cuisinier * @author Arjen Poutsma * @author Greg Turnquist - * @see org.springframework.ws.transport.xmpp.support.XmppConnectionFactoryBean * @since 2.0 + * @see org.springframework.ws.transport.xmpp.support.XmppConnectionFactoryBean */ public class XmppMessageReceiver extends AbstractStandaloneMessageReceiver { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java index 4a976756..bf196222 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java @@ -25,9 +25,9 @@ package org.springframework.ws.test.client; * * @author Lukas Krecan * @author Arjen Poutsma + * @since 2.0 * @see RequestMatchers#xpath(String) * @see RequestMatchers#xpath(String, java.util.Map) - * @since 2.0 */ public interface RequestXPathExpectations { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreator.java index 530db02c..28650aa8 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreator.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/RequestCreator.java @@ -26,8 +26,8 @@ import org.springframework.ws.WebServiceMessageFactory; * {@link RequestCreators}. * * @author Arjen Poutsma - * @see RequestCreators * @since 2.0 + * @see RequestCreators */ public interface RequestCreator { diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java index 8935077c..4628d1a7 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java @@ -27,9 +27,9 @@ package org.springframework.ws.test.server; * * @author Lukas Krecan * @author Arjen Poutsma + * @since 2.0 * @see org.springframework.ws.test.client.RequestMatchers#xpath(String) * @see org.springframework.ws.test.client.RequestMatchers#xpath(String, java.util.Map) - * @since 2.0 */ public interface ResponseXPathExpectations { diff --git a/spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java b/spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java index d6be6d1c..4b7ff16a 100644 --- a/spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java +++ b/spring-xml/src/main/java/org/springframework/xml/dom/DomContentHandler.java @@ -35,8 +35,8 @@ import org.springframework.util.Assert; * SAX {@code ContentHandler} that transforms callback calls to DOM {@code Node}s. * * @author Arjen Poutsma - * @see org.w3c.dom.Node * @since 1.0.0 + * @see org.w3c.dom.Node */ public class DomContentHandler implements ContentHandler { diff --git a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java index 1c0ace68..0610f5a0 100644 --- a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java +++ b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java @@ -37,10 +37,10 @@ import org.springframework.util.StringUtils; * allows for prefixes to be specified as well. * * @author Arjen Poutsma + * @since 1.0.0 * @see javax.xml.namespace.QName * @see javax.xml.namespace.QName#toString() * @see javax.xml.namespace.QName#valueOf(String) - * @since 1.0.0 */ public class QNameEditor extends PropertyEditorSupport { diff --git a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java index b7cd93ac..e3f7c732 100644 --- a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java @@ -27,8 +27,8 @@ import org.springframework.util.StringUtils; * Helper class for using {@link QName}. * * @author Arjen Poutsma - * @see javax.xml.namespace.QName * @since 1.0.0 + * @see javax.xml.namespace.QName */ public abstract class QNameUtils { diff --git a/spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java b/spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java index e48b2dc8..f2d33282 100644 --- a/spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java +++ b/spring-xml/src/main/java/org/springframework/xml/sax/AbstractXmlReader.java @@ -30,11 +30,11 @@ import org.xml.sax.ext.LexicalHandler; * defined in {@link XMLReader}, and does not recognize any features * * @author Arjen Poutsma + * @since 1.0.0 * @see #setContentHandler(org.xml.sax.ContentHandler) * @see #setDTDHandler(org.xml.sax.DTDHandler) * @see #setEntityResolver(org.xml.sax.EntityResolver) * @see #setErrorHandler(org.xml.sax.ErrorHandler) - * @since 1.0.0 */ public abstract class AbstractXmlReader implements XMLReader { diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/StringResult.java b/spring-xml/src/main/java/org/springframework/xml/transform/StringResult.java index e75b6e7d..3d7ca945 100644 --- a/spring-xml/src/main/java/org/springframework/xml/transform/StringResult.java +++ b/spring-xml/src/main/java/org/springframework/xml/transform/StringResult.java @@ -25,8 +25,8 @@ import javax.xml.transform.stream.StreamResult; * resulting string can be retrieved via {@code toString()}. * * @author Arjen Poutsma - * @see #toString() * @since 1.0.0 + * @see #toString() */ public class StringResult extends StreamResult { diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java index 33e109f7..cd140112 100644 --- a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java +++ b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java @@ -33,8 +33,8 @@ import org.apache.commons.logging.LogFactory; * thread-safe. * * @author Arjen Poutsma - * @see Transformer * @since 1.0.0 + * @see Transformer */ public abstract class TransformerObjectSupport { diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidator.java b/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidator.java index 59d26f65..6ec5b07b 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidator.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidator.java @@ -29,8 +29,8 @@ import org.xml.sax.SAXParseException; * Instances of this class are designed to be thread safe. * * @author Arjen Poutsma - * @see XmlValidatorFactory#createValidator(org.springframework.core.io.Resource, String) * @since 1.0.0 + * @see XmlValidatorFactory#createValidator(org.springframework.core.io.Resource, String) */ public interface XmlValidator { diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java index e56e8270..484f0bfa 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidatorFactory.java @@ -36,8 +36,8 @@ import org.springframework.xml.JaxpVersion; * implementations to a custom, SAX-based implementation. * * @author Arjen Poutsma - * @see XmlValidator * @since 1.0.0 + * @see XmlValidator */ public abstract class XmlValidatorFactory { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java index 95aace09..09662854 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java @@ -32,8 +32,8 @@ import org.w3c.dom.Node; * * @author Arjen Poutsma * @author Greg Turnquist - * @see #createXPathExpression(String) * @since 1.0.0 + * @see #createXPathExpression(String) */ abstract class JaxenXPathExpressionFactory { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathTemplate.java index f5cbc48f..e9c13660 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathTemplate.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathTemplate.java @@ -36,8 +36,8 @@ import org.w3c.dom.Node; * Namespaces can be set using the {@code namespaces} property. * * @author Arjen Poutsma - * @see Jaxen * @since 1.0.0 + * @see Jaxen */ public class JaxenXPathTemplate extends AbstractXPathTemplate { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java index 7cfa6051..a5da42e5 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java @@ -37,8 +37,8 @@ import org.springframework.xml.namespace.SimpleNamespaceContext; * * @author Arjen Poutsma * @author Greg Turnquist - * @see #createXPathExpression(String) * @since 1.0.0 + * @see #createXPathExpression(String) */ abstract class Jaxp13XPathExpressionFactory { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java index 1f5c059a..ee01af32 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java @@ -54,8 +54,8 @@ import org.springframework.xml.transform.TraxUtils; * Namespaces can be set using the {@code namespaces} property. * * @author Arjen Poutsma - * @see #setNamespaces(java.util.Map) * @since 1.0.0 + * @see #setNamespaces(java.util.Map) */ public class Jaxp13XPathTemplate extends AbstractXPathTemplate { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/NodeCallbackHandler.java b/spring-xml/src/main/java/org/springframework/xml/xpath/NodeCallbackHandler.java index 33484cd3..cf93704a 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/NodeCallbackHandler.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/NodeCallbackHandler.java @@ -28,8 +28,8 @@ import org.w3c.dom.Node; * per node, assembling them in a List. * * @author Arjen Poutsma - * @see XPathOperations#evaluate(String,javax.xml.transform.Source,NodeCallbackHandler) * @since 1.0.0 + * @see XPathOperations#evaluate(String,javax.xml.transform.Source,NodeCallbackHandler) */ public interface NodeCallbackHandler { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java b/spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java index 1e11d19d..57844088 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java @@ -26,11 +26,11 @@ import org.w3c.dom.Node; * handling. * * @author Arjen Poutsma + * @since 1.0.0 * @see XPathOperations#evaluate(String,javax.xml.transform.Source,NodeMapper) * @see XPathOperations#evaluateAsObject(String,javax.xml.transform.Source,NodeMapper) * @see XPathExpression#evaluate(org.w3c.dom.Node,NodeMapper) * @see XPathExpression#evaluateAsObject(org.w3c.dom.Node,NodeMapper) - * @since 1.0.0 */ public interface NodeMapper { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java index de1e459d..45c67420 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactory.java @@ -33,8 +33,8 @@ import org.springframework.util.Assert; * implementations to Jaxen. * * @author Arjen Poutsma - * @see XPathExpression * @since 1.0.0 + * @see XPathExpression */ public abstract class XPathExpressionFactory { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java index 0098135a..cf0f04eb 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathExpressionFactoryBean.java @@ -31,8 +31,8 @@ import org.springframework.util.CollectionUtils; * and Jaxen XPaths. * * @author Arjen Poutsma - * @see #setExpression(String) * @since 1.0.0 + * @see #setExpression(String) */ public class XPathExpressionFactoryBean implements FactoryBean, InitializingBean { diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/XPathOperations.java b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathOperations.java index 78df83d7..fec2f066 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/XPathOperations.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/XPathOperations.java @@ -31,9 +31,9 @@ import org.w3c.dom.Node; * {@link XPathExpressionFactoryBean} for optimal performance, but less flexibility. * * @author Arjen Poutsma + * @since 1.0.0 * @see Jaxp13XPathTemplate * @see JaxenXPathTemplate - * @since 1.0.0 */ public interface XPathOperations { diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java index a057b14f..f669a814 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java +++ b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java @@ -47,8 +47,8 @@ import org.springframework.xml.xsd.XsdSchema; * Schema. * * @author Arjen Poutsma - * @see Commons XML Schema * @since 1.5.0 + * @see Commons XML Schema */ public class CommonsXsdSchema implements XsdSchema { diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java index dc2859b3..a210c3da 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java +++ b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java @@ -57,8 +57,8 @@ import org.springframework.xml.xsd.XsdSchemaCollection; * schemas. * * @author Arjen Poutsma - * @see Commons XML Schema * @since 1.5.0 + * @see Commons XML Schema */ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, InitializingBean, ResourceLoaderAware { From 4103d90541d0075e04b2e25e3344505603437812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 7 Mar 2025 13:03:00 +0100 Subject: [PATCH 06/10] Review checkstyle rules of spring-xml See gh-1479 --- .../xml/DocumentBuilderFactoryUtils.java | 20 +++++----- .../org/springframework/xml/JaxpVersion.java | 2 +- .../xml/XMLInputFactoryUtils.java | 4 +- .../xml/namespace/QNameUtils.java | 6 +-- .../transform/TransformerFactoryUtils.java | 12 +++--- .../xml/transform/TransformerHelper.java | 3 +- .../validation/Jaxp13ValidatorFactory.java | 2 +- .../validation/Jaxp15ValidatorFactory.java | 6 +-- .../xml/validation/SchemaFactoryUtils.java | 8 ++-- .../xml/validation/SchemaLoaderUtils.java | 2 +- .../xml/validation/XMLReaderFactoryUtils.java | 4 +- .../validation/XmlValidationException.java | 2 +- .../xml/xpath/AbstractXPathTemplate.java | 40 +++++++++---------- .../xml/xpath/Jaxp13XPathTemplate.java | 2 +- .../springframework/xml/xpath/NodeMapper.java | 1 + .../commons/CommonsXsdSchemaCollection.java | 2 +- 16 files changed, 64 insertions(+), 52 deletions(-) diff --git a/spring-xml/src/main/java/org/springframework/xml/DocumentBuilderFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/DocumentBuilderFactoryUtils.java index 4912f5db..d81446c9 100644 --- a/spring-xml/src/main/java/org/springframework/xml/DocumentBuilderFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/DocumentBuilderFactoryUtils.java @@ -24,10 +24,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** + * General utilities for {@link DocumentBuilderFactory}. + * * @author Greg Turnquist * @since 3.0.5 */ -public class DocumentBuilderFactoryUtils { +public abstract class DocumentBuilderFactoryUtils { private static final Log log = LogFactory.getLog(DocumentBuilderFactoryUtils.class); @@ -42,7 +44,7 @@ public class DocumentBuilderFactoryUtils { try { factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException ex) { if (log.isWarnEnabled()) { log.warn(XMLConstants.ACCESS_EXTERNAL_DTD + " property not supported by " + factory.getClass().getCanonicalName()); @@ -52,7 +54,7 @@ public class DocumentBuilderFactoryUtils { try { factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, ""); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException ex) { if (log.isWarnEnabled()) { log.warn(XMLConstants.ACCESS_EXTERNAL_SCHEMA + " property not supported by " + factory.getClass().getCanonicalName()); @@ -62,7 +64,7 @@ public class DocumentBuilderFactoryUtils { try { factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); } - catch (ParserConfigurationException e) { + catch (ParserConfigurationException ex) { if (log.isWarnEnabled()) { log.warn("FEATURE 'http://apache.org/xml/features/disallow-doctype-decl' is probably not supported by " + factory.getClass().getCanonicalName()); @@ -72,7 +74,7 @@ public class DocumentBuilderFactoryUtils { try { factory.setFeature("http://xml.org/sax/features/external-general-entities", false); } - catch (ParserConfigurationException e) { + catch (ParserConfigurationException ex) { if (log.isWarnEnabled()) { log.warn("FEATURE 'http://xml.org/sax/features/external-general-entities' is probably not supported by " + factory.getClass().getCanonicalName()); @@ -82,7 +84,7 @@ public class DocumentBuilderFactoryUtils { try { factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false); } - catch (ParserConfigurationException e) { + catch (ParserConfigurationException ex) { if (log.isWarnEnabled()) { log.warn( "FEATURE 'http://xml.org/sax/features/external-parameter-entities' is probably not supported by " @@ -93,7 +95,7 @@ public class DocumentBuilderFactoryUtils { try { factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); } - catch (ParserConfigurationException e) { + catch (ParserConfigurationException ex) { if (log.isWarnEnabled()) { log.warn( "FEATURE 'http://apache.org/xml/features/nonvalidating/load-external-dtd' is probably not supported by " @@ -105,9 +107,9 @@ public class DocumentBuilderFactoryUtils { factory.setXIncludeAware(false); factory.setExpandEntityReferences(false); } - catch (Exception e) { + catch (Exception ex) { if (log.isWarnEnabled()) { - log.warn("Caught " + e.getMessage() + " attempting to configure your XML parser."); + log.warn("Caught " + ex.getMessage() + " attempting to configure your XML parser."); } } diff --git a/spring-xml/src/main/java/org/springframework/xml/JaxpVersion.java b/spring-xml/src/main/java/org/springframework/xml/JaxpVersion.java index 19ab7daa..eeeaf934 100644 --- a/spring-xml/src/main/java/org/springframework/xml/JaxpVersion.java +++ b/spring-xml/src/main/java/org/springframework/xml/JaxpVersion.java @@ -74,7 +74,7 @@ public abstract class JaxpVersion { ClassUtils.forName(JAXP_14_CLASS_NAME, classLoader); jaxpVersion = JAXP_14; } - catch (ClassNotFoundException e) { + catch (ClassNotFoundException ex2) { // leave 1.3 as default (it's either 1.3 or unknown) jaxpVersion = JAXP_13; } diff --git a/spring-xml/src/main/java/org/springframework/xml/XMLInputFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/XMLInputFactoryUtils.java index 4aa191ef..ea5e6782 100644 --- a/spring-xml/src/main/java/org/springframework/xml/XMLInputFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/XMLInputFactoryUtils.java @@ -19,9 +19,11 @@ package org.springframework.xml; import javax.xml.stream.XMLInputFactory; /** + * General utilities for {@link XMLInputFactory}. + * * @author Greg Turnquist */ -public class XMLInputFactoryUtils { +public abstract class XMLInputFactoryUtils { /** * Build an {@link XMLInputFactory} and set properties to prevent external entities diff --git a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java index e3f7c732..4436b272 100644 --- a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java @@ -41,8 +41,8 @@ public abstract class QNameUtils { * @param localPart local part of the {@code QName} * @param prefix prefix of the {@code QName}. May be ignored. * @return the created {@code QName} - * @see QName#QName(String,String,String) * @deprecated in favor of {@link QName#QName(String, String, String)} + * @see QName#QName(String,String,String) */ @Deprecated public static QName createQName(String namespaceUri, String localPart, String prefix) { @@ -56,8 +56,8 @@ public abstract class QNameUtils { * returned. * @param qName the {@code QName} to return the prefix from * @return the prefix, if available, or an empty string - * @see javax.xml.namespace.QName#getPrefix() * @deprecated in favor of {@link QName#getPrefix()} + * @see javax.xml.namespace.QName#getPrefix() */ @Deprecated public static String getPrefix(QName qName) { @@ -65,7 +65,7 @@ public abstract class QNameUtils { } /** - * Validates the given String as a QName + * Validates the given String as a QName. * @param text the qualified name * @return {@code true} if valid, {@code false} otherwise */ diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerFactoryUtils.java index d8e8b92b..d2dc3dec 100644 --- a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerFactoryUtils.java @@ -26,10 +26,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** + * General utilities of {@link TransformerFactory}. + * * @author Greg Turnquist * @since 3.0.5 */ -public class TransformerFactoryUtils { +public abstract class TransformerFactoryUtils { private static final Log log = LogFactory.getLog(TransformerFactoryUtils.class); @@ -48,8 +50,8 @@ public class TransformerFactoryUtils { try { return defaultSettings(transformerFactoryClass.getDeclaredConstructor().newInstance()); } - catch (InvocationTargetException | NoSuchMethodException | InstantiationException | IllegalAccessException e) { - throw new TransformerFactoryConfigurationError(e, + catch (InvocationTargetException | NoSuchMethodException | InstantiationException | IllegalAccessException ex) { + throw new TransformerFactoryConfigurationError(ex, "Could not instantiate TransformerFactory [" + transformerFactoryClass + "]"); } } @@ -61,7 +63,7 @@ public class TransformerFactoryUtils { try { factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException ex) { if (log.isWarnEnabled()) { log.warn(XMLConstants.ACCESS_EXTERNAL_DTD + " property not supported by " + factory.getClass().getCanonicalName()); @@ -71,7 +73,7 @@ public class TransformerFactoryUtils { try { factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, ""); } - catch (IllegalArgumentException e) { + catch (IllegalArgumentException ex) { if (log.isWarnEnabled()) { log.warn(XMLConstants.ACCESS_EXTERNAL_STYLESHEET + " property not supported by " + factory.getClass().getCanonicalName()); diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java index 1a641ebb..2d5b2fa9 100644 --- a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java +++ b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerHelper.java @@ -100,7 +100,8 @@ public class TransformerHelper { synchronized (this) { result = this.transformerFactory; if (result == null) { - this.transformerFactory = result = newTransformerFactory(this.transformerFactoryClass); + result = newTransformerFactory(this.transformerFactoryClass); + this.transformerFactory = result; } } } diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java index 351e63ab..7601c883 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java @@ -52,7 +52,7 @@ abstract class Jaxp13ValidatorFactory { private Schema schema; - public Jaxp13Validator(Schema schema) { + Jaxp13Validator(Schema schema) { this.schema = schema; } diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java index bfa20265..1a429b1c 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java @@ -60,7 +60,7 @@ abstract class Jaxp15ValidatorFactory { private Schema schema; - public Jaxp15Validator(Schema schema) { + Jaxp15Validator(Schema schema) { this.schema = schema; } @@ -79,7 +79,7 @@ abstract class Jaxp15ValidatorFactory { try { validator.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, ""); } - catch (SAXNotRecognizedException | SAXNotSupportedException e) { + catch (SAXNotRecognizedException | SAXNotSupportedException ex) { if (log.isWarnEnabled()) { log.warn(XMLConstants.ACCESS_EXTERNAL_DTD + " property not supported by " + validator.getClass().getCanonicalName()); @@ -89,7 +89,7 @@ abstract class Jaxp15ValidatorFactory { try { validator.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, ""); } - catch (SAXNotRecognizedException | SAXNotSupportedException e) { + catch (SAXNotRecognizedException | SAXNotSupportedException ex) { if (log.isWarnEnabled()) { log.warn(XMLConstants.ACCESS_EXTERNAL_SCHEMA + " property not supported by " + validator.getClass().getCanonicalName()); diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/SchemaFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/validation/SchemaFactoryUtils.java index dd541921..08c6b77d 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/SchemaFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/SchemaFactoryUtils.java @@ -27,10 +27,12 @@ import org.xml.sax.SAXNotSupportedException; import org.springframework.util.ResourceUtils; /** + * General utilities for {@link SchemaFactory}. + * * @author Greg Turnquist * @since 3.0.5 */ -public class SchemaFactoryUtils { +public abstract class SchemaFactoryUtils { private static final Log log = LogFactory.getLog(SchemaFactoryUtils.class); @@ -45,7 +47,7 @@ public class SchemaFactoryUtils { try { schemaFactory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, ""); } - catch (SAXNotRecognizedException | SAXNotSupportedException e) { + catch (SAXNotRecognizedException | SAXNotSupportedException ex) { if (log.isWarnEnabled()) { log.warn(XMLConstants.ACCESS_EXTERNAL_DTD + " property not supported by " + schemaFactory.getClass().getCanonicalName()); @@ -57,7 +59,7 @@ public class SchemaFactoryUtils { schemaFactory.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, ResourceUtils.URL_PROTOCOL_FILE + "," + "jar:file" + "," + "nested" + "," + ResourceUtils.URL_PROTOCOL_WSJAR); } - catch (SAXNotRecognizedException | SAXNotSupportedException e) { + catch (SAXNotRecognizedException | SAXNotSupportedException ex) { if (log.isWarnEnabled()) { log.warn(XMLConstants.ACCESS_EXTERNAL_SCHEMA + " property not supported by " + schemaFactory.getClass().getCanonicalName()); diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java b/spring-xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java index 82976c83..a431cdbc 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/SchemaLoaderUtils.java @@ -85,7 +85,7 @@ public abstract class SchemaLoaderUtils { try { return resource.getURL().toString(); } - catch (IOException e) { + catch (IOException ex) { return null; } } diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/XMLReaderFactoryUtils.java b/spring-xml/src/main/java/org/springframework/xml/validation/XMLReaderFactoryUtils.java index fd3250b3..e2f441eb 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/XMLReaderFactoryUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/XMLReaderFactoryUtils.java @@ -24,10 +24,12 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; /** + * General utilities to create an {@link XMLReader}. + * * @author Greg Turnquist * @since 3.0.5 */ -public class XMLReaderFactoryUtils { +public abstract class XMLReaderFactoryUtils { /** * Build a {@link XMLReader} and set properties to prevent external entity access. diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidationException.java b/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidationException.java index a1024140..9f739e9a 100644 --- a/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidationException.java +++ b/spring-xml/src/main/java/org/springframework/xml/validation/XmlValidationException.java @@ -19,7 +19,7 @@ package org.springframework.xml.validation; import org.springframework.xml.XmlException; /** - * Exception thrown when a validation error occurs + * Exception thrown when a validation error occurs. * * @author Arjen Poutsma * @since 1.0.0 diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java index 2dcdfe34..2146dd22 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/AbstractXPathTemplate.java @@ -56,26 +56,6 @@ public abstract class AbstractXPathTemplate extends TransformerObjectSupport imp evaluate(expression, context, new NodeCallbackHandlerNodeMapper(callbackHandler)); } - /** - * Static inner class that adapts a {@link NodeCallbackHandler} to the interface of - * {@link NodeMapper}. - */ - private static final class NodeCallbackHandlerNodeMapper implements NodeMapper { - - private final NodeCallbackHandler callbackHandler; - - public NodeCallbackHandlerNodeMapper(NodeCallbackHandler callbackHandler) { - this.callbackHandler = callbackHandler; - } - - @Override - public Object mapNode(Node node, int nodeNum) throws DOMException { - this.callbackHandler.processNode(node); - return null; - } - - } - /** * Returns the root element of the given source. * @param source the source to get the root element from @@ -88,4 +68,24 @@ public abstract class AbstractXPathTemplate extends TransformerObjectSupport imp return document.getDocumentElement(); } + /** + * Static inner class that adapts a {@link NodeCallbackHandler} to the interface of + * {@link NodeMapper}. + */ + private static final class NodeCallbackHandlerNodeMapper implements NodeMapper { + + private final NodeCallbackHandler callbackHandler; + + NodeCallbackHandlerNodeMapper(NodeCallbackHandler callbackHandler) { + this.callbackHandler = callbackHandler; + } + + @Override + public Object mapNode(Node node, int nodeNum) throws DOMException { + this.callbackHandler.processNode(node); + return null; + } + + } + } diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java index ee01af32..8299082a 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathTemplate.java @@ -98,7 +98,7 @@ public class Jaxp13XPathTemplate extends AbstractXPathTemplate { @Override public double evaluateAsDouble(String expression, Source context) throws XPathException { Double result = (Double) evaluate(expression, context, XPathConstants.NUMBER); - return result != null ? result : Double.NaN; + return (result != null) ? result : Double.NaN; } @Override diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java b/spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java index 57844088..46d01369 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java +++ b/spring-xml/src/main/java/org/springframework/xml/xpath/NodeMapper.java @@ -25,6 +25,7 @@ import org.w3c.dom.Node; * of mapping each node to a result object, but don't need to worry about exception * handling. * + * @param the type of the result object * @author Arjen Poutsma * @since 1.0.0 * @see XPathOperations#evaluate(String,javax.xml.transform.Source,NodeMapper) diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java index a210c3da..3f06c499 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java +++ b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java @@ -254,7 +254,7 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali return createInputSource(resource); } } - catch (IOException e) { + catch (IOException ex) { // fall through } } From 15d28812b171680f35ed6d667cad520572fbcc9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 7 Mar 2025 13:54:37 +0100 Subject: [PATCH 07/10] Review checkstyle rules of spring-ws-core See gh-1479 --- .../ws/client/core/SourceExtractor.java | 1 + .../ws/client/core/WebServiceMessageExtractor.java | 1 + .../ws/client/core/WebServiceTemplate.java | 4 ++-- .../ws/client/support/WebServiceAccessor.java | 2 +- .../destination/Wsdl11DestinationProvider.java | 2 +- .../interceptor/AbstractValidatingInterceptor.java | 8 ++++---- .../support/interceptor/ClientInterceptorAdapter.java | 2 +- .../interceptor/WebServiceValidationException.java | 2 +- .../ws/config/annotation/package-info.java | 2 +- .../springframework/ws/context/MessageContext.java | 1 - .../springframework/ws/mime/AbstractMimeMessage.java | 2 +- .../java/org/springframework/ws/mime/Attachment.java | 2 +- .../java/org/springframework/ws/mime/MimeMessage.java | 2 +- .../ws/pox/dom/DomPoxMessageFactory.java | 2 +- .../springframework/ws/server/MessageDispatcher.java | 4 ++-- .../server/endpoint/AbstractDom4jPayloadEndpoint.java | 2 +- .../server/endpoint/AbstractDomPayloadEndpoint.java | 2 +- .../endpoint/AbstractEndpointExceptionResolver.java | 7 ++++--- .../server/endpoint/AbstractJDomPayloadEndpoint.java | 2 +- .../server/endpoint/AbstractLoggingInterceptor.java | 4 +++- .../endpoint/AbstractStaxEventPayloadEndpoint.java | 2 +- .../AbstractValidatingMarshallingPayloadEndpoint.java | 2 +- .../server/endpoint/AbstractXomPayloadEndpoint.java | 6 +++--- .../adapter/DefaultMethodEndpointAdapter.java | 4 ++-- .../method/AbstractPayloadSourceMethodProcessor.java | 4 ++-- .../adapter/method/SourcePayloadMethodProcessor.java | 8 ++++---- .../method/XPathParamMethodArgumentResolver.java | 2 +- .../jaxb/AbstractJaxb2PayloadMethodProcessor.java | 6 +++--- .../jaxb/XmlRootElementPayloadMethodProcessor.java | 2 +- .../interceptor/EndpointInterceptorAdapter.java | 8 ++++++-- .../AbstractAnnotationMethodEndpointMapping.java | 1 + .../mapping/AbstractMethodEndpointMapping.java | 5 +++-- .../mapping/AbstractQNameEndpointMapping.java | 2 +- .../server/endpoint/mapping/UriEndpointMapping.java | 2 +- .../mapping/jaxb/XmlRootElementEndpointMapping.java | 2 +- .../java/org/springframework/ws/soap/SoapHeader.java | 2 +- .../ws/soap/addressing/client/ActionCallback.java | 2 +- .../ws/soap/addressing/client/package-info.java | 2 +- .../soap/addressing/messageid/MessageIdStrategy.java | 2 +- .../addressing/messageid/UuidMessageIdStrategy.java | 5 ++++- .../server/AddressingEndpointInterceptor.java | 4 ++-- .../server/AnnotationActionEndpointMapping.java | 4 ++-- .../server/SimpleActionEndpointMapping.java | 2 +- .../addressing/server/annotation/package-info.java | 2 +- .../addressing/version/AbstractAddressingVersion.java | 6 +++--- .../ws/soap/client/SoapFaultClientException.java | 6 +++--- .../springframework/ws/soap/saaj/SaajAttachment.java | 2 +- .../ws/soap/saaj/SaajAttachmentException.java | 2 ++ .../springframework/ws/soap/saaj/SaajSoap11Body.java | 2 +- .../springframework/ws/soap/saaj/SaajSoap12Body.java | 2 +- .../springframework/ws/soap/saaj/SaajSoap12Fault.java | 4 +++- .../springframework/ws/soap/saaj/SaajSoapBody.java | 4 ++-- .../ws/soap/saaj/SaajSoapBodyException.java | 2 ++ .../springframework/ws/soap/saaj/SaajSoapElement.java | 1 + .../ws/soap/saaj/SaajSoapElementException.java | 2 ++ .../ws/soap/saaj/SaajSoapEnvelopeException.java | 2 ++ .../springframework/ws/soap/saaj/SaajSoapFault.java | 2 +- .../ws/soap/saaj/SaajSoapFaultDetail.java | 2 +- .../ws/soap/saaj/SaajSoapFaultException.java | 2 ++ .../ws/soap/saaj/SaajSoapHeaderException.java | 2 ++ .../springframework/ws/soap/saaj/SaajSoapMessage.java | 10 +++++----- .../soap/saaj/SaajSoapMessageCreationException.java | 2 ++ .../ws/soap/saaj/SaajSoapMessageException.java | 2 ++ .../ws/soap/saaj/SaajSoapMessageFactory.java | 2 +- .../ws/soap/saaj/support/SaajUtils.java | 11 ++++++++++- .../ws/soap/saaj/support/SaajXmlReader.java | 6 +++--- .../AbstractSoapFaultDefinitionExceptionResolver.java | 2 +- .../server/endpoint/SimpleSoapExceptionResolver.java | 2 +- .../server/endpoint/adapter/method/package-info.java | 2 +- .../PayloadRootSmartSoapEndpointInterceptor.java | 2 +- .../SoapActionAnnotationMethodEndpointMapping.java | 2 +- .../org/springframework/ws/stream/package-info.java | 2 +- .../springframework/ws/support/MarshallingUtils.java | 4 ++-- .../java/org/springframework/ws/support/WebUtils.java | 2 +- .../HeadersAwareSenderWebServiceConnection.java | 2 ++ .../ws/transport/TransportInputStream.java | 4 ++-- .../transport/http/AbstractHttpSenderConnection.java | 2 +- .../transport/http/ClientHttpRequestConnection.java | 2 +- .../ws/transport/http/CommonsHttpMessageSender.java | 2 +- .../ws/transport/http/HttpTransportConstants.java | 4 ++-- .../http/HttpUrlConnectionMessageSender.java | 4 ++-- .../ws/transport/http/JdkHttpClientConnection.java | 8 ++------ .../ws/transport/http/LastModifiedHelper.java | 6 +++--- .../http/LocationTransformerObjectSupport.java | 6 +++--- .../ws/transport/http/support/package-info.java | 2 +- .../ws/transport/support/EnumerationIterator.java | 1 + .../WebServiceMessageReceiverObjectSupport.java | 2 +- .../provider/InliningXsdSchemaTypesProvider.java | 2 +- src/checkstyle/checkstyle-suppressions.xml | 3 +++ 89 files changed, 161 insertions(+), 118 deletions(-) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java index 878b8e9a..9a6f4cc3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/SourceExtractor.java @@ -34,6 +34,7 @@ import javax.xml.transform.TransformerException; * Implementations of this interface perform the actual work of extracting results, but * don't need to worry about exception handling, or resource handling. * + * @param the type of the source * @author Arjen Poutsma * @since 1.0.0 * @see org.springframework.ws.client.core.WebServiceTemplate diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceMessageExtractor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceMessageExtractor.java index 14ce76d7..2a70f452 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceMessageExtractor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceMessageExtractor.java @@ -35,6 +35,7 @@ import org.springframework.ws.WebServiceMessage; * Implementations of this interface perform the actual work of extracting results, but * don't need to worry about exception handling, or resource handling. * + * @param the type of the result object * @author Arjen Poutsma * @since 1.0.0 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java index 68477da5..b87a1da8 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java @@ -208,7 +208,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService public String getDefaultUri() { if (this.destinationProvider != null) { URI uri = this.destinationProvider.getDestination(); - return uri != null ? uri.toString() : null; + return (uri != null) ? uri.toString() : null; } else { return null; @@ -813,7 +813,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService * returned {@code false}. * @param interceptorIndex index of last interceptor that successfully completed * @param messageContext the message context - * @param ex Exception thrown on handler execution, or {@code null} if none + * @param ex exception thrown on handler execution, or {@code null} if none * @see ClientInterceptor#afterCompletion */ private void triggerAfterCompletion(int interceptorIndex, MessageContext messageContext, Exception ex) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java index bba24478..a0d77bd5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/WebServiceAccessor.java @@ -113,7 +113,7 @@ public abstract class WebServiceAccessor extends TransformerObjectSupport implem try { this.logger.debug("Opening [" + connection + "] to [" + connection.getUri() + "]"); } - catch (URISyntaxException e) { + catch (URISyntaxException ex) { // ignore } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java index 4df1afae..ed0c5572 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java @@ -130,7 +130,7 @@ public class Wsdl11DestinationProvider extends AbstractCachingDestinationProvide if (this.logger.isDebugEnabled()) { this.logger.debug("Found location [" + location + "] in " + this.wsdlResource); } - return location != null ? URI.create(location) : null; + return (location != null) ? URI.create(location) : null; } catch (IOException ex) { throw new WebServiceIOException("Error extracting location from WSDL [" + this.wsdlResource + "]", ex); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java index f1805793..5de59abb 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java @@ -184,8 +184,8 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup try { errors = this.validator.validate(requestSource); } - catch (IOException e) { - throw new WebServiceIOException("Could not validate response: " + e.getMessage(), e); + catch (IOException ex) { + throw new WebServiceIOException("Could not validate response: " + ex.getMessage(), ex); } if (!ObjectUtils.isEmpty(errors)) { return handleRequestValidationErrors(messageContext, errors); @@ -234,8 +234,8 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup try { errors = this.validator.validate(responseSource); } - catch (IOException e) { - throw new WebServiceIOException("Could not validate response: " + e.getMessage(), e); + catch (IOException ex) { + throw new WebServiceIOException("Could not validate response: " + ex.getMessage(), ex); } if (!ObjectUtils.isEmpty(errors)) { return handleResponseValidationErrors(messageContext, errors); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java index 1136392e..3ed06cf1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapter.java @@ -32,7 +32,7 @@ import org.springframework.ws.context.MessageContext; public abstract class ClientInterceptorAdapter implements ClientInterceptor { /** - * Logger available to subclasses + * Logger available to subclasses. */ protected final Log logger = LogFactory.getLog(getClass()); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java index 5882c4ec..b124975d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/WebServiceValidationException.java @@ -30,7 +30,7 @@ import org.springframework.ws.client.WebServiceClientException; @SuppressWarnings("serial") public class WebServiceValidationException extends WebServiceClientException { - private SAXParseException[] validationErrors; + private final SAXParseException[] validationErrors; /** * Create a new instance of the {@code WebServiceValidationException} class. diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/package-info.java index 46f03258..45416085 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/package-info.java @@ -17,4 +17,4 @@ /** * Annotations and supporting classes for declarative configuration. */ -package org.springframework.ws.config.annotation; \ No newline at end of file +package org.springframework.ws.config.annotation; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/context/MessageContext.java b/spring-ws-core/src/main/java/org/springframework/ws/context/MessageContext.java index 47cbd3a8..ce506a30 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/context/MessageContext.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/context/MessageContext.java @@ -65,7 +65,6 @@ public interface MessageContext { /** * Removes the response message, if any. - * * @since 1.5.0 */ void clearResponse(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java index 630a018c..b9a10204 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java @@ -71,7 +71,7 @@ public abstract class AbstractMimeMessage implements MimeMessage { private final String contentType; - public InputStreamSourceDataSource(InputStreamSource inputStreamSource, String contentType) { + InputStreamSourceDataSource(InputStreamSource inputStreamSource, String contentType) { this.inputStreamSource = inputStreamSource; this.contentType = contentType; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java index 627e0c62..d08b9257 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/mime/Attachment.java @@ -22,7 +22,7 @@ import java.io.InputStream; import jakarta.activation.DataHandler; /** - * Represents an attachment to a {@link org.springframework.ws.mime.MimeMessage} + * Represents an attachment to a {@link org.springframework.ws.mime.MimeMessage}. * * @author Arjen Poutsma * @since 1.0.0 diff --git a/spring-ws-core/src/main/java/org/springframework/ws/mime/MimeMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/mime/MimeMessage.java index fa2d708e..f3df5c26 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/mime/MimeMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/mime/MimeMessage.java @@ -29,8 +29,8 @@ import org.springframework.ws.WebServiceMessage; * file, an {@link InputStreamSource}, or a {@link DataHandler}. * * @author Arjen Poutsma - * @see Attachment * @since 1.0.0 + * @see Attachment */ public interface MimeMessage extends WebServiceMessage { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java index 66b5bc07..36eb0329 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java @@ -37,8 +37,8 @@ import org.springframework.xml.transform.TransformerObjectSupport; * {@link DomPoxMessage}. * * @author Arjen Poutsma - * @see org.springframework.ws.pox.dom.DomPoxMessage * @since 1.0.0 + * @see org.springframework.ws.pox.dom.DomPoxMessage */ public class DomPoxMessageFactory extends TransformerObjectSupport implements WebServiceMessageFactory { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java b/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java index f2441b0d..8e6b6e1d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/MessageDispatcher.java @@ -256,7 +256,7 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa throw ex; } catch (Exception ex) { - Object endpoint = mappedEndpoint != null ? mappedEndpoint.getEndpoint() : null; + Object endpoint = (mappedEndpoint != null) ? mappedEndpoint.getEndpoint() : null; processEndpointException(messageContext, endpoint, ex); triggerHandleResponse(mappedEndpoint, interceptorIndex, messageContext); } @@ -390,7 +390,7 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa * returned {@code false}. * @param mappedEndpoint the mapped EndpointInvocationChain * @param interceptorIndex index of last interceptor that successfully completed - * @param ex Exception thrown on handler execution, or {@code null} if none + * @param ex exception thrown on handler execution, or {@code null} if none * @see EndpointInterceptor#afterCompletion */ private void triggerAfterCompletion(EndpointInvocationChain mappedEndpoint, int interceptorIndex, diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java index e3c85e6c..a7fcaa9b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDom4jPayloadEndpoint.java @@ -68,7 +68,7 @@ public abstract class AbstractDom4jPayloadEndpoint extends TransformerObjectSupp } Document responseDocument = DocumentHelper.createDocument(); Element responseElement = invokeInternal(requestElement, responseDocument); - return responseElement != null ? new DocumentSource(responseElement) : null; + return (responseElement != null) ? new DocumentSource(responseElement) : null; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java index 3c9911ba..75163780 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractDomPayloadEndpoint.java @@ -99,7 +99,7 @@ public abstract class AbstractDomPayloadEndpoint extends TransformerObjectSuppor Element requestElement = getDocumentElement(request, documentBuilder); Document responseDocument = documentBuilder.newDocument(); Element responseElement = invokeInternal(requestElement, responseDocument); - return responseElement != null ? new DOMSource(responseElement) : null; + return (responseElement != null) ? new DOMSource(responseElement) : null; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java index 05847184..60c82f59 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java @@ -91,11 +91,12 @@ public abstract class AbstractEndpointExceptionResolver implements EndpointExcep /** * Default implementation that checks whether the given {@code endpoint} is in the set * of {@link #setMappedEndpoints mapped endpoints}. - * @see #resolveExceptionInternal(MessageContext,Object,Exception) + * @see #resolveExceptionInternal(MessageContext, Object, Exception) */ @Override public final boolean resolveException(MessageContext messageContext, Object endpoint, Exception ex) { - Object mappedEndpoint = endpoint instanceof MethodEndpoint ? ((MethodEndpoint) endpoint).getBean() : endpoint; + Object mappedEndpoint = (endpoint instanceof MethodEndpoint methodEndpoint) ? methodEndpoint.getBean() + : endpoint; if (this.mappedEndpoints != null && !this.mappedEndpoints.contains(mappedEndpoint)) { return false; } @@ -144,7 +145,7 @@ public abstract class AbstractEndpointExceptionResolver implements EndpointExcep * of the exception * @param ex the exception that got thrown during endpoint execution * @return {@code true} if resolved; {@code false} otherwise - * @see #resolveException(MessageContext,Object,Exception) + * @see #resolveException(MessageContext, Object, Exception) */ protected abstract boolean resolveExceptionInternal(MessageContext messageContext, Object endpoint, Exception ex); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java index abb9292a..8ee1cb8d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java @@ -60,7 +60,7 @@ public abstract class AbstractJDomPayloadEndpoint extends TransformerObjectSuppo public final Source invoke(Source request) throws Exception { Element requestElement = getDocumentElement(request); Element responseElement = invokeInternal(requestElement); - return responseElement != null ? new JDOMSource(responseElement) : null; + return (responseElement != null) ? new JDOMSource(responseElement) : null; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java index ca542579..9913e7e5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java @@ -112,7 +112,9 @@ public abstract class AbstractLoggingInterceptor extends TransformerObjectSuppor return true; } - /** Does nothing by default */ + /** + * Does nothing by default. + */ @Override public void afterCompletion(MessageContext messageContext, Object endpoint, Exception ex) { } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java index b7fa3c1b..04ce6ad5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java @@ -159,7 +159,7 @@ public abstract class AbstractStaxEventPayloadEndpoint extends AbstractStaxPaylo private ByteArrayOutputStream os; - public ResponseCreatingEventWriter(MessageContext messageContext) { + ResponseCreatingEventWriter(MessageContext messageContext) { this.messageContext = messageContext; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java index a97aa8e2..9578a361 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractValidatingMarshallingPayloadEndpoint.java @@ -54,7 +54,7 @@ public abstract class AbstractValidatingMarshallingPayloadEndpoint extends Abstr /** Return the primary Validator for this controller. */ public Validator getValidator() { Validator[] validators = getValidators(); - return (validators != null && validators.length > 0 ? validators[0] : null); + return (validators != null && validators.length > 0) ? validators[0] : null; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java index 0689393e..8f38c1bc 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java @@ -81,7 +81,7 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor requestElement = sourceCallback.element; } Element responseElement = invokeInternal(requestElement); - return responseElement != null ? convertResponse(responseElement) : null; + return (responseElement != null) ? convertResponse(responseElement) : null; } private Source convertResponse(Element responseElement) throws IOException { @@ -151,8 +151,8 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor } this.element = document.getRootElement(); } - catch (ParsingException e) { - throw new XomParsingException(e); + catch (ParsingException ex) { + throw new XomParsingException(ex); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java index 8a773df3..0e8ae148 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapter.java @@ -137,7 +137,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter } private ClassLoader getClassLoader() { - return this.classLoader != null ? this.classLoader : DefaultMethodEndpointAdapter.class.getClassLoader(); + return (this.classLoader != null) ? this.classLoader : DefaultMethodEndpointAdapter.class.getClassLoader(); } @Override @@ -202,7 +202,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter .forName(className, getClassLoader()); methodArgumentResolvers.add(BeanUtils.instantiateClass(methodArgumentResolverClass)); } - catch (ClassNotFoundException e) { + catch (ClassNotFoundException ex) { this.logger.warn("Could not find \"" + className + "\" on the classpath"); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadSourceMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadSourceMethodProcessor.java index 64f77fc2..69b7e6a7 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadSourceMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadSourceMethodProcessor.java @@ -37,13 +37,13 @@ public abstract class AbstractPayloadSourceMethodProcessor extends AbstractPaylo @Override public final Object resolveArgument(MessageContext messageContext, MethodParameter parameter) throws Exception { Source requestPayload = getRequestPayload(messageContext); - return requestPayload != null ? resolveRequestPayloadArgument(parameter, requestPayload) : null; + return (requestPayload != null) ? resolveRequestPayloadArgument(parameter, requestPayload) : null; } /** Returns the request payload as {@code Source}. */ private Source getRequestPayload(MessageContext messageContext) { WebServiceMessage request = messageContext.getRequest(); - return request != null ? request.getPayloadSource() : null; + return (request != null) ? request.getPayloadSource() : null; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java index f4db1fe0..38eca09f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java @@ -155,19 +155,19 @@ public class SourcePayloadMethodProcessor extends AbstractPayloadSourceMethodPro final Location parentLocation = getParent().getLocation(); return new Location() { public int getLineNumber() { - return parentLocation != null ? parentLocation.getLineNumber() : -1; + return (parentLocation != null) ? parentLocation.getLineNumber() : -1; } public int getColumnNumber() { - return parentLocation != null ? parentLocation.getColumnNumber() : -1; + return (parentLocation != null) ? parentLocation.getColumnNumber() : -1; } public int getCharacterOffset() { - return parentLocation != null ? parentLocation.getLineNumber() : -1; + return (parentLocation != null) ? parentLocation.getLineNumber() : -1; } public String getPublicId() { - return parentLocation != null ? parentLocation.getPublicId() : null; + return (parentLocation != null) ? parentLocation.getPublicId() : null; } public String getSystemId() { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java index 7d005ac3..909430a2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java @@ -107,7 +107,7 @@ public class XPathParamMethodArgumentResolver implements MethodArgumentResolver Element rootElement = getRootElement(messageContext.getRequest().getPayloadSource()); String expression = parameter.getParameterAnnotation(XPathParam.class).value(); Object result = xpath.evaluate(expression, rootElement, evaluationReturnType); - return useConversionService ? this.conversionService.convert(result, parameterType) : result; + return (useConversionService) ? this.conversionService.convert(result, parameterType) : result; } private QName getReturnType(Class parameterType) { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java index cf9ace90..b4e3211c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/AbstractJaxb2PayloadMethodProcessor.java @@ -177,7 +177,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa private Source getRequestPayload(MessageContext messageContext) { WebServiceMessage request = messageContext.getRequest(); - return request != null ? request.getPayloadSource() : null; + return (request != null) ? request.getPayloadSource() : null; } private JAXBException convertToJaxbException(Exception ex) { @@ -239,7 +239,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa private Object result; - public Jaxb2SourceCallback(Class clazz) throws JAXBException { + Jaxb2SourceCallback(Class clazz) throws JAXBException { this.unmarshaller = createUnmarshaller(clazz); } @@ -309,7 +309,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa private JAXBElement result; - public JaxbElementSourceCallback(Class declaredType) throws JAXBException { + JaxbElementSourceCallback(Class declaredType) throws JAXBException { this.unmarshaller = createUnmarshaller(declaredType); this.declaredType = declaredType; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessor.java index eb7e484b..78f36ad2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessor.java @@ -54,7 +54,7 @@ public class XmlRootElementPayloadMethodProcessor extends AbstractJaxb2PayloadMe } else { JAXBElement element = unmarshalElementFromRequestPayload(messageContext, parameterType); - return element != null ? element.getValue() : null; + return (element != null) ? element.getValue() : null; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java index 69aa4cfc..5dfaa3c1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/EndpointInterceptorAdapter.java @@ -32,10 +32,14 @@ import org.springframework.ws.server.EndpointInterceptor; */ public class EndpointInterceptorAdapter implements EndpointInterceptor { - /** Logger available to subclasses */ + /** + * Logger available to subclasses. + */ protected final Log logger = LogFactory.getLog(getClass()); - /** Returns {@code false}. */ + /** + * Returns {@code false}. + */ public boolean understands(Element header) { return false; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java index f53e59e7..ab41e70f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractAnnotationMethodEndpointMapping.java @@ -31,6 +31,7 @@ import org.springframework.ws.server.endpoint.annotation.Endpoint; * The methods of each bean carrying @Endpoint will be registered using * {@link #registerMethods(String)}. * + * @param the type of the key * @author Arjen Poutsma * @since 1.0.0 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java index 9714bc8c..1890b724 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java @@ -44,6 +44,7 @@ import org.springframework.ws.server.endpoint.MethodEndpoint; * that qualify as endpoint. The methods of this bean are then registered under a specific * key with {@link #registerEndpoint(Object, MethodEndpoint)}. * + * @param the type of the key * @author Arjen Poutsma * @since 1.0.0 */ @@ -165,7 +166,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointM } endpointTypes.addAll(Arrays.asList(endpointType.getInterfaces())); for (Class currentEndpointType : endpointTypes) { - final Class targetClass = (specificEndpointType != null ? specificEndpointType : currentEndpointType); + final Class targetClass = (specificEndpointType != null) ? specificEndpointType : currentEndpointType; ReflectionUtils.doWithMethods(currentEndpointType, new ReflectionUtils.MethodCallback() { public void doWith(Method method) { Method specificMethod = ClassUtils.getMostSpecificMethod(method, targetClass); @@ -201,7 +202,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointM */ protected List getLookupKeysForMethod(Method method) { T key = getLookupKeyForMethod(method); - return key != null ? Collections.singletonList(key) : Collections.emptyList(); + return (key != null) ? Collections.singletonList(key) : Collections.emptyList(); } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java index 28f3376c..f03f0837 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractQNameEndpointMapping.java @@ -33,7 +33,7 @@ public abstract class AbstractQNameEndpointMapping extends AbstractMapBasedEndpo @Override protected final String getLookupKeyForMessage(MessageContext messageContext) throws Exception { QName qName = resolveQName(messageContext); - return qName != null ? qName.toString() : null; + return (qName != null) ? qName.toString() : null; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java index 2153cd41..34c5724e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMapping.java @@ -81,7 +81,7 @@ public class UriEndpointMapping extends AbstractMapBasedEndpointMapping { new URI(key); return true; } - catch (URISyntaxException e) { + catch (URISyntaxException ex) { return false; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java index df415145..4f1b0c8b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java @@ -88,7 +88,7 @@ public class XmlRootElementEndpointMapping extends AbstractAnnotationMethodEndpo return result; } } - catch (InvocationTargetException | NoSuchMethodException | InstantiationException | IllegalAccessException e) { + catch (InvocationTargetException | NoSuchMethodException | InstantiationException | IllegalAccessException ex) { // ignore } return null; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java index d637f7e6..799b21a0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapHeader.java @@ -86,8 +86,8 @@ public interface SoapHeader extends SoapElement { * @param name the qualified name for which to search * @return an iterator over all the header elements * @throws SoapHeaderException if the header cannot be returned - * @see SoapHeaderElement * @since 2.0.3 + * @see SoapHeaderElement */ Iterator examineHeaderElements(QName name) throws SoapHeaderException; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java index ac56a455..338f74b4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/ActionCallback.java @@ -128,7 +128,7 @@ public class ActionCallback implements WebServiceMessageCallback { } /** - * Returns the WS-Addressing version + * Returns the WS-Addressing version. */ public AddressingVersion getVersion() { return this.version; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/package-info.java index 5581c371..ba24782d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/client/package-info.java @@ -17,4 +17,4 @@ /** * Client-side WS-Addressing support. */ -package org.springframework.ws.soap.addressing.client; \ No newline at end of file +package org.springframework.ws.soap.addressing.client; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java index e72ae7af..585304b4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/MessageIdStrategy.java @@ -30,7 +30,7 @@ import org.springframework.ws.soap.SoapMessage; public interface MessageIdStrategy { /** - * Indicates whether the given {@code MessageID} value is a duplicate or not + * Indicates whether the given {@code MessageID} value is a duplicate or not. * @param messageId the message id * @return {@code true} if a duplicate; {@code false} otherwise */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java index 7a3c7ccc..0ef9a09d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategy.java @@ -23,7 +23,7 @@ import org.springframework.ws.soap.SoapMessage; /** * Implementation of the {@link MessageIdStrategy} interface that uses a {@link UUID} to - * generate a Message Id. The UUID is prefixed by {@code urn:uuid:}. + * generate a Message Id. The UUID is prefixed by {@value PREFIX}. *

    * Note that the {@link UUID} class is only available on Java 5 and above. * @@ -32,6 +32,9 @@ import org.springframework.ws.soap.SoapMessage; */ public class UuidMessageIdStrategy implements MessageIdStrategy { + /** + * Prefix of the generated UUID. + */ public static final String PREFIX = "urn:uuid:"; /** Returns {@code false}. */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java index 485e2ba3..74daf062 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java @@ -98,13 +98,13 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor { Assert.isInstanceOf(SoapMessage.class, messageContext.getResponse()); MessageAddressingProperties requestMap = this.version .getMessageAddressingProperties((SoapMessage) messageContext.getRequest()); - EndpointReference replyEpr = !isFault ? requestMap.getReplyTo() : requestMap.getFaultTo(); + EndpointReference replyEpr = (!isFault) ? requestMap.getReplyTo() : requestMap.getFaultTo(); if (handleNoneAddress(messageContext, replyEpr)) { return false; } SoapMessage reply = (SoapMessage) messageContext.getResponse(); URI replyMessageId = getMessageId(reply); - URI action = isFault ? this.faultAction : this.replyAction; + URI action = (isFault) ? this.faultAction : this.replyAction; MessageAddressingProperties replyMap = requestMap.getReplyProperties(replyEpr, action, replyMessageId); this.version.addAddressingHeaders(reply, replyMap); if (handleAnonymousAddress(messageContext, replyEpr)) { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java index f0a11d8d..5ef29a8f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AnnotationActionEndpointMapping.java @@ -78,7 +78,7 @@ public class AnnotationActionEndpointMapping extends AbstractActionMethodEndpoin try { return new URI(action.value()); } - catch (URISyntaxException e) { + catch (URISyntaxException ex) { throw new IllegalArgumentException( "Invalid Action annotation [" + action.value() + "] on [" + method + "]"); } @@ -136,7 +136,7 @@ public class AnnotationActionEndpointMapping extends AbstractActionMethodEndpoin try { return new URI(action); } - catch (URISyntaxException e) { + catch (URISyntaxException ex) { throw new IllegalArgumentException( "Invalid Action annotation [" + action + "] on [" + methodEndpoint + "]"); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java index b813a41e..fb65455f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMapping.java @@ -109,7 +109,7 @@ public class SimpleActionEndpointMapping extends AbstractActionEndpointMapping { /** * Register all endpoints specified in the action map. - * @param actionMap Map with action URIs as keys and endppint beans or bean names as + * @param actionMap map with action URIs as keys and endpoint beans or bean names as * values * @throws BeansException if an endpoint couldn't be registered * @throws IllegalStateException if there is a conflicting endpoint registered diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/package-info.java index 17c7d543..81884c7b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/annotation/package-info.java @@ -17,4 +17,4 @@ /** * Annotations for server-side WS-Addressing support. */ -package org.springframework.ws.soap.addressing.server.annotation; \ No newline at end of file +package org.springframework.ws.soap.addressing.server.annotation; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java index 56b29e79..7eae3a4b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java @@ -152,7 +152,7 @@ public abstract class AbstractAddressingVersion extends TransformerObjectSupport try { return new URI(messageId); } - catch (URISyntaxException e) { + catch (URISyntaxException ex) { return null; } } @@ -184,9 +184,9 @@ public abstract class AbstractAddressingVersion extends TransformerObjectSupport if (address == null) { return null; } - List referenceProperties = this.referencePropertiesExpression != null + List referenceProperties = (this.referencePropertiesExpression != null) ? this.referencePropertiesExpression.evaluateAsNodeList(node) : Collections.emptyList(); - List referenceParameters = this.referenceParametersExpression != null + List referenceParameters = (this.referenceParametersExpression != null) ? this.referenceParametersExpression.evaluateAsNodeList(node) : Collections.emptyList(); return new EndpointReference(address, referenceProperties, referenceParameters); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java index a6b911b1..238500b4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/SoapFaultClientException.java @@ -41,7 +41,7 @@ public class SoapFaultClientException extends WebServiceFaultException { public SoapFaultClientException(SoapMessage faultMessage) { super(faultMessage); SoapBody body = faultMessage.getSoapBody(); - this.soapFault = body != null ? body.getFault() : null; + this.soapFault = (body != null) ? body.getFault() : null; } /** Returns the {@link SoapFault}. */ @@ -51,7 +51,7 @@ public class SoapFaultClientException extends WebServiceFaultException { /** Returns the fault code. */ public QName getFaultCode() { - return this.soapFault != null ? this.soapFault.getFaultCode() : null; + return (this.soapFault != null) ? this.soapFault.getFaultCode() : null; } /** @@ -61,7 +61,7 @@ public class SoapFaultClientException extends WebServiceFaultException { * Note that this message returns the same as {@link #getMessage()}. */ public String getFaultStringOrReason() { - return this.soapFault != null ? this.soapFault.getFaultStringOrReason() : null; + return (this.soapFault != null) ? this.soapFault.getFaultStringOrReason() : null; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java index 6f82c1cd..366269d4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachment.java @@ -37,7 +37,7 @@ class SaajAttachment implements Attachment { private final AttachmentPart saajAttachment; - public SaajAttachment(AttachmentPart saajAttachment) { + SaajAttachment(AttachmentPart saajAttachment) { Assert.notNull(saajAttachment, "saajAttachment must not be null"); this.saajAttachment = saajAttachment; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachmentException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachmentException.java index 87f563c1..ef626ce3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachmentException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajAttachmentException.java @@ -19,6 +19,8 @@ package org.springframework.ws.soap.saaj; import org.springframework.ws.mime.AttachmentException; /** + * Exception thrown when a {@link SaajAttachment} could not be accessed. + * * @author Arjen Poutsma */ @SuppressWarnings("serial") diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java index 9220e0ce..53bd2c51 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Body.java @@ -48,7 +48,7 @@ class SaajSoap11Body extends SaajSoapBody implements Soap11Body { @Override public Soap11Fault getFault() { SOAPFault fault = getSaajBody().getFault(); - return fault != null ? new SaajSoap11Fault(fault) : null; + return (fault != null) ? new SaajSoap11Fault(fault) : null; } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java index 6011c058..8e4f5b27 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Body.java @@ -45,7 +45,7 @@ class SaajSoap12Body extends SaajSoapBody implements Soap12Body { @Override public Soap12Fault getFault() { SOAPFault fault = getSaajBody().getFault(); - return fault != null ? new SaajSoap12Fault(fault) : null; + return (fault != null) ? new SaajSoap12Fault(fault) : null; } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java index 66ef0c8a..89a3ef35 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Fault.java @@ -27,12 +27,14 @@ import jakarta.xml.soap.SOAPFault; import org.springframework.ws.soap.soap12.Soap12Fault; /** + * A {@link SaajSoapFault} for SOAP 1.2. + * * @author Arjen Poutsma * @since 1.0.0 */ class SaajSoap12Fault extends SaajSoapFault implements Soap12Fault { - public SaajSoap12Fault(SOAPFault fault) { + SaajSoap12Fault(SOAPFault fault) { super(fault); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBody.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBody.java index 84257092..54f0b5a6 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBody.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBody.java @@ -36,14 +36,14 @@ import org.springframework.ws.soap.saaj.support.SaajUtils; */ abstract class SaajSoapBody extends SaajSoapElement implements SoapBody { - public SaajSoapBody(SOAPBody body) { + SaajSoapBody(SOAPBody body) { super(body); } @Override public Source getPayloadSource() { SOAPElement bodyElement = SaajUtils.getFirstBodyElement(getSaajBody()); - return bodyElement != null ? new DOMSource(bodyElement) : null; + return (bodyElement != null) ? new DOMSource(bodyElement) : null; } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBodyException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBodyException.java index 0ed4ecb8..0ce0807a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBodyException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapBodyException.java @@ -19,6 +19,8 @@ package org.springframework.ws.soap.saaj; import org.springframework.ws.soap.SoapBodyException; /** + * A SAAJ {@link SoapBodyException}. + * * @author Arjen Poutsma */ @SuppressWarnings("serial") diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java index a85a5029..26671d25 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElement.java @@ -32,6 +32,7 @@ import org.springframework.ws.soap.SoapElement; * SAAJ-specific implementation of the {@code SoapElement} interface. Wraps a * {@link jakarta.xml.soap.SOAPElement}. * + * @param the type of the {@link SOAPElement} * @author Arjen Poutsma * @since 1.0.0 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElementException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElementException.java index 56458267..051a261c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElementException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapElementException.java @@ -19,6 +19,8 @@ package org.springframework.ws.soap.saaj; import org.springframework.ws.soap.SoapElementException; /** + * A SAAJ {@link SoapElementException}. + * * @author Arjen Poutsma */ @SuppressWarnings("serial") diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelopeException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelopeException.java index 4ce49bba..99ef9b85 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelopeException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapEnvelopeException.java @@ -19,6 +19,8 @@ package org.springframework.ws.soap.saaj; import org.springframework.ws.soap.SoapEnvelopeException; /** + * A SAAJ {@link SoapEnvelopeException}. + * * @author Arjen Poutsma * @since 1.0.0 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFault.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFault.java index 7b749121..02aea8b5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFault.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFault.java @@ -50,7 +50,7 @@ abstract class SaajSoapFault extends SaajSoapElement implements SoapF @Override public SoapFaultDetail getFaultDetail() { Detail saajDetail = getSaajFault().getDetail(); - return saajDetail != null ? new SaajSoapFaultDetail(saajDetail) : null; + return (saajDetail != null) ? new SaajSoapFaultDetail(saajDetail) : null; } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java index e08884c2..41f3148b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultDetail.java @@ -40,7 +40,7 @@ import org.springframework.ws.soap.SoapFaultDetailElement; */ class SaajSoapFaultDetail extends SaajSoapElement implements SoapFaultDetail { - public SaajSoapFaultDetail(SOAPFaultElement faultElement) { + SaajSoapFaultDetail(SOAPFaultElement faultElement) { super(faultElement); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultException.java index 89b96372..4fb3dcda 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapFaultException.java @@ -19,6 +19,8 @@ package org.springframework.ws.soap.saaj; import org.springframework.ws.soap.SoapFaultException; /** + * A SAAJ {@link SoapFaultException}. + * * @author Arjen Poutsma * @since 1.0.0 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderException.java index a16bb8b8..de28bed5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeaderException.java @@ -19,6 +19,8 @@ package org.springframework.ws.soap.saaj; import org.springframework.ws.soap.SoapHeaderException; /** + * A SAAJ {@link SoapHeaderException}. + * * @author Arjen Poutsma * @since 1.0.0 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java index 194e188b..450b3cd3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java @@ -150,11 +150,11 @@ public class SaajSoapMessage extends AbstractSoapMessage { MimeHeaders mimeHeaders = getSaajMessage().getMimeHeaders(); if (SoapVersion.SOAP_11 == getVersion()) { String[] actions = mimeHeaders.getHeader(TransportConstants.HEADER_SOAP_ACTION); - return ObjectUtils.isEmpty(actions) ? TransportConstants.EMPTY_SOAP_ACTION : actions[0]; + return (ObjectUtils.isEmpty(actions)) ? TransportConstants.EMPTY_SOAP_ACTION : actions[0]; } else if (SoapVersion.SOAP_12 == getVersion()) { String[] contentTypes = mimeHeaders.getHeader(TransportConstants.HEADER_CONTENT_TYPE); - return !ObjectUtils.isEmpty(contentTypes) ? SoapUtils.extractActionFromContentType(contentTypes[0]) + return (!ObjectUtils.isEmpty(contentTypes)) ? SoapUtils.extractActionFromContentType(contentTypes[0]) : TransportConstants.EMPTY_SOAP_ACTION; } else { @@ -178,7 +178,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { throw new SaajSoapMessageException("Could not save message", ex); } String[] contentTypes = mimeHeaders.getHeader(TransportConstants.HEADER_CONTENT_TYPE); - String contentType = !ObjectUtils.isEmpty(contentTypes) ? contentTypes[0] : getVersion().getContentType(); + String contentType = (!ObjectUtils.isEmpty(contentTypes)) ? contentTypes[0] : getVersion().getContentType(); contentType = SoapUtils.setActionInContentType(contentType, soapAction); mimeHeaders.setHeader(TransportConstants.HEADER_CONTENT_TYPE, contentType); mimeHeaders.removeHeader(TransportConstants.HEADER_SOAP_ACTION); @@ -295,7 +295,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { private void convertMessageToXop() { MimeHeaders mimeHeaders = this.saajMessage.getMimeHeaders(); String[] oldContentTypes = mimeHeaders.getHeader(TransportConstants.HEADER_CONTENT_TYPE); - String oldContentType = !ObjectUtils.isEmpty(oldContentTypes) ? oldContentTypes[0] + String oldContentType = (!ObjectUtils.isEmpty(oldContentTypes)) ? oldContentTypes[0] : getVersion().getContentType(); mimeHeaders.setHeader(TransportConstants.HEADER_CONTENT_TYPE, CONTENT_TYPE_XOP + ";type=" + '"' + oldContentType + '"'); @@ -304,7 +304,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { private void convertPartToXop() { SOAPPart saajPart = this.saajMessage.getSOAPPart(); String[] oldContentTypes = saajPart.getMimeHeader(TransportConstants.HEADER_CONTENT_TYPE); - String oldContentType = !ObjectUtils.isEmpty(oldContentTypes) ? oldContentTypes[0] + String oldContentType = (!ObjectUtils.isEmpty(oldContentTypes)) ? oldContentTypes[0] : getVersion().getContentType(); saajPart.setMimeHeader(TransportConstants.HEADER_CONTENT_TYPE, CONTENT_TYPE_XOP + ";type=" + '"' + oldContentType + '"'); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageCreationException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageCreationException.java index dabaa5bb..ca76f18a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageCreationException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageCreationException.java @@ -19,6 +19,8 @@ package org.springframework.ws.soap.saaj; import org.springframework.ws.soap.SoapMessageCreationException; /** + * A SAAJ {@link SoapMessageCreationException}. + * * @author Arjen Poutsma * @since 1.0.0 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageException.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageException.java index 8e2fd465..b542c4c3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageException.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageException.java @@ -19,6 +19,8 @@ package org.springframework.ws.soap.saaj; import org.springframework.ws.soap.SoapMessageException; /** + * A SAAJ {@link SoapMessageException}. + * * @author Arjen Poutsma * @since 1.0.0 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java index 5bdb35f3..d6b09163 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java @@ -213,7 +213,7 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB postProcess(saajMessage); return new SaajSoapMessage(saajMessage, this.langAttributeOnSoap11FaultString); } - catch (SOAPException e) { + catch (SOAPException ex2) { // fall-through } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java index 6f8d056a..3b9354b2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java @@ -47,10 +47,19 @@ import org.springframework.ws.transport.TransportConstants; */ public abstract class SaajUtils { + /** + * SAAJ version 1.1. + */ public static final int SAAJ_11 = 0; + /** + * SAAJ version 1.2. + */ public static final int SAAJ_12 = 1; + /** + * SAAJ version 1.3. + */ public static final int SAAJ_13 = 2; private static int saajVersion = SAAJ_13; @@ -172,7 +181,7 @@ public abstract class SaajUtils { * Loads a SAAJ {@code SOAPMessage} from the given resource with a given message * factory. * @param resource the resource to read from - * @param messageFactory SAAJ message factory used to construct the message + * @param messageFactory the SAAJ message factory used to construct the message * @return the loaded SAAJ message * @throws SOAPException if the message cannot be constructed * @throws IOException if the input stream resource cannot be loaded diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java index a6d7bd8f..2744eccd 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java @@ -94,7 +94,7 @@ public class SaajXmlReader extends AbstractXmlReader { *

    * Note that the given {@code InputSource} is not read, but ignored. * @param ignored is ignored - * @throws org.xml.sax.SAXException A SAX exception, possibly wrapping a + * @throws org.xml.sax.SAXException a SAX exception, possibly wrapping a * {@code XMLStreamException} */ @Override @@ -107,7 +107,7 @@ public class SaajXmlReader extends AbstractXmlReader { *

    * Note that the given system identifier is not read, but ignored. * @param ignored is ignored - * @throws SAXException A SAX exception, possibly wrapping a + * @throws SAXException a SAX exception, possibly wrapping a * {@code XMLStreamException} */ @Override @@ -171,7 +171,7 @@ public class SaajXmlReader extends AbstractXmlReader { private void handleText(Text text) throws SAXException { if (getContentHandler() != null) { - char[] ch = text.getValue() != null ? text.getValue().toCharArray() : new char[0]; + char[] ch = (text.getValue() != null) ? text.getValue().toCharArray() : new char[0]; getContentHandler().characters(ch, 0, ch.length); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java index 70ceb84a..e23f63e4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/AbstractSoapFaultDefinitionExceptionResolver.java @@ -75,7 +75,7 @@ public abstract class AbstractSoapFaultDefinitionExceptionResolver extends Abstr String faultStringOrReason = definition.getFaultStringOrReason(); if (!StringUtils.hasLength(faultStringOrReason)) { - faultStringOrReason = StringUtils.hasLength(ex.getMessage()) ? ex.getMessage() : ex.toString(); + faultStringOrReason = (StringUtils.hasLength(ex.getMessage())) ? ex.getMessage() : ex.toString(); } SoapBody soapBody = ((SoapMessage) messageContext.getResponse()).getSoapBody(); SoapFault fault; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java index c20416ce..9c86990e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolver.java @@ -64,7 +64,7 @@ public class SimpleSoapExceptionResolver extends AbstractEndpointExceptionResolv Assert.isInstanceOf(SoapMessage.class, messageContext.getResponse(), "SimpleSoapExceptionResolver requires a SoapMessage"); SoapMessage response = (SoapMessage) messageContext.getResponse(); - String faultString = StringUtils.hasLength(ex.getMessage()) ? ex.getMessage() : ex.toString(); + String faultString = (StringUtils.hasLength(ex.getMessage())) ? ex.getMessage() : ex.toString(); SoapBody body = response.getSoapBody(); SoapFault fault = body.addServerOrReceiverFault(faultString, getLocale()); customizeFault(messageContext, endpoint, ex, fault); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/package-info.java index e4facc72..0e791c25 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/package-info.java @@ -17,4 +17,4 @@ /** * Method argument resolvers for SOAP headers. */ -package org.springframework.ws.soap.server.endpoint.adapter.method; \ No newline at end of file +package org.springframework.ws.soap.server.endpoint.adapter.method; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java index 93d5b39f..675e7013 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptor.java @@ -66,7 +66,7 @@ public class PayloadRootSmartSoapEndpointInterceptor extends DelegatingSmartSoap return !StringUtils.hasLength(this.localPart) || this.localPart.equals(payloadRootName.getLocalPart()); } - catch (TransformerException e) { + catch (TransformerException ex) { return false; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java index 4254e2c1..f26206e7 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java @@ -111,7 +111,7 @@ public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotatio @Override protected String getLookupKeyForMethod(Method method) { SoapAction soapAction = AnnotationUtils.findAnnotation(method, SoapAction.class); - return soapAction != null ? soapAction.value() : null; + return (soapAction != null) ? soapAction.value() : null; } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/stream/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/stream/package-info.java index e5963afe..920844b3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/stream/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/stream/package-info.java @@ -17,4 +17,4 @@ /** * Streaming support. */ -package org.springframework.ws.stream; \ No newline at end of file +package org.springframework.ws.stream; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java index 24febb7f..90d50846 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/support/MarshallingUtils.java @@ -90,7 +90,7 @@ public abstract class MarshallingUtils { private final MimeMessage mimeMessage; - public MimeMessageContainer(MimeMessage mimeMessage) { + MimeMessageContainer(MimeMessage mimeMessage) { this.mimeMessage = mimeMessage; } @@ -112,7 +112,7 @@ public abstract class MarshallingUtils { @Override public DataHandler getAttachment(String contentId) { Attachment attachment = this.mimeMessage.getAttachment(contentId); - return attachment != null ? attachment.getDataHandler() : null; + return (attachment != null) ? attachment.getDataHandler() : null; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/support/WebUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/support/WebUtils.java index 29b395a2..7e919978 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/support/WebUtils.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/support/WebUtils.java @@ -61,7 +61,7 @@ public abstract class WebUtils { } int begin = urlPath.lastIndexOf('/', end) + 1; int paramIndex = urlPath.indexOf(';', begin); - end = (paramIndex != -1 && paramIndex < end ? paramIndex : end); + end = (paramIndex != -1 && paramIndex < end) ? paramIndex : end; return urlPath.substring(begin, end); } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareSenderWebServiceConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareSenderWebServiceConnection.java index 00e28dc3..74bc4c34 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareSenderWebServiceConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/HeadersAwareSenderWebServiceConnection.java @@ -20,6 +20,8 @@ import java.io.IOException; import java.util.Iterator; /** + * Specialization of {@link WebServiceConnection} that is able to manage headers. + * * @author Greg Turnquist * @since 2.3 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java index 0a563697..852146df 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/TransportInputStream.java @@ -64,7 +64,7 @@ public abstract class TransportInputStream extends InputStream { try { getInputStream().mark(readlimit); } - catch (IOException e) { + catch (IOException ex) { // ignored } } @@ -74,7 +74,7 @@ public abstract class TransportInputStream extends InputStream { try { return getInputStream().markSupported(); } - catch (IOException e) { + catch (IOException ex) { return false; } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java index 53d9e864..1c3d973a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java @@ -106,7 +106,7 @@ public abstract class AbstractHttpSenderConnection extends AbstractSenderConnect if (inputStream == null) { inputStream = getRawResponseInputStream(); } - return isGzipResponse() ? new GZIPInputStream(inputStream) : inputStream; + return (isGzipResponse()) ? new GZIPInputStream(inputStream) : inputStream; } /** Determine whether the response is a GZIP response. */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java index dec8f88c..b2e69edd 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/ClientHttpRequestConnection.java @@ -98,7 +98,7 @@ public class ClientHttpRequestConnection extends AbstractHttpSenderConnection { @Override public Iterator getResponseHeaders(String name) throws IOException { List headers = this.response.getHeaders().get(name); - return headers != null ? headers.iterator() : Collections.emptyIterator(); + return (headers != null) ? headers.iterator() : Collections.emptyIterator(); } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java index 40fbcd44..4d6674ae 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/CommonsHttpMessageSender.java @@ -201,7 +201,7 @@ public class CommonsHttpMessageSender extends AbstractHttpWebServiceMessageSende * By default, the {@link AuthScope#ANY} is returned. */ public AuthScope getAuthScope() { - return this.authScope != null ? this.authScope : AuthScope.ANY; + return (this.authScope != null) ? this.authScope : AuthScope.ANY; } /** diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpTransportConstants.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpTransportConstants.java index 2676c92f..6cef6541 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpTransportConstants.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpTransportConstants.java @@ -62,10 +62,10 @@ public interface HttpTransportConstants extends TransportConstants { /** The "https" URI scheme. */ String HTTPS_URI_SCHEME = "https"; - /** The "GET" HTTP method */ + /** The "GET" HTTP method. */ String METHOD_GET = "GET"; - /** The "POST" HTTP method */ + /** The "POST" HTTP method. */ String METHOD_POST = "POST"; } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java index bb506476..228d8077 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSender.java @@ -47,8 +47,8 @@ public class HttpUrlConnectionMessageSender extends AbstractHttpWebServiceMessag /** * Sets the timeout until a connection is established. * @param connectTimeout the timeout value - * @see URLConnection#setConnectTimeout(int) * @since 3.0.1 + * @see URLConnection#setConnectTimeout(int) */ public void setConnectionTimeout(Duration connectTimeout) { this.connectionTimeout = connectTimeout; @@ -57,8 +57,8 @@ public class HttpUrlConnectionMessageSender extends AbstractHttpWebServiceMessag /** * Set the socket read timeout. * @param readTimeout the timeout value - * @see URLConnection#setReadTimeout(int) * @since 3.0.1 + * @see URLConnection#setReadTimeout(int) */ public void setReadTimeout(Duration readTimeout) { this.readTimeout = readTimeout; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java index c22221b8..b66425c7 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java @@ -112,17 +112,13 @@ public class JdkHttpClientConnection extends AbstractHttpSenderConnection { @Override protected int getResponseCode() throws IOException { - return this.response != null ? this.response.statusCode() : 0; + return (this.response != null) ? this.response.statusCode() : 0; } @Override protected String getResponseMessage() throws IOException { - HttpStatus status = HttpStatus.resolve(getResponseCode()); - - return status != null // - ? status.getReasonPhrase() // - : ""; + return (status != null) ? status.getReasonPhrase() : ""; } @Override diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LastModifiedHelper.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LastModifiedHelper.java index 7ae287b3..6247ae68 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LastModifiedHelper.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LastModifiedHelper.java @@ -34,7 +34,7 @@ import org.springframework.xml.transform.TraxUtils; * @author Arjen Poutsma * @since 1.5.3 */ -class LastModifiedHelper { +final class LastModifiedHelper { private LastModifiedHelper() { } @@ -47,7 +47,7 @@ class LastModifiedHelper { static long getLastModified(Source source) { if (source instanceof DOMSource) { Document document = TraxUtils.getDocument((DOMSource) source); - return document != null ? getLastModified(document.getDocumentURI()) : -1; + return (document != null) ? getLastModified(document.getDocumentURI()) : -1; } else { return getLastModified(source.getSystemId()); @@ -65,7 +65,7 @@ class LastModifiedHelper { } } } - catch (URISyntaxException e) { + catch (URISyntaxException ex) { // ignore } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java index d8b7bb2e..221a214f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java @@ -93,9 +93,9 @@ public abstract class LocationTransformerObjectSupport extends TransformerObject String xForwardedHost = request.getHeader("X-Forwarded-Host"); String xForwardedPort = request.getHeader("X-Forwarded-Port"); - String scheme = StringUtils.hasText(xForwardedProto) ? xForwardedProto : request.getScheme(); - String serverName = StringUtils.hasText(xForwardedHost) ? xForwardedHost : request.getServerName(); - int serverPort = StringUtils.hasText(xForwardedPort) ? Integer.parseInt(xForwardedPort) + String scheme = (StringUtils.hasText(xForwardedProto)) ? xForwardedProto : request.getScheme(); + String serverName = (StringUtils.hasText(xForwardedHost)) ? xForwardedHost : request.getServerName(); + int serverPort = (StringUtils.hasText(xForwardedPort)) ? Integer.parseInt(xForwardedPort) : request.getServerPort(); StringBuilder url = new StringBuilder(scheme); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/package-info.java index 2894839a..f3b2a67b 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/support/package-info.java @@ -17,4 +17,4 @@ /** * Support classes for handling messages via HTTP. */ -package org.springframework.ws.transport.http.support; \ No newline at end of file +package org.springframework.ws.transport.http.support; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java index f57d84eb..0e675f4e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/EnumerationIterator.java @@ -22,6 +22,7 @@ import java.util.Iterator; /** * Adapts an {@link Enumeration} to follow the interface of {@link Iterator}. * + * @param the element type * @author Arjen Poutsma * @since 1.0.0 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java index 38f2c59d..24544bf3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/support/WebServiceMessageReceiverObjectSupport.java @@ -131,7 +131,7 @@ public abstract class WebServiceMessageReceiverObjectSupport implements Initiali try { this.logger.debug("Accepting incoming [" + connection + "] at [" + connection.getUri() + "]"); } - catch (URISyntaxException e) { + catch (URISyntaxException ex) { // ignore } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java index 2ea73ff9..af12e1d5 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/InliningXsdSchemaTypesProvider.java @@ -114,7 +114,7 @@ public class InliningXsdSchemaTypesProvider extends TransformerObjectSupport imp Document schemaDocument = (Document) result.getNode(); return schemaDocument.getDocumentElement(); } - catch (TransformerException e) { + catch (TransformerException ex) { throw new WsdlDefinitionException("Could not transform schema source to Document"); } } diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 4d199e80..08c4349f 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -6,4 +6,7 @@ + + + \ No newline at end of file From 37504f00f5819f83cca2517eae5dbd8fbe4b7ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 7 Mar 2025 14:35:25 +0100 Subject: [PATCH 08/10] Review checkstyle rules of spring-ws-security See gh-1479 --- .../security/WsSecurityFaultException.java | 6 ++-- .../security/support/SpringSecurityUtils.java | 2 +- .../ws/soap/security/wss4j2/Wss4jHandler.java | 7 ++-- .../wss4j2/Wss4jSecurityInterceptor.java | 36 +++++++++++++------ .../callback/KeyStoreCallbackHandler.java | 6 ++-- .../security/x509/cache/package-info.java | 2 +- .../ws/soap/security/x509/package-info.java | 2 +- .../security/x509/populator/package-info.java | 2 +- 8 files changed, 40 insertions(+), 23 deletions(-) diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java index eab05c1d..f735e4ad 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/WsSecurityFaultException.java @@ -27,11 +27,11 @@ import javax.xml.namespace.QName; @SuppressWarnings("serial") public abstract class WsSecurityFaultException extends WsSecurityException { - private QName faultCode; + private final QName faultCode; - private String faultString; + private final String faultString; - private String faultActor; + private final String faultActor; /** * Construct a new {@code WsSecurityFaultException} with the given fault code, string, diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java index 00d51cfe..1ddb14a0 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java @@ -23,7 +23,7 @@ import org.springframework.security.authentication.LockedException; import org.springframework.security.core.userdetails.UserDetails; /** - * Generic utility methods for Spring Security + * Generic utility methods for Spring Security. * * @author Tareq Abedrabbo * @since 1.5.8 diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java index e190c4ee..871f3cba 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java @@ -31,9 +31,9 @@ import org.w3c.dom.Document; import org.springframework.util.StringUtils; import org.springframework.ws.context.MessageContext; -import static org.springframework.ws.soap.security.wss4j2.Wss4jSecurityInterceptor.SECUREMENT_PASSWORD_PROPERTY_NAME; - /** + * {@link WSHandler} implementation. + * * @author Tareq Abed Rabbo * @author Arjen Poutsma * @author Jamin Hitchcock @@ -95,7 +95,8 @@ class Wss4jHandler extends WSHandler { @Override public String getPassword(Object msgContext) { - String contextPassword = (String) getProperty(msgContext, SECUREMENT_PASSWORD_PROPERTY_NAME); + String contextPassword = (String) getProperty(msgContext, + Wss4jSecurityInterceptor.SECUREMENT_PASSWORD_PROPERTY_NAME); if (StringUtils.hasLength(contextPassword)) { return contextPassword; } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java index bf40586c..b0f1648d 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java @@ -147,8 +147,14 @@ import org.springframework.ws.soap.security.wss4j2.callback.UsernameTokenPrincip */ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor implements InitializingBean { + /** + * Property name for securement user. + */ public static final String SECUREMENT_USER_PROPERTY_NAME = "Wss4jSecurityInterceptor.securementUser"; + /** + * Property name for securement password. + */ public static final String SECUREMENT_PASSWORD_PROPERTY_NAME = "Wss4jSecurityInterceptor.securementPassword"; private String securementActions; @@ -419,13 +425,15 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl /** * Sets the username for securement username token or/and the alias of the private key - * for securement signature + * for securement signature. */ public void setSecurementUsername(String securementUsername) { this.securementUsername = securementUsername; } - /** Sets the time to live on the outgoing message */ + /** + * Sets the time to live on the outgoing message. + */ public void setSecurementTimeToLive(int securementTimeToLive) { if (securementTimeToLive <= 0) { @@ -450,7 +458,9 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl this.samlCallbackHandler = samlCallbackHandler; } - /** Sets the server-side time to live */ + /** + * Sets the server-side time to live. + */ public void setValidationTimeToLive(int validationTimeToLive) { if (validationTimeToLive <= 0) { @@ -491,12 +501,16 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl this.validationCallbackHandler = new CallbackHandlerChain(callbackHandler); } - /** Sets the Crypto to use to decrypt incoming messages */ + /** + * Sets the Crypto to use to decrypt incoming messages. + */ public void setValidationDecryptionCrypto(Crypto decryptionCrypto) { this.validationDecryptionCrypto = decryptionCrypto; } - /** Sets the Crypto to use to verify the signature of incoming messages */ + /** + * Sets the Crypto to use to verify the signature of incoming messages. + */ public void setValidationSignatureCrypto(Crypto signatureCrypto) { this.validationSignatureCrypto = signatureCrypto; } @@ -511,13 +525,15 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl this.enableSignatureConfirmation = enableSignatureConfirmation; } - /** Sets if the generated timestamp header's precision is in milliseconds. */ + /** + * Sets if the generated timestamp header's precision is in milliseconds. + */ public void setTimestampPrecisionInMilliseconds(boolean timestampPrecisionInMilliseconds) { this.handler.setOption(WSHandlerConstants.TIMESTAMP_PRECISION, timestampPrecisionInMilliseconds); } /** - * Sets whether timestamp verification is done with the server-side time to live + * Sets whether timestamp verification is done with the server-side time to live. */ public void setTimestampStrict(boolean timestampStrict) { this.timestampStrict = timestampStrict; @@ -817,9 +833,9 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl @SuppressWarnings("unchecked") private void updateContextWithResults(MessageContext messageContext, List results) { - List handlerResults; - if ((handlerResults = (List) messageContext - .getProperty(WSHandlerConstants.RECV_RESULTS)) == null) { + List handlerResults = (List) messageContext + .getProperty(WSHandlerConstants.RECV_RESULTS); + if (handlerResults == null) { handlerResults = new ArrayList<>(); messageContext.setProperty(WSHandlerConstants.RECV_RESULTS, handlerResults); } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java index 84aa2687..6fd23e93 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java @@ -74,11 +74,11 @@ public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler i Key key; try { - key = this.keyStore.getKey(id, this.symmetricKeyPassword != null ? this.symmetricKeyPassword + key = this.keyStore.getKey(id, (this.symmetricKeyPassword != null) ? this.symmetricKeyPassword : this.privateKeyPassword.toCharArray()); } - catch (UnrecoverableKeyException | KeyStoreException | NoSuchAlgorithmException e) { - throw new IOException("Could not get key", e); + catch (UnrecoverableKeyException | KeyStoreException | NoSuchAlgorithmException ex) { + throw new IOException("Could not get key", ex); } callback.setKey(key.getEncoded()); diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/package-info.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/package-info.java index 4e4d897f..f7743d9a 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/package-info.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/cache/package-info.java @@ -17,4 +17,4 @@ /** * Caching support for X.509 client certificates. */ -package org.springframework.ws.soap.security.x509.cache; \ No newline at end of file +package org.springframework.ws.soap.security.x509.cache; diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/package-info.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/package-info.java index 4a9b17f0..c47e760f 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/package-info.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/package-info.java @@ -17,4 +17,4 @@ /** * X.509 client-certificate authentication support. */ -package org.springframework.ws.soap.security.x509; \ No newline at end of file +package org.springframework.ws.soap.security.x509; diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/package-info.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/package-info.java index 10633b03..1a7d85d3 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/package-info.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/populator/package-info.java @@ -17,4 +17,4 @@ /** * User details popular for X.509 client certificates. */ -package org.springframework.ws.soap.security.x509.populator; \ No newline at end of file +package org.springframework.ws.soap.security.x509.populator; From 19ae0073cee94459518330c66255c50af2aac295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 7 Mar 2025 14:46:55 +0100 Subject: [PATCH 09/10] Review checkstyle rules of spring-ws-support See gh-1479 --- .../http/HttpExchangeConnection.java | 2 +- .../http/WsdlDefinitionHttpHandler.java | 2 ++ .../ws/transport/jms/JmsSenderConnection.java | 2 +- .../transport/jms/JmsTransportConstants.java | 32 ++++++++++++++----- .../transport/jms/TextMessageInputStream.java | 2 +- .../transport/mail/MailMessageReceiver.java | 2 +- .../mail/MailReceiverConnection.java | 2 +- .../transport/mail/MailSenderConnection.java | 4 +-- .../monitor/AbstractMonitoringStrategy.java | 2 +- .../mail/support/MailTransportUtils.java | 2 +- ...bstractAsyncStandaloneMessageReceiver.java | 2 +- .../ws/transport/xmpp/MessageInputStream.java | 2 +- .../transport/xmpp/XmppMessageReceiver.java | 4 +-- .../xmpp/XmppReceiverConnection.java | 4 +-- .../transport/xmpp/XmppSenderConnection.java | 14 ++++---- .../support/XmppConnectionFactoryBean.java | 6 ++-- .../transport/xmpp/support/package-info.java | 2 +- src/checkstyle/checkstyle-suppressions.xml | 5 +-- 18 files changed, 55 insertions(+), 36 deletions(-) diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java index fd6ee565..5064cdaf 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpExchangeConnection.java @@ -109,7 +109,7 @@ public class HttpExchangeConnection extends AbstractReceiverConnection @Override public Iterator getRequestHeaders(String name) throws IOException { List headers = this.httpExchange.getRequestHeaders().get(name); - return headers != null ? headers.iterator() : Collections.emptyIterator(); + return (headers != null) ? headers.iterator() : Collections.emptyIterator(); } @Override diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java index 4ef85979..c093094a 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHttpHandler.java @@ -33,6 +33,8 @@ import org.springframework.ws.wsdl.WsdlDefinition; import org.springframework.xml.transform.TransformerObjectSupport; /** + * {@link HttpHandler} implementation for WSDL documents. + * * @author Arjen Poutsma * @since 1.5.0 */ diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java index 7a312f8a..258ab5a2 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsSenderConnection.java @@ -262,7 +262,7 @@ public class JmsSenderConnection extends AbstractSenderConnection { String messageSelector = "JMSCorrelationID = '" + messageId + "'"; messageConsumer = this.session.createConsumer(this.responseDestination, messageSelector); } - Message message = this.receiveTimeout >= 0 ? messageConsumer.receive(this.receiveTimeout) + Message message = (this.receiveTimeout >= 0) ? messageConsumer.receive(this.receiveTimeout) : messageConsumer.receive(); if (message instanceof BytesMessage || message instanceof TextMessage) { this.responseMessage = message; diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportConstants.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportConstants.java index 500a1eed..1c31cc63 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportConstants.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsTransportConstants.java @@ -29,28 +29,44 @@ import org.springframework.ws.transport.TransportConstants; */ public interface JmsTransportConstants extends TransportConstants { - /** The "jms" URI scheme" */ + /** + * The "jms" URI scheme". + */ String JMS_URI_SCHEME = "jms"; - /** Indicates a {@link BytesMessage} type. */ + /** + * Indicates a {@link BytesMessage} type. + */ int BYTES_MESSAGE_TYPE = 1; - /** Indicates a {@link TextMessage} type. */ + /** + * Indicates a {@link TextMessage} type. + */ int TEXT_MESSAGE_TYPE = 2; - /** Prefix for JMS properties that map to transport headers. */ + /** + * Prefix for JMS properties that map to transport headers. + */ String PROPERTY_PREFIX = "SOAPJMS_"; - /** JMS property used for storing {@link #HEADER_ACCEPT_ENCODING}. */ + /** + * JMS property used for storing {@link #HEADER_ACCEPT_ENCODING}. + */ String PROPERTY_ACCEPT_ENCODING = PROPERTY_PREFIX + "acceptEncoding"; - /** JMS property used for storing {@link #HEADER_SOAP_ACTION}. */ + /** + * JMS property used for storing {@link #HEADER_SOAP_ACTION}. + */ String PROPERTY_SOAP_ACTION = PROPERTY_PREFIX + "soapAction"; - /** JMS property used for storing {@link #HEADER_CONTENT_LENGTH}. */ + /** + * JMS property used for storing {@link #HEADER_CONTENT_LENGTH}. + */ String PROPERTY_CONTENT_LENGTH = PROPERTY_PREFIX + "contentLength"; - /** JMS property used for storing {@link #HEADER_CONTENT_TYPE}. */ + /** + * JMS property used for storing {@link #HEADER_CONTENT_TYPE}. + */ String PROPERTY_CONTENT_TYPE = PROPERTY_PREFIX + "contentType"; } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageInputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageInputStream.java index c5b61f0e..d161f53e 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageInputStream.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/TextMessageInputStream.java @@ -43,7 +43,7 @@ class TextMessageInputStream extends FilterInputStream { Assert.notNull(encoding, "'encoding' must not be null"); try { String text = message.getText(); - byte[] contents = text != null ? text.getBytes(encoding) : new byte[0]; + byte[] contents = (text != null) ? text.getBytes(encoding) : new byte[0]; return new ByteArrayInputStream(contents); } catch (JMSException ex) { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java index 8e2e3dc3..df65e92b 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java @@ -265,7 +265,7 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver private final Message message; - public MessageHandler(Message message) { + MessageHandler(Message message) { this.message = message; } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java index 6d6315d9..5c017320 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java @@ -235,7 +235,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { private String contentType; - public ByteArrayDataSource(String contentType, byte[] data) { + ByteArrayDataSource(String contentType, byte[] data) { this.data = data; this.contentType = contentType; } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java index 5844ba27..d2325e57 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java @@ -211,7 +211,7 @@ public class MailSenderConnection extends AbstractSenderConnection { try { Thread.sleep(this.receiveTimeout); } - catch (InterruptedException e) { + catch (InterruptedException ex) { // Re-interrupt current thread, to allow other threads to react. Thread.currentThread().interrupt(); } @@ -313,7 +313,7 @@ public class MailSenderConnection extends AbstractSenderConnection { private String contentType; - public ByteArrayDataSource(String contentType, byte[] data) { + ByteArrayDataSource(String contentType, byte[] data) { this.data = data; this.contentType = contentType; } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java index f4611d5d..12b178bf 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java @@ -132,7 +132,7 @@ public abstract class AbstractMonitoringStrategy implements MonitoringStrategy { } } } - return searchTerm != null ? folder.search(searchTerm) : folder.getMessages(); + return (searchTerm != null) ? folder.search(searchTerm) : folder.getMessages(); } /** diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java index 4497764f..60cc82e5 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java @@ -59,7 +59,7 @@ public abstract class MailTransportUtils { try { return new InternetAddress(group); } - catch (AddressException e) { + catch (AddressException ex) { // try next group } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java index db54e481..e7df2c2c 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java @@ -72,7 +72,7 @@ public abstract class AbstractAsyncStandaloneMessageReceiver extends AbstractSta * @see org.springframework.core.task.SimpleAsyncTaskExecutor#SimpleAsyncTaskExecutor(String) */ protected TaskExecutor createDefaultTaskExecutor() { - String threadNamePrefix = this.beanName != null ? this.beanName + "-" : this.DEFAULT_THREAD_NAME_PREFIX; + String threadNamePrefix = (this.beanName != null) ? this.beanName + "-" : this.DEFAULT_THREAD_NAME_PREFIX; return new SimpleAsyncTaskExecutor(threadNamePrefix); } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java index aa9fbb8e..1f46bec5 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/MessageInputStream.java @@ -42,7 +42,7 @@ class MessageInputStream extends FilterInputStream { Assert.notNull(message, "'message' must not be null"); Assert.notNull(encoding, "'encoding' must not be null"); String text = message.getBody(); - byte[] contents = text != null ? text.getBytes(encoding) : new byte[0]; + byte[] contents = (text != null) ? text.getBytes(encoding) : new byte[0]; return new ByteArrayInputStream(contents); } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java index 26fe593d..3b35ac7f 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java @@ -71,8 +71,8 @@ public class XmppMessageReceiver extends AbstractStandaloneMessageReceiver { try { this.connection.connect(); } - catch (InterruptedException e) { - throw new IOException(e); + catch (InterruptedException ex) { + throw new IOException(ex); } } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java index ece05b02..6139ebf2 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java @@ -145,8 +145,8 @@ public class XmppReceiverConnection extends AbstractReceiverConnection { try { this.connection.sendStanza(this.responseMessage); } - catch (SmackException.NotConnectedException | InterruptedException e) { - throw new IOException(e); + catch (SmackException.NotConnectedException | InterruptedException ex) { + throw new IOException(ex); } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java index c12ff781..f7bd8f24 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java @@ -70,8 +70,8 @@ public class XmppSenderConnection extends AbstractSenderConnection { try { this.requestMessage = new Message(JidCreate.from(to), Message.Type.chat); } - catch (XmppStringprepException e) { - throw new RuntimeException(e); + catch (XmppStringprepException ex) { + throw new RuntimeException(ex); } this.requestMessage.setThread(thread); } @@ -141,8 +141,8 @@ public class XmppSenderConnection extends AbstractSenderConnection { try { this.connection.sendStanza(this.requestMessage); } - catch (SmackException.NotConnectedException | InterruptedException e) { - throw new IOException(e); + catch (SmackException.NotConnectedException | InterruptedException ex) { + throw new IOException(ex); } } @@ -156,7 +156,7 @@ public class XmppSenderConnection extends AbstractSenderConnection { StanzaCollector collector = this.connection.createStanzaCollector(packetFilter); try { - Stanza packet = this.receiveTimeout >= 0 ? collector.nextResult(this.receiveTimeout) + Stanza packet = (this.receiveTimeout >= 0) ? collector.nextResult(this.receiveTimeout) : collector.nextResult(); if (packet instanceof Message) { this.responseMessage = (Message) packet; @@ -166,8 +166,8 @@ public class XmppSenderConnection extends AbstractSenderConnection { "Wrong packet type: [" + packet.getClass() + "]. Only Messages can be handled."); } } - catch (InterruptedException e) { - throw new IOException(e); + catch (InterruptedException ex) { + throw new IOException(ex); } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java index fd719b7f..bd774a20 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBean.java @@ -33,7 +33,7 @@ import org.springframework.util.StringUtils; /** * Factory to make {@link org.jivesoftware.smack.XMPPConnection} and perform connection - * and login on the XMPP server + * and login on the XMPP server. * * @author Gildas Cuisinier * @author Arjen Poutsma @@ -107,8 +107,8 @@ public class XmppConnectionFactoryBean implements FactoryBean this.connection.login(this.username, this.password); } } - catch (InterruptedException e) { - throw new IOException(e); + catch (InterruptedException ex) { + throw new IOException(ex); } } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/package-info.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/package-info.java index b02e2b9f..4bfed310 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/package-info.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/support/package-info.java @@ -17,4 +17,4 @@ /** * Support classes for handling messages via XMPP. */ -package org.springframework.ws.transport.xmpp.support; \ No newline at end of file +package org.springframework.ws.transport.xmpp.support; diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 08c4349f..60133e12 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -7,6 +7,7 @@ - - + + + \ No newline at end of file From 17c4dd41d858ec97ea2abd29509946f69867e736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 7 Mar 2025 14:55:59 +0100 Subject: [PATCH 10/10] Review checkstyle rules of spring-ws-test See gh-1479 --- .../test/client/RequestXPathExpectations.java | 2 +- .../test/client/SoapFaultResponseCreator.java | 7 ++--- .../ws/test/client/UriMatcher.java | 6 ++-- .../ws/test/client/package-info.java | 4 +-- .../ws/test/server/MockWebServiceClient.java | 11 ++++--- .../ws/test/server/ResponseMatchers.java | 5 ++-- .../server/ResponseXPathExpectations.java | 2 +- .../test/server/SoapFaultResponseMatcher.java | 14 ++++----- .../ws/test/server/package-info.java | 4 +-- .../ws/test/support/SourceAssertionError.java | 2 +- .../creator/PayloadMessageCreator.java | 5 ++-- .../creator/SoapEnvelopeMessageCreator.java | 9 +++--- .../ws/test/support/creator/package-info.java | 4 +-- .../matcher/AbstractSoapMessageMatcher.java | 5 ++-- .../ws/test/support/matcher/DiffMatcher.java | 6 ++-- .../support/matcher/PayloadDiffMatcher.java | 7 ++--- .../matcher/SchemaValidatingMatcher.java | 6 ++-- .../matcher/SoapEnvelopeDiffMatcher.java | 8 ++--- .../support/matcher/SoapHeaderMatcher.java | 9 +++--- .../matcher/XPathExpectationsHelper.java | 29 ++++++++++--------- .../ws/test/support/matcher/package-info.java | 4 +-- .../support/matcher/xmlunit2/DiffMatcher.java | 6 ++-- .../matcher/xmlunit2/PayloadDiffMatcher.java | 8 ++--- .../xmlunit2/SoapEnvelopeDiffMatcher.java | 8 ++--- .../matcher/xmlunit2/package-info.java | 2 +- .../ws/test/support/package-info.java | 4 +-- 26 files changed, 80 insertions(+), 97 deletions(-) diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java index bf196222..4ce8c070 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/RequestXPathExpectations.java @@ -48,7 +48,7 @@ public interface RequestXPathExpectations { * @param expectedValue the expected value * @return the request matcher */ - RequestMatcher evaluatesTo(final boolean expectedValue); + RequestMatcher evaluatesTo(boolean expectedValue); /** * Expects the XPath expression to evaluate to the given integer. diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java index 3c4ffb80..0dc0c976 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java @@ -22,8 +22,7 @@ import java.net.URI; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapMessage; - -import static org.springframework.ws.test.support.AssertionErrors.fail; +import org.springframework.ws.test.support.AssertionErrors; /** * Implementation of {@link ResponseCreator} that responds with a SOAP fault. @@ -36,12 +35,12 @@ abstract class SoapFaultResponseCreator extends AbstractResponseCreator { @Override protected void doWithResponse(URI uri, WebServiceMessage request, WebServiceMessage response) throws IOException { if (!(response instanceof SoapMessage soapResponse)) { - fail("Response is not a SOAP message"); + AssertionErrors.fail("Response is not a SOAP message"); return; } SoapBody responseBody = soapResponse.getSoapBody(); if (responseBody == null) { - fail("SOAP message [" + response + "] does not contain SOAP body"); + AssertionErrors.fail("SOAP message [" + response + "] does not contain SOAP body"); } addSoapFault(responseBody); } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java index fd5f6b3a..49116e70 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/UriMatcher.java @@ -19,8 +19,7 @@ package org.springframework.ws.test.client; import java.net.URI; import org.springframework.ws.WebServiceMessage; - -import static org.springframework.ws.test.support.AssertionErrors.assertEquals; +import org.springframework.ws.test.support.AssertionErrors; /** * Matches {@link URI}s. @@ -38,7 +37,8 @@ class UriMatcher implements RequestMatcher { @Override public void match(URI actual, WebServiceMessage request) { - assertEquals("Unexpected connection", this.expected, actual, "Payload", request.getPayloadSource()); + AssertionErrors.assertEquals("Unexpected connection", this.expected, actual, "Payload", + request.getPayloadSource()); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/package-info.java index a3eedc4a..2e9632c9 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/package-info.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/package-info.java @@ -1,11 +1,11 @@ /* - * Copyright 2005-2022 the original author or authors. + * Copyright 2005-2025 the original author 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 + * https://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, diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java index 3c7b61b6..baac4b3d 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java @@ -29,11 +29,10 @@ import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import org.springframework.ws.soap.server.SoapMessageDispatcher; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.ws.test.support.MockStrategiesHelper; import org.springframework.ws.transport.WebServiceMessageReceiver; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Main entry point for server-side Web service testing. Typically used * to test a {@link org.springframework.ws.server.MessageDispatcher MessageDispatcher} @@ -105,7 +104,7 @@ import static org.springframework.ws.test.support.AssertionErrors.fail; * @author Lukas Krecan * @since 2.0 */ -public class MockWebServiceClient { +public final class MockWebServiceClient { private static final Log logger = LogFactory.getLog(MockWebServiceClient.class); @@ -186,7 +185,7 @@ public class MockWebServiceClient { } catch (Exception ex) { logger.error("Could not send request", ex); - fail(ex.getMessage()); + AssertionErrors.fail(ex.getMessage()); return null; } } @@ -207,7 +206,7 @@ public class MockWebServiceClient { WebServiceMessage request = this.messageContext.getRequest(); WebServiceMessage response = this.messageContext.getResponse(); if (response == null) { - fail("No response received"); + AssertionErrors.fail("No response received"); return null; } try { @@ -216,7 +215,7 @@ public class MockWebServiceClient { } catch (IOException ex) { logger.error("Could not match request", ex); - fail(ex.getMessage()); + AssertionErrors.fail(ex.getMessage()); return null; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java index 57478cbe..b83d73f4 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java @@ -28,14 +28,13 @@ import org.springframework.util.Assert; import org.springframework.ws.FaultAwareWebServiceMessage; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.soap.SoapVersion; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.ws.test.support.matcher.SchemaValidatingMatcher; import org.springframework.ws.test.support.matcher.SoapHeaderMatcher; import org.springframework.ws.test.support.matcher.xmlunit2.PayloadDiffMatcher; import org.springframework.ws.test.support.matcher.xmlunit2.SoapEnvelopeDiffMatcher; import org.springframework.xml.transform.ResourceSource; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Factory methods for {@link ResponseMatcher} classes. Typically used to provide input * for {@link ResponseActions#andExpect(ResponseMatcher)}. @@ -139,7 +138,7 @@ public abstract class ResponseMatchers { throws IOException, AssertionError { if (response instanceof FaultAwareWebServiceMessage faultMessage) { if (faultMessage.hasFault()) { - fail("Response has a SOAP Fault: \"" + faultMessage.getFaultReason() + "\""); + AssertionErrors.fail("Response has a SOAP Fault: \"" + faultMessage.getFaultReason() + "\""); } } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java index 4628d1a7..4e20f11b 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/ResponseXPathExpectations.java @@ -50,7 +50,7 @@ public interface ResponseXPathExpectations { * @param expectedValue the expected value * @return the request matcher */ - ResponseMatcher evaluatesTo(final boolean expectedValue); + ResponseMatcher evaluatesTo(boolean expectedValue); /** * Expects the XPath expression to evaluate to the given integer. diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java index f45be742..b57a441f 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/SoapFaultResponseMatcher.java @@ -25,9 +25,7 @@ import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapFault; import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.SoapVersion; - -import static org.springframework.ws.test.support.AssertionErrors.assertEquals; -import static org.springframework.ws.test.support.AssertionErrors.assertTrue; +import org.springframework.ws.test.support.AssertionErrors; /** * Abstract Implementation of {@link ResponseMatcher} that checks for a SOAP fault. @@ -45,16 +43,16 @@ abstract class SoapFaultResponseMatcher implements ResponseMatcher { @Override public void match(WebServiceMessage request, WebServiceMessage response) throws IOException, AssertionError { - assertTrue("Response is not a SOAP message", response instanceof SoapMessage); + AssertionErrors.assertTrue("Response is not a SOAP message", response instanceof SoapMessage); SoapMessage soapResponse = (SoapMessage) response; SoapBody responseBody = soapResponse.getSoapBody(); - assertTrue("Response has no SOAP Body", responseBody != null); - assertTrue("Response has no SOAP Fault", responseBody.hasFault()); + AssertionErrors.assertTrue("Response has no SOAP Body", responseBody != null); + AssertionErrors.assertTrue("Response has no SOAP Fault", responseBody.hasFault()); SoapFault soapFault = responseBody.getFault(); QName expectedFaultCode = getExpectedFaultCode(soapResponse.getVersion()); - assertEquals("Invalid SOAP Fault code", expectedFaultCode, soapFault.getFaultCode()); + AssertionErrors.assertEquals("Invalid SOAP Fault code", expectedFaultCode, soapFault.getFaultCode()); if (this.expectedFaultStringOrReason != null) { - assertEquals("Invalid SOAP Fault string/reason", this.expectedFaultStringOrReason, + AssertionErrors.assertEquals("Invalid SOAP Fault string/reason", this.expectedFaultStringOrReason, soapFault.getFaultStringOrReason()); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/package-info.java index d0b38c0f..8b068324 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/package-info.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/package-info.java @@ -1,11 +1,11 @@ /* - * Copyright 2005-2022 the original author or authors. + * Copyright 2005-2025 the original author 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 + * https://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, diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java index 9e798e74..6c287789 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/SourceAssertionError.java @@ -68,7 +68,7 @@ public class SourceAssertionError extends AssertionError { if (sourceString != null) { String newLine = System.lineSeparator(); builder.append(newLine); - String label = this.sourceLabel != null ? this.sourceLabel : "Source"; + String label = (this.sourceLabel != null) ? this.sourceLabel : "Source"; builder.append(label); builder.append(": "); builder.append(sourceString); diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java index 21cc5066..d19795fb 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java @@ -23,10 +23,9 @@ import javax.xml.transform.TransformerException; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.xml.transform.TransformerHelper; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Implementation of {@link WebServiceMessageCreator} that creates a request based on a * {@link Source}. @@ -56,7 +55,7 @@ public class PayloadMessageCreator extends AbstractMessageCreator { this.transformerHelper.transform(this.payload, message.getPayloadResult()); } catch (TransformerException ex) { - fail("Could not transform request payload to message: " + ex.getMessage()); + AssertionErrors.fail("Could not transform request payload to message: " + ex.getMessage()); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java index 36b76a94..a1a2adb5 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/SoapEnvelopeMessageCreator.java @@ -27,11 +27,9 @@ import org.w3c.dom.Document; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.soap.SoapMessage; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.xml.transform.TransformerHelper; -import static org.springframework.ws.test.support.AssertionErrors.assertTrue; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Implementation of {@link WebServiceMessageCreator} that creates a request based on a * SOAP envelope {@link Source}. @@ -57,7 +55,8 @@ public class SoapEnvelopeMessageCreator extends AbstractMessageCreator { @Override protected void doWithMessage(WebServiceMessage message) throws IOException { - assertTrue("Message created with factory is not a SOAP message", message instanceof SoapMessage); + AssertionErrors.assertTrue("Message created with factory is not a SOAP message", + message instanceof SoapMessage); SoapMessage soapMessage = (SoapMessage) message; try { DOMResult result = new DOMResult(); @@ -65,7 +64,7 @@ public class SoapEnvelopeMessageCreator extends AbstractMessageCreator { soapMessage.setDocument((Document) result.getNode()); } catch (TransformerException ex) { - fail("Could not transform request SOAP envelope to message: " + ex.getMessage()); + AssertionErrors.fail("Could not transform request SOAP envelope to message: " + ex.getMessage()); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/package-info.java index ebc12066..c61ce908 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/package-info.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/package-info.java @@ -1,11 +1,11 @@ /* - * Copyright 2005-2022 the original author or authors. + * Copyright 2005-2025 the original author 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 + * https://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, diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java index 412313f2..806cd4d2 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/AbstractSoapMessageMatcher.java @@ -20,8 +20,7 @@ import java.io.IOException; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.soap.SoapMessage; - -import static org.springframework.ws.test.support.AssertionErrors.assertTrue; +import org.springframework.ws.test.support.AssertionErrors; /** * Abstract base class for SOAP-specific {@link WebServiceMessageMatcher} implementations. @@ -36,7 +35,7 @@ public abstract class AbstractSoapMessageMatcher implements WebServiceMessageMat @Override public final void match(WebServiceMessage message) throws IOException, AssertionError { - assertTrue("Message is not a SOAP message", message instanceof SoapMessage); + AssertionErrors.assertTrue("Message is not a SOAP message", message instanceof SoapMessage); match((SoapMessage) message); } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java index b7c36e63..dc7d229e 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java @@ -19,8 +19,7 @@ package org.springframework.ws.test.support.matcher; import org.custommonkey.xmlunit.Diff; import org.springframework.ws.WebServiceMessage; - -import static org.springframework.ws.test.support.AssertionErrors.assertTrue; +import org.springframework.ws.test.support.AssertionErrors; /** * Implementation of {@link WebServiceMessageMatcher} based on XMLUnit's {@link Diff}. @@ -37,7 +36,8 @@ public abstract class DiffMatcher implements WebServiceMessageMatcher { public final void match(WebServiceMessage message) throws AssertionError { Diff diff = createDiff(message); - assertTrue("Messages are different, " + diff.toString(), diff.similar(), "Payload", message.getPayloadSource()); + AssertionErrors.assertTrue("Messages are different, " + diff.toString(), diff.similar(), "Payload", + message.getPayloadSource()); } /** diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java index a04e6382..f5041686 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java @@ -25,10 +25,9 @@ import org.w3c.dom.Document; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.xml.transform.TransformerHelper; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Matches {@link Source} payloads. * @@ -54,7 +53,7 @@ public class PayloadDiffMatcher extends DiffMatcher { protected final Diff createDiff(WebServiceMessage message) { Source payload = message.getPayloadSource(); if (payload == null) { - fail("Request message does not contain payload"); + AssertionErrors.fail("Request message does not contain payload"); } return createDiff(payload); } @@ -72,7 +71,7 @@ public class PayloadDiffMatcher extends DiffMatcher { return (Document) result.getNode(); } catch (TransformerException ex) { - fail("Could not transform source to DOMResult" + ex.getMessage()); + AssertionErrors.fail("Could not transform source to DOMResult" + ex.getMessage()); return null; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java index 5080cf28..0e849f58 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcher.java @@ -25,11 +25,10 @@ import org.springframework.core.io.Resource; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.ws.WebServiceMessage; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.xml.validation.XmlValidator; import org.springframework.xml.validation.XmlValidatorFactory; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Uses the {@link XmlValidator} to validate request payload. * @@ -60,7 +59,8 @@ public class SchemaValidatingMatcher implements WebServiceMessageMatcher { public void match(WebServiceMessage message) throws IOException, AssertionError { SAXParseException[] exceptions = this.xmlValidator.validate(message.getPayloadSource()); if (!ObjectUtils.isEmpty(exceptions)) { - fail("XML is not valid: " + Arrays.toString(exceptions), "Payload", message.getPayloadSource()); + AssertionErrors.fail("XML is not valid: " + Arrays.toString(exceptions), "Payload", + message.getPayloadSource()); } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java index af4417a8..9d4c6349 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java @@ -28,11 +28,9 @@ import org.w3c.dom.Document; import org.springframework.util.Assert; import org.springframework.ws.soap.SoapMessage; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.xml.transform.TransformerHelper; -import static org.springframework.ws.test.support.AssertionErrors.assertTrue; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Matches {@link Source} SOAP envelopes. * @@ -64,7 +62,7 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { Document actualDocument = soapMessage.getDocument(); Document expectedDocument = createDocumentFromSource(this.expected); Diff diff = new Diff(expectedDocument, actualDocument); - assertTrue("Envelopes are different, " + diff, diff.similar()); + AssertionErrors.assertTrue("Envelopes are different, " + diff, diff.similar()); } private Document createDocumentFromSource(Source source) { @@ -75,7 +73,7 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { return (Document) result.getNode(); } catch (TransformerException ex) { - fail("Could not transform source to DOMResult" + ex.getMessage()); + AssertionErrors.fail("Could not transform source to DOMResult" + ex.getMessage()); return null; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java index 970ea699..87b1152b 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcher.java @@ -25,8 +25,7 @@ import org.springframework.util.Assert; import org.springframework.ws.soap.SoapHeader; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; - -import static org.springframework.ws.test.support.AssertionErrors.assertTrue; +import org.springframework.ws.test.support.AssertionErrors; /** * Matches SOAP headers. @@ -51,8 +50,8 @@ public class SoapHeaderMatcher extends AbstractSoapMessageMatcher { @Override protected void match(SoapMessage soapMessage) throws IOException, AssertionError { SoapHeader soapHeader = soapMessage.getSoapHeader(); - assertTrue("SOAP message [" + soapMessage + "] does not contain SOAP header", soapHeader != null, "Envelope", - soapMessage.getEnvelope().getSource()); + AssertionErrors.assertTrue("SOAP message [" + soapMessage + "] does not contain SOAP header", + soapHeader != null, "Envelope", soapMessage.getEnvelope().getSource()); Iterator soapHeaderElementIterator = soapHeader.examineAllHeaderElements(); boolean found = false; @@ -63,7 +62,7 @@ public class SoapHeaderMatcher extends AbstractSoapMessageMatcher { break; } } - assertTrue("SOAP header [" + this.soapHeaderName + "] not found", found, "Envelope", + AssertionErrors.assertTrue("SOAP header [" + this.soapHeaderName + "] not found", found, "Envelope", soapMessage.getEnvelope().getSource()); } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java index 74bf1337..3ffbc9ad 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelper.java @@ -26,13 +26,11 @@ import org.w3c.dom.Node; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.xml.transform.TransformerHelper; import org.springframework.xml.xpath.XPathExpression; import org.springframework.xml.xpath.XPathExpressionFactory; -import static org.springframework.ws.test.support.AssertionErrors.assertEquals; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Helper class for dealing with XPath expectations. * @@ -75,8 +73,8 @@ public class XPathExpectationsHelper { Node payload = transformToNode(message); Node result = XPathExpectationsHelper.this.expression.evaluateAsNode(payload); if (result == null) { - fail("No match for \"" + XPathExpectationsHelper.this.expressionString + "\" found", "Payload", - message.getPayloadSource()); + AssertionErrors.fail("No match for \"" + XPathExpectationsHelper.this.expressionString + "\" found", + "Payload", message.getPayloadSource()); } } }; @@ -88,8 +86,8 @@ public class XPathExpectationsHelper { Node payload = transformToNode(message); Node result = XPathExpectationsHelper.this.expression.evaluateAsNode(payload); if (result != null) { - fail("Match for \"" + XPathExpectationsHelper.this.expressionString + "\" found", "Payload", - message.getPayloadSource()); + AssertionErrors.fail("Match for \"" + XPathExpectationsHelper.this.expressionString + "\" found", + "Payload", message.getPayloadSource()); } } }; @@ -100,8 +98,9 @@ public class XPathExpectationsHelper { public void match(WebServiceMessage message) throws IOException, AssertionError { Node payload = transformToNode(message); boolean result = XPathExpectationsHelper.this.expression.evaluateAsBoolean(payload); - assertEquals("Evaluation of XPath expression \"" + XPathExpectationsHelper.this.expressionString - + "\" failed.", expectedValue, result, "Payload", message.getPayloadSource()); + AssertionErrors.assertEquals("Evaluation of XPath expression \"" + + XPathExpectationsHelper.this.expressionString + "\" failed.", expectedValue, result, + "Payload", message.getPayloadSource()); } }; @@ -116,8 +115,9 @@ public class XPathExpectationsHelper { public void match(WebServiceMessage message) throws IOException, AssertionError { Node payload = transformToNode(message); double result = XPathExpectationsHelper.this.expression.evaluateAsNumber(payload); - assertEquals("Evaluation of XPath expression \"" + XPathExpectationsHelper.this.expressionString - + "\" failed.", expectedValue, result, "Payload", message.getPayloadSource()); + AssertionErrors.assertEquals("Evaluation of XPath expression \"" + + XPathExpectationsHelper.this.expressionString + "\" failed.", expectedValue, result, + "Payload", message.getPayloadSource()); } }; @@ -129,8 +129,9 @@ public class XPathExpectationsHelper { public void match(WebServiceMessage message) throws IOException, AssertionError { Node payload = transformToNode(message); String result = XPathExpectationsHelper.this.expression.evaluateAsString(payload); - assertEquals("Evaluation of XPath expression \"" + XPathExpectationsHelper.this.expressionString - + "\" failed.", expectedValue, result, "Payload", message.getPayloadSource()); + AssertionErrors.assertEquals("Evaluation of XPath expression \"" + + XPathExpectationsHelper.this.expressionString + "\" failed.", expectedValue, result, + "Payload", message.getPayloadSource()); } }; } @@ -142,7 +143,7 @@ public class XPathExpectationsHelper { return domResult.getNode(); } catch (TransformerException ex) { - fail("Could not transform request payload: " + ex.getMessage()); + AssertionErrors.fail("Could not transform request payload: " + ex.getMessage()); return null; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java index 29deada1..4183720b 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/package-info.java @@ -1,11 +1,11 @@ /* - * Copyright 2005-2022 the original author or authors. + * Copyright 2005-2025 the original author 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 + * https://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, diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java index c769e62f..9b25e703 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java @@ -19,10 +19,9 @@ package org.springframework.ws.test.support.matcher.xmlunit2; import org.xmlunit.diff.Diff; import org.springframework.ws.WebServiceMessage; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.ws.test.support.matcher.WebServiceMessageMatcher; -import static org.springframework.ws.test.support.AssertionErrors.assertTrue; - /** * Implementation of {@link WebServiceMessageMatcher} based on XMLUnit's {@link Diff}. * @@ -33,9 +32,8 @@ public abstract class DiffMatcher implements WebServiceMessageMatcher { @Override public final void match(WebServiceMessage message) throws AssertionError { - Diff diff = createDiff(message); - assertTrue("Messages are different, " + diff.toString(), !diff.hasDifferences(), "Payload", + AssertionErrors.assertTrue("Messages are different, " + diff.toString(), !diff.hasDifferences(), "Payload", message.getPayloadSource()); } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java index fad47cba..84e480b6 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java @@ -28,10 +28,9 @@ import org.xmlunit.placeholder.PlaceholderDifferenceEvaluator; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.xml.transform.TransformerHelper; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Matches {@link Source} payloads. * @@ -57,7 +56,7 @@ public class PayloadDiffMatcher extends DiffMatcher { Source payload = message.getPayloadSource(); if (payload == null) { - fail("Request message does not contain payload"); + AssertionErrors.fail("Request message does not contain payload"); } return createDiff(payload); @@ -86,8 +85,7 @@ public class PayloadDiffMatcher extends DiffMatcher { return (Document) result.getNode(); } catch (TransformerException ex) { - - fail("Could not transform source to DOMResult" + ex.getMessage()); + AssertionErrors.fail("Could not transform source to DOMResult" + ex.getMessage()); return null; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java index 35d38a36..b13fae1b 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcher.java @@ -30,12 +30,10 @@ import org.xmlunit.placeholder.PlaceholderDifferenceEvaluator; import org.springframework.util.Assert; import org.springframework.ws.soap.SoapMessage; +import org.springframework.ws.test.support.AssertionErrors; import org.springframework.ws.test.support.matcher.AbstractSoapMessageMatcher; import org.springframework.xml.transform.TransformerHelper; -import static org.springframework.ws.test.support.AssertionErrors.assertTrue; -import static org.springframework.ws.test.support.AssertionErrors.fail; - /** * Matches {@link Source} SOAP envelopes. * @@ -66,7 +64,7 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { DifferenceEvaluators.chain(new PlaceholderDifferenceEvaluator(), DifferenceEvaluators.Default)) .checkForSimilar() .build(); - assertTrue("Envelopes are different, " + diff.toString(), !diff.hasDifferences()); + AssertionErrors.assertTrue("Envelopes are different, " + diff.toString(), !diff.hasDifferences()); } private Document createDocumentFromSource(Source source) { @@ -77,7 +75,7 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { return (Document) result.getNode(); } catch (TransformerException ex) { - fail("Could not transform source to DOMResult" + ex.getMessage()); + AssertionErrors.fail("Could not transform source to DOMResult" + ex.getMessage()); return null; } } diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/package-info.java index ad048ba2..baaf0fa9 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/package-info.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/package-info.java @@ -17,4 +17,4 @@ /** * Matcher support for XMLUnit. */ -package org.springframework.ws.test.support.matcher.xmlunit2; \ No newline at end of file +package org.springframework.ws.test.support.matcher.xmlunit2; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/package-info.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/package-info.java index 45e988ba..73000dcf 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/package-info.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/package-info.java @@ -1,11 +1,11 @@ /* - * Copyright 2005-2022 the original author or authors. + * Copyright 2005-2025 the original author 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 + * https://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,