Polish

Author: snicoll

spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java

@@ -389,7 +389,7 @@ private void initMessageFactory(DefaultStrategiesHelper helper) throws BeanIniti
 
 	private void initMessageSenders(DefaultStrategiesHelper helper) {
 		List<WebServiceMessageSender> 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 void doWithMessage(WebServiceMessage request) throws IOException, Transfo
 					}
 				}
 			}
-		}, new WebServiceMessageExtractor<Object>() {
+		}, new WebServiceMessageExtractor<>() {
 
 			public Object extractData(WebServiceMessage response) throws IOException {
 				Unmarshaller unmarshaller = getUnmarshaller();
@@ -473,7 +473,7 @@ public boolean sendSourceAndReceiveToResult(String uri, Source requestPayload,
 		try {
 			final Transformer transformer = createTransformer();
 			Boolean retVal = doSendAndReceive(uri, transformer, requestPayload, requestCallback,
-					new SourceExtractor<Boolean>() {
+					new SourceExtractor<>() {
 
 						public Boolean extractData(Source source) throws IOException, TransformerException {
 							if (source != null) {
@@ -532,7 +532,7 @@ public void doWithMessage(WebServiceMessage message) throws IOException, Transfo
 					requestCallback.doWithMessage(message);
 				}
 			}
-		}, new SourceExtractorMessageExtractor<T>(responseExtractor));
+		}, new SourceExtractorMessageExtractor<>(responseExtractor));
 	}
 
 	//
@@ -689,8 +689,7 @@ else if (sentMessageTracingLogger.isDebugEnabled()) {
 	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 @@ else if (receivedMessageTracingLogger.isDebugEnabled()) {
 	 * @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;

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<String, String> expressionNamespaces = new HashMap<String, String>();
+	private Map<String, String> expressionNamespaces = new HashMap<>();
 
 	private XPathExpression locationXPathExpression;
 

spring-ws-core/src/main/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParser.java

@@ -110,10 +110,10 @@ private void registerEndpointMappings(Object source, ParserContext parserContext
 	private void registerEndpointAdapters(Element element, Object source, ParserContext parserContext) {
 		RootBeanDefinition adapterDef = createBeanDefinition(DefaultMethodEndpointAdapter.class, source);
 
-		ManagedList<BeanMetadataElement> argumentResolvers = new ManagedList<BeanMetadataElement>();
+		ManagedList<BeanMetadataElement> argumentResolvers = new ManagedList<>();
 		argumentResolvers.setSource(source);
 
-		ManagedList<BeanMetadataElement> returnValueHandlers = new ManagedList<BeanMetadataElement>();
+		ManagedList<BeanMetadataElement> returnValueHandlers = new ManagedList<>();
 		returnValueHandlers.setSource(source);
 
 		argumentResolvers.add(createBeanDefinition(MessageContextMethodArgumentResolver.class, source));

spring-ws-core/src/main/java/org/springframework/ws/config/DynamicWsdlBeanDefinitionParser.java

@@ -68,7 +68,7 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 		if (commonsSchemaPresent) {
 			RootBeanDefinition collectionDef = createBeanDefinition(CommonsXsdSchemaCollection.class, source);
 			collectionDef.getPropertyValues().addPropertyValue("inline", "true");
-			ManagedList<String> xsds = new ManagedList<String>();
+			ManagedList<String> xsds = new ManagedList<>();
 			xsds.setSource(source);
 			for (Element schema : schemas) {
 				xsds.add(schema.getAttribute("location"));

spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurationSupport.java

@@ -124,10 +124,10 @@ public AnnotationActionEndpointMapping annotationActionEndpointMapping() {
 	 */
 	protected final EndpointInterceptor[] getInterceptors() {
 		if (interceptors == null) {
-			interceptors = new ArrayList<EndpointInterceptor>();
+			interceptors = new ArrayList<>();
 			addInterceptors(interceptors);
 		}
-		return interceptors.toArray(new EndpointInterceptor[interceptors.size()]);
+		return interceptors.toArray(new EndpointInterceptor[0]);
 	}
 
 	/**
@@ -148,10 +148,10 @@ protected void addInterceptors(List<EndpointInterceptor> interceptors) {
 	 */
 	@Bean
 	public DefaultMethodEndpointAdapter defaultMethodEndpointAdapter() {
-		List<MethodArgumentResolver> argumentResolvers = new ArrayList<MethodArgumentResolver>();
+		List<MethodArgumentResolver> argumentResolvers = new ArrayList<>();
 		addArgumentResolvers(argumentResolvers);
 
-		List<MethodReturnValueHandler> returnValueHandlers = new ArrayList<MethodReturnValueHandler>();
+		List<MethodReturnValueHandler> returnValueHandlers = new ArrayList<>();
 		addReturnValueHandlers(returnValueHandlers);
 
 		DefaultMethodEndpointAdapter adapter = new DefaultMethodEndpointAdapter();

spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurerComposite.java

@@ -32,7 +32,7 @@
  */
 public class WsConfigurerComposite implements WsConfigurer {
 
-	private List<WsConfigurer> delegates = new ArrayList<WsConfigurer>();
+	private List<WsConfigurer> delegates = new ArrayList<>();
 
 	public void addWsConfigurers(List<WsConfigurer> configurers) {
 		if (configurers != null) {

spring-ws-core/src/main/java/org/springframework/ws/context/AbstractMessageContext.java

@@ -62,7 +62,7 @@ public void setProperty(String name, Object value) {
 
 	private Map<String, Object> getProperties() {
 		if (properties == null) {
-			properties = new HashMap<String, Object>();
+			properties = new HashMap<>();
 		}
 		return properties;
 	}

spring-ws-core/src/main/java/org/springframework/ws/mime/AbstractMimeMessage.java

@@ -93,8 +93,7 @@ public String getContentType() {
 
 		@Override
 		public String getName() {
-			if (inputStreamSource instanceof Resource) {
-				Resource resource = (Resource) inputStreamSource;
+			if (inputStreamSource instanceof Resource resource) {
 				return resource.getFilename();
 			}
 			else {

spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessage.java

@@ -105,8 +105,7 @@ public String toString() {
 	@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));

spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java

@@ -149,7 +149,7 @@ protected void logMessageSource(String logMessage, Source source) throws Transfo
 			Transformer transformer = createNonIndentingTransformer();
 			StringWriter writer = new StringWriter();
 			transformer.transform(source, new StreamResult(writer));
-			String message = logMessage + writer.toString();
+			String message = logMessage + writer;
 			logMessage(message);
 		}
 	}