acceptableMediaTypes) {
set(ACCEPT, MediaType.toString(acceptableMediaTypes));
}
/**
- * Return the list of acceptable {@linkplain MediaType media types}, as specified by the {@code Accept} header.
+ * Return the list of acceptable {@linkplain MediaType media types},
+ * as specified by the {@code Accept} header.
* Returns an empty list when the acceptable media types are unspecified.
- * @return the acceptable media types
*/
public List getAccept() {
String value = getFirst(ACCEPT);
@@ -164,8 +166,8 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Set the list of acceptable {@linkplain Charset charsets}, as specified by the {@code Accept-Charset} header.
- * @param acceptableCharsets the acceptable charsets
+ * Set the list of acceptable {@linkplain Charset charsets},
+ * as specified by the {@code Accept-Charset} header.
*/
public void setAcceptCharset(List acceptableCharsets) {
StringBuilder builder = new StringBuilder();
@@ -180,9 +182,8 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Return the list of acceptable {@linkplain Charset charsets}, as specified by the {@code Accept-Charset}
- * header.
- * @return the acceptable charsets
+ * Return the list of acceptable {@linkplain Charset charsets},
+ * as specified by the {@code Accept-Charset} header.
*/
public List getAcceptCharset() {
List result = new ArrayList();
@@ -207,27 +208,27 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Set the set of allowed {@link HttpMethod HTTP methods}, as specified by the {@code Allow} header.
- * @param allowedMethods the allowed methods
+ * Set the set of allowed {@link HttpMethod HTTP methods},
+ * as specified by the {@code Allow} header.
*/
public void setAllow(Set allowedMethods) {
set(ALLOW, StringUtils.collectionToCommaDelimitedString(allowedMethods));
}
/**
- * Return the set of allowed {@link HttpMethod HTTP methods}, as specified by the {@code Allow} header.
+ * Return the set of allowed {@link HttpMethod HTTP methods},
+ * as specified by the {@code Allow} header.
* Returns an empty set when the allowed methods are unspecified.
- * @return the allowed methods
*/
public Set getAllow() {
String value = getFirst(ALLOW);
if (!StringUtils.isEmpty(value)) {
- List allowedMethod = new ArrayList(5);
+ List result = new LinkedList();
String[] tokens = value.split(",\\s*");
for (String token : tokens) {
- allowedMethod.add(HttpMethod.valueOf(token));
+ result.add(HttpMethod.valueOf(token));
}
- return EnumSet.copyOf(allowedMethod);
+ return EnumSet.copyOf(result);
}
else {
return EnumSet.noneOf(HttpMethod.class);
@@ -235,25 +236,24 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Sets the (new) value of the {@code Cache-Control} header.
- * @param cacheControl the value of the header
+ * Set the (new) value of the {@code Cache-Control} header.
*/
public void setCacheControl(String cacheControl) {
set(CACHE_CONTROL, cacheControl);
}
/**
- * Returns the value of the {@code Cache-Control} header.
- * @return the value of the header
+ * Return the value of the {@code Cache-Control} header.
*/
public String getCacheControl() {
return getFirst(CACHE_CONTROL);
}
/**
- * Sets the (new) value of the {@code Content-Disposition} header for {@code form-data}.
+ * Set the (new) value of the {@code Content-Disposition} header
+ * for {@code form-data}.
* @param name the control name
- * @param filename the filename, may be {@code null}
+ * @param filename the filename (may be {@code null})
*/
public void setContentDispositionFormData(String name, String filename) {
Assert.notNull(name, "'name' must not be null");
@@ -267,17 +267,17 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Set the length of the body in bytes, as specified by the {@code Content-Length} header.
- * @param contentLength the content length
+ * Set the length of the body in bytes, as specified by the
+ * {@code Content-Length} header.
*/
public void setContentLength(long contentLength) {
set(CONTENT_LENGTH, Long.toString(contentLength));
}
/**
- * Return the length of the body in bytes, as specified by the {@code Content-Length} header.
+ * Return the length of the body in bytes, as specified by the
+ * {@code Content-Length} header.
* Returns -1 when the content-length is unknown.
- * @return the content length
*/
public long getContentLength() {
String value = getFirst(CONTENT_LENGTH);
@@ -285,8 +285,8 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Set the {@linkplain MediaType media type} of the body, as specified by the {@code Content-Type} header.
- * @param mediaType the media type
+ * Set the {@linkplain MediaType media type} of the body,
+ * as specified by the {@code Content-Type} header.
*/
public void setContentType(MediaType mediaType) {
Assert.isTrue(!mediaType.isWildcardType(), "'Content-Type' cannot contain wildcard type '*'");
@@ -295,9 +295,9 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Return the {@linkplain MediaType media type} of the body, as specified by the {@code Content-Type} header.
+ * Return the {@linkplain MediaType media type} of the body, as specified
+ * by the {@code Content-Type} header.
* Returns {@code null} when the content-type is unknown.
- * @return the content type
*/
public MediaType getContentType() {
String value = getFirst(CONTENT_TYPE);
@@ -305,18 +305,20 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Sets the date and time at which the message was created, as specified by the {@code Date} header.
- * The date should be specified as the number of milliseconds since January 1, 1970 GMT.
- * @param date the date
+ * Set the date and time at which the message was created, as specified
+ * by the {@code Date} header.
+ *
The date should be specified as the number of milliseconds since
+ * January 1, 1970 GMT.
*/
public void setDate(long date) {
setDate(DATE, date);
}
/**
- * Returns the date and time at which the message was created, as specified by the {@code Date} header.
- *
The date is returned as the number of milliseconds since January 1, 1970 GMT. Returns -1 when the date is unknown.
- * @return the creation date/time
+ * Return the date and time at which the message was created, as specified
+ * by the {@code Date} header.
+ *
The date is returned as the number of milliseconds since
+ * January 1, 1970 GMT. Returns -1 when the date is unknown.
* @throws IllegalArgumentException if the value can't be converted to a date
*/
public long getDate() {
@@ -324,41 +326,39 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Sets the (new) entity tag of the body, as specified by the {@code ETag} header.
- * @param eTag the new entity tag
+ * Set the (new) entity tag of the body, as specified by the {@code ETag} header.
*/
public void setETag(String eTag) {
if (eTag != null) {
- Assert.isTrue(eTag.startsWith("\"") || eTag.startsWith("W/"), "Invalid eTag, does not start with W/ or \"");
+ Assert.isTrue(eTag.startsWith("\"") || eTag.startsWith("W/"),
+ "Invalid eTag, does not start with W/ or \"");
Assert.isTrue(eTag.endsWith("\""), "Invalid eTag, does not end with \"");
}
set(ETAG, eTag);
}
/**
- * Returns the entity tag of the body, as specified by the {@code ETag} header.
- * @return the entity tag
+ * Return the entity tag of the body, as specified by the {@code ETag} header.
*/
public String getETag() {
return getFirst(ETAG);
}
/**
- * Sets the date and time at which the message is no longer valid, as specified by the {@code Expires} header.
- * The date should be specified as the number of milliseconds since January 1, 1970 GMT.
- * @param expires the new expires header value
+ * Set the date and time at which the message is no longer valid,
+ * as specified by the {@code Expires} header.
+ *
The date should be specified as the number of milliseconds since
+ * January 1, 1970 GMT.
*/
public void setExpires(long expires) {
setDate(EXPIRES, expires);
}
/**
- * Returns the date and time at which the message is no longer valid, as specified by
- * the {@code Expires} header.
- *
The date is returned as the number of milliseconds since January 1, 1970 GMT.
- * Returns -1 when the date is unknown.
- *
- * @return the expires value
+ * Return the date and time at which the message is no longer valid,
+ * as specified by the {@code Expires} header.
+ *
The date is returned as the number of milliseconds since
+ * January 1, 1970 GMT. Returns -1 when the date is unknown.
*/
public long getExpires() {
try {
@@ -370,18 +370,18 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Sets the (new) value of the {@code If-Modified-Since} header.
- * The date should be specified as the number of milliseconds since January 1, 1970 GMT.
- * @param ifModifiedSince the new value of the header
+ * Set the (new) value of the {@code If-Modified-Since} header.
+ *
The date should be specified as the number of milliseconds since
+ * January 1, 1970 GMT.
*/
public void setIfModifiedSince(long ifModifiedSince) {
setDate(IF_MODIFIED_SINCE, ifModifiedSince);
}
/**
- * Returns the value of the {@code IfModifiedSince} header.
- *
The date is returned as the number of milliseconds since January 1, 1970 GMT. Returns -1 when the date is unknown.
- * @return the header value
+ * Return the value of the {@code IfModifiedSince} header.
+ *
The date is returned as the number of milliseconds since
+ * January 1, 1970 GMT. Returns -1 when the date is unknown.
* @deprecated use {@link #getIfModifiedSince()}
*/
@Deprecated
@@ -390,25 +390,23 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Returns the value of the {@code If-Modified-Since} header.
- * The date is returned as the number of milliseconds since January 1, 1970 GMT. Returns -1 when the date is unknown.
- * @return the header value
+ * Return the value of the {@code If-Modified-Since} header.
+ *
The date is returned as the number of milliseconds since
+ * January 1, 1970 GMT. Returns -1 when the date is unknown.
*/
public long getIfModifiedSince() {
return getFirstDate(IF_MODIFIED_SINCE);
}
/**
- * Sets the (new) value of the {@code If-None-Match} header.
- * @param ifNoneMatch the new value of the header
+ * Set the (new) value of the {@code If-None-Match} header.
*/
public void setIfNoneMatch(String ifNoneMatch) {
set(IF_NONE_MATCH, ifNoneMatch);
}
/**
- * Sets the (new) values of the {@code If-None-Match} header.
- * @param ifNoneMatchList the new value of the header
+ * Set the (new) values of the {@code If-None-Match} header.
*/
public void setIfNoneMatch(List ifNoneMatchList) {
StringBuilder builder = new StringBuilder();
@@ -423,8 +421,7 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Returns the value of the {@code If-None-Match} header.
- * @return the header value
+ * Return the value of the {@code If-None-Match} header.
*/
public List getIfNoneMatch() {
List result = new ArrayList();
@@ -439,35 +436,37 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Sets the time the resource was last changed, as specified by the {@code Last-Modified} header.
- * The date should be specified as the number of milliseconds since January 1, 1970 GMT.
- * @param lastModified the last modified date
+ * Set the time the resource was last changed, as specified by the
+ * {@code Last-Modified} header.
+ *
The date should be specified as the number of milliseconds since
+ * January 1, 1970 GMT.
*/
public void setLastModified(long lastModified) {
setDate(LAST_MODIFIED, lastModified);
}
/**
- * Returns the time the resource was last changed, as specified by the {@code Last-Modified} header.
- *
The date is returned as the number of milliseconds since January 1, 1970 GMT. Returns -1 when the date is unknown.
- * @return the last modified date
+ * Return the time the resource was last changed, as specified by the
+ * {@code Last-Modified} header.
+ *
The date is returned as the number of milliseconds since
+ * January 1, 1970 GMT. Returns -1 when the date is unknown.
*/
public long getLastModified() {
return getFirstDate(LAST_MODIFIED);
}
/**
- * Set the (new) location of a resource, as specified by the {@code Location} header.
- * @param location the location
+ * Set the (new) location of a resource,
+ * as specified by the {@code Location} header.
*/
public void setLocation(URI location) {
set(LOCATION, location.toASCIIString());
}
/**
- * Return the (new) location of a resource, as specified by the {@code Location} header.
+ * Return the (new) location of a resource
+ * as specified by the {@code Location} header.
*
Returns {@code null} when the location is unknown.
- * @return the location
*/
public URI getLocation() {
String value = getFirst(LOCATION);
@@ -475,16 +474,14 @@ public class HttpHeaders implements MultiValueMap, Serializable
}
/**
- * Sets the (new) value of the {@code Pragma} header.
- * @param pragma the value of the header
+ * Set the (new) value of the {@code Pragma} header.
*/
public void setPragma(String pragma) {
set(PRAGMA, pragma);
}
/**
- * Returns the value of the {@code Pragma} header.
- * @return the value of the header
+ * Return the value of the {@code Pragma} header.
*/
public String getPragma() {
return getFirst(PRAGMA);
@@ -493,9 +490,9 @@ public class HttpHeaders implements MultiValueMap, Serializable
// Date methods
/**
- * Parse the first header value for the given header name as a date, return -1 if
- * there is no value, or raise {@link IllegalArgumentException} if the value cannot be
- * parsed as a date.
+ * Parse the first header value for the given header name as a date,
+ * return -1 if there is no value, or raise {@link IllegalArgumentException}
+ * if the value cannot be parsed as a date.
*/
public long getFirstDate(String headerName) {
String headerValue = getFirst(headerName);
@@ -508,7 +505,7 @@ public class HttpHeaders implements MultiValueMap, Serializable
try {
return simpleDateFormat.parse(headerValue).getTime();
}
- catch (ParseException e) {
+ catch (ParseException ex) {
// ignore
}
}
@@ -532,23 +529,23 @@ public class HttpHeaders implements MultiValueMap, Serializable
/**
* Return the first header value for the given header name, if any.
* @param headerName the header name
- * @return the first header value; or {@code null}
+ * @return the first header value, or {@code null} if none
*/
public String getFirst(String headerName) {
- List headerValues = headers.get(headerName);
- return headerValues != null ? headerValues.get(0) : null;
+ List headerValues = this.headers.get(headerName);
+ return (headerValues != null ? headerValues.get(0) : null);
}
/**
* Add the given, single header value under the given name.
- * @param headerName the header name
+ * @param headerName the header name
* @param headerValue the header value
* @throws UnsupportedOperationException if adding headers is not supported
* @see #put(String, List)
* @see #set(String, String)
*/
public void add(String headerName, String headerValue) {
- List headerValues = headers.get(headerName);
+ List headerValues = this.headers.get(headerName);
if (headerValues == null) {
headerValues = new LinkedList();
this.headers.put(headerName, headerValues);
@@ -558,7 +555,7 @@ public class HttpHeaders implements MultiValueMap, Serializable
/**
* Set the given, single header value under the given name.
- * @param headerName the header name
+ * @param headerName the header name
* @param headerValue the header value
* @throws UnsupportedOperationException if adding headers is not supported
* @see #put(String, List)
@@ -567,7 +564,7 @@ public class HttpHeaders implements MultiValueMap, Serializable
public void set(String headerName, String headerValue) {
List headerValues = new LinkedList();
headerValues.add(headerValue);
- headers.put(headerName, headerValues);
+ this.headers.put(headerName, headerValues);
}
public void setAll(Map values) {
@@ -578,7 +575,7 @@ public class HttpHeaders implements MultiValueMap, Serializable
public Map toSingleValueMap() {
LinkedHashMap singleValueMap = new LinkedHashMap(this.headers.size());
- for (Entry> entry : headers.entrySet()) {
+ for (Entry> entry : this.headers.entrySet()) {
singleValueMap.put(entry.getKey(), entry.getValue().get(0));
}
return singleValueMap;
@@ -614,8 +611,8 @@ public class HttpHeaders implements MultiValueMap, Serializable
return this.headers.remove(key);
}
- public void putAll(Map> m) {
- this.headers.putAll(m);
+ public void putAll(Map> map) {
+ this.headers.putAll(map);
}
public void clear() {
diff --git a/spring-web/src/main/java/org/springframework/http/HttpMethod.java b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
index f006c703cc..2f1bcd2b50 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpMethod.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * 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.
@@ -26,6 +26,6 @@ package org.springframework.http;
*/
public enum HttpMethod {
- GET, POST, HEAD, OPTIONS, PUT, PATCH, DELETE, TRACE
+ GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
}
diff --git a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
index 8c493d312d..f3dfe98abf 100644
--- a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
+++ b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequestFactoryWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
@@ -23,7 +23,8 @@ import org.springframework.http.HttpMethod;
import org.springframework.util.Assert;
/**
- * Abstract base class for {@link ClientHttpRequestFactory} implementations that decorate another request factory.
+ * Abstract base class for {@link ClientHttpRequestFactory} implementations
+ * that decorate another request factory.
*
* @author Arjen Poutsma
* @since 3.1
@@ -34,11 +35,11 @@ public abstract class AbstractClientHttpRequestFactoryWrapper implements ClientH
/**
- * Creates a {@code AbstractClientHttpRequestFactoryWrapper} wrapping the given request factory.
+ * Create a {@code AbstractClientHttpRequestFactoryWrapper} wrapping the given request factory.
* @param requestFactory the request factory to be wrapped
*/
protected AbstractClientHttpRequestFactoryWrapper(ClientHttpRequestFactory requestFactory) {
- Assert.notNull(requestFactory, "'requestFactory' must not be null");
+ Assert.notNull(requestFactory, "ClientHttpRequestFactory must not be null");
this.requestFactory = requestFactory;
}
@@ -49,12 +50,12 @@ public abstract class AbstractClientHttpRequestFactoryWrapper implements ClientH
* {@linkplain #AbstractClientHttpRequestFactoryWrapper(ClientHttpRequestFactory) constructor}.
*/
public final ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
- return createRequest(uri, httpMethod, requestFactory);
+ return createRequest(uri, httpMethod, this.requestFactory);
}
/**
- * Create a new {@link ClientHttpRequest} for the specified URI and HTTP method by using the
- * passed-on request factory.
+ * Create a new {@link ClientHttpRequest} for the specified URI and HTTP method
+ * by using the passed-on request factory.
* Called from {@link #createRequest(URI, HttpMethod)}.
* @param uri the URI to create a request for
* @param httpMethod the HTTP method to execute
diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
index 0131cfa50f..abbd16c00a 100644
--- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * 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.
@@ -43,9 +43,9 @@ import org.springframework.http.HttpMethod;
import org.springframework.util.Assert;
/**
- * {@link org.springframework.http.client.ClientHttpRequestFactory} implementation that uses
- * Apache HttpComponents HttpClient
- * to create requests.
+ * {@link org.springframework.http.client.ClientHttpRequestFactory} implementation that
+ * uses Apache HttpComponents
+ * HttpClient to create requests.
*
*
Allows to use a pre-configured {@link HttpClient} instance -
* potentially with authentication, HTTP connection pooling, etc.
@@ -144,20 +144,20 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
switch (httpMethod) {
case GET:
return new HttpGet(uri);
- case DELETE:
- return new HttpDelete(uri);
case HEAD:
return new HttpHead(uri);
- case OPTIONS:
- return new HttpOptions(uri);
case POST:
return new HttpPost(uri);
case PUT:
return new HttpPut(uri);
- case TRACE:
- return new HttpTrace(uri);
case PATCH:
return new HttpPatch(uri);
+ case DELETE:
+ return new HttpDelete(uri);
+ case OPTIONS:
+ return new HttpOptions(uri);
+ case TRACE:
+ return new HttpTrace(uri);
default:
throw new IllegalArgumentException("Invalid HTTP method: " + httpMethod);
}
@@ -183,6 +183,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
return null;
}
+
/**
* Shutdown hook that closes the underlying
* {@link org.apache.http.conn.ClientConnectionManager ClientConnectionManager}'s
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
index a422614fe9..f10f5d512c 100644
--- a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * 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.
@@ -42,49 +42,48 @@ class InterceptingClientHttpRequest extends AbstractBufferingClientHttpRequest {
private URI uri;
+
protected InterceptingClientHttpRequest(ClientHttpRequestFactory requestFactory,
- List interceptors,
- URI uri,
- HttpMethod method) {
+ List interceptors, URI uri, HttpMethod method) {
+
this.requestFactory = requestFactory;
this.interceptors = interceptors;
this.method = method;
this.uri = uri;
}
+
public HttpMethod getMethod() {
- return method;
+ return this.method;
}
public URI getURI() {
- return uri;
+ return this.uri;
}
@Override
protected final ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
- RequestExecution requestExecution = new RequestExecution();
-
+ InterceptingRequestExecution requestExecution = new InterceptingRequestExecution();
return requestExecution.execute(this, bufferedOutput);
}
- private class RequestExecution implements ClientHttpRequestExecution {
+
+ private class InterceptingRequestExecution implements ClientHttpRequestExecution {
private final Iterator iterator;
- private RequestExecution() {
+ public InterceptingRequestExecution() {
this.iterator = interceptors.iterator();
}
public ClientHttpResponse execute(HttpRequest request, byte[] body) throws IOException {
- if (iterator.hasNext()) {
- ClientHttpRequestInterceptor nextInterceptor = iterator.next();
+ if (this.iterator.hasNext()) {
+ ClientHttpRequestInterceptor nextInterceptor = this.iterator.next();
return nextInterceptor.intercept(request, body, this);
}
else {
ClientHttpRequest delegate = requestFactory.createRequest(request.getURI(), request.getMethod());
-
delegate.getHeaders().putAll(request.getHeaders());
-
if (body.length > 0) {
StreamUtils.copy(body, delegate.getBody());
}
diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
index 6e797c2bb1..aadab06951 100644
--- a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
@@ -32,20 +32,22 @@ public class InterceptingClientHttpRequestFactory extends AbstractClientHttpRequ
private final List interceptors;
+
/**
- * Creates a new instance of the {@code InterceptingClientHttpRequestFactory} with the given parameters.
- *
+ * Create a new instance of the {@code InterceptingClientHttpRequestFactory} with the given parameters.
* @param requestFactory the request factory to wrap
- * @param interceptors the interceptors that are to be applied. Can be {@code null}.
+ * @param interceptors the interceptors that are to be applied (can be {@code null})
*/
public InterceptingClientHttpRequestFactory(ClientHttpRequestFactory requestFactory,
List interceptors) {
+
super(requestFactory);
- this.interceptors = interceptors != null ? interceptors : Collections.emptyList();
+ this.interceptors = (interceptors != null ? interceptors : Collections.emptyList());
}
@Override
protected ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod, ClientHttpRequestFactory requestFactory) {
- return new InterceptingClientHttpRequest(requestFactory, interceptors, uri, httpMethod);
+ return new InterceptingClientHttpRequest(requestFactory, this.interceptors, uri, httpMethod);
}
+
}
diff --git a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
index 97cfde4b85..92b38dc681 100644
--- a/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * 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.
@@ -160,19 +160,23 @@ public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory
if (this.readTimeout >= 0) {
connection.setReadTimeout(this.readTimeout);
}
+
connection.setDoInput(true);
+
if ("GET".equals(httpMethod)) {
connection.setInstanceFollowRedirects(true);
}
else {
connection.setInstanceFollowRedirects(false);
}
- if ("PUT".equals(httpMethod) || "POST".equals(httpMethod) || "PATCH".equals(httpMethod)) {
+
+ if ("POST".equals(httpMethod) || "PUT".equals(httpMethod) || "PATCH".equals(httpMethod)) {
connection.setDoOutput(true);
}
else {
connection.setDoOutput(false);
}
+
connection.setRequestMethod(httpMethod);
}
diff --git a/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
index 969feefda5..61b894533f 100644
--- a/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/http/client/support/HttpRequestWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
@@ -24,8 +24,10 @@ import org.springframework.http.HttpRequest;
import org.springframework.util.Assert;
/**
- * Provides a convenient implementation of the {@link HttpRequest} interface that can be overridden to adapt the
- * request. Methods default to calling through to the wrapped request object.
+ * Provides a convenient implementation of the {@link HttpRequest} interface
+ * that can be overridden to adapt the request.
+ *
+ * These methods default to calling through to the wrapped request object.
*
* @author Arjen Poutsma
* @since 3.1
@@ -36,38 +38,38 @@ public class HttpRequestWrapper implements HttpRequest {
/**
- * Creates a new {@code HttpRequest} wrapping the given request object.
- *
+ * Create a new {@code HttpRequest} wrapping the given request object.
* @param request the request object to be wrapped
*/
public HttpRequestWrapper(HttpRequest request) {
- Assert.notNull(request, "'request' must not be null");
+ Assert.notNull(request, "HttpRequest must not be null");
this.request = request;
}
+
/**
- * Returns the wrapped request.
+ * Return the wrapped request.
*/
public HttpRequest getRequest() {
- return request;
+ return this.request;
}
/**
- * Returns the method of the wrapped request.
+ * Return the method of the wrapped request.
*/
public HttpMethod getMethod() {
return this.request.getMethod();
}
/**
- * Returns the URI of the wrapped request.
+ * Return the URI of the wrapped request.
*/
public URI getURI() {
return this.request.getURI();
}
/**
- * Returns the headers of the wrapped request.
+ * Return the headers of the wrapped request.
*/
public HttpHeaders getHeaders() {
return this.request.getHeaders();
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index a8117f933e..d0d7d99f87 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * 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.
@@ -142,18 +142,21 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
}
}
- private boolean isFormPost(HttpServletRequest request) {
- return (request.getContentType() != null && request.getContentType().contains(FORM_CONTENT_TYPE) &&
+
+
+ private static boolean isFormPost(HttpServletRequest request) {
+ String contentType = request.getContentType();
+ return (contentType != null && contentType.contains(FORM_CONTENT_TYPE) &&
METHOD_POST.equalsIgnoreCase(request.getMethod()));
}
/**
* Use {@link javax.servlet.ServletRequest#getParameterMap()} to reconstruct the
* body of a form 'POST' providing a predictable outcome as opposed to reading
- * from the body, which can fail if any other code has used ServletRequest
- * to access a parameter thus causing the input stream to be "consumed".
+ * from the body, which can fail if any other code has used the ServletRequest
+ * to access a parameter, thus causing the input stream to be "consumed".
*/
- private InputStream getBodyFromServletRequestParameters(HttpServletRequest request) throws IOException {
+ private static InputStream getBodyFromServletRequestParameters(HttpServletRequest request) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
Writer writer = new OutputStreamWriter(bos, FORM_CHARSET);
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java
index 814687ca65..80bd4b1c01 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * 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.
@@ -17,16 +17,14 @@
package org.springframework.web.bind.annotation;
/**
- * Java 5 enumeration of HTTP request methods. Intended for use
- * with the {@link RequestMapping#method()} attribute of the
- * {@link RequestMapping} annotation.
+ * Java 5 enumeration of HTTP request methods. Intended for use with the
+ * {@link RequestMapping#method()} attribute of the {@link RequestMapping} annotation.
*
*
Note that, by default, {@link org.springframework.web.servlet.DispatcherServlet}
* supports GET, HEAD, POST, PUT, PATCH and DELETE only. DispatcherServlet will
- * process TRACE and OPTIONS with the default HttpServlet behavior unless
- * explicitly told to dispatch those request types as well: Check out
- * the "dispatchOptionsRequest" and "dispatchTraceRequest" properties,
- * switching them to "true" if necessary.
+ * process TRACE and OPTIONS with the default HttpServlet behavior unless explicitly
+ * told to dispatch those request types as well: Check out the "dispatchOptionsRequest"
+ * and "dispatchTraceRequest" properties, switching them to "true" if necessary.
*
* @author Juergen Hoeller
* @since 2.5
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
index 96a6e88a07..e3375717b5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java
@@ -814,15 +814,13 @@ public abstract class FrameworkServlet extends HttpServletBean {
/**
- * Override the parent class implementation in order to intercept PATCH
- * requests.
+ * Override the parent class implementation in order to intercept PATCH requests.
*/
@Override
protected void service(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- String method = request.getMethod();
- if (method.equalsIgnoreCase(RequestMethod.PATCH.name())) {
+ if (RequestMethod.PATCH.name().equalsIgnoreCase(request.getMethod())) {
processRequest(request, response);
}
else {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
index bc65b27de2..ba0be31ad3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * 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.
@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.springframework.http.MediaType;
import org.springframework.web.HttpMediaTypeException;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,34 +41,36 @@ abstract class AbstractMediaTypeExpression implements Comparable