You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2013/01/15 19:30:06 UTC
svn commit: r1433569 [5/12] - in /httpcomponents:
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/httpcore/
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchm...
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java Tue Jan 15 18:29:58 2013
@@ -299,7 +299,7 @@ public class TestProtocolRequirements ex
* these field values when a message is forwarded."
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
*/
- private void testOrderOfMultipleHeadersIsPreservedOnRequests(String h, HttpRequestWrapper request)
+ private void testOrderOfMultipleHeadersIsPreservedOnRequests(final String h, final HttpRequestWrapper request)
throws Exception {
Capture<HttpRequestWrapper> reqCapture = new Capture<HttpRequestWrapper>();
@@ -422,7 +422,7 @@ public class TestProtocolRequirements ex
testOrderOfMultipleHeadersIsPreservedOnRequests("Warning", request);
}
- private void testOrderOfMultipleHeadersIsPreservedOnResponses(String h) throws Exception {
+ private void testOrderOfMultipleHeadersIsPreservedOnResponses(final String h) throws Exception {
EasyMock.expect(
mockBackend.execute(
EasyMock.isA(HttpRoute.class),
@@ -500,7 +500,7 @@ public class TestProtocolRequirements ex
*
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec6.html#sec6.1.1
*/
- private void testUnknownResponseStatusCodeIsNotCached(int code) throws Exception {
+ private void testUnknownResponseStatusCodeIsNotCached(final int code) throws Exception {
emptyMockCacheExpectsNoPuts();
@@ -934,8 +934,8 @@ public class TestProtocolRequirements ex
*
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.4
*/
- private void testHEADResponseWithUpdatedEntityFieldsMakeACacheEntryStale(String eHeader,
- String oldVal, String newVal) throws Exception {
+ private void testHEADResponseWithUpdatedEntityFieldsMakeACacheEntryStale(final String eHeader,
+ final String oldVal, final String newVal) throws Exception {
// put something cacheable in the cache
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(
@@ -2987,7 +2987,7 @@ public class TestProtocolRequirements ex
* for validation, but we can't tell if we receive a conditional request
* from upstream.
*/
- private HttpResponse testRequestWithWeakETagValidatorIsNotAllowed(String header)
+ private HttpResponse testRequestWithWeakETagValidatorIsNotAllowed(final String header)
throws Exception {
Capture<HttpRequestWrapper> cap = new Capture<HttpRequestWrapper>();
EasyMock.expect(
@@ -3332,7 +3332,7 @@ public class TestProtocolRequirements ex
* request or response, and it MUST NOT add any of these fields if not
* already present: - Content-Location - Content-MD5 - ETag - Last-Modified
*/
- private void testDoesNotModifyHeaderFromOrigin(String header, String value) throws Exception {
+ private void testDoesNotModifyHeaderFromOrigin(final String header, final String value) throws Exception {
originResponse = Proxies.enhanceResponse(HttpTestUtils.make200Response());
originResponse.setHeader(header, value);
@@ -3368,7 +3368,7 @@ public class TestProtocolRequirements ex
testDoesNotModifyHeaderFromOrigin("Last-Modified", lm);
}
- private void testDoesNotAddHeaderToOriginResponse(String header) throws Exception {
+ private void testDoesNotAddHeaderToOriginResponse(final String header) throws Exception {
originResponse.removeHeaders(header);
backendExpectsAnyRequest().andReturn(originResponse);
@@ -3400,7 +3400,7 @@ public class TestProtocolRequirements ex
testDoesNotAddHeaderToOriginResponse("Last-Modified");
}
- private void testDoesNotModifyHeaderFromOriginOnCacheHit(String header, String value)
+ private void testDoesNotModifyHeaderFromOriginOnCacheHit(final String header, final String value)
throws Exception {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(
@@ -3444,7 +3444,7 @@ public class TestProtocolRequirements ex
testDoesNotModifyHeaderFromOriginOnCacheHit("Last-Modified", lm);
}
- private void testDoesNotAddHeaderOnCacheHit(String header) throws Exception {
+ private void testDoesNotAddHeaderOnCacheHit(final String header) throws Exception {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(
new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1));
@@ -3484,7 +3484,7 @@ public class TestProtocolRequirements ex
testDoesNotAddHeaderOnCacheHit("Last-Modified");
}
- private void testDoesNotModifyHeaderOnRequest(String header, String value) throws Exception {
+ private void testDoesNotModifyHeaderOnRequest(final String header, final String value) throws Exception {
BasicHttpEntityEnclosingRequest req =
new BasicHttpEntityEnclosingRequest("POST","/",HttpVersion.HTTP_1_1);
req.setEntity(HttpTestUtils.makeBody(128));
@@ -3531,7 +3531,7 @@ public class TestProtocolRequirements ex
testDoesNotModifyHeaderOnRequest("Last-Modified", lm);
}
- private void testDoesNotAddHeaderToRequestIfNotPresent(String header) throws Exception {
+ private void testDoesNotAddHeaderToRequestIfNotPresent(final String header) throws Exception {
BasicHttpEntityEnclosingRequest req =
new BasicHttpEntityEnclosingRequest("POST","/",HttpVersion.HTTP_1_1);
req.setEntity(HttpTestUtils.makeBody(128));
@@ -3642,7 +3642,7 @@ public class TestProtocolRequirements ex
* - Content-Type"
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.2
*/
- private void testDoesNotModifyHeaderFromOriginResponseWithNoTransform(String header, String value) throws Exception {
+ private void testDoesNotModifyHeaderFromOriginResponseWithNoTransform(final String header, final String value) throws Exception {
originResponse.addHeader("Cache-Control","no-transform");
originResponse.setHeader(header, value);
@@ -3676,7 +3676,7 @@ public class TestProtocolRequirements ex
testDoesNotModifyHeaderFromOriginResponseWithNoTransform("Content-Type","text/html;charset=utf-8");
}
- private void testDoesNotModifyHeaderOnCachedResponseWithNoTransform(String header, String value) throws Exception {
+ private void testDoesNotModifyHeaderOnCachedResponseWithNoTransform(final String header, final String value) throws Exception {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(
new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1));
HttpRequestWrapper req2 = HttpRequestWrapper.wrap(
@@ -3853,7 +3853,7 @@ public class TestProtocolRequirements ex
* with corresponding headers received in the incoming response,
* except for Warning headers as described immediately above."
*/
- private void decorateWithEndToEndHeaders(HttpResponse r) {
+ private void decorateWithEndToEndHeaders(final HttpResponse r) {
r.setHeader("Allow","GET");
r.setHeader("Content-Encoding","gzip");
r.setHeader("Content-Language","en");
@@ -4646,7 +4646,7 @@ public class TestProtocolRequirements ex
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.9
*/
protected void testUnsafeOperationInvalidatesCacheForThatUri(
- HttpRequestWrapper unsafeReq) throws Exception, IOException {
+ final HttpRequestWrapper unsafeReq) throws Exception, IOException {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(
new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1));
HttpResponse resp1 = HttpTestUtils.make200Response();
@@ -4692,7 +4692,7 @@ public class TestProtocolRequirements ex
}
protected void testUnsafeMethodInvalidatesCacheForHeaderUri(
- HttpRequestWrapper unsafeReq) throws Exception, IOException {
+ final HttpRequestWrapper unsafeReq) throws Exception, IOException {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(
new BasicHttpRequest("GET", "/content", HttpVersion.HTTP_1_1));
HttpResponse resp1 = HttpTestUtils.make200Response();
@@ -4720,19 +4720,19 @@ public class TestProtocolRequirements ex
}
protected void testUnsafeMethodInvalidatesCacheForUriInContentLocationHeader(
- HttpRequestWrapper unsafeReq) throws Exception, IOException {
+ final HttpRequestWrapper unsafeReq) throws Exception, IOException {
unsafeReq.setHeader("Content-Location","http://foo.example.com/content");
testUnsafeMethodInvalidatesCacheForHeaderUri(unsafeReq);
}
protected void testUnsafeMethodInvalidatesCacheForRelativeUriInContentLocationHeader(
- HttpRequestWrapper unsafeReq) throws Exception, IOException {
+ final HttpRequestWrapper unsafeReq) throws Exception, IOException {
unsafeReq.setHeader("Content-Location","/content");
testUnsafeMethodInvalidatesCacheForHeaderUri(unsafeReq);
}
protected void testUnsafeMethodInvalidatesCacheForUriInLocationHeader(
- HttpRequestWrapper unsafeReq) throws Exception, IOException {
+ final HttpRequestWrapper unsafeReq) throws Exception, IOException {
unsafeReq.setHeader("Location","http://foo.example.com/content");
testUnsafeMethodInvalidatesCacheForHeaderUri(unsafeReq);
}
@@ -4798,7 +4798,7 @@ public class TestProtocolRequirements ex
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.10
*/
protected void testUnsafeMethodDoesNotInvalidateCacheForHeaderUri(
- HttpRequestWrapper unsafeReq) throws Exception, IOException {
+ final HttpRequestWrapper unsafeReq) throws Exception, IOException {
HttpHost otherHost = new HttpHost("bar.example.com");
HttpRoute otherRoute = new HttpRoute(otherHost);
@@ -4824,18 +4824,18 @@ public class TestProtocolRequirements ex
}
protected void testUnsafeMethodDoesNotInvalidateCacheForUriInContentLocationHeadersFromOtherHosts(
- HttpRequestWrapper unsafeReq) throws Exception, IOException {
+ final HttpRequestWrapper unsafeReq) throws Exception, IOException {
unsafeReq.setHeader("Content-Location","http://bar.example.com/content");
testUnsafeMethodDoesNotInvalidateCacheForHeaderUri(unsafeReq);
}
protected void testUnsafeMethodDoesNotInvalidateCacheForUriInLocationHeadersFromOtherHosts(
- HttpRequestWrapper unsafeReq) throws Exception, IOException {
+ final HttpRequestWrapper unsafeReq) throws Exception, IOException {
unsafeReq.setHeader("Location","http://bar.example.com/content");
testUnsafeMethodDoesNotInvalidateCacheForHeaderUri(unsafeReq);
}
- protected HttpRequestWrapper makeRequestWithBody(String method, String requestUri) {
+ protected HttpRequestWrapper makeRequestWithBody(final String method, final String requestUri) {
HttpEntityEnclosingRequest request =
new BasicHttpEntityEnclosingRequest(method, requestUri, HttpVersion.HTTP_1_1);
int nbytes = 128;
@@ -4891,7 +4891,7 @@ public class TestProtocolRequirements ex
*
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.11
*/
- private void testRequestIsWrittenThroughToOrigin(HttpRequest req)
+ private void testRequestIsWrittenThroughToOrigin(final HttpRequest req)
throws Exception {
HttpResponse resp = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NO_CONTENT, "No Content");
HttpRequestWrapper wrapper = HttpRequestWrapper.wrap(req);
@@ -5034,7 +5034,7 @@ public class TestProtocolRequirements ex
* it MAY be returned in reply to any subsequent request.
*/
protected void testSharedCacheRevalidatesAuthorizedResponse(
- HttpResponse authorizedResponse, int minTimes, int maxTimes) throws Exception,
+ final HttpResponse authorizedResponse, final int minTimes, final int maxTimes) throws Exception,
IOException {
if (config.isSharedCache()) {
String authorization = "Basic dXNlcjpwYXNzd2Q=";
@@ -5107,7 +5107,7 @@ public class TestProtocolRequirements ex
}
protected void testSharedCacheMustUseNewRequestHeadersWhenRevalidatingAuthorizedResponse(
- HttpResponse authorizedResponse) throws Exception, IOException,
+ final HttpResponse authorizedResponse) throws Exception, IOException,
ClientProtocolException {
if (config.isSharedCache()) {
String authorization1 = "Basic dXNlcjpwYXNzd2Q=";
@@ -5273,7 +5273,7 @@ public class TestProtocolRequirements ex
*
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.4
*/
- protected void testCacheIsNotUsedWhenRespondingToRequest(HttpRequestWrapper req)
+ protected void testCacheIsNotUsedWhenRespondingToRequest(final HttpRequestWrapper req)
throws Exception {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(
new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1));
@@ -5333,7 +5333,7 @@ public class TestProtocolRequirements ex
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.4
*/
protected void testStaleCacheResponseMustBeRevalidatedWithOrigin(
- HttpResponse staleResponse) throws Exception {
+ final HttpResponse staleResponse) throws Exception {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(
new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1));
@@ -5393,7 +5393,7 @@ public class TestProtocolRequirements ex
* for any reason, it MUST generate a 504 (Gateway Timeout) response."
*/
protected void testGenerates504IfCannotRevalidateStaleResponse(
- HttpResponse staleResponse) throws Exception {
+ final HttpResponse staleResponse) throws Exception {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(
new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1));
@@ -6018,7 +6018,7 @@ public class TestProtocolRequirements ex
}
- private void assertValidViaHeader(String via) {
+ private void assertValidViaHeader(final String via) {
// Via = "Via" ":" 1#( received-protocol received-by [ comment ] )
// received-protocol = [ protocol-name "/" ] protocol-version
// protocol-name = token
@@ -6056,7 +6056,7 @@ public class TestProtocolRequirements ex
}
}
- private boolean isValidComment(String s) {
+ private boolean isValidComment(final String s) {
final String leafComment = "^\\(([^\\p{Cntrl}()]|\\\\\\p{ASCII})*\\)$";
final String nestedPrefix = "^\\(([^\\p{Cntrl}()]|\\\\\\p{ASCII})*\\(";
final String nestedSuffix = "\\)([^\\p{Cntrl}()]|\\\\\\p{ASCII})*\\)$";
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseProtocolCompliance.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseProtocolCompliance.java Tue Jan 15 18:29:58 2013
@@ -62,12 +62,12 @@ public class TestResponseProtocolComplia
public boolean set;
}
- private void setMinimalResponseHeaders(HttpResponse resp) {
+ private void setMinimalResponseHeaders(final HttpResponse resp) {
resp.setHeader("Date", DateUtils.formatDate(new Date()));
resp.setHeader("Server", "MyServer/1.0");
}
- private ByteArrayInputStream makeTrackableBody(int nbytes, final Flag closed) {
+ private ByteArrayInputStream makeTrackableBody(final int nbytes, final Flag closed) {
byte[] buf = HttpTestUtils.getRandomBytes(nbytes);
ByteArrayInputStream bais = new ByteArrayInputStream(buf) {
@Override
@@ -78,7 +78,7 @@ public class TestResponseProtocolComplia
return bais;
}
- private HttpResponse makePartialResponse(int nbytes) {
+ private HttpResponse makePartialResponse(final int nbytes) {
HttpResponse resp = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_PARTIAL_CONTENT, "Partial Content");
setMinimalResponseHeaders(resp);
resp.setHeader("Content-Length","" + nbytes);
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java Tue Jan 15 18:29:58 2013
@@ -133,7 +133,7 @@ public class TestEhcacheHttpCacheStorage
Element element = new Element(key, new byte[]{});
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback(){
- public HttpCacheEntry update(HttpCacheEntry old){
+ public HttpCacheEntry update(final HttpCacheEntry old){
assertNull(old);
return updatedValue;
}
@@ -160,7 +160,7 @@ public class TestEhcacheHttpCacheStorage
Element existingElement = new Element(key, new byte[]{});
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback(){
- public HttpCacheEntry update(HttpCacheEntry old){
+ public HttpCacheEntry update(final HttpCacheEntry old){
assertEquals(existingValue, old);
return updatedValue;
}
@@ -188,7 +188,7 @@ public class TestEhcacheHttpCacheStorage
Element existingElement = new Element(key, new byte[]{});
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback(){
- public HttpCacheEntry update(HttpCacheEntry old){
+ public HttpCacheEntry update(final HttpCacheEntry old){
assertEquals(existingValue, old);
return updatedValue;
}
@@ -220,7 +220,7 @@ public class TestEhcacheHttpCacheStorage
Element existingElement = new Element(key, new byte[]{});
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback(){
- public HttpCacheEntry update(HttpCacheEntry old){
+ public HttpCacheEntry update(final HttpCacheEntry old){
assertEquals(existingValue, old);
return updatedValue;
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java Tue Jan 15 18:29:58 2013
@@ -95,8 +95,8 @@ public class TestMemcachedCacheEntryImpl
impl.set(bytes);
}
- private void assertEquivalent(HttpCacheEntry entry,
- HttpCacheEntry resultEntry) throws IOException {
+ private void assertEquivalent(final HttpCacheEntry entry,
+ final HttpCacheEntry resultEntry) throws IOException {
/* Ugh. Implementing HttpCacheEntry#equals is problematic
* due to the Resource response body (may cause unexpected
* I/O to users). Checking that two entries
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java Tue Jan 15 18:29:58 2013
@@ -321,7 +321,7 @@ public class TestMemcachedHttpCacheStora
final byte[] serialized = HttpTestUtils.getRandomBytes(128);
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
- public HttpCacheEntry update(HttpCacheEntry old) {
+ public HttpCacheEntry update(final HttpCacheEntry old) {
assertNull(old);
return updatedValue;
}
@@ -353,7 +353,7 @@ public class TestMemcachedHttpCacheStora
final byte[] newBytes = HttpTestUtils.getRandomBytes(128);
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
- public HttpCacheEntry update(HttpCacheEntry old) {
+ public HttpCacheEntry update(final HttpCacheEntry old) {
assertNull(old);
return updatedValue;
}
@@ -392,7 +392,7 @@ public class TestMemcachedHttpCacheStora
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
- public HttpCacheEntry update(HttpCacheEntry old) {
+ public HttpCacheEntry update(final HttpCacheEntry old) {
assertSame(existingValue, old);
return updatedValue;
}
@@ -435,7 +435,7 @@ public class TestMemcachedHttpCacheStora
mockMemcachedCacheEntryFactory, mockKeyHashingScheme);
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
- public HttpCacheEntry update(HttpCacheEntry old) {
+ public HttpCacheEntry update(final HttpCacheEntry old) {
assertSame(existingValue, old);
return updatedValue;
}
@@ -485,7 +485,7 @@ public class TestMemcachedHttpCacheStora
final byte[] newBytes2 = HttpTestUtils.getRandomBytes(128);
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
- public HttpCacheEntry update(HttpCacheEntry old) {
+ public HttpCacheEntry update(final HttpCacheEntry old) {
if (old == existingValue) {
return updatedValue;
}
@@ -539,7 +539,7 @@ public class TestMemcachedHttpCacheStora
final HttpCacheEntry updatedValue = HttpTestUtils.makeCacheEntry();
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
- public HttpCacheEntry update(HttpCacheEntry old) {
+ public HttpCacheEntry update(final HttpCacheEntry old) {
assertNull(old);
return updatedValue;
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java Tue Jan 15 18:29:58 2013
@@ -42,7 +42,7 @@ public class TestPrefixKeyHashingScheme
@Before
public void setUp() {
scheme = new KeyHashingScheme() {
- public String hash(String storageKey) {
+ public String hash(final String storageKey) {
assertEquals(KEY, storageKey);
return "hash";
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java Tue Jan 15 18:29:58 2013
@@ -144,7 +144,7 @@ public final class AuthSchemeRegistry im
public AuthSchemeProvider lookup(final String name) {
return new AuthSchemeProvider() {
- public AuthScheme create(HttpContext context) {
+ public AuthScheme create(final HttpContext context) {
HttpRequest request = (HttpRequest) context.getAttribute(
ExecutionContext.HTTP_REQUEST);
return getAuthScheme(name, request.getParams());
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java Tue Jan 15 18:29:58 2013
@@ -101,7 +101,7 @@ public class AuthScope {
* May be set to <tt>null</tt> if credentials are applicable to
* any authentication scheme.
*/
- public AuthScope(final String host, int port,
+ public AuthScope(final String host, final int port,
final String realm, final String scheme)
{
this.host = (host == null) ? ANY_HOST: host.toLowerCase(Locale.ENGLISH);
@@ -138,7 +138,7 @@ public class AuthScope {
* to <tt>null</tt> if credentials are applicable to
* any realm.
*/
- public AuthScope(final String host, int port, final String realm) {
+ public AuthScope(final String host, final int port, final String realm) {
this(host, port, realm, ANY_SCHEME);
}
@@ -153,7 +153,7 @@ public class AuthScope {
* to negative value if credentials are applicable to
* any port.
*/
- public AuthScope(final String host, int port) {
+ public AuthScope(final String host, final int port) {
this(host, port, ANY_REALM, ANY_SCHEME);
}
@@ -241,7 +241,7 @@ public class AuthScope {
* @see java.lang.Object#equals(Object)
*/
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (o == null) {
return false;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java Tue Jan 15 18:29:58 2013
@@ -52,7 +52,7 @@ public class AuthenticationException ext
*
* @param message the exception detail message
*/
- public AuthenticationException(String message) {
+ public AuthenticationException(final String message) {
super(message);
}
@@ -63,7 +63,7 @@ public class AuthenticationException ext
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
*/
- public AuthenticationException(String message, Throwable cause) {
+ public AuthenticationException(final String message, final Throwable cause) {
super(message, cause);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java Tue Jan 15 18:29:58 2013
@@ -63,7 +63,7 @@ public final class BasicUserPrincipal im
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java Tue Jan 15 18:29:58 2013
@@ -52,7 +52,7 @@ public class InvalidCredentialsException
*
* @param message the exception detail message
*/
- public InvalidCredentialsException(String message) {
+ public InvalidCredentialsException(final String message) {
super(message);
}
@@ -63,7 +63,7 @@ public class InvalidCredentialsException
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
*/
- public InvalidCredentialsException(String message, Throwable cause) {
+ public InvalidCredentialsException(final String message, final Throwable cause) {
super(message, cause);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java Tue Jan 15 18:29:58 2013
@@ -53,7 +53,7 @@ public class MalformedChallengeException
*
* @param message the exception detail message
*/
- public MalformedChallengeException(String message) {
+ public MalformedChallengeException(final String message) {
super(message);
}
@@ -64,7 +64,7 @@ public class MalformedChallengeException
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
*/
- public MalformedChallengeException(String message, Throwable cause) {
+ public MalformedChallengeException(final String message, final Throwable cause) {
super(message, cause);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java Tue Jan 15 18:29:58 2013
@@ -60,7 +60,7 @@ public class NTCredentials implements Cr
*
* @param usernamePassword the domain/username:password formed string
*/
- public NTCredentials(String usernamePassword) {
+ public NTCredentials(final String usernamePassword) {
super();
Args.notNull(usernamePassword, "Username:password string");
String username;
@@ -149,7 +149,7 @@ public class NTCredentials implements Cr
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java Tue Jan 15 18:29:58 2013
@@ -91,7 +91,7 @@ public class NTUserPrincipal implements
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java Tue Jan 15 18:29:58 2013
@@ -53,7 +53,7 @@ public class UsernamePasswordCredentials
* @param usernamePassword the username:password formed string
* @see #toString
*/
- public UsernamePasswordCredentials(String usernamePassword) {
+ public UsernamePasswordCredentials(final String usernamePassword) {
super();
Args.notNull(usernamePassword, "Username:password string");
int atColon = usernamePassword.indexOf(':');
@@ -73,7 +73,7 @@ public class UsernamePasswordCredentials
* @param userName the user name
* @param password the password
*/
- public UsernamePasswordCredentials(String userName, String password) {
+ public UsernamePasswordCredentials(final String userName, final String password) {
super();
Args.notNull(userName, "Username");
this.principal = new BasicUserPrincipal(userName);
@@ -98,7 +98,7 @@ public class UsernamePasswordCredentials
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java Tue Jan 15 18:29:58 2013
@@ -51,7 +51,7 @@ public class CircularRedirectException e
*
* @param message The exception detail message
*/
- public CircularRedirectException(String message) {
+ public CircularRedirectException(final String message) {
super(message);
}
@@ -62,7 +62,7 @@ public class CircularRedirectException e
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
*/
- public CircularRedirectException(String message, Throwable cause) {
+ public CircularRedirectException(final String message, final Throwable cause) {
super(message, cause);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java Tue Jan 15 18:29:58 2013
@@ -44,15 +44,15 @@ public class ClientProtocolException ext
super();
}
- public ClientProtocolException(String s) {
+ public ClientProtocolException(final String s) {
super(s);
}
- public ClientProtocolException(Throwable cause) {
+ public ClientProtocolException(final Throwable cause) {
initCause(cause);
}
- public ClientProtocolException(String message, Throwable cause) {
+ public ClientProtocolException(final String message, final Throwable cause) {
super(message);
initCause(cause);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java Tue Jan 15 18:29:58 2013
@@ -40,7 +40,7 @@ public class HttpResponseException exten
private final int statusCode;
- public HttpResponseException(int statusCode, final String s) {
+ public HttpResponseException(final int statusCode, final String s) {
super(s);
this.statusCode = statusCode;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java Tue Jan 15 18:29:58 2013
@@ -53,7 +53,7 @@ public class NonRepeatableRequestExcepti
*
* @param message The exception detail message
*/
- public NonRepeatableRequestException(String message) {
+ public NonRepeatableRequestException(final String message) {
super(message);
}
@@ -63,7 +63,7 @@ public class NonRepeatableRequestExcepti
* @param message The exception detail message
* @param cause the cause
*/
- public NonRepeatableRequestException(String message, Throwable cause) {
+ public NonRepeatableRequestException(final String message, final Throwable cause) {
super(message, cause);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java Tue Jan 15 18:29:58 2013
@@ -52,7 +52,7 @@ public class RedirectException extends P
*
* @param message The exception detail message
*/
- public RedirectException(String message) {
+ public RedirectException(final String message) {
super(message);
}
@@ -63,7 +63,7 @@ public class RedirectException extends P
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
*/
- public RedirectException(String message, Throwable cause) {
+ public RedirectException(final String message, final Throwable cause) {
super(message, cause);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java Tue Jan 15 18:29:58 2013
@@ -226,7 +226,7 @@ public class RequestConfig implements Cl
this.socketTimeout = -1;
}
- public Builder setExpectContinueEnabled(boolean expectContinueEnabled) {
+ public Builder setExpectContinueEnabled(final boolean expectContinueEnabled) {
this.expectContinueEnabled = expectContinueEnabled;
return this;
}
@@ -241,7 +241,7 @@ public class RequestConfig implements Cl
return this;
}
- public Builder setStaleConnectionCheckEnabled(boolean staleConnectionCheckEnabled) {
+ public Builder setStaleConnectionCheckEnabled(final boolean staleConnectionCheckEnabled) {
this.staleConnectionCheckEnabled = staleConnectionCheckEnabled;
return this;
}
@@ -251,17 +251,17 @@ public class RequestConfig implements Cl
return this;
}
- public Builder setRedirectsEnabled(boolean redirectsEnabled) {
+ public Builder setRedirectsEnabled(final boolean redirectsEnabled) {
this.redirectsEnabled = redirectsEnabled;
return this;
}
- public Builder setRelativeRedirectsAllowed(boolean relativeRedirectsAllowed) {
+ public Builder setRelativeRedirectsAllowed(final boolean relativeRedirectsAllowed) {
this.relativeRedirectsAllowed = relativeRedirectsAllowed;
return this;
}
- public Builder setCircularRedirectsAllowed(boolean circularRedirectsAllowed) {
+ public Builder setCircularRedirectsAllowed(final boolean circularRedirectsAllowed) {
this.circularRedirectsAllowed = circularRedirectsAllowed;
return this;
}
@@ -271,7 +271,7 @@ public class RequestConfig implements Cl
return this;
}
- public Builder setAuthenticationEnabled(boolean authenticationEnabled) {
+ public Builder setAuthenticationEnabled(final boolean authenticationEnabled) {
this.authenticationEnabled = authenticationEnabled;
return this;
}
@@ -291,7 +291,7 @@ public class RequestConfig implements Cl
return this;
}
- public Builder setConnectTimeout(int connectTimeout) {
+ public Builder setConnectTimeout(final int connectTimeout) {
this.connectTimeout = connectTimeout;
return this;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java Tue Jan 15 18:29:58 2013
@@ -93,7 +93,7 @@ abstract class DecompressingEntity exten
* {@inheritDoc}
*/
@Override
- public void writeTo(OutputStream outstream) throws IOException {
+ public void writeTo(final OutputStream outstream) throws IOException {
Args.notNull(outstream, "Output stream");
InputStream instream = getContent();
try {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/RequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/RequestBuilder.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/RequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/RequestBuilder.java Tue Jan 15 18:29:58 2013
@@ -196,7 +196,7 @@ public class RequestBuilder {
return this;
}
- public RequestBuilder removeHeader(Header header) {
+ public RequestBuilder removeHeader(final Header header) {
if (headergroup == null) {
headergroup = new HeaderGroup();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java Tue Jan 15 18:29:58 2013
@@ -53,7 +53,7 @@ public class HttpClientParams {
(ClientPNames.HANDLE_REDIRECTS, true);
}
- public static void setRedirecting(final HttpParams params, boolean value) {
+ public static void setRedirecting(final HttpParams params, final boolean value) {
Args.notNull(params, "HTTP parameters");
params.setBooleanParameter
(ClientPNames.HANDLE_REDIRECTS, value);
@@ -65,7 +65,7 @@ public class HttpClientParams {
(ClientPNames.HANDLE_AUTHENTICATION, true);
}
- public static void setAuthenticating(final HttpParams params, boolean value) {
+ public static void setAuthenticating(final HttpParams params, final boolean value) {
Args.notNull(params, "HTTP parameters");
params.setBooleanParameter
(ClientPNames.HANDLE_AUTHENTICATION, value);
@@ -91,7 +91,7 @@ public class HttpClientParams {
*
* @since 4.2
*/
- public static void setConnectionManagerTimeout(final HttpParams params, long timeout) {
+ public static void setConnectionManagerTimeout(final HttpParams params, final long timeout) {
Args.notNull(params, "HTTP parameters");
params.setLongParameter(ClientPNames.CONN_MANAGER_TIMEOUT, timeout);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java Tue Jan 15 18:29:58 2013
@@ -57,7 +57,7 @@ public class JdkIdn implements Idn {
}
}
- public String toUnicode(String punycode) {
+ public String toUnicode(final String punycode) {
try {
return (String) toUnicode.invoke(null, punycode);
} catch (IllegalAccessException e) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java Tue Jan 15 18:29:58 2013
@@ -47,7 +47,7 @@ public class Punycode {
impl = _impl;
}
- public static String toUnicode(String punycode) {
+ public static String toUnicode(final String punycode) {
return impl.toUnicode(punycode);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java Tue Jan 15 18:29:58 2013
@@ -47,7 +47,7 @@ public class Rfc3492Idn implements Idn {
private static final char delimiter = '-';
private static final String ACE_PREFIX = "xn--";
- private int adapt(int delta, int numpoints, boolean firsttime) {
+ private int adapt(int delta, final int numpoints, final boolean firsttime) {
if (firsttime) {
delta = delta / damp;
} else {
@@ -62,7 +62,7 @@ public class Rfc3492Idn implements Idn {
return k + (((base - tmin + 1) * delta) / (delta + skew));
}
- private int digit(char c) {
+ private int digit(final char c) {
if ((c >= 'A') && (c <= 'Z')) {
return (c - 'A');
}
@@ -75,7 +75,7 @@ public class Rfc3492Idn implements Idn {
throw new IllegalArgumentException("illegal digit: "+ c);
}
- public String toUnicode(String punycode) {
+ public String toUnicode(final String punycode) {
StringBuilder unicode = new StringBuilder(punycode.length());
StringTokenizer tok = new StringTokenizer(punycode, ".");
while (tok.hasMoreTokens()) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java Tue Jan 15 18:29:58 2013
@@ -76,7 +76,7 @@ public class URIUtils {
public static URI createURI(
final String scheme,
final String host,
- int port,
+ final int port,
final String path,
final String query,
final String fragment) throws URISyntaxException {
@@ -128,7 +128,7 @@ public class URIUtils {
public static URI rewriteURI(
final URI uri,
final HttpHost target,
- boolean dropFragment) throws URISyntaxException {
+ final boolean dropFragment) throws URISyntaxException {
Args.notNull(uri, "URI");
URIBuilder uribuilder = new URIBuilder(uri);
if (target != null) {
@@ -247,7 +247,7 @@ public class URIUtils {
* @param uri the original URI
* @return the URI without dot segments
*/
- private static URI removeDotSegments(URI uri) {
+ private static URI removeDotSegments(final URI uri) {
String path = uri.getPath();
if ((path == null) || (path.indexOf("/.") == -1)) {
// No dot segments to remove
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java Tue Jan 15 18:29:58 2013
@@ -56,14 +56,14 @@ public class BasicEofSensorWatcher imple
* @param conn the connection to auto-release
* @param reuse whether the connection should be re-used
*/
- public BasicEofSensorWatcher(ManagedClientConnection conn,
- boolean reuse) {
+ public BasicEofSensorWatcher(final ManagedClientConnection conn,
+ final boolean reuse) {
Args.notNull(conn, "Connection");
managedConn = conn;
attemptReuse = reuse;
}
- public boolean eofDetected(InputStream wrapped)
+ public boolean eofDetected(final InputStream wrapped)
throws IOException {
try {
@@ -79,7 +79,7 @@ public class BasicEofSensorWatcher imple
return false;
}
- public boolean streamClosed(InputStream wrapped)
+ public boolean streamClosed(final InputStream wrapped)
throws IOException {
try {
@@ -95,7 +95,7 @@ public class BasicEofSensorWatcher imple
return false;
}
- public boolean streamAbort(InputStream wrapped)
+ public boolean streamAbort(final InputStream wrapped)
throws IOException {
managedConn.abortConnection();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java Tue Jan 15 18:29:58 2013
@@ -68,9 +68,9 @@ public class BasicManagedEntity extends
* @param conn the connection to release
* @param reuse whether the connection should be re-used
*/
- public BasicManagedEntity(HttpEntity entity,
- ManagedClientConnection conn,
- boolean reuse) {
+ public BasicManagedEntity(final HttpEntity entity,
+ final ManagedClientConnection conn,
+ final boolean reuse) {
super(entity);
Args.notNull(conn, "Connection");
this.managedConn = conn;
@@ -133,7 +133,7 @@ public class BasicManagedEntity extends
}
}
- public boolean eofDetected(InputStream wrapped) throws IOException {
+ public boolean eofDetected(final InputStream wrapped) throws IOException {
try {
if (attemptReuse && (managedConn != null)) {
// there may be some cleanup required, such as
@@ -147,7 +147,7 @@ public class BasicManagedEntity extends
return false;
}
- public boolean streamClosed(InputStream wrapped) throws IOException {
+ public boolean streamClosed(final InputStream wrapped) throws IOException {
try {
if (attemptReuse && (managedConn != null)) {
boolean valid = managedConn.isOpen();
@@ -168,7 +168,7 @@ public class BasicManagedEntity extends
return false;
}
- public boolean streamAbort(InputStream wrapped) throws IOException {
+ public boolean streamAbort(final InputStream wrapped) throws IOException {
if (managedConn != null) {
managedConn.abortConnection();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java Tue Jan 15 18:29:58 2013
@@ -53,7 +53,7 @@ public class ConnectionPoolTimeoutExcept
*
* @param message The exception detail message
*/
- public ConnectionPoolTimeoutException(String message) {
+ public ConnectionPoolTimeoutException(final String message) {
super(message);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java Tue Jan 15 18:29:58 2013
@@ -129,7 +129,7 @@ public class EofSensorInputStream extend
}
@Override
- public int read(byte[] b, int off, int len) throws IOException {
+ public int read(final byte[] b, final int off, final int len) throws IOException {
int l = -1;
if (isReadAllowed()) {
@@ -146,7 +146,7 @@ public class EofSensorInputStream extend
}
@Override
- public int read(byte[] b) throws IOException {
+ public int read(final byte[] b) throws IOException {
return read(b, 0, b.length);
}
@@ -190,7 +190,7 @@ public class EofSensorInputStream extend
* @throws IOException
* in case of an IO problem on closing the underlying stream
*/
- protected void checkEOF(int eof) throws IOException {
+ protected void checkEOF(final int eof) throws IOException {
if ((wrappedStream != null) && (eof < 0)) {
try {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java Tue Jan 15 18:29:58 2013
@@ -47,7 +47,7 @@ public class HttpInetSocketAddress exten
private final HttpHost httphost;
- public HttpInetSocketAddress(final HttpHost httphost, final InetAddress addr, int port) {
+ public HttpInetSocketAddress(final HttpHost httphost, final InetAddress addr, final int port) {
super(addr, port);
Args.notNull(httphost, "HTTP host");
this.httphost = httphost;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java Tue Jan 15 18:29:58 2013
@@ -103,9 +103,9 @@ public final class MultihomePlainSocketF
* @throws IOException if an error occurs during the connection
* @throws SocketTimeoutException if timeout expires before connecting
*/
- public Socket connectSocket(Socket sock, String host, int port,
- InetAddress localAddress, int localPort,
- HttpParams params)
+ public Socket connectSocket(Socket sock, final String host, final int port,
+ final InetAddress localAddress, int localPort,
+ final HttpParams params)
throws IOException {
Args.notNull(host, "Target host");
Args.notNull(params, "HTTP parameters");
@@ -166,7 +166,7 @@ public final class MultihomePlainSocketF
*
* @throws IllegalArgumentException if the argument is invalid
*/
- public final boolean isSecure(Socket sock)
+ public final boolean isSecure(final Socket sock)
throws IllegalArgumentException {
Args.notNull(sock, "Socket");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java Tue Jan 15 18:29:58 2013
@@ -74,7 +74,7 @@ public final class ConnManagerParams imp
* @deprecated (4.1) use {@link HttpConnectionParams#setConnectionTimeout(HttpParams, int)}
*/
@Deprecated
- public static void setTimeout(final HttpParams params, long timeout) {
+ public static void setTimeout(final HttpParams params, final long timeout) {
Args.notNull(params, "HTTP parameters");
params.setLongParameter(TIMEOUT, timeout);
}
@@ -82,7 +82,7 @@ public final class ConnManagerParams imp
/** The default maximum number of connections allowed per host */
private static final ConnPerRoute DEFAULT_CONN_PER_ROUTE = new ConnPerRoute() {
- public int getMaxForRoute(HttpRoute route) {
+ public int getMaxForRoute(final HttpRoute route) {
return ConnPerRouteBean.DEFAULT_MAX_CONNECTIONS_PER_ROUTE;
}
@@ -125,7 +125,7 @@ public final class ConnManagerParams imp
*/
public static void setMaxTotalConnections(
final HttpParams params,
- int maxTotalConnections) {
+ final int maxTotalConnections) {
Args.notNull(params, "HTTP parameters");
params.setIntParameter(MAX_TOTAL_CONNECTIONS, maxTotalConnections);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java Tue Jan 15 18:29:58 2013
@@ -55,7 +55,7 @@ public final class ConnPerRouteBean impl
private volatile int defaultMax;
- public ConnPerRouteBean(int defaultMax) {
+ public ConnPerRouteBean(final int defaultMax) {
super();
this.maxPerHostMap = new ConcurrentHashMap<HttpRoute, Integer>();
setDefaultMaxPerRoute(defaultMax);
@@ -76,12 +76,12 @@ public final class ConnPerRouteBean impl
return this.defaultMax;
}
- public void setDefaultMaxPerRoute(int max) {
+ public void setDefaultMaxPerRoute(final int max) {
Args.positive(max, "Defautl max per route");
this.defaultMax = max;
}
- public void setMaxForRoute(final HttpRoute route, int max) {
+ public void setMaxForRoute(final HttpRoute route, final int max) {
Args.notNull(route, "HTTP route");
Args.positive(max, "Max per route");
this.maxPerHostMap.put(route, Integer.valueOf(max));
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java Tue Jan 15 18:29:58 2013
@@ -77,7 +77,7 @@ public class ConnRouteParams implements
* @return the default proxy set in the argument parameters, or
* <code>null</code> if not set
*/
- public static HttpHost getDefaultProxy(HttpParams params) {
+ public static HttpHost getDefaultProxy(final HttpParams params) {
Args.notNull(params, "Parameters");
HttpHost proxy = (HttpHost)
params.getParameter(DEFAULT_PROXY);
@@ -98,8 +98,8 @@ public class ConnRouteParams implements
* <code>null</code> by {@link #getDefaultProxy},
* to allow for explicit unsetting in hierarchies.
*/
- public static void setDefaultProxy(HttpParams params,
- HttpHost proxy) {
+ public static void setDefaultProxy(final HttpParams params,
+ final HttpHost proxy) {
Args.notNull(params, "Parameters");
params.setParameter(DEFAULT_PROXY, proxy);
}
@@ -115,7 +115,7 @@ public class ConnRouteParams implements
* @return the forced route set in the argument parameters, or
* <code>null</code> if not set
*/
- public static HttpRoute getForcedRoute(HttpParams params) {
+ public static HttpRoute getForcedRoute(final HttpParams params) {
Args.notNull(params, "Parameters");
HttpRoute route = (HttpRoute)
params.getParameter(FORCED_ROUTE);
@@ -136,8 +136,8 @@ public class ConnRouteParams implements
* <code>null</code> by {@link #getForcedRoute},
* to allow for explicit unsetting in hierarchies.
*/
- public static void setForcedRoute(HttpParams params,
- HttpRoute route) {
+ public static void setForcedRoute(final HttpParams params,
+ final HttpRoute route) {
Args.notNull(params, "Parameters");
params.setParameter(FORCED_ROUTE, route);
}
@@ -154,7 +154,7 @@ public class ConnRouteParams implements
* @return the local address set in the argument parameters, or
* <code>null</code> if not set
*/
- public static InetAddress getLocalAddress(HttpParams params) {
+ public static InetAddress getLocalAddress(final HttpParams params) {
Args.notNull(params, "Parameters");
InetAddress local = (InetAddress)
params.getParameter(LOCAL_ADDRESS);
@@ -169,8 +169,8 @@ public class ConnRouteParams implements
* @param params the parameters in which to set the value
* @param local the value to set, may be <code>null</code>
*/
- public static void setLocalAddress(HttpParams params,
- InetAddress local) {
+ public static void setLocalAddress(final HttpParams params,
+ final InetAddress local) {
Args.notNull(params, "Parameters");
params.setParameter(LOCAL_ADDRESS, local);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java Tue Jan 15 18:29:58 2013
@@ -50,7 +50,7 @@ public class BasicRouteDirector implemen
* either the next step to perform, or success, or failure.
* 0 is for success, a negative value for failure.
*/
- public int nextStep(RouteInfo plan, RouteInfo fact) {
+ public int nextStep(final RouteInfo plan, final RouteInfo fact) {
Args.notNull(plan, "Planned route");
int step = UNREACHABLE;
@@ -75,7 +75,7 @@ public class BasicRouteDirector implemen
*
* @return the first step
*/
- protected int firstStep(RouteInfo plan) {
+ protected int firstStep(final RouteInfo plan) {
return (plan.getHopCount() > 1) ?
CONNECT_PROXY : CONNECT_TARGET;
@@ -91,7 +91,7 @@ public class BasicRouteDirector implemen
* @return one of the constants defined in this class, indicating
* either the next step to perform, or success, or failure
*/
- protected int directStep(RouteInfo plan, RouteInfo fact) {
+ protected int directStep(final RouteInfo plan, final RouteInfo fact) {
if (fact.getHopCount() > 1) {
return UNREACHABLE;
@@ -131,7 +131,7 @@ public class BasicRouteDirector implemen
* @return one of the constants defined in this class, indicating
* either the next step to perform, or success, or failure
*/
- protected int proxiedStep(RouteInfo plan, RouteInfo fact) {
+ protected int proxiedStep(final RouteInfo plan, final RouteInfo fact) {
if (fact.getHopCount() <= 1) {
return UNREACHABLE;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java Tue Jan 15 18:29:58 2013
@@ -88,9 +88,9 @@ public final class HttpRoute implements
* @param layered the layering type of this route, or
* <code>null</code> for PLAIN
*/
- private HttpRoute(InetAddress local,
- HttpHost target, HttpHost[] proxies,
- boolean secure,
+ private HttpRoute(final InetAddress local,
+ final HttpHost target, final HttpHost[] proxies,
+ final boolean secure,
TunnelType tunnelled, LayerType layered) {
Args.notNull(target, "Target host");
Args.notNull(proxies, "Array of proxy hosts");
@@ -130,8 +130,8 @@ public final class HttpRoute implements
* @param tunnelled the tunnel type of this route
* @param layered the layering type of this route
*/
- public HttpRoute(HttpHost target, InetAddress local, HttpHost[] proxies,
- boolean secure, TunnelType tunnelled, LayerType layered) {
+ public HttpRoute(final HttpHost target, final InetAddress local, final HttpHost[] proxies,
+ final boolean secure, final TunnelType tunnelled, final LayerType layered) {
this(local, target, toChain(proxies), secure, tunnelled, layered);
}
@@ -153,8 +153,8 @@ public final class HttpRoute implements
* layered protocol,
* <code>false</code> otherwise
*/
- public HttpRoute(HttpHost target, InetAddress local, HttpHost proxy,
- boolean secure, TunnelType tunnelled, LayerType layered) {
+ public HttpRoute(final HttpHost target, final InetAddress local, final HttpHost proxy,
+ final boolean secure, final TunnelType tunnelled, final LayerType layered) {
this(local, target, toChain(proxy), secure, tunnelled, layered);
}
@@ -169,7 +169,7 @@ public final class HttpRoute implements
* @param secure <code>true</code> if the route is (to be) secure,
* <code>false</code> otherwise
*/
- public HttpRoute(HttpHost target, InetAddress local, boolean secure) {
+ public HttpRoute(final HttpHost target, final InetAddress local, final boolean secure) {
this(local, target, EMPTY_HTTP_HOST_ARRAY, secure, TunnelType.PLAIN, LayerType.PLAIN);
}
@@ -179,7 +179,7 @@ public final class HttpRoute implements
*
* @param target the host to which to route
*/
- public HttpRoute(HttpHost target) {
+ public HttpRoute(final HttpHost target) {
this(null, target, EMPTY_HTTP_HOST_ARRAY, false, TunnelType.PLAIN, LayerType.PLAIN);
}
@@ -197,8 +197,8 @@ public final class HttpRoute implements
* @param secure <code>true</code> if the route is (to be) secure,
* <code>false</code> otherwise
*/
- public HttpRoute(HttpHost target, InetAddress local, HttpHost proxy,
- boolean secure) {
+ public HttpRoute(final HttpHost target, final InetAddress local, final HttpHost proxy,
+ final boolean secure) {
this(local, target, toChain(proxy), secure,
secure ? TunnelType.TUNNELLED : TunnelType.PLAIN,
secure ? LayerType.LAYERED : LayerType.PLAIN);
@@ -213,7 +213,7 @@ public final class HttpRoute implements
*
* @return a proxy chain array, may be empty (never null)
*/
- private static HttpHost[] toChain(HttpHost proxy) {
+ private static HttpHost[] toChain(final HttpHost proxy) {
if (proxy == null) {
return EMPTY_HTTP_HOST_ARRAY;
}
@@ -230,7 +230,7 @@ public final class HttpRoute implements
*
* @return a new proxy chain array, may be empty (never null)
*/
- private static HttpHost[] toChain(HttpHost[] proxies) {
+ private static HttpHost[] toChain(final HttpHost[] proxies) {
if ((proxies == null) || (proxies.length < 1)) {
return EMPTY_HTTP_HOST_ARRAY;
}
@@ -260,7 +260,7 @@ public final class HttpRoute implements
}
- public final HttpHost getHopTarget(int hop) {
+ public final HttpHost getHopTarget(final int hop) {
Args.notNegative(hop, "Hop index");
final int hopcount = getHopCount();
Args.check(hop < hopcount, "Hop index exceeds tracked route length");
@@ -315,7 +315,7 @@ public final class HttpRoute implements
* <code>false</code>
*/
@Override
- public final boolean equals(Object obj) {
+ public final boolean equals(final Object obj) {
if (this == obj) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java Tue Jan 15 18:29:58 2013
@@ -78,7 +78,7 @@ public final class RouteTracker implemen
* @param local the local address to route from, or
* <code>null</code> for the default
*/
- public RouteTracker(HttpHost target, InetAddress local) {
+ public RouteTracker(final HttpHost target, final InetAddress local) {
Args.notNull(target, "Target host");
this.targetHost = target;
this.localAddress = local;
@@ -104,7 +104,7 @@ public final class RouteTracker implemen
*
* @param route the route to track
*/
- public RouteTracker(HttpRoute route) {
+ public RouteTracker(final HttpRoute route) {
this(route.getTargetHost(), route.getLocalAddress());
}
@@ -114,7 +114,7 @@ public final class RouteTracker implemen
* @param secure <code>true</code> if the route is secure,
* <code>false</code> otherwise
*/
- public final void connectTarget(boolean secure) {
+ public final void connectTarget(final boolean secure) {
Asserts.check(!this.connected, "Already connected");
this.connected = true;
this.secure = secure;
@@ -127,7 +127,7 @@ public final class RouteTracker implemen
* @param secure <code>true</code> if the route is secure,
* <code>false</code> otherwise
*/
- public final void connectProxy(HttpHost proxy, boolean secure) {
+ public final void connectProxy(final HttpHost proxy, final boolean secure) {
Args.notNull(proxy, "Proxy host");
Asserts.check(!this.connected, "Already connected");
this.connected = true;
@@ -141,7 +141,7 @@ public final class RouteTracker implemen
* @param secure <code>true</code> if the route is secure,
* <code>false</code> otherwise
*/
- public final void tunnelTarget(boolean secure) {
+ public final void tunnelTarget(final boolean secure) {
Asserts.check(this.connected, "No tunnel unless connected");
Asserts.notNull(this.proxyChain, "No tunnel without proxy");
this.tunnelled = TunnelType.TUNNELLED;
@@ -157,7 +157,7 @@ public final class RouteTracker implemen
* @param secure <code>true</code> if the route is secure,
* <code>false</code> otherwise
*/
- public final void tunnelProxy(HttpHost proxy, boolean secure) {
+ public final void tunnelProxy(final HttpHost proxy, final boolean secure) {
Args.notNull(proxy, "Proxy host");
Asserts.check(this.connected, "No tunnel unless connected");
Asserts.notNull(this.proxyChain, "No tunnel without proxy");
@@ -177,7 +177,7 @@ public final class RouteTracker implemen
* @param secure <code>true</code> if the route is secure,
* <code>false</code> otherwise
*/
- public final void layerProtocol(boolean secure) {
+ public final void layerProtocol(final boolean secure) {
// it is possible to layer a protocol over a direct connection,
// although this case is probably not considered elsewhere
Asserts.check(this.connected, "No layered protocol unless connected");
@@ -205,7 +205,7 @@ public final class RouteTracker implemen
return hops;
}
- public final HttpHost getHopTarget(int hop) {
+ public final HttpHost getHopTarget(final int hop) {
Args.notNegative(hop, "Hop index");
final int hopcount = getHopCount();
Args.check(hop < hopcount, "Hop index exceeds tracked route length");
@@ -271,7 +271,7 @@ public final class RouteTracker implemen
* <code>false</code>
*/
@Override
- public final boolean equals(Object o) {
+ public final boolean equals(final Object o) {
if (o == this) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactoryAdaptor.java Tue Jan 15 18:29:58 2013
@@ -46,7 +46,7 @@ class LayeredSocketFactoryAdaptor extend
public Socket createSocket(
final Socket socket,
- final String host, int port, boolean autoClose) throws IOException, UnknownHostException {
+ final String host, final int port, final boolean autoClose) throws IOException, UnknownHostException {
return this.factory.createLayeredSocket(socket, host, port, autoClose);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java Tue Jan 15 18:29:58 2013
@@ -131,7 +131,7 @@ public class PlainSocketFactory implemen
*
* @return <code>false</code>
*/
- public final boolean isSecure(Socket sock) {
+ public final boolean isSecure(final Socket sock) {
return false;
}
@@ -141,7 +141,7 @@ public class PlainSocketFactory implemen
@Deprecated
public Socket connectSocket(
final Socket socket,
- final String host, int port,
+ final String host, final int port,
final InetAddress localAddress, int localPort,
final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
InetSocketAddress local = null;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java Tue Jan 15 18:29:58 2013
@@ -214,7 +214,7 @@ public final class Scheme {
*
* @return the given port or the defaultPort
*/
- public final int resolvePort(int port) {
+ public final int resolvePort(final int port) {
return port <= 0 ? defaultPort : port;
}
@@ -236,7 +236,7 @@ public final class Scheme {
}
@Override
- public final boolean equals(Object obj) {
+ public final boolean equals(final Object obj) {
if (this == obj) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor.java Tue Jan 15 18:29:58 2013
@@ -49,7 +49,7 @@ class SchemeLayeredSocketFactoryAdaptor
public Socket createLayeredSocket(
final Socket socket,
- final String target, int port,
+ final String target, final int port,
final HttpParams params) throws IOException, UnknownHostException {
return this.factory.createSocket(socket, target, port, true);
}