Polishing

spring-test/src/main/java/org/springframework/mock/http/MockHttpInputMessage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.mock.http;
 
 import java.io.ByteArrayInputStream;
@@ -37,14 +38,15 @@ public class MockHttpInputMessage implements HttpInputMessage {
 
 
 	public MockHttpInputMessage(byte[] contents) {
-		this.body = (contents != null) ? new ByteArrayInputStream(contents) : null;
+		this.body = (contents != null ? new ByteArrayInputStream(contents) : null);
 	}
 
 	public MockHttpInputMessage(InputStream body) {
-		Assert.notNull(body, "'body' must not be null");
+		Assert.notNull(body, "InputStream must not be null");
 		this.body = body;
 	}
 
+
 	@Override
 	public HttpHeaders getHeaders() {
 		return this.headers;
@@ -54,4 +56,5 @@ public class MockHttpInputMessage implements HttpInputMessage {
 	public InputStream getBody() throws IOException {
 		return this.body;
 	}
+
 }

spring-test/src/main/java/org/springframework/mock/http/client/MockClientHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,14 +33,14 @@ import org.springframework.mock.http.MockHttpOutputMessage;
  */
 public class MockClientHttpRequest extends MockHttpOutputMessage implements ClientHttpRequest {
 
-	private URI uri;
-
 	private HttpMethod httpMethod;
 
-	private boolean executed = false;
+	private URI uri;
 
 	private ClientHttpResponse clientHttpResponse;
 
+	private boolean executed = false;
+
 
 	/**
 	 * Default constructor.
@@ -56,13 +56,9 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
 		this.uri = uri;
 	}
 
-	@Override
-	public URI getURI() {
-		return this.uri;
-	}
 
-	public void setURI(URI uri) {
-		this.uri = uri;
+	public void setMethod(HttpMethod httpMethod) {
+		this.httpMethod = httpMethod;
 	}
 
 	@Override
@@ -70,8 +66,13 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
 		return this.httpMethod;
 	}
 
-	public void setMethod(HttpMethod httpMethod) {
-		this.httpMethod = httpMethod;
+	public void setURI(URI uri) {
+		this.uri = uri;
+	}
+
+	@Override
+	public URI getURI() {
+		return this.uri;
 	}
 
 	public void setResponse(ClientHttpResponse clientHttpResponse) {
@@ -96,7 +97,6 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
 	/**
 	 * The default implementation returns the configured
 	 * {@link #setResponse(ClientHttpResponse) response}.
-	 *
 	 * <p>Override this method to execute the request and provide a response,
 	 * potentially different than the configured response.
 	 */
@@ -104,6 +104,7 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
 		return this.clientHttpResponse;
 	}
 
+
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
@@ -114,7 +115,7 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
 			sb.append(" ").append(this.uri);
 		}
 		if (!getHeaders().isEmpty()) {
-			sb.append(", headers : ").append(getHeaders());
+			sb.append(", headers: ").append(getHeaders());
 		}
 		if (sb.length() == 0) {
 			sb.append("Not yet initialized");

spring-test/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java

@@ -53,7 +53,7 @@ public class DefaultResponseCreator implements ResponseCreator {
 	 * Use static factory methods in {@link MockRestResponseCreators}.
 	 */
 	protected DefaultResponseCreator(HttpStatus statusCode) {
-		Assert.notNull(statusCode);
+		Assert.notNull(statusCode, "HttpStatus must not be null");
 		this.statusCode = statusCode;
 	}
 
@@ -61,7 +61,7 @@ public class DefaultResponseCreator implements ResponseCreator {
 	@Override
 	public ClientHttpResponse createResponse(ClientHttpRequest request) throws IOException {
 		MockClientHttpResponse response;
-		if (this.contentResource != null ){
+		if (this.contentResource != null) {
 			InputStream stream = this.contentResource.getInputStream();
 			response = new MockClientHttpResponse(stream, this.statusCode);
 		}