Polishing

(cherry picked from commit 058714b)

spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java

@@ -232,7 +232,7 @@ public class Jackson2ObjectMapperBuilder {
 	 * @see com.fasterxml.jackson.databind.ObjectMapper#addMixInAnnotations(Class, Class)
 	 */
 	public Jackson2ObjectMapperBuilder mixIn(Class<?> target, Class<?> mixinSource) {
-		if (mixIns != null) {
+		if (mixinSource != null) {
 			this.mixIns.put(target, mixinSource);
 		}
 		return this;

spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.web.client;
 
 import java.io.IOException;
@@ -9,32 +25,33 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpResponse;
 
 /**
- * Implementation of {@link ClientHttpResponse} that can not only check if the response
- * has a message body, but also if its length is 0 (i.e. empty) by actually reading the input stream.
+ * Implementation of {@link ClientHttpResponse} that can not only check if
+ * the response has a message body, but also if its length is 0 (i.e. empty)
+ * by actually reading the input stream.
  *
  * @author Brian Clozel
- * @since 4.1
+ * @since 4.1.5
  * @see <a href="http://tools.ietf.org/html/rfc7230#section-3.3.3">rfc7230 Section 3.3.3</a>
  */
 class MessageBodyClientHttpResponseWrapper implements ClientHttpResponse {
 
+	private final ClientHttpResponse response;
+
 	private PushbackInputStream pushbackInputStream;
 
-	private final ClientHttpResponse response;
 
 	public MessageBodyClientHttpResponseWrapper(ClientHttpResponse response) throws IOException {
 		this.response = response;
 	}
 
+
 	/**
 	 * Indicates whether the response has a message body.
-	 *
 	 * <p>Implementation returns {@code false} for:
 	 * <ul>
-	 *     <li>a response status of {@code 1XX}, {@code 204} or {@code 304}</li>
-	 *     <li>a {@code Content-Length} header of {@code 0}</li>
+	 * <li>a response status of {@code 1XX}, {@code 204} or {@code 304}</li>
+	 * <li>a {@code Content-Length} header of {@code 0}</li>
 	 * </ul>
-	 *
 	 * @return {@code true} if the response has a message body, {@code false} otherwise
 	 * @throws IOException in case of I/O errors
 	 */
@@ -52,13 +69,11 @@ class MessageBodyClientHttpResponseWrapper implements ClientHttpResponse {
 
 	/**
 	 * Indicates whether the response has an empty message body.
-	 *
 	 * <p>Implementation tries to read the first bytes of the response stream:
 	 * <ul>
-	 *     <li>if no bytes are available, the message body is empty</li>
-	 *     <li>otherwise it is not empty and the stream is reset to its start for further reading</li>
+	 * <li>if no bytes are available, the message body is empty</li>
+	 * <li>otherwise it is not empty and the stream is reset to its start for further reading</li>
 	 * </ul>
-	 *
 	 * @return {@code true} if the response has a zero-length message body, {@code false} otherwise
 	 * @throws IOException in case of I/O errors
 	 */
@@ -79,44 +94,46 @@ class MessageBodyClientHttpResponseWrapper implements ClientHttpResponse {
 		}
 		else {
 			this.pushbackInputStream = new PushbackInputStream(body);
-			int b = pushbackInputStream.read();
+			int b = this.pushbackInputStream.read();
 			if (b == -1) {
 				return true;
 			}
 			else {
-				pushbackInputStream.unread(b);
+				this.pushbackInputStream.unread(b);
 				return false;
 			}
 		}
 	}
 
-	@Override
-	public HttpStatus getStatusCode() throws IOException {
-		return response.getStatusCode();
-	}
 
 	@Override
-	public int getRawStatusCode() throws IOException {
-		return response.getRawStatusCode();
-	}
-
-	@Override
-	public String getStatusText() throws IOException {
-		return response.getStatusText();
-	}
-
-	@Override
-	public void close() {
-		response.close();
+	public HttpHeaders getHeaders() {
+		return this.response.getHeaders();
 	}
 
 	@Override
 	public InputStream getBody() throws IOException {
-		return this.pushbackInputStream != null ? this.pushbackInputStream : response.getBody();
+		return (this.pushbackInputStream != null ? this.pushbackInputStream : this.response.getBody());
 	}
 
 	@Override
-	public HttpHeaders getHeaders() {
-		return response.getHeaders();
+	public HttpStatus getStatusCode() throws IOException {
+		return this.response.getStatusCode();
 	}
+
+	@Override
+	public int getRawStatusCode() throws IOException {
+		return this.response.getRawStatusCode();
+	}
+
+	@Override
+	public String getStatusText() throws IOException {
+		return this.response.getStatusText();
+	}
+
+	@Override
+	public void close() {
+		this.response.close();
+	}
+
 }