From 3a60f3638eca7f09227d988bc8faa467670c2476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 27 Feb 2025 14:26:51 +0100 Subject: [PATCH] Polish --- .../ws/client/core/WebServiceTemplate.java | 17 +++---- .../Wsdl11DestinationProvider.java | 2 +- .../AnnotationDrivenBeanDefinitionParser.java | 4 +- .../DynamicWsdlBeanDefinitionParser.java | 2 +- .../annotation/WsConfigurationSupport.java | 8 ++-- .../annotation/WsConfigurerComposite.java | 2 +- .../ws/context/AbstractMessageContext.java | 2 +- .../ws/mime/AbstractMimeMessage.java | 3 +- .../ws/pox/dom/DomPoxMessage.java | 3 +- .../endpoint/AbstractLoggingInterceptor.java | 2 +- .../endpoint/AbstractXomPayloadEndpoint.java | 46 ++++++------------- .../ws/server/endpoint/MethodEndpoint.java | 3 +- .../adapter/DefaultMethodEndpointAdapter.java | 4 +- ...nericMarshallingMethodEndpointAdapter.java | 3 +- .../MarshallingMethodEndpointAdapter.java | 2 +- .../MarshallingPayloadMethodProcessor.java | 3 +- .../method/dom/DomPayloadMethodProcessor.java | 3 +- .../AbstractJaxb2PayloadMethodProcessor.java | 7 ++- .../mapping/AbstractEndpointMapping.java | 10 ++-- .../AbstractMapBasedEndpointMapping.java | 7 ++- .../AbstractMethodEndpointMapping.java | 8 ++-- ...adRootAnnotationMethodEndpointMapping.java | 2 +- .../addressing/core/EndpointReference.java | 2 + .../core/MessageAddressingProperties.java | 2 + .../messageid/UuidMessageIdStrategy.java | 2 +- .../server/AbstractActionEndpointMapping.java | 9 ++-- .../AbstractAddressingEndpointMapping.java | 10 ++-- .../server/SimpleActionEndpointMapping.java | 2 +- .../version/AbstractAddressingVersion.java | 9 ++-- .../ws/soap/saaj/SaajSoap11Header.java | 2 +- .../ws/soap/saaj/SaajSoap12Header.java | 20 ++++---- .../ws/soap/saaj/SaajSoapMessage.java | 3 +- .../ws/soap/saaj/SaajSoapMessageFactory.java | 3 +- .../soap/saaj/support/SaajContentHandler.java | 6 +-- .../ws/soap/saaj/support/SaajXmlReader.java | 3 +- .../ws/soap/server/SoapMessageDispatcher.java | 8 ++-- ...gValidatingMarshallingPayloadEndpoint.java | 3 +- ...tSoapFaultDefinitionExceptionResolver.java | 6 +-- .../SoapFaultMappingExceptionResolver.java | 2 +- ...apHeaderElementMethodArgumentResolver.java | 5 +- .../server/endpoint/annotation/FaultCode.java | 2 +- ...actFaultCreatingValidatingInterceptor.java | 3 +- .../SoapEnvelopeLoggingInterceptor.java | 3 +- ...ActionAnnotationMethodEndpointMapping.java | 5 +- .../mapping/SoapActionEndpointMapping.java | 3 +- .../ws/support/DefaultStrategiesHelper.java | 9 ++-- .../ws/support/MarshallingUtils.java | 6 +-- .../ws/transport/TransportInputStream.java | 4 +- .../ws/transport/TransportOutputStream.java | 4 +- .../http/AbstractHttpSenderConnection.java | 13 ++---- .../http/HttpComponentsMessageSender.java | 3 +- .../transport/http/HttpServletConnection.java | 4 +- .../ws/transport/http/HttpUrlConnection.java | 2 +- .../http/HttpUrlConnectionMessageSender.java | 3 +- .../LocationTransformerObjectSupport.java | 3 +- .../http/WsdlDefinitionHandlerAdapter.java | 2 +- .../http/XsdSchemaHandlerAdapter.java | 2 +- ...ebServiceMessageReceiverObjectSupport.java | 6 +-- .../provider/DefaultMessagesProvider.java | 3 +- .../AbstractWebServiceMessageFactoryTest.java | 2 +- .../ws/MockWebServiceMessage.java | 2 +- ...ap12WebServiceTemplateIntegrationTest.java | 2 +- ...mPoxWebServiceTemplateIntegrationTest.java | 2 +- .../core/SimpleFaultMessageResolverTest.java | 2 +- .../client/core/WebServiceTemplateTest.java | 12 ++--- .../Wsdl11DestinationProviderTest.java | 2 +- .../PayloadValidatingInterceptorTest.java | 2 +- ...otationDrivenBeanDefinitionParserTest.java | 2 +- .../InterceptorsBeanDefinitionParserTest.java | 4 +- .../WebServicesNamespaceHandlerTigerTest.java | 2 +- .../config/WsdlBeanDefinitionParserTest.java | 2 +- .../DefaultWsConfigurationTest.java | 2 +- .../WsConfigurationSupportTest.java | 2 +- .../annotation/WsConfigurerAdapterTest.java | 7 ++- .../ws/context/DefaultMessageContextTest.java | 2 +- .../ws/pox/dom/DomPoxMessageFactoryTest.java | 2 +- .../ws/server/MessageDispatcherTest.java | 4 +- .../endpoint/Dom4jPayloadEndpointTest.java | 6 +-- .../endpoint/DomPayloadEndpointTest.java | 6 +-- .../EndpointExceptionResolverTest.java | 2 +- .../endpoint/JDomPayloadEndpointTest.java | 6 +-- .../MarshallingPayloadEndpointTest.java | 12 ++--- .../server/endpoint/MethodEndpointTest.java | 1 - .../endpoint/XomPayloadEndpointTest.java | 2 +- .../MarshallingMethodEndpointAdapterTest.java | 17 ++++--- .../adapter/MessageEndpointAdapterTest.java | 2 +- .../MessageMethodEndpointAdapterTest.java | 14 +++--- .../adapter/PayloadEndpointAdapterTest.java | 2 +- .../PayloadMethodEndpointAdapterTest.java | 21 ++++----- ...amAnnotationMethodEndpointAdapterTest.java | 28 ++++++----- .../SourcePayloadMethodProcessorTest.java | 2 +- .../endpoint/mapping/EndpointMappingTest.java | 16 +++---- .../MapBasedSoapEndpointMappingTest.java | 2 +- ...otAnnotationMethodEndpointMappingTest.java | 4 +- .../PayloadRootQNameEndpointMappingTest.java | 2 +- .../mapping/UriEndpointMappingTest.java | 2 +- .../XPathPayloadEndpointMappingTest.java | 2 +- .../XmlRootElementEndpointMappingTest.java | 2 +- .../ws/soap/AbstractSoapMessageTest.java | 6 +-- .../addressing/AbstractWsAddressingTest.java | 8 +--- .../AddressingInterceptor200408Test.java | 2 +- ...tationActionMethodEndpointMappingTest.java | 8 +--- .../server/SoapMessageDispatcherTest.java | 2 +- ...idatingMarshallingPayloadEndpointTest.java | 6 +-- .../SimpleSoapExceptionResolverTest.java | 2 +- ...pFaultAnnotationExceptionResolverTest.java | 18 ++++---- .../SoapFaultDefinitionEditorTest.java | 2 +- ...SoapFaultMappingExceptionResolverTest.java | 2 +- ...aderElementMethodArgumentResolverTest.java | 2 +- .../PayloadValidatingInterceptorTest.java | 6 +-- .../DelegatingSoapEndpointMappingTest.java | 2 +- ...onAnnotationMethodEndpointMappingTest.java | 4 +- .../AbstractSoap11MessageFactoryTest.java | 14 +++--- .../AbstractSoap12MessageFactoryTest.java | 8 ++-- .../transport/MockTransportInputStream.java | 2 +- .../transport/MockTransportOutputStream.java | 2 +- ...ebServiceMessageSenderIntegrationTest.java | 2 +- .../http/MessageDispatcherServletTest.java | 2 +- ...viceMessageReceiverHandlerAdapterTest.java | 17 ++++--- ...rviceMessageReceiverObjectSupportTest.java | 8 ++-- .../provider/DefaultMessagesProviderTest.java | 1 + .../wsdl11/provider/Soap11ProviderTest.java | 1 + .../wsdl11/provider/Soap12ProviderTest.java | 1 + .../wsdl11/provider/SoapProviderTest.java | 1 + .../SuffixBasedMessagesProviderTest.java | 1 + .../SuffixBasedPortTypesProviderTest.java | 1 + .../security/callback/CleanupCallback.java | 2 + .../wss4j2/Wss4jSecurityInterceptor.java | 7 ++- .../AbstractWsPasswordCallbackHandler.java | 3 +- ...mplePasswordValidationCallbackHandler.java | 2 +- ...rityPasswordValidationCallbackHandler.java | 2 +- .../UsernameTokenPrincipalCallback.java | 2 + .../wss4j2/support/CryptoFactoryBean.java | 3 +- .../x509/X509AuthenticationToken.java | 2 + .../x509/cache/EhCacheBasedX509UserCache.java | 2 +- .../callback/CallbackHandlerChainTest.java | 2 +- .../SaajWss4jMessageInterceptorSignTest.java | 8 ++-- .../Wss4jMessageInterceptorSamlTest.java | 5 +- .../Wss4jMessageInterceptorTimestampTest.java | 4 +- ...4jMessageInterceptorUsernameTokenTest.java | 2 +- .../ws/soap/security/wss4j2/Wss4jTest.java | 2 +- .../http/HttpsUrlConnectionMessageSender.java | 3 +- .../http/WsdlDefinitionHttpHandler.java | 5 +- .../jms/BytesMessageInputStream.java | 4 +- .../jms/BytesMessageOutputStream.java | 4 +- .../jms/support/JmsTransportUtils.java | 5 +- .../mail/MailReceiverConnection.java | 4 +- .../transport/mail/MailSenderConnection.java | 4 +- .../mail/support/MailTransportUtils.java | 2 +- .../transport/xmpp/XmppMessageReceiver.java | 3 +- ...ServiceMessageListenerIntegrationTest.java | 12 +++-- .../client/MockWebServiceMessageSender.java | 2 +- .../test/client/SoapFaultResponseCreator.java | 3 +- .../ws/test/server/ResponseMatchers.java | 3 +- .../ws/test/support/MockStrategiesHelper.java | 6 +-- .../ws/test/support/SourceAssertionError.java | 2 +- .../matcher/SoapEnvelopeDiffMatcher.java | 2 +- .../xml/dom/DomContentHandler.java | 6 +-- .../xml/transform/TraxUtils.java | 12 ++--- .../validation/Jaxp13ValidatorFactory.java | 4 +- .../validation/Jaxp15ValidatorFactory.java | 4 +- .../xpath/JaxenXPathExpressionFactory.java | 2 +- .../xml/xpath/JaxenXPathTemplate.java | 2 +- .../xpath/Jaxp13XPathExpressionFactory.java | 4 +- .../xml/xpath/Jaxp13XPathTemplate.java | 4 +- .../xml/xpath/XPathExpressionFactory.java | 11 ++--- .../xml/xsd/commons/CommonsXsdSchema.java | 4 +- .../commons/CommonsXsdSchemaCollection.java | 9 ++-- .../xml/namespace/QNameEditorTest.java | 2 +- .../xml/transform/TransformerHelperTest.java | 2 +- .../AbstractValidatorFactoryTest.java | 8 ++-- .../xml/validation/SchemaLoaderUtilsTest.java | 4 +- .../AbstractXPathExpressionFactoryTest.java | 32 ++++++------- .../xml/xpath/AbstractXPathTemplateTest.java | 4 +- .../JaxenXPathExpressionFactoryTest.java | 4 +- .../xml/xpath/JaxenXPathTemplateTest.java | 2 +- .../xpath/XPathExpressionFactoryBeanTest.java | 2 +- .../CommonsXsdSchemaCollectionTest.java | 2 +- 178 files changed, 404 insertions(+), 489 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 5fd1da0f..c750c4f3 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 @@ -389,7 +389,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService private void initMessageSenders(DefaultStrategiesHelper helper) { List messageSenders = helper.getDefaultStrategies(WebServiceMessageSender.class); - setMessageSenders(messageSenders.toArray(new WebServiceMessageSender[messageSenders.size()])); + setMessageSenders(messageSenders.toArray(new WebServiceMessageSender[0])); } private void initFaultMessageResolver(DefaultStrategiesHelper helper) throws BeanInitializationException { @@ -434,7 +434,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService } } } - }, new WebServiceMessageExtractor() { + }, new WebServiceMessageExtractor<>() { public Object extractData(WebServiceMessage response) throws IOException { Unmarshaller unmarshaller = getUnmarshaller(); @@ -473,7 +473,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService try { final Transformer transformer = createTransformer(); Boolean retVal = doSendAndReceive(uri, transformer, requestPayload, requestCallback, - new SourceExtractor() { + new SourceExtractor<>() { public Boolean extractData(Source source) throws IOException, TransformerException { if (source != null) { @@ -532,7 +532,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService requestCallback.doWithMessage(message); } } - }, new SourceExtractorMessageExtractor(responseExtractor)); + }, new SourceExtractorMessageExtractor<>(responseExtractor)); } // @@ -689,8 +689,7 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService protected boolean hasError(WebServiceConnection connection, WebServiceMessage request) throws IOException { if (checkConnectionForError && connection.hasError()) { // could be a fault - if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection) { - FaultAwareWebServiceConnection faultConnection = (FaultAwareWebServiceConnection) connection; + if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) { return !(faultConnection.hasFault() && request instanceof FaultAwareWebServiceMessage); } else { @@ -755,17 +754,15 @@ 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) { + if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection faultConnection) { // check whether the connection has a fault (i.e. status code 500 in HTTP) - FaultAwareWebServiceConnection faultConnection = (FaultAwareWebServiceConnection) connection; if (!faultConnection.hasFault()) { return false; } } - if (response instanceof FaultAwareWebServiceMessage) { + if (response instanceof FaultAwareWebServiceMessage faultMessage) { // either the connection has a fault, or checkConnectionForFault is false: // let's verify the fault - FaultAwareWebServiceMessage faultMessage = (FaultAwareWebServiceMessage) response; return faultMessage.hasFault(); } return false; 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 c66abfec..7b8c0a14 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 @@ -60,7 +60,7 @@ public class Wsdl11DestinationProvider extends AbstractCachingDestinationProvide private static TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); - private Map expressionNamespaces = new HashMap(); + private Map expressionNamespaces = new HashMap<>(); private XPathExpression locationXPathExpression; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParser.java index 448ace96..4e51b716 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParser.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParser.java @@ -110,10 +110,10 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser { private void registerEndpointAdapters(Element element, Object source, ParserContext parserContext) { RootBeanDefinition adapterDef = createBeanDefinition(DefaultMethodEndpointAdapter.class, source); - ManagedList argumentResolvers = new ManagedList(); + ManagedList argumentResolvers = new ManagedList<>(); argumentResolvers.setSource(source); - ManagedList returnValueHandlers = new ManagedList(); + ManagedList returnValueHandlers = new ManagedList<>(); returnValueHandlers.setSource(source); argumentResolvers.add(createBeanDefinition(MessageContextMethodArgumentResolver.class, source)); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/DynamicWsdlBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/DynamicWsdlBeanDefinitionParser.java index 7636f01e..769dcd7e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/DynamicWsdlBeanDefinitionParser.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/DynamicWsdlBeanDefinitionParser.java @@ -68,7 +68,7 @@ class DynamicWsdlBeanDefinitionParser extends AbstractBeanDefinitionParser { if (commonsSchemaPresent) { RootBeanDefinition collectionDef = createBeanDefinition(CommonsXsdSchemaCollection.class, source); collectionDef.getPropertyValues().addPropertyValue("inline", "true"); - ManagedList xsds = new ManagedList(); + ManagedList xsds = new ManagedList<>(); xsds.setSource(source); for (Element schema : schemas) { xsds.add(schema.getAttribute("location")); 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 f8cc1d24..1e8fec53 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 @@ -124,10 +124,10 @@ public class WsConfigurationSupport { */ protected final EndpointInterceptor[] getInterceptors() { if (interceptors == null) { - interceptors = new ArrayList(); + interceptors = new ArrayList<>(); addInterceptors(interceptors); } - return interceptors.toArray(new EndpointInterceptor[interceptors.size()]); + return interceptors.toArray(new EndpointInterceptor[0]); } /** @@ -148,10 +148,10 @@ public class WsConfigurationSupport { */ @Bean public DefaultMethodEndpointAdapter defaultMethodEndpointAdapter() { - List argumentResolvers = new ArrayList(); + List argumentResolvers = new ArrayList<>(); addArgumentResolvers(argumentResolvers); - List returnValueHandlers = new ArrayList(); + List returnValueHandlers = new ArrayList<>(); addReturnValueHandlers(returnValueHandlers); DefaultMethodEndpointAdapter adapter = new DefaultMethodEndpointAdapter(); 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 f41841bf..8659c8fd 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 @@ -32,7 +32,7 @@ import org.springframework.ws.server.endpoint.adapter.method.MethodReturnValueHa */ public class WsConfigurerComposite implements WsConfigurer { - private List delegates = new ArrayList(); + private List delegates = new ArrayList<>(); public void addWsConfigurers(List configurers) { if (configurers != null) { 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 a452a80d..20710161 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 @@ -62,7 +62,7 @@ public abstract class AbstractMessageContext implements MessageContext { private Map getProperties() { if (properties == null) { - properties = new HashMap(); + properties = new HashMap<>(); } return properties; } 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 0744703f..f26bdeb7 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 @@ -93,8 +93,7 @@ public abstract class AbstractMimeMessage implements MimeMessage { @Override public String getName() { - if (inputStreamSource instanceof Resource) { - Resource resource = (Resource) inputStreamSource; + if (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 9422ae7e..dc359543 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 @@ -105,8 +105,7 @@ public class DomPoxMessage implements PoxMessage { @Override public void writeTo(OutputStream outputStream) throws IOException { try { - if (outputStream instanceof TransportOutputStream) { - TransportOutputStream transportOutputStream = (TransportOutputStream) outputStream; + if (outputStream instanceof TransportOutputStream transportOutputStream) { transportOutputStream.addHeader(TransportConstants.HEADER_CONTENT_TYPE, contentType); } transformer.transform(getPayloadSource(), new StreamResult(outputStream)); 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 fe06bb05..ecdd809e 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 @@ -149,7 +149,7 @@ public abstract class AbstractLoggingInterceptor extends TransformerObjectSuppor Transformer transformer = createNonIndentingTransformer(); StringWriter writer = new StringWriter(); transformer.transform(source, new StreamResult(writer)); - String message = logMessage + writer.toString(); + String message = logMessage + writer; logMessage(message); } } 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 88309f13..57cb457b 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 @@ -297,39 +297,19 @@ public abstract class AbstractXomPayloadEndpoint extends TransformerObjectSuppor private static Attribute.Type convertAttributeType(String type) { type = type.toUpperCase(Locale.ENGLISH); - if ("CDATA".equals(type)) { - return Attribute.Type.CDATA; - } - else if ("ENTITIES".equals(type)) { - return Attribute.Type.ENTITIES; - } - else if ("ENTITY".equals(type)) { - return Attribute.Type.ENTITY; - } - else if ("ENUMERATION".equals(type)) { - return Attribute.Type.ENUMERATION; - } - else if ("ID".equals(type)) { - return Attribute.Type.ID; - } - else if ("IDREF".equals(type)) { - return Attribute.Type.IDREF; - } - else if ("IDREFS".equals(type)) { - return Attribute.Type.IDREFS; - } - else if ("NMTOKEN".equals(type)) { - return Attribute.Type.NMTOKEN; - } - else if ("NMTOKENS".equals(type)) { - return Attribute.Type.NMTOKENS; - } - else if ("NOTATION".equals(type)) { - return Attribute.Type.NOTATION; - } - else { - return Attribute.Type.UNDECLARED; - } + return switch (type) { + case "CDATA" -> Attribute.Type.CDATA; + case "ENTITIES" -> Attribute.Type.ENTITIES; + case "ENTITY" -> Attribute.Type.ENTITY; + case "ENUMERATION" -> Attribute.Type.ENUMERATION; + case "ID" -> Attribute.Type.ID; + case "IDREF" -> Attribute.Type.IDREF; + case "IDREFS" -> Attribute.Type.IDREFS; + case "NMTOKEN" -> Attribute.Type.NMTOKEN; + case "NMTOKENS" -> Attribute.Type.NMTOKENS; + case "NOTATION" -> Attribute.Type.NOTATION; + default -> Attribute.Type.UNDECLARED; + }; } } 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 771d0074..3b2e8881 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,8 +89,7 @@ public final class MethodEndpoint { /** Returns the object bean for this method endpoint. */ public Object getBean() { - if (beanFactory != null && bean instanceof String) { - String beanName = (String) bean; + if (beanFactory != null && bean instanceof String beanName) { return beanFactory.getBean(beanName); } else { 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 002b0370..78613ffc 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 @@ -158,7 +158,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter private void initMethodArgumentResolvers() { if (CollectionUtils.isEmpty(methodArgumentResolvers)) { - List methodArgumentResolvers = new ArrayList(); + List methodArgumentResolvers = new ArrayList<>(); methodArgumentResolvers.add(new DomPayloadMethodProcessor()); methodArgumentResolvers.add(new MessageContextMethodArgumentResolver()); methodArgumentResolvers.add(new SourcePayloadMethodProcessor()); @@ -209,7 +209,7 @@ public class DefaultMethodEndpointAdapter extends AbstractMethodEndpointAdapter private void initMethodReturnValueHandlers() { if (CollectionUtils.isEmpty(methodReturnValueHandlers)) { - List methodReturnValueHandlers = new ArrayList(); + List methodReturnValueHandlers = new ArrayList<>(); methodReturnValueHandlers.add(new DomPayloadMethodProcessor()); methodReturnValueHandlers.add(new SourcePayloadMethodProcessor()); if (isPresent(DOM4J_CLASS_NAME)) { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java index b1f80113..f84fc00c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java @@ -104,8 +104,7 @@ public class GenericMarshallingMethodEndpointAdapter extends MarshallingMethodEn if (method.getParameterTypes().length != 1) { return false; } - else if (getUnmarshaller() instanceof GenericUnmarshaller) { - GenericUnmarshaller genericUnmarshaller = (GenericUnmarshaller) getUnmarshaller(); + else if (getUnmarshaller() instanceof GenericUnmarshaller genericUnmarshaller) { return genericUnmarshaller.supports(method.getGenericParameterTypes()[0]); } else { 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 f85c207e..700f362a 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 @@ -139,7 +139,7 @@ public class MarshallingMethodEndpointAdapter extends AbstractMethodEndpointAdap protected void invokeInternal(MessageContext messageContext, MethodEndpoint methodEndpoint) throws Exception { WebServiceMessage request = messageContext.getRequest(); Object requestObject = unmarshalRequest(request); - Object responseObject = methodEndpoint.invoke(new Object[] { requestObject }); + Object responseObject = methodEndpoint.invoke(requestObject); if (responseObject != null) { WebServiceMessage response = messageContext.getResponse(); marshalResponse(responseObject, response); 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 215e2cf4..094c19c0 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 @@ -141,8 +141,7 @@ public class MarshallingPayloadMethodProcessor extends AbstractPayloadMethodProc if (marshaller == null) { return false; } - else if (marshaller instanceof GenericMarshaller) { - GenericMarshaller genericMarshaller = (GenericMarshaller) marshaller; + else if (marshaller instanceof GenericMarshaller genericMarshaller) { return genericMarshaller.supports(returnType.getGenericParameterType()); } else { diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessor.java index 68fb0564..3f4ca55c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessor.java @@ -65,8 +65,7 @@ public class DomPayloadMethodProcessor extends AbstractPayloadSourceMethodProces if (parameterType.isAssignableFrom(requestNode.getClass())) { return requestNode; } - else if (Element.class.equals(parameterType) && requestNode instanceof Document) { - Document document = (Document) requestNode; + else if (Element.class.equals(parameterType) && requestNode instanceof Document document) { return document.getDocumentElement(); } // should not happen 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 2f25e4cf..161276cd 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 @@ -76,7 +76,7 @@ import org.springframework.xml.transform.TraxUtils; */ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloadMethodProcessor { - private final ConcurrentMap, JAXBContext> jaxbContexts = new ConcurrentHashMap, JAXBContext>(); + private final ConcurrentMap, JAXBContext> jaxbContexts = new ConcurrentHashMap<>(); @Override public final void handleReturnValue(MessageContext messageContext, MethodParameter returnType, Object returnValue) @@ -106,8 +106,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa logger.debug("Marshalling [" + jaxbElement + "] to response payload"); } WebServiceMessage response = messageContext.getResponse(); - if (response instanceof StreamingWebServiceMessage) { - StreamingWebServiceMessage streamingResponse = (StreamingWebServiceMessage) response; + if (response instanceof StreamingWebServiceMessage streamingResponse) { StreamingPayload payload = new JaxbStreamingPayload(clazz, jaxbElement); streamingResponse.setStreamingPayload(payload); @@ -164,7 +163,7 @@ public abstract class AbstractJaxb2PayloadMethodProcessor extends AbstractPayloa return null; } try { - JaxbElementSourceCallback callback = new JaxbElementSourceCallback(clazz); + JaxbElementSourceCallback callback = new JaxbElementSourceCallback<>(clazz); TraxUtils.doWithSource(requestPayload, callback); if (logger.isDebugEnabled()) { logger.debug("Unmarshalled payload request to [" + callback.result + "]"); 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 3c06d032..e58dade8 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 @@ -100,8 +100,7 @@ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport i Map smartInterceptors = BeanFactoryUtils .beansOfTypeIncludingAncestors(getApplicationContext(), SmartEndpointInterceptor.class, true, false); if (!smartInterceptors.isEmpty()) { - this.smartInterceptors = smartInterceptors.values() - .toArray(new SmartEndpointInterceptor[smartInterceptors.size()]); + this.smartInterceptors = smartInterceptors.values().toArray(new SmartEndpointInterceptor[0]); } } @@ -120,15 +119,14 @@ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport i if (endpoint == null) { return null; } - if (endpoint instanceof String) { - String endpointName = (String) endpoint; + if (endpoint instanceof String endpointName) { endpoint = resolveStringEndpoint(endpointName); if (endpoint == null) { return null; } } - List interceptors = new ArrayList(); + List interceptors = new ArrayList<>(); if (this.interceptors != null) { interceptors.addAll(Arrays.asList(this.interceptors)); } @@ -142,7 +140,7 @@ public abstract class AbstractEndpointMapping extends ApplicationObjectSupport i } return createEndpointInvocationChain(messageContext, endpoint, - interceptors.toArray(new EndpointInterceptor[interceptors.size()])); + interceptors.toArray(new EndpointInterceptor[0])); } /** 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 2129fe8c..4f045794 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 @@ -42,10 +42,10 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa private boolean registerBeanNames = false; - private final Map endpointMap = new HashMap(); + private final Map endpointMap = new HashMap<>(); // holds mappings set via setEndpointMap and setMappings - private Map temporaryEndpointMap = new HashMap(); + private Map temporaryEndpointMap = new HashMap<>(); /** * Set whether to lazily initialize endpoints. Only applicable to singleton endpoints, @@ -144,8 +144,7 @@ public abstract class AbstractMapBasedEndpointMapping extends AbstractEndpointMa throw new ApplicationContextException("Cannot map endpoint [" + endpoint + "] on registration key [" + key + "]: there's already endpoint [" + mappedEndpoint + "] mapped"); } - if (!lazyInitEndpoints && endpoint instanceof String) { - String endpointName = (String) endpoint; + if (!lazyInitEndpoints && endpoint instanceof String endpointName) { endpoint = resolveStringEndpoint(endpointName); } if (endpoint == null) { 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 ec28cf78..f98d4e64 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 @@ -49,7 +49,7 @@ import org.springframework.ws.server.endpoint.MethodEndpoint; */ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointMapping { - private final Map endpointMap = new HashMap(); + private final Map endpointMap = new HashMap<>(); /** * Lookup an endpoint for the given message. The extraction of the endpoint key is @@ -156,8 +156,8 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointM private Set findEndpointMethods(Class endpointType, final ReflectionUtils.MethodFilter endpointMethodFilter) { - final Set endpointMethods = new LinkedHashSet(); - Set> endpointTypes = new LinkedHashSet>(); + final Set endpointMethods = new LinkedHashSet<>(); + Set> endpointTypes = new LinkedHashSet<>(); Class specificEndpointType = null; if (!Proxy.isProxyClass(endpointType)) { endpointTypes.add(endpointType); @@ -201,7 +201,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/PayloadRootAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java index f1247574..20fb1eaf 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java @@ -75,7 +75,7 @@ public class PayloadRootAnnotationMethodEndpointMapping extends AbstractAnnotati @Override protected List getLookupKeysForMethod(Method method) { - List result = new ArrayList(); + List result = new ArrayList<>(); PayloadRoots payloadRoots = AnnotationUtils.findAnnotation(method, PayloadRoots.class); if (payloadRoots != null) { 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 1c5f8889..ec5ad94e 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 @@ -16,6 +16,7 @@ package org.springframework.ws.soap.addressing.core; +import java.io.Serial; import java.io.Serializable; import java.net.URI; import java.util.Collections; @@ -34,6 +35,7 @@ import org.springframework.util.Assert; */ public final class EndpointReference implements Serializable { + @Serial private static final long serialVersionUID = 8999416009328865260L; private final URI address; 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 8be43c0e..1acef9a3 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 @@ -16,6 +16,7 @@ package org.springframework.ws.soap.addressing.core; +import java.io.Serial; import java.io.Serializable; import java.net.URI; import java.util.Collections; @@ -37,6 +38,7 @@ import org.w3c.dom.Node; */ public final class MessageAddressingProperties implements Serializable { + @Serial private static final long serialVersionUID = -6980663311446506672L; private final URI to; 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 bc0b7276..7a3c7ccc 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 @@ -42,7 +42,7 @@ public class UuidMessageIdStrategy implements MessageIdStrategy { @Override public URI newMessageId(SoapMessage message) { - return URI.create(PREFIX + UUID.randomUUID().toString()); + return URI.create(PREFIX + UUID.randomUUID()); } } 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 89d30378..1e1ae6d6 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 @@ -46,7 +46,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn public static final String DEFAULT_FAULT_ACTION_SUFFIX = "Fault"; // keys are action URIs, values are endpoints - private final Map endpointMap = new HashMap(); + private final Map endpointMap = new HashMap<>(); private String outputActionSuffix = DEFAULT_OUTPUT_ACTION_SUFFIX; @@ -128,8 +128,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn Assert.notNull(endpoint, "Endpoint object must not be null"); Object resolvedEndpoint = endpoint; - if (endpoint instanceof String) { - String endpointName = (String) endpoint; + if (endpoint instanceof String endpointName) { if (getApplicationContext().isSingleton(endpointName)) { resolvedEndpoint = getApplicationContext().getBean(endpointName); } @@ -153,7 +152,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn protected URI getResponseAction(Object endpoint, MessageAddressingProperties requestMap) { URI requestAction = requestMap.getAction(); if (requestAction != null) { - return URI.create(requestAction.toString() + getOutputActionSuffix()); + return URI.create(requestAction + getOutputActionSuffix()); } else { return null; @@ -164,7 +163,7 @@ public abstract class AbstractActionEndpointMapping extends AbstractAddressingEn protected URI getFaultAction(Object endpoint, MessageAddressingProperties requestMap) { URI requestAction = requestMap.getAction(); if (requestAction != null) { - return URI.create(requestAction.toString() + getFaultActionSuffix()); + return URI.create(requestAction + getFaultActionSuffix()); } else { return null; 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 acba20b2..d068b328 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 @@ -247,8 +247,7 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec Map smartInterceptors = BeanFactoryUtils .beansOfTypeIncludingAncestors(getApplicationContext(), SmartEndpointInterceptor.class, true, false); if (!smartInterceptors.isEmpty()) { - this.smartInterceptors = smartInterceptors.values() - .toArray(new SmartEndpointInterceptor[smartInterceptors.size()]); + this.smartInterceptors = smartInterceptors.values().toArray(new SmartEndpointInterceptor[0]); } } } @@ -288,8 +287,7 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec WebServiceMessageSender[] messageSenders = getMessageSenders(endpoint); MessageIdStrategy messageIdStrategy = getMessageIdStrategy(endpoint); - List interceptors = new ArrayList(); - interceptors.addAll(Arrays.asList(preInterceptors)); + List interceptors = new ArrayList<>(Arrays.asList(preInterceptors)); AddressingEndpointInterceptor addressingInterceptor = new AddressingEndpointInterceptor(version, messageIdStrategy, messageSenders, responseAction, faultAction); @@ -304,8 +302,8 @@ public abstract class AbstractAddressingEndpointMapping extends TransformerObjec } } - return new SoapEndpointInvocationChain(endpoint, - interceptors.toArray(new EndpointInterceptor[interceptors.size()]), actorsOrRoles, isUltimateReceiver); + return new SoapEndpointInvocationChain(endpoint, interceptors.toArray(new EndpointInterceptor[0]), + actorsOrRoles, isUltimateReceiver); } private boolean supports(AddressingVersion version, SoapMessage request) { 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 a9007693..83ecb2a6 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 @@ -55,7 +55,7 @@ import org.springframework.beans.BeansException; public class SimpleActionEndpointMapping extends AbstractActionEndpointMapping { // contents will be copied over to endpointMap - private final Map actionMap = new HashMap(); + private final Map actionMap = new HashMap<>(); private URI 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 9bcbefab..9b1faa4d 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 @@ -159,8 +159,7 @@ public abstract class AbstractAddressingVersion extends TransformerObjectSupport private Element getSoapHeaderElement(SoapMessage message) { Source source = message.getSoapHeader().getSource(); - if (source instanceof DOMSource) { - DOMSource domSource = (DOMSource) source; + if (source instanceof DOMSource domSource) { if (domSource.getNode() != null && domSource.getNode().getNodeType() == Node.ELEMENT_NODE) { return (Element) domSource.getNode(); } @@ -295,12 +294,10 @@ public abstract class AbstractAddressingVersion extends TransformerObjectSupport } private SoapFault addAddressingFault(SoapMessage message, QName subcode, String reason) { - if (message.getSoapBody() instanceof Soap11Body) { - Soap11Body soapBody = (Soap11Body) message.getSoapBody(); + if (message.getSoapBody() instanceof Soap11Body soapBody) { return soapBody.addFault(subcode, reason, Locale.ENGLISH); } - else if (message.getSoapBody() instanceof Soap12Body) { - Soap12Body soapBody = (Soap12Body) message.getSoapBody(); + else if (message.getSoapBody() instanceof Soap12Body soapBody) { Soap12Fault soapFault = soapBody.addClientOrSenderFault(reason, Locale.ENGLISH); soapFault.addFaultSubcode(subcode); return soapFault; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Header.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Header.java index db68692a..bb86f066 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Header.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap11Header.java @@ -45,7 +45,7 @@ class SaajSoap11Header extends SaajSoapHeader implements Soap11Header { @Override @SuppressWarnings("unchecked") public Iterator examineHeaderElementsToProcess(String[] actors) { - List result = new ArrayList(); + List result = new ArrayList<>(); Iterator iterator = getSaajHeader().examineAllHeaderElements(); while (iterator.hasNext()) { SOAPHeaderElement saajHeaderElement = iterator.next(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Header.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Header.java index 45534adb..11a45535 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Header.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoap12Header.java @@ -72,7 +72,7 @@ class SaajSoap12Header extends SaajSoapHeader implements Soap12Header { @SuppressWarnings("unchecked") public Iterator examineHeaderElementsToProcess(String[] roles, boolean isUltimateDestination) throws SoapHeaderException { - List result = new ArrayList(); + List result = new ArrayList<>(); Iterator iterator = getSaajHeader().examineAllHeaderElements(); while (iterator.hasNext()) { SOAPHeaderElement saajHeaderElement = iterator.next(); @@ -89,14 +89,16 @@ class SaajSoap12Header extends SaajSoapHeader implements Soap12Header { if (!StringUtils.hasLength(headerRole)) { return true; } - if (SOAPConstants.URI_SOAP_1_2_ROLE_NEXT.equals(headerRole)) { - return true; - } - if (SOAPConstants.URI_SOAP_1_2_ROLE_ULTIMATE_RECEIVER.equals(headerRole)) { - return isUltimateDestination; - } - if (SOAPConstants.URI_SOAP_1_2_ROLE_NONE.equals(headerRole)) { - return false; + switch (headerRole) { + case SOAPConstants.URI_SOAP_1_2_ROLE_NEXT -> { + return true; + } + case SOAPConstants.URI_SOAP_1_2_ROLE_ULTIMATE_RECEIVER -> { + return isUltimateDestination; + } + case SOAPConstants.URI_SOAP_1_2_ROLE_NONE -> { + return false; + } } if (!ObjectUtils.isEmpty(roles)) { for (String role : roles) { 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 76dbbbcb..1e76efdd 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 @@ -243,8 +243,7 @@ public class SaajSoapMessage extends AbstractSoapMessage { try { SOAPMessage message = getSaajMessage(); message.saveChanges(); - if (outputStream instanceof TransportOutputStream) { - TransportOutputStream transportOutputStream = (TransportOutputStream) outputStream; + if (outputStream instanceof TransportOutputStream transportOutputStream) { // some SAAJ implementations (Axis 1) do not have a Content-Type header by // default MimeHeaders headers = message.getMimeHeaders(); 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 7cfd3c10..ebc1bcf2 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 @@ -242,8 +242,7 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB private MimeHeaders parseMimeHeaders(InputStream inputStream) throws IOException { MimeHeaders mimeHeaders = new MimeHeaders(); - if (inputStream instanceof TransportInputStream) { - TransportInputStream transportInputStream = (TransportInputStream) inputStream; + if (inputStream instanceof TransportInputStream transportInputStream) { for (Iterator headerNames = transportInputStream.getHeaderNames(); headerNames.hasNext();) { String headerName = headerNames.next(); for (Iterator headerValues = transportInputStream.getHeaders(headerName); headerValues 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 477abe39..c919a4e4 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 @@ -46,7 +46,7 @@ public class SaajContentHandler implements ContentHandler { private final SOAPEnvelope envelope; - private Map namespaces = new LinkedHashMap(); + private Map namespaces = new LinkedHashMap<>(); /** * Constructs a new instance of the {@code SaajContentHandler} that creates children @@ -65,7 +65,7 @@ public class SaajContentHandler implements ContentHandler { } @Override - public void characters(char ch[], int start, int length) throws SAXException { + public void characters(char[] ch, int start, int length) throws SAXException { try { String text = new String(ch, start, length); element.addTextNode(text); @@ -151,7 +151,7 @@ public class SaajContentHandler implements ContentHandler { } @Override - public void ignorableWhitespace(char ch[], int start, int length) throws SAXException { + public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { } @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 726b1299..20d8b655 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 @@ -129,8 +129,7 @@ public class SaajXmlReader extends AbstractXmlReader { if (node instanceof SOAPElement) { handleElement((SOAPElement) node); } - else if (node instanceof Text) { - Text text = (Text) node; + else if (node instanceof Text text) { handleText(text); } } 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 7f3ccf50..c2c977fe 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 @@ -90,8 +90,7 @@ public class SoapMessageDispatcher extends MessageDispatcher { if (messageContext.getRequest() instanceof SoapMessage) { String[] actorsOrRoles = null; boolean isUltimateReceiver = true; - if (mappedEndpoint instanceof SoapEndpointInvocationChain) { - SoapEndpointInvocationChain soapChain = (SoapEndpointInvocationChain) mappedEndpoint; + if (mappedEndpoint instanceof SoapEndpointInvocationChain soapChain) { actorsOrRoles = soapChain.getActorsOrRoles(); isUltimateReceiver = soapChain.isUltimateReceiver(); } @@ -115,7 +114,7 @@ public class SoapMessageDispatcher extends MessageDispatcher { headerIterator = ((Soap12Header) soapHeader).examineHeaderElementsToProcess(actorsOrRoles, isUltimateReceiver); } - List notUnderstoodHeaderNames = new ArrayList(); + List notUnderstoodHeaderNames = new ArrayList<>(); while (headerIterator.hasNext()) { SoapHeaderElement headerElement = headerIterator.next(); QName headerName = headerElement.getName(); @@ -171,8 +170,7 @@ public class SoapMessageDispatcher extends MessageDispatcher { fault.setFaultActorOrRole(actorsOrRoles[0]); } SoapHeader header = soapResponse.getSoapHeader(); - if (header instanceof Soap12Header) { - Soap12Header soap12Header = (Soap12Header) header; + if (header instanceof Soap12Header soap12Header) { for (QName headerName : notUnderstoodHeaderNames) { soap12Header.addNotUnderstoodHeaderElement(headerName); } 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 efb23397..290de1b0 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 @@ -170,8 +170,7 @@ public abstract class AbstractFaultCreatingValidatingMarshallingPayloadEndpoint String msg = messageSource.getMessage(objectError, getFaultLocale()); logger.warn("Validation error on request object[" + requestObject + "]: " + msg); } - if (messageContext.getResponse() instanceof SoapMessage) { - SoapMessage response = (SoapMessage) messageContext.getResponse(); + if (messageContext.getResponse() instanceof SoapMessage response) { SoapBody body = response.getSoapBody(); SoapFault fault = body.addClientOrSenderFault(getFaultStringOrReason(), getFaultLocale()); if (getAddValidationErrorDetail()) { 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 e3fa6448..ccf9738f 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 @@ -89,12 +89,10 @@ public abstract class AbstractSoapFaultDefinitionExceptionResolver extends Abstr fault = soapBody.addClientOrSenderFault(faultStringOrReason, definition.getLocale()); } else { - if (soapBody instanceof Soap11Body) { - Soap11Body soap11Body = (Soap11Body) soapBody; + if (soapBody instanceof Soap11Body soap11Body) { fault = soap11Body.addFault(definition.getFaultCode(), faultStringOrReason, definition.getLocale()); } - else if (soapBody instanceof Soap12Body) { - Soap12Body soap12Body = (Soap12Body) soapBody; + else if (soapBody instanceof Soap12Body soap12Body) { Soap12Fault soap12Fault = soap12Body.addServerOrReceiverFault(faultStringOrReason, definition.getLocale()); soap12Fault.addFaultSubcode(definition.getFaultCode()); 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 d2f84ff7..32ad4bd8 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 @@ -32,7 +32,7 @@ import org.springframework.util.CollectionUtils; */ public class SoapFaultMappingExceptionResolver extends AbstractSoapFaultDefinitionExceptionResolver { - private Map exceptionMappings = new LinkedHashMap(); + private Map exceptionMappings = new LinkedHashMap<>(); /** * Set the mappings between exception class names and SOAP Faults. The exception class 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 b607c51d..c06471db 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 @@ -71,8 +71,7 @@ public class SoapHeaderElementMethodArgumentResolver implements MethodArgumentRe // List parameter if (List.class.equals(parameterType)) { Type genericType = parameter.getGenericParameterType(); - if (genericType instanceof ParameterizedType) { - ParameterizedType parameterizedType = (ParameterizedType) genericType; + if (genericType instanceof ParameterizedType parameterizedType) { Type[] typeArguments = parameterizedType.getActualTypeArguments(); if (typeArguments.length == 1 && SoapHeaderElement.class.equals(typeArguments[0])) { return true; @@ -120,7 +119,7 @@ public class SoapHeaderElementMethodArgumentResolver implements MethodArgumentRe private List extractSoapHeaderList(QName qname, org.springframework.ws.soap.SoapHeader soapHeader) { - List result = new ArrayList(); + List result = new ArrayList<>(); Iterator elements = soapHeader.examineAllHeaderElements(); while (elements.hasNext()) { SoapHeaderElement e = elements.next(); 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 ccd2d3db..0f6cfd66 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 @@ -70,7 +70,7 @@ public enum FaultCode { private final QName value; - private FaultCode(QName value) { + FaultCode(QName value) { this.value = 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 758d9ae7..5ff34fed 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 @@ -161,8 +161,7 @@ public abstract class AbstractFaultCreatingValidatingInterceptor extends Abstrac for (SAXParseException error : errors) { logger.warn("XML validation error on request: " + error.getMessage()); } - if (messageContext.getResponse() instanceof SoapMessage) { - SoapMessage response = (SoapMessage) messageContext.getResponse(); + if (messageContext.getResponse() instanceof SoapMessage response) { SoapBody body = response.getSoapBody(); SoapFault fault = body.addClientOrSenderFault(getFaultStringOrReason(), getFaultStringOrReasonLocale()); if (getAddValidationErrorDetail()) { 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 e0121e08..a0d65cb1 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 @@ -61,8 +61,7 @@ public class SoapEnvelopeLoggingInterceptor extends AbstractLoggingInterceptor i @Override protected Source getSource(WebServiceMessage message) { - if (message instanceof SoapMessage) { - SoapMessage soapMessage = (SoapMessage) message; + if (message instanceof SoapMessage soapMessage) { return soapMessage.getEnvelope().getSource(); } else { 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 b2ce2a90..b1e5eedf 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 @@ -93,8 +93,7 @@ public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotatio @Override protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception { - if (messageContext.getRequest() instanceof SoapMessage) { - SoapMessage request = (SoapMessage) messageContext.getRequest(); + if (messageContext.getRequest() instanceof SoapMessage request) { String soapAction = request.getSoapAction(); if (StringUtils.hasLength(soapAction) && soapAction.charAt(0) == '"' && soapAction.charAt(soapAction.length() - 1) == '"') { @@ -117,7 +116,7 @@ public class SoapActionAnnotationMethodEndpointMapping extends AbstractAnnotatio @Override protected List getLookupKeysForMethod(Method method) { - List result = new ArrayList(); + List result = new ArrayList<>(); SoapActions soapActions = AnnotationUtils.findAnnotation(method, SoapActions.class); if (soapActions != null) { 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 d3cc9e5d..a0ef6543 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 @@ -92,8 +92,7 @@ public class SoapActionEndpointMapping extends AbstractMapBasedEndpointMapping i @Override protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception { - if (messageContext.getRequest() instanceof SoapMessage) { - SoapMessage request = (SoapMessage) messageContext.getRequest(); + if (messageContext.getRequest() instanceof SoapMessage request) { String soapAction = request.getSoapAction(); if (StringUtils.hasLength(soapAction) && soapAction.charAt(0) == '"' && soapAction.charAt(soapAction.length() - 1) == '"') { 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 e7d0981e..87ceeda9 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 @@ -157,8 +157,7 @@ public class DefaultStrategiesHelper { /** Instantiates the given bean, simulating the standard bean life cycle. */ private T instantiateBean(Class clazz, ApplicationContext applicationContext) { T strategy = BeanUtils.instantiateClass(clazz); - if (strategy instanceof BeanNameAware) { - BeanNameAware beanNameAware = (BeanNameAware) strategy; + if (strategy instanceof BeanNameAware beanNameAware) { beanNameAware.setBeanName(clazz.getName()); } if (applicationContext != null) { @@ -177,8 +176,7 @@ public class DefaultStrategiesHelper { if (strategy instanceof MessageSourceAware) { ((MessageSourceAware) strategy).setMessageSource(applicationContext); } - if (strategy instanceof ApplicationContextAware) { - ApplicationContextAware applicationContextAware = (ApplicationContextAware) strategy; + if (strategy instanceof ApplicationContextAware applicationContextAware) { applicationContextAware.setApplicationContext(applicationContext); } if (applicationContext instanceof WebApplicationContext && strategy instanceof ServletContextAware) { @@ -186,8 +184,7 @@ public class DefaultStrategiesHelper { ((ServletContextAware) strategy).setServletContext(servletContext); } } - if (strategy instanceof InitializingBean) { - InitializingBean initializingBean = (InitializingBean) strategy; + if (strategy instanceof InitializingBean initializingBean) { try { initializingBean.afterPropertiesSet(); } 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 0d79def6..ea192edf 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 @@ -59,8 +59,7 @@ public abstract class MarshallingUtils { if (payload == null) { return null; } - else if (unmarshaller instanceof MimeUnmarshaller && message instanceof MimeMessage) { - MimeUnmarshaller mimeUnmarshaller = (MimeUnmarshaller) unmarshaller; + else if (unmarshaller instanceof MimeUnmarshaller mimeUnmarshaller && message instanceof MimeMessage) { MimeMessageContainer container = new MimeMessageContainer((MimeMessage) message); return mimeUnmarshaller.unmarshal(payload, container); } @@ -78,8 +77,7 @@ public abstract class MarshallingUtils { * @throws IOException in case of I/O errors */ public static void marshal(Marshaller marshaller, Object graph, WebServiceMessage message) throws IOException { - if (marshaller instanceof MimeMarshaller && message instanceof MimeMessage) { - MimeMarshaller mimeMarshaller = (MimeMarshaller) marshaller; + if (marshaller instanceof MimeMarshaller mimeMarshaller && message instanceof MimeMessage) { MimeMessageContainer container = new MimeMessageContainer((MimeMessage) message); mimeMarshaller.marshal(graph, message.getPayloadResult(), container); } 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 6153675c..ab9490bb 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 @@ -80,12 +80,12 @@ public abstract class TransportInputStream extends InputStream { } @Override - public int read(byte b[]) throws IOException { + public int read(byte[] b) throws IOException { return getInputStream().read(b); } @Override - public int read(byte b[], int off, int len) throws IOException { + public int read(byte[] b, int off, int len) throws IOException { return getInputStream().read(b, off, len); } 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 e930a05c..202b38e3 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 @@ -60,12 +60,12 @@ public abstract class TransportOutputStream extends OutputStream { } @Override - public void write(byte b[]) throws IOException { + public void write(byte[] b) throws IOException { getOutputStream().write(b); } @Override - public void write(byte b[], int off, int len) throws IOException { + public void write(byte[] b, int off, int len) throws IOException { getOutputStream().write(b, off, len); } 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 431ab8ed..818a1693 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 @@ -140,14 +140,11 @@ public abstract class AbstractHttpSenderConnection extends AbstractSenderConnect // SOAP 1.1 specifies a 500 status code for faults // SOAP 1.2 specifies a 400 status code for sender faults, and 500 for all other // faults - switch (getResponseCode()) { - case HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR: - return isSoap11Response() || isSoap12Response(); - case HttpTransportConstants.STATUS_BAD_REQUEST: - return isSoap12Response(); - default: - return false; - } + return switch (getResponseCode()) { + case HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR -> isSoap11Response() || isSoap12Response(); + case HttpTransportConstants.STATUS_BAD_REQUEST -> isSoap12Response(); + default -> false; + }; } /** Determine whether the response is a SOAP 1.1 message. */ 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 d0b22fab..76b4c070 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 @@ -188,12 +188,11 @@ public class HttpComponentsMessageSender extends AbstractHttpWebServiceMessageSe */ public void setMaxConnectionsPerHost(Map maxConnectionsPerHost) throws URISyntaxException { org.apache.http.conn.ClientConnectionManager connectionManager = getHttpClient().getConnectionManager(); - if (!(connectionManager instanceof org.apache.http.impl.conn.PoolingClientConnectionManager)) { + if (!(connectionManager instanceof org.apache.http.impl.conn.PoolingClientConnectionManager poolingConnectionManager)) { throw new IllegalArgumentException( "maxConnectionsPerHost is not supported on " + connectionManager.getClass().getName() + ". Use " + org.apache.http.impl.conn.PoolingClientConnectionManager.class.getName() + " instead"); } - org.apache.http.impl.conn.PoolingClientConnectionManager poolingConnectionManager = (org.apache.http.impl.conn.PoolingClientConnectionManager) connectionManager; for (Map.Entry entry : maxConnectionsPerHost.entrySet()) { URI uri = new URI(entry.getKey()); 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 4ba20486..152925f8 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 @@ -108,12 +108,12 @@ public class HttpServletConnection extends AbstractReceiverConnection @Override public Iterator getRequestHeaderNames() throws IOException { - return new EnumerationIterator(getHttpServletRequest().getHeaderNames()); + return new EnumerationIterator<>(getHttpServletRequest().getHeaderNames()); } @Override public Iterator getRequestHeaders(String name) throws IOException { - return new EnumerationIterator(getHttpServletRequest().getHeaders(name)); + return new EnumerationIterator<>(getHttpServletRequest().getHeaders(name)); } @Override 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 3cda6571..e9853f77 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 @@ -106,7 +106,7 @@ public class HttpUrlConnection extends AbstractHttpSenderConnection { @Override public Iterator getResponseHeaderNames() throws IOException { - Set headerNames = new HashSet(); + Set headerNames = new HashSet<>(); // Header field 0 is the status line, so we start at 1 int i = 1; while (true) { 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 00e14bab..fd538dc3 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 @@ -68,11 +68,10 @@ public class HttpUrlConnectionMessageSender extends AbstractHttpWebServiceMessag public WebServiceConnection createConnection(URI uri) throws IOException { URL url = uri.toURL(); URLConnection connection = url.openConnection(); - if (!(connection instanceof HttpURLConnection)) { + if (!(connection instanceof HttpURLConnection httpURLConnection)) { throw new HttpTransportException("URI [" + uri + "] is not an HTTP URL"); } else { - HttpURLConnection httpURLConnection = (HttpURLConnection) connection; prepareConnection(httpURLConnection); return new HttpUrlConnection(httpURLConnection); } 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 3a0860a4..f79de2da 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 @@ -57,8 +57,7 @@ public abstract class LocationTransformerObjectSupport extends TransformerObject List locationNodes = xPathExpression.evaluateAsNodeList(definitionDocument); for (Node locationNode : locationNodes) { - if (locationNode instanceof Attr) { - Attr location = (Attr) locationNode; + if (locationNode instanceof Attr location) { if (StringUtils.hasLength(location.getValue())) { String newLocation = transformLocation(location.getValue(), request); if (logger.isDebugEnabled()) { 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 ebf56add..256db539 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 @@ -88,7 +88,7 @@ public class WsdlDefinitionHandlerAdapter extends LocationTransformerObjectSuppo private static final String CONTENT_TYPE = "text/xml"; - private Map expressionNamespaces = new HashMap(); + private Map expressionNamespaces = new HashMap<>(); private String locationExpression = DEFAULT_LOCATION_EXPRESSION; 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 9657f61c..6387d6d8 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 @@ -60,7 +60,7 @@ public class XsdSchemaHandlerAdapter extends LocationTransformerObjectSupport private static final String CONTENT_TYPE = "text/xml"; - private Map expressionNamespaces = new HashMap(); + private Map expressionNamespaces = new HashMap<>(); private String schemaLocationExpression = DEFAULT_SCHEMA_LOCATION_EXPRESSION; 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 5b3ae71b..99146b4a 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 @@ -92,10 +92,8 @@ public abstract class WebServiceMessageReceiverObjectSupport implements Initiali receiver.receive(messageContext); if (messageContext.hasResponse()) { WebServiceMessage response = messageContext.getResponse(); - if (response instanceof FaultAwareWebServiceMessage - && connection instanceof FaultAwareWebServiceConnection) { - FaultAwareWebServiceMessage faultResponse = (FaultAwareWebServiceMessage) response; - FaultAwareWebServiceConnection faultConnection = (FaultAwareWebServiceConnection) connection; + if (response instanceof FaultAwareWebServiceMessage faultResponse + && connection instanceof FaultAwareWebServiceConnection faultConnection) { faultConnection.setFaultCode(faultResponse.getFaultCode()); } connection.send(messageContext.getResponse()); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java index c3c7ba0a..bb701adb 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/provider/DefaultMessagesProvider.java @@ -52,8 +52,7 @@ public class DefaultMessagesProvider implements MessagesProvider { Assert.notNull(types, "No types element present in definition"); for (Object element : types.getExtensibilityElements()) { ExtensibilityElement extensibilityElement = (ExtensibilityElement) element; - if (extensibilityElement instanceof Schema) { - Schema schema = (Schema) extensibilityElement; + if (extensibilityElement instanceof Schema schema) { if (schema.getElement() != null) { createMessages(definition, schema.getElement()); } 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 f372cdda..bd65fa15 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 @@ -31,7 +31,7 @@ public abstract class AbstractWebServiceMessageFactoryTest { } @Test - public void testCreateEmptyMessage() throws Exception { + public void testCreateEmptyMessage() { WebServiceMessage message = messageFactory.createWebServiceMessage(); 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 1a299059..493b47da 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 @@ -201,7 +201,7 @@ public class MockWebServiceMessage implements FaultAwareWebServiceMessage { } @Override - public void write(char cbuf[], int off, int len) { + public void write(char[] cbuf, int off, int len) { if (off < 0 || off > cbuf.length || len < 0 || off + len > cbuf.length || off + len < 0) { throw new IndexOutOfBoundsException(); diff --git a/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 4673ff80..a6216737 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 @@ -219,7 +219,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { Marshaller marshaller = new Marshaller() { @Override - public void marshal(Object graph, Result result) throws XmlMappingException, IOException { + public void marshal(Object graph, Result result) throws XmlMappingException { assertThat(requestObject).isEqualTo(graph); 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 99afa5d6..305eb237 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 @@ -118,7 +118,7 @@ public class DomPoxWebServiceTemplateIntegrationTest { } @Override - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { resp.sendError(sc); } 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 5e7d1f35..b1ad1891 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 @@ -33,7 +33,7 @@ public class SimpleFaultMessageResolverTest { private SimpleFaultMessageResolver resolver; @BeforeEach - public void setUp() throws Exception { + public void setUp() { resolver = new SimpleFaultMessageResolver(); } 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 d022508f..142bd4d2 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 @@ -70,7 +70,7 @@ public class WebServiceTemplateTest { template.setMessageSender(new WebServiceMessageSender() { @Override - public WebServiceConnection createConnection(URI uri) throws IOException { + public WebServiceConnection createConnection(URI uri) { return connectionMock; } @@ -308,7 +308,7 @@ public class WebServiceTemplateTest { template.setMessageSender(new WebServiceMessageSender() { @Override - public WebServiceConnection createConnection(URI uri) throws IOException { + public WebServiceConnection createConnection(URI uri) { return connectionMock; } @@ -347,8 +347,8 @@ public class WebServiceTemplateTest { when(interceptorMock2.handleRequest(isA(MessageContext.class))).thenReturn(true); when(interceptorMock2.handleResponse(isA(MessageContext.class))).thenReturn(true); when(interceptorMock1.handleResponse(isA(MessageContext.class))).thenReturn(true); - interceptorMock2.afterCompletion(isA(MessageContext.class), (Exception) isNull()); - interceptorMock1.afterCompletion(isA(MessageContext.class), (Exception) isNull()); + interceptorMock2.afterCompletion(isA(MessageContext.class), isNull()); + interceptorMock1.afterCompletion(isA(MessageContext.class), isNull()); WebServiceMessageCallback requestCallback = mock(WebServiceMessageCallback.class); requestCallback.doWithMessage(isA(WebServiceMessage.class)); @@ -377,7 +377,7 @@ public class WebServiceTemplateTest { ClientInterceptor interceptorMock2 = mock(ClientInterceptor.class); template.setInterceptors(new ClientInterceptor[] { interceptorMock1, interceptorMock2 }); when(interceptorMock1.handleRequest(isA(MessageContext.class))).thenReturn(false); - interceptorMock1.afterCompletion(isA(MessageContext.class), (Exception) isNull()); + interceptorMock1.afterCompletion(isA(MessageContext.class), isNull()); WebServiceMessageCallback requestCallback = mock(WebServiceMessageCallback.class); requestCallback.doWithMessage(messageContext.getRequest()); @@ -401,7 +401,7 @@ public class WebServiceTemplateTest { 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), (Exception) isNull()); + interceptorMock1.afterCompletion(isA(MessageContext.class), isNull()); WebServiceMessageCallback requestCallback = mock(WebServiceMessageCallback.class); requestCallback.doWithMessage(messageContext.getRequest()); 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 c4ba8f35..b02f1a1f 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 @@ -32,7 +32,7 @@ public class Wsdl11DestinationProviderTest { private Wsdl11DestinationProvider provider; @BeforeEach - public void setUp() throws Exception { + public void setUp() { provider = new Wsdl11DestinationProvider(); } 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 366c8657..cbbee22e 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 @@ -177,7 +177,7 @@ public class PayloadValidatingInterceptorTest { } @Test - public void testNonExistingSchema() throws Exception { + public void testNonExistingSchema() { assertThatIllegalArgumentException().isThrownBy(() -> { 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 e3d4b795..d97ee876 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 @@ -58,7 +58,7 @@ public class AnnotationDrivenBeanDefinitionParserTest { private ApplicationContext applicationContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { applicationContext = new ClassPathXmlApplicationContext("annotationDrivenBeanDefinitionParserTest.xml", getClass()); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java index cd57ed63..6e9b0d07 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java @@ -55,7 +55,7 @@ public class InterceptorsBeanDefinitionParserTest { ApplicationContext applicationContext = new ClassPathXmlApplicationContext( "interceptorsBeanDefinitionParserOrderTest.xml", getClass()); - List interceptors = new ArrayList( + List interceptors = new ArrayList<>( applicationContext.getBeansOfType(DelegatingSmartEndpointInterceptor.class).values()); assertThat(interceptors).hasSize(6); @@ -75,7 +75,7 @@ public class InterceptorsBeanDefinitionParserTest { ApplicationContext applicationContext = new ClassPathXmlApplicationContext( "interceptorsBeanDefinitionParserInjectionTest.xml", getClass()); - List interceptors = new ArrayList( + List interceptors = new ArrayList<>( applicationContext.getBeansOfType(DelegatingSmartEndpointInterceptor.class).values()); assertThat(interceptors).hasSize(1); 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 94b729ab..a8c97bf9 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 @@ -34,7 +34,7 @@ public class WebServicesNamespaceHandlerTigerTest { private ApplicationContext applicationContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { applicationContext = new ClassPathXmlApplicationContext("webServicesNamespaceHandlerTest-tiger.xml", getClass()); } 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 12b2f5cd..fce41209 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 @@ -37,7 +37,7 @@ public class WsdlBeanDefinitionParserTest { private ApplicationContext applicationContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { applicationContext = new ClassPathXmlApplicationContext("wsdlBeanDefinitionParserTest.xml", getClass()); } 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 30d4d276..6095a280 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 @@ -40,7 +40,7 @@ public class DefaultWsConfigurationTest { private ApplicationContext applicationContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); applicationContext.register(TestConfig.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTest.java index 22734395..3e3547e4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTest.java @@ -40,7 +40,7 @@ public class WsConfigurationSupportTest { private ApplicationContext applicationContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); applicationContext.register(TestConfig.class); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTest.java index 20f4dee0..cc5f4ebf 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTest.java @@ -43,7 +43,7 @@ public class WsConfigurerAdapterTest { private ApplicationContext applicationContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); applicationContext.register(TestConfig.class); @@ -131,7 +131,7 @@ public class WsConfigurerAdapterTest { } @Override - public Object resolveArgument(MessageContext messageContext, MethodParameter parameter) throws Exception { + public Object resolveArgument(MessageContext messageContext, MethodParameter parameter) { return null; } @@ -145,8 +145,7 @@ public class WsConfigurerAdapterTest { } @Override - public void handleReturnValue(MessageContext messageContext, MethodParameter returnType, Object returnValue) - throws Exception { + public void handleReturnValue(MessageContext messageContext, MethodParameter returnType, Object returnValue) { } } 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 8502c79d..cfc850a4 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 @@ -38,7 +38,7 @@ public class DefaultMessageContextTest { private WebServiceMessage request; @BeforeEach - public void setUp() throws Exception { + public void setUp() { factoryMock = createMock(WebServiceMessageFactory.class); request = new MockWebServiceMessage(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java index 03fc9395..1bdac9cd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java @@ -22,7 +22,7 @@ import org.springframework.ws.WebServiceMessageFactory; public class DomPoxMessageFactoryTest extends AbstractWebServiceMessageFactoryTest { @Override - protected WebServiceMessageFactory createMessageFactory() throws Exception { + protected WebServiceMessageFactory createMessageFactory() { return new DomPoxMessageFactory(); } 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 9b2a8056..9474e13f 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 @@ -50,7 +50,7 @@ public class MessageDispatcherTest { private WebServiceMessageFactory factoryMock; @BeforeEach - public void setUp() throws Exception { + public void setUp() { dispatcher = new MessageDispatcher(); factoryMock = createMock(WebServiceMessageFactory.class); @@ -395,7 +395,7 @@ public class MessageDispatcherTest { } @Test - public void testNoEndpointFound() throws Exception { + public void testNoEndpointFound() { dispatcher.setEndpointMappings(Collections.emptyList()); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java index 861a4084..b854ed4a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java @@ -30,7 +30,7 @@ public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractDom4jPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { + protected Element invokeInternal(Element requestElement, Document responseDocument) { assertThat(requestElement).isNotNull(); assertThat(responseDocument).isNotNull(); @@ -47,7 +47,7 @@ public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractDom4jPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { + protected Element invokeInternal(Element requestElement, Document responseDocument) { return null; } }; @@ -59,7 +59,7 @@ public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractDom4jPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { + protected Element invokeInternal(Element requestElement, Document responseDocument) { assertThat(requestElement).isNull(); return null; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java index 7d1ac352..887a37f7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java @@ -29,7 +29,7 @@ public class DomPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractDomPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement, Document document) throws Exception { + protected Element invokeInternal(Element requestElement, Document document) { return null; } }; @@ -41,7 +41,7 @@ public class DomPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractDomPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { + protected Element invokeInternal(Element requestElement, Document responseDocument) { assertThat(requestElement).isNotNull(); assertThat(responseDocument).isNotNull(); @@ -59,7 +59,7 @@ public class DomPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractDomPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement, Document responseDocument) throws Exception { + protected Element invokeInternal(Element requestElement, Document responseDocument) { assertThat(requestElement).isNull(); return null; 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 5d8947a6..21768ab4 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 @@ -49,7 +49,7 @@ public class EndpointExceptionResolverTest { }; exceptionResolver.setMappedEndpoints(Collections.singleton(this)); - methodEndpoint = new MethodEndpoint(this, getClass().getMethod("emptyMethod", new Class[0])); + methodEndpoint = new MethodEndpoint(this, getClass().getMethod("emptyMethod")); } @Test diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java index d0d71adb..3ed96f91 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java @@ -29,7 +29,7 @@ public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractJDomPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement) throws Exception { + protected Element invokeInternal(Element requestElement) { return null; } }; @@ -41,7 +41,7 @@ public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractJDomPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement) throws Exception { + protected Element invokeInternal(Element requestElement) { assertThat(requestElement).isNotNull(); assertThat(requestElement.getName()).isEqualTo(REQUEST_ELEMENT); @@ -58,7 +58,7 @@ public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractJDomPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement) throws Exception { + protected Element invokeInternal(Element requestElement) { assertThat(requestElement).isNull(); return null; 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 2aa93685..f261a076 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 @@ -116,7 +116,7 @@ public class MarshallingPayloadEndpointTest { AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { @Override - protected Object invokeInternal(Object requestObject) throws Exception { + protected Object invokeInternal(Object requestObject) { assertThat(requestObject).isEqualTo(42L); return "result"; @@ -174,7 +174,7 @@ public class MarshallingPayloadEndpointTest { AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { @Override - protected Object invokeInternal(Object requestObject) throws Exception { + protected Object invokeInternal(Object requestObject) { assertThat(requestObject).isEqualTo(42L); return null; @@ -201,7 +201,7 @@ public class MarshallingPayloadEndpointTest { AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { @Override - protected Object invokeInternal(Object requestObject) throws Exception { + protected Object invokeInternal(Object requestObject) { assertThat(requestObject).isNull(); return null; @@ -239,7 +239,7 @@ public class MarshallingPayloadEndpointTest { AbstractMarshallingPayloadEndpoint endpoint = new AbstractMarshallingPayloadEndpoint() { @Override - protected Object invokeInternal(Object requestObject) throws Exception { + protected Object invokeInternal(Object requestObject) { assertThat(requestObject).isEqualTo(42L); return "result"; @@ -261,12 +261,12 @@ public class MarshallingPayloadEndpointTest { private static class SimpleMarshaller implements Marshaller, Unmarshaller { @Override - public void marshal(Object graph, Result result) throws XmlMappingException, IOException { + public void marshal(Object graph, Result result) throws XmlMappingException { fail("Not expected"); } @Override - public Object unmarshal(Source source) throws XmlMappingException, IOException { + public Object unmarshal(Source source) throws XmlMappingException { fail("Not expected"); return null; } 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 dd2f0019..93906cef 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 @@ -59,7 +59,6 @@ public class MethodEndpointTest { @Test public void testEquals() throws Exception { - assertThat(endpoint).isEqualTo(endpoint); assertThat(endpoint).isEqualTo(new MethodEndpoint(this, method)); Method otherMethod = getClass().getMethod("testEquals"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java index 6fe38a7c..e33d74a6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java @@ -58,7 +58,7 @@ public class XomPayloadEndpointTest extends AbstractPayloadEndpointTest { return new AbstractXomPayloadEndpoint() { @Override - protected Element invokeInternal(Element requestElement) throws Exception { + protected Element invokeInternal(Element requestElement) { assertThat(requestElement).isNull(); return null; 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 14668491..1db81766 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 @@ -70,7 +70,7 @@ public class MarshallingMethodEndpointAdapterTest { @Test public void testNoResponse() throws Exception { - Method noResponse = getClass().getMethod("noResponse", new Class[] { MyType.class }); + Method noResponse = getClass().getMethod("noResponse", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); expect(unmarshallerMock.unmarshal(isA(Source.class))).andReturn(new MyType()); @@ -90,7 +90,7 @@ public class MarshallingMethodEndpointAdapterTest { MockWebServiceMessage request = new MockWebServiceMessage(); messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - Method noResponse = getClass().getMethod("noResponse", new Class[] { MyType.class }); + Method noResponse = getClass().getMethod("noResponse", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); replay(marshallerMock, unmarshallerMock); @@ -106,7 +106,7 @@ public class MarshallingMethodEndpointAdapterTest { @Test public void testResponse() throws Exception { - Method response = getClass().getMethod("response", new Class[] { MyType.class }); + 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)); @@ -125,7 +125,7 @@ public class MarshallingMethodEndpointAdapterTest { @Test public void testSupportedNoResponse() throws NoSuchMethodException { - Method noResponse = getClass().getMethod("noResponse", new Class[] { MyType.class }); + Method noResponse = getClass().getMethod("noResponse", MyType.class); MethodEndpoint methodEndpoint = new MethodEndpoint(this, noResponse); expect(unmarshallerMock.supports(MyType.class)).andReturn(true); @@ -139,7 +139,7 @@ public class MarshallingMethodEndpointAdapterTest { @Test public void testSupportedResponse() throws NoSuchMethodException { - Method response = getClass().getMethod("response", new Class[] { MyType.class }); + 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); @@ -154,8 +154,7 @@ public class MarshallingMethodEndpointAdapterTest { @Test public void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { - Method unsupported = getClass().getMethod("unsupportedMultipleParams", - new Class[] { String.class, String.class }); + Method unsupported = getClass().getMethod("unsupportedMultipleParams", String.class, String.class); replay(marshallerMock, unmarshallerMock); @@ -167,7 +166,7 @@ public class MarshallingMethodEndpointAdapterTest { @Test public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { - Method unsupported = getClass().getMethod("unsupportedWrongParam", new Class[] { String.class }); + Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); expect(unmarshallerMock.supports(String.class)).andReturn(false); expect(marshallerMock.supports(String.class)).andReturn(true); @@ -181,7 +180,7 @@ public class MarshallingMethodEndpointAdapterTest { @Test public void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { - Method unsupported = getClass().getMethod("unsupportedWrongParam", new Class[] { String.class }); + Method unsupported = getClass().getMethod("unsupportedWrongParam", String.class); expect(marshallerMock.supports(String.class)).andReturn(false); replay(marshallerMock, unmarshallerMock); 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 2d8ad78d..9f744d11 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 @@ -33,7 +33,7 @@ public class MessageEndpointAdapterTest { private MessageEndpoint endpointMock; @BeforeEach - public void setUp() throws Exception { + public void setUp() { adapter = new MessageEndpointAdapter(); endpointMock = createMock(MessageEndpoint.class); } 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 da2855f9..5dafe77c 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 @@ -36,7 +36,7 @@ public class MessageMethodEndpointAdapterTest { private MessageContext messageContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { adapter = new MessageMethodEndpointAdapter(); messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @@ -44,30 +44,28 @@ public class MessageMethodEndpointAdapterTest { @Test public void testSupported() throws NoSuchMethodException { - MethodEndpoint methodEndpoint = new MethodEndpoint(this, "supported", new Class[] { MessageContext.class }); + MethodEndpoint methodEndpoint = new MethodEndpoint(this, "supported", MessageContext.class); assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); } @Test public void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { - assertThat(adapter.supportsInternal(new MethodEndpoint(this, "unsupportedMultipleParams", - new Class[] { MessageContext.class, MessageContext.class }))) + assertThat(adapter.supportsInternal( + new MethodEndpoint(this, "unsupportedMultipleParams", MessageContext.class, MessageContext.class))) .isFalse(); } @Test public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { - assertThat(adapter - .supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", new Class[] { String.class }))) - .isFalse(); + assertThat(adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", String.class))).isFalse(); } @Test public void testInvokeSupported() throws Exception { - MethodEndpoint methodEndpoint = new MethodEndpoint(this, "supported", new Class[] { MessageContext.class }); + MethodEndpoint methodEndpoint = new MethodEndpoint(this, "supported", MessageContext.class); assertThat(supportedInvoked).isFalse(); 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 046e7840..c21e0193 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 @@ -44,7 +44,7 @@ public class PayloadEndpointAdapterTest { private PayloadEndpoint endpointMock; @BeforeEach - public void setUp() throws Exception { + public void setUp() { adapter = new PayloadEndpointAdapter(); endpointMock = createMock(PayloadEndpoint.class); 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 72682a4b..ac6d3578 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 @@ -44,7 +44,7 @@ public class PayloadMethodEndpointAdapterTest { private MessageContext messageContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { adapter = new PayloadMethodEndpointAdapter(); messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); @@ -53,45 +53,42 @@ public class PayloadMethodEndpointAdapterTest { @Test public void testSupportedNoResponse() throws NoSuchMethodException { - MethodEndpoint methodEndpoint = new MethodEndpoint(this, "noResponse", new Class[] { DOMSource.class }); + MethodEndpoint methodEndpoint = new MethodEndpoint(this, "noResponse", DOMSource.class); assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); } @Test public void testSupportedResponse() throws NoSuchMethodException { - MethodEndpoint methodEndpoint = new MethodEndpoint(this, "response", new Class[] { StreamSource.class }); + MethodEndpoint methodEndpoint = new MethodEndpoint(this, "response", StreamSource.class); assertThat(adapter.supportsInternal(methodEndpoint)).isTrue(); } @Test public void testUnsupportedMethodMultipleParams() throws NoSuchMethodException { - assertThat(adapter.supportsInternal( - new MethodEndpoint(this, "unsupportedMultipleParams", new Class[] { Source.class, Source.class }))) + assertThat(adapter + .supportsInternal(new MethodEndpoint(this, "unsupportedMultipleParams", Source.class, Source.class))) .isFalse(); } @Test public void testUnsupportedMethodWrongReturnType() throws NoSuchMethodException { - assertThat(adapter - .supportsInternal(new MethodEndpoint(this, "unsupportedWrongReturnType", new Class[] { Source.class }))) + assertThat(adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongReturnType", Source.class))) .isFalse(); } @Test public void testUnsupportedMethodWrongParam() throws NoSuchMethodException { - assertThat(adapter - .supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", new Class[] { String.class }))) - .isFalse(); + assertThat(adapter.supportsInternal(new MethodEndpoint(this, "unsupportedWrongParam", String.class))).isFalse(); } @Test public void testNoResponse() throws Exception { - MethodEndpoint methodEndpoint = new MethodEndpoint(this, "noResponse", new Class[] { DOMSource.class }); + MethodEndpoint methodEndpoint = new MethodEndpoint(this, "noResponse", DOMSource.class); assertThat(noResponseInvoked).isFalse(); @@ -105,7 +102,7 @@ public class PayloadMethodEndpointAdapterTest { WebServiceMessage request = new MockWebServiceMessage(""); messageContext = new DefaultMessageContext(request, new MockWebServiceMessageFactory()); - MethodEndpoint methodEndpoint = new MethodEndpoint(this, "response", new Class[] { StreamSource.class }); + MethodEndpoint methodEndpoint = new MethodEndpoint(this, "response", StreamSource.class); assertThat(responseInvoked).isFalse(); 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 b9dcbe6e..5e670d3e 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 @@ -71,7 +71,7 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { @Test public void testUnsupportedInvalidParam() throws NoSuchMethodException { - MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidParamType", new Class[] { Integer.TYPE }); + MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidParamType", Integer.TYPE); assertThat(adapter.supports(endpoint)).isFalse(); } @@ -79,45 +79,43 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { @Test public void testUnsupportedInvalidReturnType() throws NoSuchMethodException { - MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidReturnType", - new Class[] { String.class }); + MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidReturnType", String.class); assertThat(adapter.supports(endpoint)).isFalse(); } @Test public void testUnsupportedInvalidParams() throws NoSuchMethodException { - MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidParams", - new Class[] { String.class, String.class }); + MethodEndpoint endpoint = new MethodEndpoint(this, "unsupportedInvalidParams", String.class, String.class); assertThat(adapter.supports(endpoint)).isFalse(); } @Test public void testSupportedTypes() throws NoSuchMethodException { - MethodEndpoint endpoint = new MethodEndpoint(this, "supportedTypes", - new Class[] { Boolean.TYPE, Double.TYPE, Node.class, NodeList.class, String.class }); + MethodEndpoint endpoint = new MethodEndpoint(this, "supportedTypes", Boolean.TYPE, Double.TYPE, Node.class, + NodeList.class, String.class); assertThat(adapter.supports(endpoint)).isTrue(); } @Test public void testSupportsStringSource() throws NoSuchMethodException { - MethodEndpoint endpoint = new MethodEndpoint(this, "supportedStringSource", new Class[] { String.class }); + MethodEndpoint endpoint = new MethodEndpoint(this, "supportedStringSource", String.class); assertThat(adapter.supports(endpoint)).isTrue(); } @Test public void testSupportsSource() throws NoSuchMethodException { - MethodEndpoint endpoint = new MethodEndpoint(this, "supportedSource", new Class[] { String.class }); + MethodEndpoint endpoint = new MethodEndpoint(this, "supportedSource", String.class); assertThat(adapter.supports(endpoint)).isTrue(); } @Test public void testSupportsVoid() throws NoSuchMethodException { - MethodEndpoint endpoint = new MethodEndpoint(this, "supportedVoid", new Class[] { String.class }); + MethodEndpoint endpoint = new MethodEndpoint(this, "supportedVoid", String.class); assertThat(adapter.supports(endpoint)).isTrue(); } @@ -130,8 +128,8 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { replay(messageMock, factoryMock); MessageContext messageContext = new DefaultMessageContext(messageMock, factoryMock); - MethodEndpoint endpoint = new MethodEndpoint(this, "supportedTypes", - new Class[] { Boolean.TYPE, Double.TYPE, Node.class, NodeList.class, String.class }); + MethodEndpoint endpoint = new MethodEndpoint(this, "supportedTypes", Boolean.TYPE, Double.TYPE, Node.class, + NodeList.class, String.class); adapter.invoke(messageContext, endpoint); assertThat(supportedTypesInvoked).isTrue(); @@ -151,7 +149,7 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { replay(requestMock, responseMock, factoryMock); MessageContext messageContext = new DefaultMessageContext(requestMock, factoryMock); - MethodEndpoint endpoint = new MethodEndpoint(this, "supportedSource", new Class[] { String.class }); + MethodEndpoint endpoint = new MethodEndpoint(this, "supportedSource", String.class); adapter.invoke(messageContext, endpoint); assertThat(supportedSourceInvoked).isTrue(); @@ -185,13 +183,13 @@ public class XPathParamAnnotationMethodEndpointAdapterTest { replay(requestMock, factoryMock); - Map namespaces = new HashMap(); + Map namespaces = new HashMap<>(); namespaces.put("root", rootNamespace); namespaces.put("child", childNamespace); adapter.setNamespaces(namespaces); MessageContext messageContext = new DefaultMessageContext(requestMock, factoryMock); - MethodEndpoint endpoint = new MethodEndpoint(this, "namespaces", new Class[] { Node.class }); + MethodEndpoint endpoint = new MethodEndpoint(this, "namespaces", Node.class); adapter.invoke(messageContext, endpoint); assertThat(namespacesInvoked).isTrue(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java index 3d2794bf..2e9d0f2a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java @@ -60,7 +60,7 @@ public class SourcePayloadMethodProcessorTest extends AbstractPayloadMethodProce } @Override - protected Object getReturnValue(MethodParameter returnType) throws Exception { + protected Object getReturnValue(MethodParameter returnType) { return new StringSource(XML); } 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 d2901941..4a130cab 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 @@ -38,7 +38,7 @@ public class EndpointMappingTest { private MessageContext messageContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { messageContext = new DefaultMessageContext(new MockWebServiceMessageFactory()); } @@ -48,7 +48,7 @@ public class EndpointMappingTest { Object defaultEndpoint = new Object(); AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override - protected Object getEndpointInternal(MessageContext givenRequest) throws Exception { + protected Object getEndpointInternal(MessageContext givenRequest) { assertThat(givenRequest).isEqualTo(messageContext); return null; } @@ -67,7 +67,7 @@ public class EndpointMappingTest { final Object endpoint = new Object(); AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override - protected Object getEndpointInternal(MessageContext givenRequest) throws Exception { + protected Object getEndpointInternal(MessageContext givenRequest) { assertThat(givenRequest).isEqualTo(messageContext); return endpoint; } @@ -86,7 +86,7 @@ public class EndpointMappingTest { EndpointInterceptor interceptor = new EndpointInterceptorAdapter(); AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override - protected Object getEndpointInternal(MessageContext givenRequest) throws Exception { + protected Object getEndpointInternal(MessageContext givenRequest) { assertThat(givenRequest).isEqualTo(messageContext); return endpoint; } @@ -109,7 +109,7 @@ public class EndpointMappingTest { EndpointInterceptor interceptor = new EndpointInterceptorAdapter(); AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override - protected Object getEndpointInternal(MessageContext givenRequest) throws Exception { + protected Object getEndpointInternal(MessageContext givenRequest) { assertThat(givenRequest).isEqualTo(messageContext); return endpoint; } @@ -133,7 +133,7 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override - protected Object getEndpointInternal(MessageContext message) throws Exception { + protected Object getEndpointInternal(MessageContext message) { assertThat(message).isEqualTo(messageContext); return "endpoint"; } @@ -154,7 +154,7 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override - protected Object getEndpointInternal(MessageContext message) throws Exception { + protected Object getEndpointInternal(MessageContext message) { assertThat(message).isEqualTo(messageContext); return "noSuchBean"; } @@ -175,7 +175,7 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override - protected Object getEndpointInternal(MessageContext message) throws Exception { + protected Object getEndpointInternal(MessageContext message) { assertThat(message).isEqualTo(messageContext); return "endpoint"; } 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 e615f4b7..a572ab61 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 @@ -124,7 +124,7 @@ public class MapBasedSoapEndpointMappingTest { } @Override - protected String getLookupKeyForMessage(MessageContext messageContext) throws Exception { + protected String getLookupKeyForMessage(MessageContext messageContext) { return 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 720d53df..ffc94021 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 @@ -124,8 +124,8 @@ public class PayloadRootAnnotationMethodEndpointMappingTest { MessageDispatcher messageDispatcher = new SoapMessageDispatcher(); messageDispatcher.setApplicationContext(applicationContext); - messageDispatcher.setEndpointMappings(Collections.singletonList(mapping)); - messageDispatcher.setEndpointAdapters(Collections.singletonList(adapter)); + messageDispatcher.setEndpointMappings(Collections.singletonList(mapping)); + messageDispatcher.setEndpointAdapters(Collections.singletonList(adapter)); messageDispatcher.receive(messageContext); 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 6ed6cd7d..12e5c14c 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 @@ -33,7 +33,7 @@ public class PayloadRootQNameEndpointMappingTest { private PayloadRootQNameEndpointMapping mapping; @BeforeEach - public void setUp() throws Exception { + public void setUp() { mapping = new PayloadRootQNameEndpointMapping(); } 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 46bd1465..65e08e78 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 @@ -42,7 +42,7 @@ public class UriEndpointMappingTest { private MessageContext context; @BeforeEach - public void setUp() throws Exception { + public void setUp() { mapping = new UriEndpointMapping(); context = new DefaultMessageContext(new MockWebServiceMessageFactory()); 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 9a036393..cabbc9f5 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 @@ -31,7 +31,7 @@ public class XPathPayloadEndpointMappingTest { private XPathPayloadEndpointMapping mapping; @BeforeEach - public void setUp() throws Exception { + public void setUp() { mapping = new XPathPayloadEndpointMapping(); } 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 76d61f0b..5a7b325e 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 @@ -31,7 +31,7 @@ public class XmlRootElementEndpointMappingTest { private XmlRootElementEndpointMapping mapping; @BeforeEach - public void createMapping() throws NoSuchMethodException { + public void createMapping() { mapping = new XmlRootElementEndpointMapping(); } 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 bbc74dc7..d6e05576 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 @@ -109,12 +109,10 @@ public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest { @Test public void testSetStreamingPayload() throws Exception { - if (!(soapMessage instanceof StreamingWebServiceMessage)) { + if (!(soapMessage instanceof StreamingWebServiceMessage streamingMessage)) { return; } - StreamingWebServiceMessage streamingMessage = (StreamingWebServiceMessage) soapMessage; - final QName name = new QName("http://springframework.org", "root", ""); streamingMessage.setStreamingPayload(new StreamingPayload() { @@ -146,7 +144,7 @@ public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest { protected abstract Resource[] getSoapSchemas(); @Test - public abstract void testGetVersion() throws Exception; + public abstract void testGetVersion(); @Test public abstract void testWriteToTransportOutputStream() throws Exception; 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 e9619b79..27d97095 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 @@ -46,14 +46,10 @@ public abstract class AbstractWsAddressingTest { mimeHeaders.addHeader("Content-Type", " application/soap+xml"); InputStream is = AbstractWsAddressingTest.class.getResourceAsStream(fileName); - assertThat(is).isNotNull(); - - try { + try (is) { + assertThat(is).isNotNull(); return new SaajSoapMessage(messageFactory.createMessage(mimeHeaders, is)); } - finally { - is.close(); - } } protected void assertXMLSimilar(SaajSoapMessage expected, SaajSoapMessage result) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java index ad3635b1..88cdbf83 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java @@ -32,7 +32,7 @@ public class AddressingInterceptor200408Test extends AbstractAddressingIntercept } @Override - public void testNoneReplyTo() throws Exception { + public void testNoneReplyTo() { // This version of the spec does not have none addresses } 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 cc532eff..f24ae6fa 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 @@ -91,15 +91,11 @@ public class AnnotationActionMethodEndpointMappingTest { mimeHeaders.addHeader("Content-Type", " application/soap+xml"); InputStream is = getClass().getResourceAsStream("valid.xml"); - assertThat(is).isNotNull(); - - try { + try (is) { + assertThat(is).isNotNull(); SaajSoapMessage message = new SaajSoapMessage(messageFactory.createMessage(mimeHeaders, is)); return new DefaultMessageContext(message, new SaajSoapMessageFactory(messageFactory)); } - finally { - is.close(); - } } @Endpoint 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 96c852fb..c17a08ed 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 @@ -54,7 +54,7 @@ public class SoapMessageDispatcherTest { private SoapEndpointInterceptor interceptorMock; @BeforeEach - public void setUp() throws Exception { + public void setUp() { interceptorMock = createMock(SoapEndpointInterceptor.class); dispatcher = new SoapMessageDispatcher(); 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 8086a3ca..3b0f94c6 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 @@ -128,7 +128,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { AbstractFaultCreatingValidatingMarshallingPayloadEndpoint endpoint = new AbstractFaultCreatingValidatingMarshallingPayloadEndpoint() { @Override - protected Object invokeInternal(Object requestObject) throws Exception { + protected Object invokeInternal(Object requestObject) { return null; } }; @@ -210,7 +210,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { } @Override - public Object unmarshal(Source source) throws XmlMappingException, IOException { + public Object unmarshal(Source source) throws XmlMappingException { return person; } @@ -220,7 +220,7 @@ public class FaultCreatingValidatingMarshallingPayloadEndpointTest { } @Override - public void marshal(Object graph, Result result) throws XmlMappingException, IOException { + public void marshal(Object graph, Result result) throws XmlMappingException { } } 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 af6406eb..69948484 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 @@ -47,7 +47,7 @@ public class SimpleSoapExceptionResolverTest { private WebServiceMessageFactory factoryMock; @BeforeEach - public void setUp() throws Exception { + public void setUp() { exceptionResolver = new SimpleSoapExceptionResolver(); factoryMock = createMock(WebServiceMessageFactory.class); 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 9323af10..25354f79 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 @@ -45,7 +45,7 @@ public class SoapFaultAnnotationExceptionResolverTest { private SoapFaultAnnotationExceptionResolver resolver; @BeforeEach - public void setUp() throws Exception { + public void setUp() { resolver = new SoapFaultAnnotationExceptionResolver(); } @@ -240,18 +240,18 @@ public class SoapFaultAnnotationExceptionResolverTest { @SoapFault(faultCode = FaultCode.CLIENT, faultStringOrReason = "Client error") @SuppressWarnings("serial") - public class MyClientException extends Exception { + public static class MyClientException extends Exception { } @SuppressWarnings("serial") - public class MySubClientException extends MyClientException { + public static class MySubClientException extends MyClientException { } @SoapFault(faultCode = FaultCode.CLIENT) @SuppressWarnings("serial") - public class NoStringOrReasonException extends Exception { + public static class NoStringOrReasonException extends Exception { public NoStringOrReasonException(String message) { super(message); @@ -261,31 +261,31 @@ public class SoapFaultAnnotationExceptionResolverTest { @SoapFault(faultCode = FaultCode.SENDER, faultStringOrReason = "Sender error") @SuppressWarnings("serial") - public class MySenderException extends Exception { + public static class MySenderException extends Exception { } @SoapFault(faultCode = FaultCode.SERVER, faultStringOrReason = "Server error") @SuppressWarnings("serial") - public class MyServerException extends Exception { + public static class MyServerException extends Exception { } @SoapFault(faultCode = FaultCode.RECEIVER, faultStringOrReason = "Receiver error") @SuppressWarnings("serial") - public class MyReceiverException extends Exception { + public static class MyReceiverException extends Exception { } @SoapFault(faultCode = FaultCode.CUSTOM, customFaultCode = "{http://springframework.org/spring-ws}Fault", faultStringOrReason = "MyCustomException thrown", locale = "nl") @SuppressWarnings("serial") - public class MyCustomException extends Exception { + public static class MyCustomException extends Exception { } @SuppressWarnings("serial") - public class NonAnnotatedException extends Exception { + public static class NonAnnotatedException extends Exception { } 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 cb258810..0891f077 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 @@ -30,7 +30,7 @@ public class SoapFaultDefinitionEditorTest { private SoapFaultDefinitionEditor editor; @BeforeEach - public void setUp() throws Exception { + public void setUp() { editor = new SoapFaultDefinitionEditor(); } 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 56a0bcf5..1b1432c0 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 @@ -44,7 +44,7 @@ public class SoapFaultMappingExceptionResolverTest { private SoapFaultMappingExceptionResolver resolver; @BeforeEach - public void setUp() throws Exception { + public void setUp() { resolver = new SoapFaultMappingExceptionResolver(); } 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 d412cc6c..2129e44f 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 @@ -112,7 +112,7 @@ public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodA assertThat(List.class).isAssignableFrom(result.getClass()); - List elements = (List) result; + List elements = (List) result; assertThat(elements.size()).isGreaterThan(1); 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 e4bf27f9..5c48cba7 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 @@ -344,13 +344,13 @@ public class PayloadValidatingInterceptorTest { return new SAXParseException[0]; } - public void warning(SAXParseException exception) throws SAXException { + public void warning(SAXParseException exception) { } - public void error(SAXParseException exception) throws SAXException { + public void error(SAXParseException exception) { } - public void fatalError(SAXParseException exception) throws SAXException { + public void fatalError(SAXParseException exception) { } }; 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 922da73d..24923149 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 @@ -39,7 +39,7 @@ public class DelegatingSoapEndpointMappingTest { private EndpointMapping mock; @BeforeEach - public void setUp() throws Exception { + public void setUp() { endpointMapping = new DelegatingSoapEndpointMapping(); mock = createMock(EndpointMapping.class); 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 2eb09627..221090ef 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 @@ -45,7 +45,7 @@ public class SoapActionAnnotationMethodEndpointMappingTest { private StaticApplicationContext applicationContext; @BeforeEach - public void setUp() throws Exception { + public void setUp() { applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("mapping", SoapActionAnnotationMethodEndpointMapping.class); @@ -67,7 +67,7 @@ public class SoapActionAnnotationMethodEndpointMappingTest { assertThat(chain).isNotNull(); - Method doIt = MyEndpoint.class.getMethod("doIt", new Class[0]); + Method doIt = MyEndpoint.class.getMethod("doIt"); MethodEndpoint expected = new MethodEndpoint("endpoint", applicationContext, doIt); assertThat(chain.getEndpoint()).isEqualTo(expected); 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 4d562c73..60101002 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 @@ -52,7 +52,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa public void testCreateSoapMessageNoAttachment() throws Exception { InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11.xml"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put("Content-Type", "text/xml"); String soapAction = "\"http://springframework.org/spring-ws/Action\""; headers.put("SOAPAction", soapAction); @@ -73,7 +73,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa public void doTestCreateSoapMessageIllFormedXml() throws Exception { InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-ill-formed.xml"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put("Content-Type", "text/xml"); TransportInputStream tis = new MockTransportInputStream(is, headers); @@ -84,7 +84,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa public void testCreateSoapMessageSwA() throws Exception { InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-attachment.bin"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put("Content-Type", "multipart/related;" + "type=\"text/xml\";" + "boundary=\"----=_Part_0_11416420.1149699787554\""); TransportInputStream tis = new MockTransportInputStream(is, headers); @@ -112,7 +112,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa public void testCreateSoapMessageMtom() throws Exception { InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-mtom.bin"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put("Content-Type", "multipart/related;" + "start-info=\"text/xml\";" + "type=\"application/xop+xml\";" + "start=\"<0.urn:uuid:492264AB42E57108E01176731445508@apache.org>\";" @@ -141,7 +141,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa public void testCreateSoapMessageMtomWeirdStartInfo() throws Exception { InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-mtom.bin"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put("Content-Type", "multipart/related;" + "startinfo=\"text/xml\";" + "type=\"application/xop+xml\";" + "start=\"<0.urn:uuid:492264AB42E57108E01176731445508@apache.org>\";" @@ -179,7 +179,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa public void testCreateSoapMessageUtf16BigEndianByteOrderMark() throws Exception { InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-utf16-be-bom.xml"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put("Content-Type", "text/xml; charset=UTF-16"); TransportInputStream tis = new MockTransportInputStream(is, headers); @@ -192,7 +192,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa public void testCreateSoapMessageUtf16LittleEndianByteOrderMark() throws Exception { InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-utf16-le-bom.xml"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put("Content-Type", "text/xml; charset=UTF-16"); TransportInputStream tis = new MockTransportInputStream(is, headers); 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 0a49b5c3..55c8daf8 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 @@ -51,7 +51,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa public void testCreateSoapMessageNoAttachment() throws Exception { InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12.xml"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); String soapAction = "\"http://springframework.org/spring-ws/Action\""; headers.put(TransportConstants.HEADER_CONTENT_TYPE, "application/soap+xml; action=" + soapAction); TransportInputStream tis = new MockTransportInputStream(is, headers); @@ -69,7 +69,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa public void doTestCreateSoapMessageIllFormedXml() throws Exception { InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12-ill-formed.xml"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put(TransportConstants.HEADER_CONTENT_TYPE, "application/soap+xml"); TransportInputStream tis = new MockTransportInputStream(is, headers); @@ -80,7 +80,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa public void testCreateSoapMessageSwA() throws Exception { InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12-attachment.bin"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put("Content-Type", "multipart/related;" + "type=\"application/soap+xml\";" + "boundary=\"----=_Part_0_11416420.1149699787554\""); TransportInputStream tis = new MockTransportInputStream(is, headers); @@ -103,7 +103,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa public void testCreateSoapMessageMtom() throws Exception { InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12-mtom.bin"); - Map headers = new HashMap(); + Map headers = new HashMap<>(); headers.put("Content-Type", "multipart/related;" + "start-info=\"application/soap+xml\";" + "type=\"application/xop+xml\";" + "start=\"<0.urn:uuid:40864869929B855F971176851454456@apache.org>\";" 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 91f79f36..47ff6f3c 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,7 +43,7 @@ public class MockTransportInputStream extends TransportInputStream { Assert.notNull(inputStream, "inputStream must not be null"); this.inputStream = inputStream; - headers = new HashMap(); + headers = new HashMap<>(); } @Override 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 7b4a8866..d288c8f9 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 @@ -24,7 +24,7 @@ import org.springframework.util.Assert; public class MockTransportOutputStream extends TransportOutputStream { - private Map headers = new HashMap(); + private Map headers = new HashMap<>(); private OutputStream outputStream; 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 33e268a5..31c89343 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 @@ -260,7 +260,7 @@ public abstract class AbstractHttpWebServiceMessageSenderIntegrationTest\n" + " \n" - + " \n" + " DIS\n" - + " \n" + " \n" + ""; + private static final String REQUEST = """ + + + + DIS + + + """; private WebServiceMessageReceiverHandlerAdapter adapter; @@ -62,7 +67,7 @@ public class WebServiceMessageReceiverHandlerAdapterTest { private FaultAwareWebServiceMessage requestMock; @BeforeEach - public void setUp() throws Exception { + public void setUp() { adapter = new WebServiceMessageReceiverHandlerAdapter(); httpRequest = new MockHttpServletRequest(); 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 acc29a96..729ff2f1 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 @@ -46,7 +46,7 @@ public class WebServiceMessageReceiverObjectSupportTest { private MockWebServiceMessage request; @BeforeEach - public void setUp() throws Exception { + public void setUp() { receiverSupport = new MyReceiverSupport(); messageFactory = new MockWebServiceMessageFactory(); @@ -67,7 +67,7 @@ public class WebServiceMessageReceiverObjectSupportTest { WebServiceMessageReceiver receiver = new WebServiceMessageReceiver() { @Override - public void receive(MessageContext messageContext) throws Exception { + public void receive(MessageContext messageContext) { assertThat(messageContext).isNotNull(); messageContext.getResponse(); } @@ -91,7 +91,7 @@ public class WebServiceMessageReceiverObjectSupportTest { WebServiceMessageReceiver receiver = new WebServiceMessageReceiver() { @Override - public void receive(MessageContext messageContext) throws Exception { + public void receive(MessageContext messageContext) { assertThat(messageContext).isNotNull(); MockWebServiceMessage response = (MockWebServiceMessage) messageContext.getResponse(); @@ -112,7 +112,7 @@ public class WebServiceMessageReceiverObjectSupportTest { WebServiceMessageReceiver receiver = new WebServiceMessageReceiver() { - public void receive(MessageContext messageContext) throws Exception { + public void receive(MessageContext messageContext) { assertThat(messageContext).isNotNull(); } }; 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 4e863471..95474afb 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 @@ -57,6 +57,7 @@ public class DefaultMessagesProviderTest { } @Test + @SuppressWarnings("unchecked") public void testAddMessages() throws Exception { String definitionNamespace = "http://springframework.org/spring-ws"; 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 ffa6af23..e5bd58ec 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 @@ -60,6 +60,7 @@ public class Soap11ProviderTest { } @Test + @SuppressWarnings("unchecked") public void testPopulateBinding() throws Exception { String namespace = "http://springframework.org/spring-ws"; 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 687c0d1d..d0c8da61 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 @@ -60,6 +60,7 @@ public class Soap12ProviderTest { } @Test + @SuppressWarnings("unchecked") public void testPopulateBinding() throws Exception { String namespace = "http://springframework.org/spring-ws"; definition.addNamespace("tns", namespace); 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 6e3edde5..e975b4e5 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 @@ -51,6 +51,7 @@ public class SoapProviderTest { } @Test + @SuppressWarnings("unchecked") public void testPopulateBinding() throws Exception { String namespace = "http://springframework.org/spring-ws"; 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 95be78e5..6b191042 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 @@ -58,6 +58,7 @@ public class SuffixBasedMessagesProviderTest { } @Test + @SuppressWarnings("unchecked") public void testAddMessages() throws Exception { String definitionNamespace = "http://springframework.org/spring-ws"; 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 40a6e043..92d8f59c 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 @@ -43,6 +43,7 @@ public class SuffixBasedPortTypesProviderTest { } @Test + @SuppressWarnings("unchecked") public void testAddPortTypes() throws Exception { String namespace = "http://springframework.org/spring-ws"; diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CleanupCallback.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CleanupCallback.java index 3c7afc80..b4a10fb6 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CleanupCallback.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/CleanupCallback.java @@ -16,6 +16,7 @@ package org.springframework.ws.soap.security.callback; +import java.io.Serial; import java.io.Serializable; import javax.security.auth.callback.Callback; @@ -29,6 +30,7 @@ import javax.security.auth.callback.Callback; */ public class CleanupCallback implements Callback, Serializable { + @Serial private static final long serialVersionUID = 4744181820980888237L; } 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 80ba65ae..bcac9198 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 @@ -637,7 +637,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl protected void secureMessage(SoapMessage soapMessage, MessageContext messageContext) throws WsSecuritySecurementException { - List securementActionsVector = new ArrayList(); + List securementActionsVector; try { securementActionsVector = WSSecurityUtil.decodeHandlerAction(securementActions, wssConfig); } @@ -820,11 +820,10 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl List handlerResults; if ((handlerResults = (List) messageContext .getProperty(WSHandlerConstants.RECV_RESULTS)) == null) { - handlerResults = new ArrayList(); + handlerResults = new ArrayList<>(); messageContext.setProperty(WSHandlerConstants.RECV_RESULTS, handlerResults); } - WSHandlerResult rResult = new WSHandlerResult(validationActor, results, - Collections.>emptyMap()); + WSHandlerResult rResult = new WSHandlerResult(validationActor, results, Collections.emptyMap()); handlerResults.add(0, rResult); messageContext.setProperty(WSHandlerConstants.RECV_RESULTS, handlerResults); } diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/AbstractWsPasswordCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/AbstractWsPasswordCallbackHandler.java index f6ff2094..94323fc2 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/AbstractWsPasswordCallbackHandler.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/AbstractWsPasswordCallbackHandler.java @@ -46,8 +46,7 @@ public abstract class AbstractWsPasswordCallbackHandler extends AbstractCallback */ @Override protected final void handleInternal(Callback callback) throws IOException, UnsupportedCallbackException { - if (callback instanceof WSPasswordCallback) { - WSPasswordCallback passwordCallback = (WSPasswordCallback) callback; + if (callback instanceof WSPasswordCallback passwordCallback) { switch (passwordCallback.getUsage()) { case WSPasswordCallback.DECRYPT: handleDecrypt(passwordCallback); 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 425a058f..4b6dec54 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 @@ -41,7 +41,7 @@ import org.springframework.util.Assert; public class SimplePasswordValidationCallbackHandler extends AbstractWsPasswordCallbackHandler implements InitializingBean { - private Map users = new HashMap(); + private Map users = new HashMap<>(); /** * Sets the users to validate against. Property names are usernames, property values 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 c0601fd3..ebca7979 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 @@ -94,7 +94,7 @@ public class SpringSecurityPasswordValidationCallbackHandler extends AbstractWsP UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(principal, principal.getPassword(), user.getAuthorities()); if (logger.isDebugEnabled()) { - logger.debug("Authentication success: " + authRequest.toString()); + logger.debug("Authentication success: " + authRequest); } authRequest.setDetails(user); SecurityContextHolder.getContext().setAuthentication(authRequest); 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 e12a279a..5cb702f7 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 @@ -16,6 +16,7 @@ package org.springframework.ws.soap.security.wss4j2.callback; +import java.io.Serial; import java.io.Serializable; import javax.security.auth.callback.Callback; @@ -34,6 +35,7 @@ import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl; */ public class UsernameTokenPrincipalCallback implements Callback, Serializable { + @Serial private static final long serialVersionUID = -3022202225157082715L; private final WSUsernameTokenPrincipalImpl 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 a504002d..6af1619d 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 @@ -89,8 +89,7 @@ public class CryptoFactoryBean implements FactoryBean, InitializingBean return resource.getFile().getAbsolutePath(); } catch (IOException ex) { - if (resource instanceof ClassPathResource) { - ClassPathResource classPathResource = (ClassPathResource) resource; + if (resource instanceof ClassPathResource classPathResource) { return classPathResource.getPath(); } else { 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 6ae2edff..fb583e65 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 @@ -16,6 +16,7 @@ package org.springframework.ws.soap.security.x509; +import java.io.Serial; import java.security.cert.X509Certificate; import java.util.Collection; @@ -35,6 +36,7 @@ public class X509AuthenticationToken extends AbstractAuthenticationToken { // ~ Instance fields // ================================================================================================ + @Serial private static final long serialVersionUID = 1L; private Object 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 8e318265..50e16809 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 @@ -65,7 +65,7 @@ public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBea @Override public UserDetails getUserFromCache(X509Certificate userCert) { - Element element = null; + Element element; try { element = cache.get(userCert); 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 305f60ce..2d2b3a9a 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 @@ -51,7 +51,7 @@ public class CallbackHandlerChainTest { } @Test - public void testUnsupported() throws Exception { + public void testUnsupported() { assertThatExceptionOfType(UnsupportedCallbackException.class).isThrownBy(() -> { 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 d26bde57..9b0fe1a5 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 @@ -54,13 +54,13 @@ public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptor interceptor.setSecurementUsername("rsaKey"); SOAPMessage saajMessage = saajSoap11MessageFactory.createMessage(); transformer.transform(new StringSource(PAYLOAD), new DOMResult(saajMessage.getSOAPBody())); - SoapMessage message = new SaajSoapMessage(saajMessage, saajSoap11MessageFactory); + SaajSoapMessage message = new SaajSoapMessage(saajMessage, saajSoap11MessageFactory); MessageContext messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(saajSoap11MessageFactory)); interceptor.secureMessage(message, messageContext); - SOAPHeader header = ((SaajSoapMessage) message).getSaajMessage().getSOAPHeader(); + SOAPHeader header = message.getSaajMessage().getSOAPHeader(); Iterator iterator = header.getChildElements(new QName( "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "Security")); @@ -96,13 +96,13 @@ public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptor interceptor.setAddInclusivePrefixes(false); SOAPMessage saajMessage = saajSoap11MessageFactory.createMessage(); transformer.transform(new StringSource(PAYLOAD), new DOMResult(saajMessage.getSOAPBody())); - SoapMessage message = new SaajSoapMessage(saajMessage, saajSoap11MessageFactory); + SaajSoapMessage message = new SaajSoapMessage(saajMessage, saajSoap11MessageFactory); MessageContext messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(saajSoap11MessageFactory)); interceptor.secureMessage(message, messageContext); - SOAPHeader header = ((SaajSoapMessage) message).getSaajMessage().getSOAPHeader(); + SOAPHeader header = message.getSaajMessage().getSOAPHeader(); Iterator iterator = header.getChildElements(new QName( "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", "Security")); 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 30b6bb10..8a12791a 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 class SamlCallbackHandler implements CallbackHandler { + private static class SamlCallbackHandler implements CallbackHandler { private Crypto crypto; @@ -103,9 +103,8 @@ public abstract class Wss4jMessageInterceptorSamlTest extends Wss4jTest { public void handle(Callback[] callbacks) { for (Callback value : callbacks) { - if (value instanceof SAMLCallback) { + if (value instanceof SAMLCallback callback) { - SAMLCallback callback = (SAMLCallback) value; callback.setSamlVersion(Version.SAML_20); callback.setIssuerCrypto(crypto); callback.setIssuerKeyName("rsaKey"); 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 4eaf9223..d1e6cad3 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 @@ -63,7 +63,7 @@ public abstract class Wss4jMessageInterceptorTimestampTest extends Wss4jTest { } @Test - public void testValidateTimestampWithExpiredTtl() throws Exception { + public void testValidateTimestampWithExpiredTtl() { assertThatExceptionOfType(WsSecurityValidationException.class).isThrownBy(() -> { @@ -77,7 +77,7 @@ public abstract class Wss4jMessageInterceptorTimestampTest extends Wss4jTest { } @Test - public void testValidateTimestampWithExpiredTtlCustomTtl() throws Exception { + public void testValidateTimestampWithExpiredTtlCustomTtl() { assertThatExceptionOfType(WsSecurityValidationException.class).isThrownBy(() -> { 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 af0ff4ce..49ce5f86 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 @@ -34,7 +34,7 @@ public abstract class Wss4jMessageInterceptorUsernameTokenTest extends Wss4jTest private Properties users = new Properties(); @Override - protected void onSetup() throws Exception { + protected void onSetup() { users.setProperty("Bert", "Ernie"); } 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 1a108fd3..fa4126ae 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 @@ -65,7 +65,7 @@ public abstract class Wss4jTest { saajSoap11MessageFactory = MessageFactory.newInstance(); saajSoap12MessageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); - Map namespaces = new HashMap(); + Map namespaces = new HashMap<>(); namespaces.put("SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/"); namespaces.put("wsse", "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"); namespaces.put("ds", "http://www.w3.org/2000/09/xmldsig#"); 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 430bd73c..29aa0a1b 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 @@ -135,8 +135,7 @@ public class HttpsUrlConnectionMessageSender extends HttpUrlConnectionMessageSen @Override protected void prepareConnection(HttpURLConnection connection) throws IOException { super.prepareConnection(connection); - if (connection instanceof HttpsURLConnection) { - HttpsURLConnection httpsConnection = (HttpsURLConnection) connection; + if (connection instanceof HttpsURLConnection httpsConnection) { httpsConnection.setSSLSocketFactory(createSslSocketFactory()); if (hostnameVerifier != null) { 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 ce082759..cad78e99 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 @@ -60,7 +60,7 @@ public class WsdlDefinitionHttpHandler extends TransformerObjectSupport implemen @Override public void handle(HttpExchange httpExchange) throws IOException { - try { + try (httpExchange) { if (HttpTransportConstants.METHOD_GET.equals(httpExchange.getRequestMethod())) { Headers headers = httpExchange.getResponseHeaders(); headers.set(HttpTransportConstants.HEADER_CONTENT_TYPE, CONTENT_TYPE); @@ -77,9 +77,6 @@ public class WsdlDefinitionHttpHandler extends TransformerObjectSupport implemen catch (TransformerException ex) { logger.error(ex, ex); } - finally { - httpExchange.close(); - } } } 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 834d95b6..dbe29cf8 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 @@ -41,7 +41,7 @@ class BytesMessageInputStream extends InputStream { } @Override - public int read(byte b[]) throws IOException { + public int read(byte[] b) throws IOException { try { return message.readBytes(b); } @@ -51,7 +51,7 @@ class BytesMessageInputStream extends InputStream { } @Override - public int read(byte b[], int off, int len) throws IOException { + public int read(byte[] b, int off, int len) throws IOException { if (off == 0) { try { return message.readBytes(b, len); 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 a7d4282e..3a55ac41 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 @@ -40,7 +40,7 @@ class BytesMessageOutputStream extends OutputStream { } @Override - public void write(byte b[]) throws IOException { + public void write(byte[] b) throws IOException { try { message.writeBytes(b); } @@ -50,7 +50,7 @@ class BytesMessageOutputStream extends OutputStream { } @Override - public void write(byte b[], int off, int len) throws IOException { + public void write(byte[] b, int off, int len) throws IOException { try { message.writeBytes(b, off, len); } diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java index 216f5dc9..5470c0fc 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java @@ -108,8 +108,7 @@ public abstract class JmsTransportUtils { if (destination instanceof Queue) { destinationName = ((Queue) destination).getQueueName(); } - else if (destination instanceof Topic) { - Topic topic = (Topic) destination; + else if (destination instanceof Topic topic) { destinationName = topic.getTopicName(); } else { @@ -135,7 +134,7 @@ public abstract class JmsTransportUtils { */ public static Iterator getHeaderNames(Message message) throws JMSException { Enumeration properties = message.getPropertyNames(); - List results = new ArrayList(); + List results = new ArrayList<>(); while (properties.hasMoreElements()) { String property = (String) properties.nextElement(); if (property.startsWith(JmsTransportConstants.PROPERTY_PREFIX)) { 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 fe1ee5b5..6e3e1ee7 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 @@ -141,7 +141,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { @Override public Iterator getRequestHeaderNames() throws IOException { try { - List headers = new ArrayList(); + List headers = new ArrayList<>(); Enumeration enumeration = requestMessage.getAllHeaders(); while (enumeration.hasMoreElements()) { Header header = (Header) enumeration.nextElement(); @@ -229,7 +229,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { } } - private class ByteArrayDataSource implements DataSource { + private static 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 9486f1f9..c691df06 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 @@ -256,7 +256,7 @@ public class MailSenderConnection extends AbstractSenderConnection { @Override public Iterator getResponseHeaderNames() throws IOException { try { - List headers = new ArrayList(); + List headers = new ArrayList<>(); Enumeration enumeration = responseMessage.getAllHeaders(); while (enumeration.hasMoreElements()) { Header header = (Header) enumeration.nextElement(); @@ -307,7 +307,7 @@ public class MailSenderConnection extends AbstractSenderConnection { MailTransportUtils.closeService(store); } - private class ByteArrayDataSource implements DataSource { + private static class ByteArrayDataSource implements DataSource { private byte[] data; 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 da776287..4497764f 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 @@ -151,7 +151,7 @@ public abstract class MailTransportUtils { tempURL.append(host); } if (port != -1) { - tempURL.append(':').append(Integer.toString(port)); + tempURL.append(':').append(port); } if (StringUtils.hasLength(file)) { tempURL.append('/'); 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 6eddee48..5ba461bd 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 @@ -111,8 +111,7 @@ public class XmppMessageReceiver extends AbstractStandaloneMessageReceiver { @Override public void processStanza(Stanza packet) { logger.info("Received " + packet); - if (packet instanceof Message) { - Message message = (Message) packet; + if (packet instanceof Message message) { try { XmppReceiverConnection wsConnection = new XmppReceiverConnection(connection, message); wsConnection.setMessageEncoding(messageEncoding); 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 82adf18e..cc71d448 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 @@ -42,9 +42,13 @@ import static org.assertj.core.api.Assertions.assertThat; @ContextConfiguration("jms-receiver-applicationContext.xml") public class WebServiceMessageListenerIntegrationTest { - private static final String CONTENT = "" - + "\n" + "\n" - + "DIS\n" + "\n" + ""; + private static final String CONTENT = """ + \ + + + DIS + + """; @Autowired private JmsTemplate jmsTemplate; @@ -78,7 +82,7 @@ public class WebServiceMessageListenerIntegrationTest { } @Test - public void testReceiveQueueBytesMessage() throws Exception { + public void testReceiveQueueBytesMessage() { final byte[] b = CONTENT.getBytes(StandardCharsets.UTF_8); 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 b61b35e0..86a6e8d0 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 @@ -36,7 +36,7 @@ import org.springframework.ws.transport.WebServiceMessageSender; */ public class MockWebServiceMessageSender implements WebServiceMessageSender { - private final List expectedConnections = new LinkedList(); + private final List expectedConnections = new LinkedList<>(); private Iterator connectionIterator; 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 b94b8e04..3c4ffb80 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 @@ -35,11 +35,10 @@ abstract class SoapFaultResponseCreator extends AbstractResponseCreator { @Override protected void doWithResponse(URI uri, WebServiceMessage request, WebServiceMessage response) throws IOException { - if (!(response instanceof SoapMessage)) { + if (!(response instanceof SoapMessage soapResponse)) { fail("Response is not a SOAP message"); return; } - SoapMessage soapResponse = (SoapMessage) response; SoapBody responseBody = soapResponse.getSoapBody(); if (responseBody == null) { fail("SOAP message [" + response + "] does not contain SOAP body"); 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 edd84d0c..57478cbe 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 @@ -137,8 +137,7 @@ public abstract class ResponseMatchers { return new ResponseMatcher() { public void match(WebServiceMessage request, WebServiceMessage response) throws IOException, AssertionError { - if (response instanceof FaultAwareWebServiceMessage) { - FaultAwareWebServiceMessage faultMessage = (FaultAwareWebServiceMessage) response; + if (response instanceof FaultAwareWebServiceMessage faultMessage) { if (faultMessage.hasFault()) { fail("Response has a SOAP Fault: \"" + faultMessage.getFaultReason() + "\""); } 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 a04910e9..8cb18cb1 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 @@ -106,12 +106,10 @@ public class MockStrategiesHelper { + ClassUtils.getShortName(defaultType)); } T defaultStrategy = BeanUtils.instantiateClass(defaultType); - if (defaultStrategy instanceof ApplicationContextAware) { - ApplicationContextAware applicationContextAware = (ApplicationContextAware) defaultStrategy; + if (defaultStrategy instanceof ApplicationContextAware applicationContextAware) { applicationContextAware.setApplicationContext(applicationContext); } - if (defaultStrategy instanceof InitializingBean) { - InitializingBean initializingBean = (InitializingBean) defaultStrategy; + if (defaultStrategy instanceof InitializingBean initializingBean) { try { initializingBean.afterPropertiesSet(); } 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 e8bc430d..f45681ad 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 @@ -66,7 +66,7 @@ public class SourceAssertionError extends AssertionError { builder.append(super.getMessage()); String sourceString = getSourceString(); if (sourceString != null) { - String newLine = System.getProperty("line.separator"); + String newLine = System.lineSeparator(); builder.append(newLine); String label = sourceLabel != null ? sourceLabel : "Source"; builder.append(label); 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 64d6b6e1..153a3257 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 @@ -64,7 +64,7 @@ public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { Document actualDocument = soapMessage.getDocument(); Document expectedDocument = createDocumentFromSource(expected); Diff diff = new Diff(expectedDocument, actualDocument); - assertTrue("Envelopes are different, " + diff.toString(), diff.similar()); + assertTrue("Envelopes are different, " + diff, diff.similar()); } private Document createDocumentFromSource(Source source) { 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 375c70f6..66fbe1b6 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 @@ -42,7 +42,7 @@ public class DomContentHandler implements ContentHandler { private final Document document; - private final List elements = new ArrayList(); + private final List elements = new ArrayList<>(); private final Node node; @@ -93,7 +93,7 @@ public class DomContentHandler implements ContentHandler { } @Override - public void characters(char ch[], int start, int length) throws SAXException { + public void characters(char[] ch, int start, int length) throws SAXException { String data = new String(ch, start, length); Node parent = getParent(); Node lastChild = parent.getLastChild(); @@ -138,7 +138,7 @@ public class DomContentHandler implements ContentHandler { } @Override - public void ignorableWhitespace(char ch[], int start, int length) throws SAXException { + public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { } @Override diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/TraxUtils.java b/spring-xml/src/main/java/org/springframework/xml/transform/TraxUtils.java index b20b2ce8..fd5f2bf5 100644 --- a/spring-xml/src/main/java/org/springframework/xml/transform/TraxUtils.java +++ b/spring-xml/src/main/java/org/springframework/xml/transform/TraxUtils.java @@ -98,13 +98,11 @@ public abstract class TraxUtils { } } } - else if (source instanceof SAXSource) { - SAXSource saxSource = (SAXSource) source; + else if (source instanceof SAXSource saxSource) { callback.saxSource(saxSource.getXMLReader(), saxSource.getInputSource()); return; } - else if (source instanceof StreamSource) { - StreamSource streamSource = (StreamSource) source; + else if (source instanceof StreamSource streamSource) { if (streamSource.getInputStream() != null) { callback.streamSource(streamSource.getInputStream()); return; @@ -151,13 +149,11 @@ public abstract class TraxUtils { } } } - else if (result instanceof SAXResult) { - SAXResult saxSource = (SAXResult) result; + else if (result instanceof SAXResult saxSource) { callback.saxResult(saxSource.getHandler(), saxSource.getLexicalHandler()); return; } - else if (result instanceof StreamResult) { - StreamResult streamSource = (StreamResult) result; + else if (result instanceof StreamResult streamSource) { if (streamSource.getOutputStream() != null) { callback.streamResult(streamSource.getOutputStream()); return; 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 444f48b8..92c2dbdd 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 @@ -84,11 +84,11 @@ abstract class Jaxp13ValidatorFactory { */ private static class DefaultValidationErrorHandler implements ValidationErrorHandler { - private List errors = new ArrayList(); + private List errors = new ArrayList<>(); @Override public SAXParseException[] getErrors() { - return errors.toArray(new SAXParseException[errors.size()]); + return errors.toArray(new SAXParseException[0]); } @Override 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 eddbb40d..bdb23929 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 @@ -113,11 +113,11 @@ abstract class Jaxp15ValidatorFactory { */ private static class DefaultValidationErrorHandler implements ValidationErrorHandler { - private List errors = new ArrayList(); + private List errors = new ArrayList<>(); @Override public SAXParseException[] getErrors() { - return errors.toArray(new SAXParseException[errors.size()]); + return errors.toArray(new SAXParseException[0]); } @Override 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 bdb4ebd6..e91505e3 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 @@ -167,7 +167,7 @@ abstract class JaxenXPathExpressionFactory { public List evaluate(Node context, NodeMapper nodeMapper) throws XPathException { try { List nodes = xpath.selectNodes(context); - List results = new ArrayList(nodes.size()); + List results = new ArrayList<>(nodes.size()); for (int i = 0; i < nodes.size(); i++) { Node node = (Node) nodes.get(i); try { 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 3b648b01..f5cbc48f 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 @@ -150,7 +150,7 @@ public class JaxenXPathTemplate extends AbstractXPathTemplate { XPath xpath = createXPath(expression); Element element = getRootElement(context); List nodes = xpath.selectNodes(element); - List results = new ArrayList(nodes.size()); + List results = new ArrayList<>(nodes.size()); for (int i = 0; i < nodes.size(); i++) { Node node = (Node) nodes.get(i); try { 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 2c0e72a6..a2056637 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 @@ -130,7 +130,7 @@ abstract class Jaxp13XPathExpressionFactory { } private List toNodeList(NodeList nodeList) { - List result = new ArrayList(nodeList.getLength()); + List result = new ArrayList<>(nodeList.getLength()); for (int i = 0; i < nodeList.getLength(); i++) { result.add(nodeList.item(i)); } @@ -171,7 +171,7 @@ abstract class Jaxp13XPathExpressionFactory { @Override public List evaluate(Node node, NodeMapper nodeMapper) throws XPathException { NodeList nodes = (NodeList) evaluate(node, XPathConstants.NODESET); - List results = new ArrayList(nodes.getLength()); + List results = new ArrayList<>(nodes.getLength()); for (int i = 0; i < nodes.getLength(); i++) { try { results.add(nodeMapper.mapNode(nodes.item(i), i)); 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 075b6815..f5b967ed 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 @@ -88,7 +88,7 @@ public class Jaxp13XPathTemplate extends AbstractXPathTemplate { @Override public List evaluateAsNodeList(String expression, Source context) throws XPathException { NodeList result = (NodeList) evaluate(expression, context, XPathConstants.NODESET); - List nodes = new ArrayList(result.getLength()); + List nodes = new ArrayList<>(result.getLength()); for (int i = 0; i < result.getLength(); i++) { nodes.add(result.item(i)); } @@ -125,7 +125,7 @@ public class Jaxp13XPathTemplate extends AbstractXPathTemplate { @Override public List evaluate(String expression, Source context, NodeMapper nodeMapper) throws XPathException { NodeList nodes = (NodeList) evaluate(expression, context, XPathConstants.NODESET); - List results = new ArrayList(nodes.getLength()); + List results = new ArrayList<>(nodes.getLength()); for (int i = 0; i < nodes.getLength(); i++) { try { results.add(nodeMapper.mapNode(nodes.item(i), i)); 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 c5360ea7..de1e459d 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 @@ -49,7 +49,7 @@ public abstract class XPathExpressionFactory { */ public static XPathExpression createXPathExpression(String expression) throws IllegalStateException, XPathParseException { - return createXPathExpression(expression, Collections.emptyMap()); + return createXPathExpression(expression, Collections.emptyMap()); } /** @@ -67,13 +67,8 @@ public abstract class XPathExpressionFactory { if (namespaces == null) { namespaces = Collections.emptyMap(); } - try { - logger.trace("Creating [javax.xml.xpath.XPathExpression]"); - return Jaxp13XPathExpressionFactory.createXPathExpression(expression, namespaces); - } - catch (XPathException e) { - throw e; - } + logger.trace("Creating [javax.xml.xpath.XPathExpression]"); + return Jaxp13XPathExpressionFactory.createXPathExpression(expression, namespaces); } } 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 cc447548..1f00b50a 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 @@ -86,8 +86,8 @@ public class CommonsXsdSchema implements XsdSchema { } public QName[] getElementNames() { - List result = new ArrayList(schema.getElements().keySet()); - return result.toArray(new QName[result.size()]); + List result = new ArrayList<>(schema.getElements().keySet()); + return result.toArray(new QName[0]); } @Override 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 dfbf1dcf..2377a1f0 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 @@ -66,7 +66,7 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali private final XmlSchemaCollection schemaCollection = new XmlSchemaCollection(); - private final List xmlSchemas = new ArrayList(); + private final List xmlSchemas = new ArrayList<>(); private Resource[] xsdResources; @@ -132,8 +132,8 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali schemaCollection.setSchemaResolver(uriResolver); - Set processedIncludes = new HashSet(); - Set processedImports = new HashSet(); + Set processedIncludes = new HashSet<>(); + Set processedImports = new HashSet<>(); for (Resource xsdResource : xsdResources) { Assert.isTrue(xsdResource.exists(), xsdResource + " does not exist"); @@ -208,8 +208,7 @@ public class CommonsXsdSchemaCollection implements XsdSchemaCollection, Initiali processedImports.add(schema); List externals = schema.getExternals(); for (XmlSchemaExternal external : externals) { - if (external instanceof XmlSchemaImport) { - XmlSchemaImport schemaImport = (XmlSchemaImport) external; + if (external instanceof XmlSchemaImport schemaImport) { XmlSchema importedSchema = schemaImport.getSchema(); if (!"http://www.w3.org/XML/1998/namespace".equals(schemaImport.getNamespace()) && importedSchema != null && !processedImports.contains(importedSchema)) { 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 02d35b7c..c181f711 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 @@ -28,7 +28,7 @@ public class QNameEditorTest { private QNameEditor editor; @BeforeEach - public void setUp() throws Exception { + public void setUp() { editor = new QNameEditor(); } 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 63f9f223..863a7a58 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 @@ -34,7 +34,7 @@ public class TransformerHelperTest { private Transformer transformer; @BeforeEach - public void setUp() throws Exception { + public void setUp() { helper = new TransformerHelper(); transformer = mock(Transformer.class); 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 14e4c6eb..81abf1d9 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 @@ -115,7 +115,6 @@ public abstract class AbstractValidatorFactoryTest { SAXParseException[] errors = validator.validate(new DOMSource(document)); assertThat(errors).isEmpty(); - ; } @Test @@ -149,7 +148,6 @@ public abstract class AbstractValidatorFactoryTest { errors = validator.validate(document); assertThat(errors).isEmpty(); - ; } @Test @@ -160,13 +158,13 @@ public abstract class AbstractValidatorFactoryTest { return new SAXParseException[0]; } - public void warning(SAXParseException exception) throws SAXException { + public void warning(SAXParseException exception) { } - public void error(SAXParseException exception) throws SAXException { + public void error(SAXParseException exception) { } - public void fatalError(SAXParseException exception) throws SAXException { + public void fatalError(SAXParseException exception) { } }; diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java index 6a53b4ea..a61ba46f 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java @@ -40,7 +40,7 @@ public class SchemaLoaderUtilsTest { } @Test - public void testLoadNonExistantSchema() throws Exception { + public void testLoadNonExistantSchema() { assertThatIllegalArgumentException().isThrownBy(() -> { Resource nonExistent = new ClassPathResource("bla"); @@ -49,7 +49,7 @@ public class SchemaLoaderUtilsTest { } @Test - public void testLoadNullSchema() throws Exception { + public void testLoadNullSchema() { assertThatIllegalArgumentException() .isThrownBy(() -> SchemaLoaderUtils.loadSchema((Resource) null, XMLConstants.W3C_XML_SCHEMA_NS_URI)); 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 eca79c7d..8eb7da7e 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 @@ -43,7 +43,7 @@ public abstract class AbstractXPathExpressionFactoryTest { private Document namespacesDocument; - private Map namespaces = new HashMap(); + private Map namespaces = new HashMap<>(); @BeforeEach public void setUp() throws Exception { @@ -82,7 +82,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsBooleanInvalidNamespaces() throws IOException, SAXException { + public void testEvaluateAsBooleanInvalidNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", namespaces); boolean result = expression.evaluateAsBoolean(namespacesDocument); @@ -91,7 +91,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsBooleanInvalidNoNamespaces() throws IOException, SAXException { + public void testEvaluateAsBooleanInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); boolean result = expression.evaluateAsBoolean(noNamespacesDocument); @@ -100,7 +100,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsBooleanNamespaces() throws IOException, SAXException { + public void testEvaluateAsBooleanNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/prefix2:boolean/text()", namespaces); @@ -110,7 +110,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsBooleanNoNamespaces() throws IOException, SAXException { + public void testEvaluateAsBooleanNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/boolean/text()"); boolean result = expression.evaluateAsBoolean(noNamespacesDocument); @@ -119,7 +119,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsDoubleInvalidNamespaces() throws IOException, SAXException { + public void testEvaluateAsDoubleInvalidNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", namespaces); double result = expression.evaluateAsNumber(noNamespacesDocument); @@ -128,7 +128,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsDoubleInvalidNoNamespaces() throws IOException, SAXException { + public void testEvaluateAsDoubleInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); double result = expression.evaluateAsNumber(noNamespacesDocument); @@ -137,7 +137,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsDoubleNamespaces() throws IOException, SAXException { + public void testEvaluateAsDoubleNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/prefix2:number/text()", namespaces); @@ -147,7 +147,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsDoubleNoNamespaces() throws IOException, SAXException { + public void testEvaluateAsDoubleNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child/number/text()"); double result = expression.evaluateAsNumber(noNamespacesDocument); @@ -156,7 +156,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsNodeInvalidNamespaces() throws IOException, SAXException { + public void testEvaluateAsNodeInvalidNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:otherchild", namespaces); Node result = expression.evaluateAsNode(namespacesDocument); @@ -165,7 +165,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsNodeInvalidNoNamespaces() throws IOException, SAXException { + public void testEvaluateAsNodeInvalidNoNamespaces() { XPathExpression expression = createXPathExpression("/root/otherchild"); Node result = expression.evaluateAsNode(noNamespacesDocument); @@ -174,7 +174,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsNodeNamespaces() throws IOException, SAXException { + public void testEvaluateAsNodeNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child", namespaces); Node result = expression.evaluateAsNode(namespacesDocument); @@ -184,7 +184,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsNodeNoNamespaces() throws IOException, SAXException { + public void testEvaluateAsNodeNoNamespaces() { XPathExpression expression = createXPathExpression("/root/child"); Node result = expression.evaluateAsNode(noNamespacesDocument); @@ -194,7 +194,7 @@ public abstract class AbstractXPathExpressionFactoryTest { } @Test - public void testEvaluateAsNodeListNamespaces() throws IOException, SAXException { + public void testEvaluateAsNodeListNamespaces() { XPathExpression expression = createXPathExpression("/prefix1:root/prefix2:child/*", namespaces); List results = expression.evaluateAsNodeList(namespacesDocument); @@ -254,7 +254,7 @@ public abstract class AbstractXPathExpressionFactoryTest { public void testEvaluateAsObject() { XPathExpression expression = createXPathExpression("/root/child"); - String result = expression.evaluateAsObject(noNamespacesDocument, new NodeMapper() { + String result = expression.evaluateAsObject(noNamespacesDocument, new NodeMapper<>() { public String mapNode(Node node, int nodeNum) throws DOMException { return node.getLocalName(); } @@ -268,7 +268,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(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 d0390094..500ad54c 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 @@ -211,7 +211,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateAsObject() throws Exception { - String result = template.evaluateAsObject("/root/child", nonamespaces, new NodeMapper() { + String result = template.evaluateAsObject("/root/child", nonamespaces, new NodeMapper<>() { public String mapNode(Node node, int nodeNum) throws DOMException { return node.getLocalName(); } @@ -224,7 +224,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluate() throws Exception { - List results = template.evaluate("/root/child/*", nonamespaces, new NodeMapper() { + List results = template.evaluate("/root/child/*", 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/JaxenXPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java index ca4d2fb2..41d5caa2 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java @@ -34,12 +34,12 @@ public class JaxenXPathExpressionFactoryTest extends AbstractXPathExpressionFact } @Override - public void testEvaluateAsDoubleNoNamespaces() throws IOException, SAXException { + public void testEvaluateAsDoubleNoNamespaces() { // Currently not working on Jaxen 1.1 beta 8, hence the override here } @Override - public void testEvaluateAsDoubleNamespaces() throws IOException, SAXException { + public void testEvaluateAsDoubleNamespaces() { // Currently not working on Jaxen 1.1 beta 8, hence the override here } diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java index 7a6b0cc9..f3bc384e 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java @@ -25,7 +25,7 @@ public class JaxenXPathTemplateTest extends AbstractXPathTemplateTest { protected XPathOperations createTemplate() { JaxenXPathTemplate template = new JaxenXPathTemplate(); - Map namespaces = new HashMap(); + Map namespaces = new HashMap<>(); namespaces.put("prefix1", "namespace1"); namespaces.put("prefix2", "namespace2"); template.setNamespaces(namespaces); 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 9fa7a8a1..bac309db 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 @@ -26,7 +26,7 @@ public class XPathExpressionFactoryBeanTest { private XPathExpressionFactoryBean factoryBean; @BeforeEach - public void setUp() throws Exception { + public void setUp() { factoryBean = new XPathExpressionFactoryBean(); } 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 890b270c..682ff255 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 @@ -140,7 +140,7 @@ public class CommonsXsdSchemaCollectionTest { } @Test - public void testInvalidSchema() throws Exception { + public void testInvalidSchema() { Resource invalid = new ClassPathResource("invalid.xsd", AbstractXsdSchemaTest.class); collection.setXsds(invalid);