SWS-981 - Polish

Author: gregturn

spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java

@@ -115,8 +115,7 @@ public SaajSoapMessage(SOAPMessage soapMessage, boolean langAttributeOnSoap11Fau
 		saajMessage = soapMessage;
 		this.langAttributeOnSoap11FaultString = langAttributeOnSoap11FaultString;
 		this.messageFactory = messageFactory;
-		if (SoapVersion.SOAP_11.equals(getVersion()))
-		{
+		if (SoapVersion.SOAP_11.equals(getVersion())) {
 			MimeHeaders headers = soapMessage.getMimeHeaders();
 			if (ObjectUtils.isEmpty(headers.getHeader(TransportConstants.HEADER_SOAP_ACTION))) {
 				headers.addHeader(TransportConstants.HEADER_SOAP_ACTION, "\"\"");

spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTest.java

@@ -1,29 +1,31 @@
 package org.springframework.ws.soap.client.core;
 
 import java.io.IOException;
-
 import javax.xml.soap.MessageFactory;
 import javax.xml.soap.SOAPConstants;
 import javax.xml.soap.SOAPException;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.ws.soap.SoapVersion;
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
 import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.ws.soap.support.SoapUtils;
 import org.springframework.ws.transport.TransportConstants;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
 public class SaajSoapActionCallbackTest {
 
 	private SaajSoapMessageFactory saaj11Factory = new SaajSoapMessageFactory();
 
 	private SaajSoapMessageFactory saaj12Factory = new SaajSoapMessageFactory();
 
 	@Before
-	public void init() throws SOAPException
-	{
+	public void init() throws SOAPException {
 		MessageFactory messageFactory11 = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
 
 		saaj11Factory.setSoapVersion(SoapVersion.SOAP_11);
@@ -37,63 +39,66 @@ public void init() throws SOAPException
 	}
 
 	@Test
-	public void noSoapAction11() throws IOException
-	{
+	public void noSoapAction11ShouldProduceEmptySoapActionHeader() throws IOException {
 		SaajSoapMessage message = saaj11Factory.createWebServiceMessage();
 		String[] soapActionHeaders = message.getSaajMessage().getMimeHeaders().getHeader(TransportConstants.HEADER_SOAP_ACTION);
-		Assert.assertEquals("\"\"", soapActionHeaders[0]);
+
+		assertThat(soapActionHeaders.length, is(1));
+		assertThat(soapActionHeaders[0], is("\"\""));
 	}
 
 	@Test
-	public void soapAction11() throws IOException
-	{
+	public void soapAction11ShouldProduceSoapActionHeader() throws IOException {
 		SaajSoapMessage message = saaj11Factory.createWebServiceMessage();
 		SoapActionCallback callback = new SoapActionCallback("testAction");
 		callback.doWithMessage(message);
 		String[] soapActionHeaders = message.getSaajMessage().getMimeHeaders().getHeader(TransportConstants.HEADER_SOAP_ACTION);
-		Assert.assertEquals("\"testAction\"", soapActionHeaders[0]);
+
+		assertThat(soapActionHeaders.length, is(1));
+		assertThat(soapActionHeaders[0], is("\"testAction\""));
 	}
 
 	@Test
-	public void emptySoapAction11() throws IOException
-	{
+	public void emptySoapAction11() throws IOException {
 		SaajSoapMessage message = saaj11Factory.createWebServiceMessage();
 		SoapActionCallback callback = new SoapActionCallback(null);
 		callback.doWithMessage(message);
 		String[] soapActionHeaders = message.getSaajMessage().getMimeHeaders().getHeader(TransportConstants.HEADER_SOAP_ACTION);
-		Assert.assertEquals("\"\"", soapActionHeaders[0]);
+
+		assertThat(soapActionHeaders.length, is(1));
+		assertThat(soapActionHeaders[0], is("\"\""));
 	}
 
 	@Test
-	public void noSoapAction12() throws IOException
-	{
+	public void noSoapAction12() throws IOException {
 		SaajSoapMessage message = saaj12Factory.createWebServiceMessage();
 		String[] soapActionHeaders = message.getSaajMessage().getMimeHeaders().getHeader(TransportConstants.HEADER_SOAP_ACTION);
-		Assert.assertNull(soapActionHeaders);
+
+		assertThat(soapActionHeaders, is(nullValue()));
 	}
 
 	@Test
-	public void soapAction12() throws IOException
-	{
+	public void soapAction12ShouldProduceNoSoapActionHeader() throws IOException {
 		SaajSoapMessage message = saaj12Factory.createWebServiceMessage();
 		SoapActionCallback callback = new SoapActionCallback("testAction");
 		callback.doWithMessage(message);
 		String[] soapActionHeaders = message.getSaajMessage().getMimeHeaders().getHeader(TransportConstants.HEADER_SOAP_ACTION);
-		Assert.assertNull(soapActionHeaders);
 		String[] contentTypes = message.getSaajMessage().getMimeHeaders().getHeader(TransportConstants.HEADER_CONTENT_TYPE);
-		Assert.assertEquals("\"testAction\"", SoapUtils.extractActionFromContentType(contentTypes[0]));
+
+		assertThat(soapActionHeaders, is(nullValue()));
+		assertThat(SoapUtils.extractActionFromContentType(contentTypes[0]), is("\"testAction\""));
 	}
 
 	@Test
-	public void emptySoapAction12() throws IOException
-	{
+	public void emptySoapAction12ShouldProduceNoSoapActionHeader() throws IOException {
 		SaajSoapMessage message = saaj12Factory.createWebServiceMessage();
 		SoapActionCallback callback = new SoapActionCallback(null);
 		callback.doWithMessage(message);
 		String[] soapActionHeaders = message.getSaajMessage().getMimeHeaders().getHeader(TransportConstants.HEADER_SOAP_ACTION);
-		Assert.assertNull(soapActionHeaders);
 		String[] contentTypes = message.getSaajMessage().getMimeHeaders().getHeader(TransportConstants.HEADER_CONTENT_TYPE);
-		Assert.assertEquals("\"\"", SoapUtils.extractActionFromContentType(contentTypes[0]));
+
+		assertThat(soapActionHeaders, is(nullValue()));
+		assertThat(SoapUtils.extractActionFromContentType(contentTypes[0]), is("\"\""));
 	}
 
 }