You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/01/15 21:08:11 UTC
svn commit: r1433610 [1/2] - in /httpcomponents/httpclient/trunk:
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/
httpclient-cache/src/test/java/org/apache/ht...
Author: olegk
Date: Tue Jan 15 20:08:10 2013
New Revision: 1433610
URL: http://svn.apache.org/viewvc?rev=1433610&view=rev
Log:
Fixed style check violations (tabs introduced by a previous commit)
Modified:
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/WarningValue.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/HttpTestUtils.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/RequestEquivalent.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/BackoffStrategyExec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestScheme.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAIMDBackoffManager.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultBackoffStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java Tue Jan 15 20:08:10 2013
@@ -162,8 +162,8 @@ class BasicHttpCache implements HttpCach
}
Header hdr = resp.getFirstHeader(HTTP.CONTENT_LEN);
if (hdr == null) {
- return false;
- }
+ return false;
+ }
int contentLength;
try {
contentLength = Integer.parseInt(hdr.getValue());
@@ -284,15 +284,15 @@ class BasicHttpCache implements HttpCach
public HttpCacheEntry getCacheEntry(final HttpHost host, final HttpRequest request) throws IOException {
HttpCacheEntry root = storage.getEntry(uriExtractor.getURI(host, request));
if (root == null) {
- return null;
- }
+ return null;
+ }
if (!root.hasVariants()) {
- return root;
- }
+ return root;
+ }
String variantCacheKey = root.getVariantMap().get(uriExtractor.getVariantKey(request, root));
if (variantCacheKey == null) {
- return null;
- }
+ return null;
+ }
return storage.getEntry(variantCacheKey);
}
@@ -306,8 +306,8 @@ class BasicHttpCache implements HttpCach
Map<String,Variant> variants = new HashMap<String,Variant>();
HttpCacheEntry root = storage.getEntry(uriExtractor.getURI(host, request));
if (root == null || !root.hasVariants()) {
- return variants;
- }
+ return variants;
+ }
for(Map.Entry<String, String> variant : root.getVariantMap().entrySet()) {
String variantKey = variant.getKey();
String variantCacheKey = variant.getValue();
@@ -321,12 +321,12 @@ class BasicHttpCache implements HttpCach
throws IOException {
HttpCacheEntry entry = storage.getEntry(variantCacheKey);
if (entry == null) {
- return;
- }
+ return;
+ }
Header etagHeader = entry.getFirstHeader(HeaderConstants.ETAG);
if (etagHeader == null) {
- return;
- }
+ return;
+ }
variants.put(etagHeader.getValue(), new Variant(variantKey, variantCacheKey, entry));
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java Tue Jan 15 20:08:10 2013
@@ -135,8 +135,8 @@ class CacheInvalidator {
protected void flushUriIfSameHost(final URL requestURL, final URL targetURL) {
URL canonicalTarget = getAbsoluteURL(cacheKeyGenerator.canonicalizeUri(targetURL.toString()));
if (canonicalTarget == null) {
- return;
- }
+ return;
+ }
if (canonicalTarget.getAuthority().equalsIgnoreCase(requestURL.getAuthority())) {
flushEntry(canonicalTarget.toString());
}
@@ -145,8 +145,8 @@ class CacheInvalidator {
protected void flushRelativeUriFromSameHost(final URL reqURL, final String relUri) {
URL relURL = getRelativeURL(reqURL, relUri);
if (relURL == null) {
- return;
- }
+ return;
+ }
flushUriIfSameHost(reqURL, relURL);
}
@@ -154,8 +154,8 @@ class CacheInvalidator {
protected boolean flushAbsoluteUriFromSameHost(final URL reqURL, final String uri) {
URL absURL = getAbsoluteURL(uri);
if (absURL == null) {
- return false;
- }
+ return false;
+ }
flushUriIfSameHost(reqURL,absURL);
return true;
}
@@ -197,31 +197,31 @@ class CacheInvalidator {
final HttpRequest request, final HttpResponse response) {
int status = response.getStatusLine().getStatusCode();
if (status < 200 || status > 299) {
- return;
- }
+ return;
+ }
URL reqURL = getAbsoluteURL(cacheKeyGenerator.getURI(host, request));
if (reqURL == null) {
- return;
- }
+ return;
+ }
URL canonURL = getContentLocationURL(reqURL, response);
if (canonURL == null) {
- return;
- }
+ return;
+ }
String cacheKey = cacheKeyGenerator.canonicalizeUri(canonURL.toString());
HttpCacheEntry entry = getEntry(cacheKey);
if (entry == null) {
- return;
- }
+ return;
+ }
// do not invalidate if response is strictly older than entry
// or if the etags match
if (responseDateOlderThanEntryDate(response, entry)) {
- return;
- }
+ return;
+ }
if (!responseAndEntryEtagsDiffer(response, entry)) {
- return;
- }
+ return;
+ }
flushUriIfSameHost(reqURL, canonURL);
}
@@ -229,13 +229,13 @@ class CacheInvalidator {
private URL getContentLocationURL(final URL reqURL, final HttpResponse response) {
Header clHeader = response.getFirstHeader("Content-Location");
if (clHeader == null) {
- return null;
- }
+ return null;
+ }
String contentLocation = clHeader.getValue();
URL canonURL = getAbsoluteURL(contentLocation);
if (canonURL != null) {
- return canonURL;
- }
+ return canonURL;
+ }
return getRelativeURL(reqURL, contentLocation);
}
@@ -244,8 +244,8 @@ class CacheInvalidator {
Header entryEtag = entry.getFirstHeader(HeaderConstants.ETAG);
Header responseEtag = response.getFirstHeader(HeaderConstants.ETAG);
if (entryEtag == null || responseEtag == null) {
- return false;
- }
+ return false;
+ }
return (!entryEtag.getValue().equals(responseEtag.getValue()));
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java Tue Jan 15 20:08:10 2013
@@ -75,8 +75,8 @@ class CacheKeyGenerator {
int port = canonicalizePort(u.getPort(), protocol);
String path = canonicalizePath(u.getPath());
if ("".equals(path)) {
- path = "/";
- }
+ path = "/";
+ }
String query = u.getQuery();
String file = (query != null) ? (path + "?" + query) : path;
URL out = new URL(protocol, hostname, port, file);
@@ -112,8 +112,8 @@ class CacheKeyGenerator {
protected String getFullHeaderValue(final Header[] headers) {
if (headers == null) {
- return "";
- }
+ return "";
+ }
StringBuilder buf = new StringBuilder("");
boolean first = true;
@@ -140,8 +140,8 @@ class CacheKeyGenerator {
*/
public String getVariantURI(final HttpHost host, final HttpRequest req, final HttpCacheEntry entry) {
if (!entry.hasVariants()) {
- return getURI(host, req);
- }
+ return getURI(host, req);
+ }
return getVariantKey(req, entry) + getURI(host, req);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheValidityPolicy.java Tue Jan 15 20:08:10 2013
@@ -57,18 +57,18 @@ class CacheValidityPolicy {
public long getFreshnessLifetimeSecs(final HttpCacheEntry entry) {
long maxage = getMaxAge(entry);
if (maxage > -1) {
- return maxage;
- }
+ return maxage;
+ }
Date dateValue = getDateValue(entry);
if (dateValue == null) {
- return 0L;
- }
+ return 0L;
+ }
Date expiry = getExpirationDate(entry);
if (expiry == null) {
- return 0;
- }
+ return 0;
+ }
long diff = expiry.getTime() - dateValue.getTime();
return (diff / 1000);
}
@@ -103,8 +103,8 @@ class CacheValidityPolicy {
if (dateValue != null && lastModifiedValue != null) {
long diff = dateValue.getTime() - lastModifiedValue.getTime();
if (diff < 0) {
- return 0;
- }
+ return 0;
+ }
return (long)(coefficient * (diff / 1000));
}
@@ -175,8 +175,8 @@ class CacheValidityPolicy {
protected Date getDateValue(final HttpCacheEntry entry) {
Header dateHdr = entry.getFirstHeader(HTTP.DATE_HEADER);
if (dateHdr == null) {
- return null;
- }
+ return null;
+ }
try {
return DateUtils.parseDate(dateHdr.getValue());
} catch (DateParseException dpe) {
@@ -188,8 +188,8 @@ class CacheValidityPolicy {
protected Date getLastModifiedValue(final HttpCacheEntry entry) {
Header dateHdr = entry.getFirstHeader(HeaderConstants.LAST_MODIFIED);
if (dateHdr == null) {
- return null;
- }
+ return null;
+ }
try {
return DateUtils.parseDate(dateHdr.getValue());
} catch (DateParseException dpe) {
@@ -201,8 +201,8 @@ class CacheValidityPolicy {
protected long getContentLengthValue(final HttpCacheEntry entry) {
Header cl = entry.getFirstHeader(HTTP.CONTENT_LEN);
if (cl == null) {
- return -1;
- }
+ return -1;
+ }
try {
return Long.parseLong(cl.getValue());
@@ -229,12 +229,12 @@ class CacheValidityPolicy {
protected long getApparentAgeSecs(final HttpCacheEntry entry) {
Date dateValue = getDateValue(entry);
if (dateValue == null) {
- return MAX_AGE;
- }
+ return MAX_AGE;
+ }
long diff = entry.getResponseDate().getTime() - dateValue.getTime();
if (diff < 0L) {
- return 0;
- }
+ return 0;
+ }
return (diff / 1000);
}
@@ -299,8 +299,8 @@ class CacheValidityPolicy {
protected Date getExpirationDate(final HttpCacheEntry entry) {
Header expiresHeader = entry.getFirstHeader(HeaderConstants.EXPIRES);
if (expiresHeader == null) {
- return null;
- }
+ return null;
+ }
try {
return DateUtils.parseDate(expiresHeader.getValue());
} catch (DateParseException dpe) {
@@ -325,8 +325,8 @@ class CacheValidityPolicy {
long age = getCurrentAgeSecs(entry, now);
long freshness = getFreshnessLifetimeSecs(entry);
if (age <= freshness) {
- return 0L;
- }
+ return 0L;
+ }
return (age - freshness);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedHttpResponseGenerator.java Tue Jan 15 20:08:10 2013
@@ -152,8 +152,8 @@ class CachedHttpResponseGenerator {
private void addMissingContentLengthHeader(final HttpResponse response, final HttpEntity entity) {
if (transferEncodingIsPresent(response)) {
- return;
- }
+ return;
+ }
Header contentLength = response.getFirstHeader(HTTP.CONTENT_LEN);
if (contentLength == null) {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java Tue Jan 15 20:08:10 2013
@@ -74,29 +74,29 @@ class CachedResponseSuitabilityChecker {
private boolean isFreshEnough(final HttpCacheEntry entry, final HttpRequest request, final Date now) {
if (validityStrategy.isResponseFresh(entry, now)) {
- return true;
- }
+ return true;
+ }
if (useHeuristicCaching &&
validityStrategy.isResponseHeuristicallyFresh(entry, now, heuristicCoefficient, heuristicDefaultLifetime)) {
- return true;
- }
+ return true;
+ }
if (originInsistsOnFreshness(entry)) {
- return false;
- }
+ return false;
+ }
long maxstale = getMaxStale(request);
if (maxstale == -1) {
- return false;
- }
+ return false;
+ }
return (maxstale > validityStrategy.getStalenessSecs(entry, now));
}
private boolean originInsistsOnFreshness(final HttpCacheEntry entry) {
if (validityStrategy.mustRevalidate(entry)) {
- return true;
- }
+ return true;
+ }
if (!sharedCache) {
- return false;
- }
+ return false;
+ }
return validityStrategy.proxyRevalidate(entry) ||
validityStrategy.hasCacheControlDirective(entry, "s-maxage");
}
@@ -113,8 +113,8 @@ class CachedResponseSuitabilityChecker {
try {
long val = Long.parseLong(elt.getValue());
if (val < 0) {
- val = 0;
- }
+ val = 0;
+ }
if (maxstale == -1 || val < maxstale) {
maxstale = val;
}
@@ -212,8 +212,8 @@ class CachedResponseSuitabilityChecker {
try {
long minfresh = Long.parseLong(elt.getValue());
if (minfresh < 0L) {
- return false;
- }
+ return false;
+ }
long age = validityStrategy.getCurrentAgeSecs(entry, now);
long freshness = validityStrategy.getFreshnessLifetimeSecs(entry);
if (freshness - age < minfresh) {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java Tue Jan 15 20:08:10 2013
@@ -487,8 +487,8 @@ public class CachingExec implements Clie
long age = validityPolicy.getCurrentAgeSecs(entry, now);
long lifetime = validityPolicy.getFreshnessLifetimeSecs(entry);
if (age - lifetime > maxstale) {
- return true;
- }
+ return true;
+ }
} catch (NumberFormatException nfe) {
return true;
}
@@ -506,8 +506,8 @@ public class CachingExec implements Clie
final ProtocolVersion pv = msg.getProtocolVersion();
String existingEntry = viaHeaders.get(pv);
if (existingEntry != null) {
- return existingEntry;
- }
+ return existingEntry;
+ }
final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.http.client", getClass().getClassLoader());
final String release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
@@ -549,16 +549,16 @@ public class CachingExec implements Clie
RequestLine line = request.getRequestLine();
if (!HeaderConstants.OPTIONS_METHOD.equals(line.getMethod())) {
- return false;
- }
+ return false;
+ }
if (!"*".equals(line.getUri())) {
- return false;
- }
+ return false;
+ }
if (!"0".equals(request.getFirstHeader(HeaderConstants.MAX_FORWARDS).getValue())) {
- return false;
- }
+ return false;
+ }
return true;
}
@@ -595,8 +595,8 @@ public class CachingExec implements Clie
Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
Date respDate = DateUtils.parseDate(responseDateHeader.getValue());
if (respDate.before(entryDate)) {
- return true;
- }
+ return true;
+ }
} catch (DateParseException e) {
// either backend response or cached entry did not have a valid
// Date header, so we can't tell if they are out of order
@@ -853,16 +853,16 @@ public class CachingExec implements Clie
// nop
}
if (existing == null) {
- return false;
- }
+ return false;
+ }
Header entryDateHeader = existing.getFirstHeader(HTTP.DATE_HEADER);
if (entryDateHeader == null) {
- return false;
- }
+ return false;
+ }
Header responseDateHeader = backendResponse.getFirstHeader(HTTP.DATE_HEADER);
if (responseDateHeader == null) {
- return false;
- }
+ return false;
+ }
try {
Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
Date responseDate = DateUtils.parseDate(responseDateHeader.getValue());
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java Tue Jan 15 20:08:10 2013
@@ -433,8 +433,8 @@ public class CachingHttpClient implement
HttpResponse fatalErrorResponse = getFatallyNoncompliantResponse(
request, context);
if (fatalErrorResponse != null) {
- return fatalErrorResponse;
- }
+ return fatalErrorResponse;
+ }
requestCompliance.makeRequestCompliant(request);
request.addHeader("Via",via);
@@ -654,8 +654,8 @@ public class CachingHttpClient implement
long age = validityPolicy.getCurrentAgeSecs(entry, now);
long lifetime = validityPolicy.getFreshnessLifetimeSecs(entry);
if (age - lifetime > maxstale) {
- return true;
- }
+ return true;
+ }
} catch (NumberFormatException nfe) {
return true;
}
@@ -673,8 +673,8 @@ public class CachingHttpClient implement
final ProtocolVersion pv = msg.getProtocolVersion();
String existingEntry = viaHeaders.get(pv);
if (existingEntry != null) {
- return existingEntry;
- }
+ return existingEntry;
+ }
final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.http.client", getClass().getClassLoader());
final String release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
@@ -727,16 +727,16 @@ public class CachingHttpClient implement
RequestLine line = request.getRequestLine();
if (!HeaderConstants.OPTIONS_METHOD.equals(line.getMethod())) {
- return false;
- }
+ return false;
+ }
if (!"*".equals(line.getUri())) {
- return false;
- }
+ return false;
+ }
if (!"0".equals(request.getFirstHeader(HeaderConstants.MAX_FORWARDS).getValue())) {
- return false;
- }
+ return false;
+ }
return true;
}
@@ -763,8 +763,8 @@ public class CachingHttpClient implement
Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
Date respDate = DateUtils.parseDate(responseDateHeader.getValue());
if (respDate.before(entryDate)) {
- return true;
- }
+ return true;
+ }
} catch (DateParseException e) {
// either backend response or cached entry did not have a valid
// Date header, so we can't tell if they are out of order
@@ -910,8 +910,8 @@ public class CachingHttpClient implement
cachedResponse.addHeader(HeaderConstants.WARNING, "110 localhost \"Response is stale\"");
HttpEntity errorBody = backendResponse.getEntity();
if (errorBody != null) {
- EntityUtils.consume(errorBody);
- }
+ EntityUtils.consume(errorBody);
+ }
return cachedResponse;
}
@@ -985,16 +985,16 @@ public class CachingHttpClient implement
// nop
}
if (existing == null) {
- return false;
- }
+ return false;
+ }
Header entryDateHeader = existing.getFirstHeader(HTTP.DATE_HEADER);
if (entryDateHeader == null) {
- return false;
- }
+ return false;
+ }
Header responseDateHeader = backendResponse.getFirstHeader(HTTP.DATE_HEADER);
if (responseDateHeader == null) {
- return false;
- }
+ return false;
+ }
try {
Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
Date responseDate = DateUtils.parseDate(responseDateHeader.getValue());
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/RequestProtocolCompliance.java Tue Jan 15 20:08:10 2013
@@ -126,8 +126,8 @@ class RequestProtocolCompliance {
}
}
if (!shouldStrip) {
- return;
- }
+ return;
+ }
request.removeHeaders(HeaderConstants.CACHE_CONTROL);
request.setHeader(HeaderConstants.CACHE_CONTROL, buildHeaderFromElements(outElts));
}
@@ -304,13 +304,13 @@ class RequestProtocolCompliance {
Header range = request.getFirstHeader(HeaderConstants.RANGE);
if (range == null) {
- return null;
- }
+ return null;
+ }
Header ifRange = request.getFirstHeader(HeaderConstants.IF_RANGE);
if (ifRange == null) {
- return null;
- }
+ return null;
+ }
String val = ifRange.getValue();
if (val.startsWith("W/")) {
@@ -338,8 +338,8 @@ class RequestProtocolCompliance {
} else {
Header ifNoneMatch = request.getFirstHeader(HeaderConstants.IF_NONE_MATCH);
if (ifNoneMatch == null) {
- return null;
- }
+ return null;
+ }
String val2 = ifNoneMatch.getValue();
if (val2.startsWith("W/")) {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java Tue Jan 15 20:08:10 2013
@@ -116,27 +116,27 @@ class ResponseCachingPolicy {
if (contentLength != null) {
int contentLengthValue = Integer.parseInt(contentLength.getValue());
if (contentLengthValue > this.maxObjectSizeBytes) {
- return false;
- }
+ return false;
+ }
}
Header[] ageHeaders = response.getHeaders(HeaderConstants.AGE);
if (ageHeaders.length > 1) {
- return false;
- }
+ return false;
+ }
Header[] expiresHeaders = response.getHeaders(HeaderConstants.EXPIRES);
if (expiresHeaders.length > 1) {
- return false;
- }
+ return false;
+ }
Header[] dateHeaders = response.getHeaders(HTTP.DATE_HEADER);
if (dateHeaders.length != 1) {
- return false;
- }
+ return false;
+ }
try {
DateUtils.parseDate(dateHeaders[0].getValue());
@@ -153,28 +153,28 @@ class ResponseCachingPolicy {
}
if (isExplicitlyNonCacheable(response)) {
- return false;
- }
+ return false;
+ }
return (cacheable || isExplicitlyCacheable(response));
}
private boolean unknownStatusCode(final int status) {
if (status >= 100 && status <= 101) {
- return false;
- }
+ return false;
+ }
if (status >= 200 && status <= 206) {
- return false;
- }
+ return false;
+ }
if (status >= 300 && status <= 307) {
- return false;
- }
+ return false;
+ }
if (status >= 400 && status <= 417) {
- return false;
- }
+ return false;
+ }
if (status >= 500 && status <= 505) {
- return false;
- }
+ return false;
+ }
return true;
}
@@ -208,8 +208,8 @@ class ResponseCachingPolicy {
protected boolean isExplicitlyCacheable(final HttpResponse response) {
if (response.getFirstHeader(HeaderConstants.EXPIRES) != null) {
- return true;
- }
+ return true;
+ }
String[] cacheableParams = { HeaderConstants.CACHE_CONTROL_MAX_AGE, "s-maxage",
HeaderConstants.CACHE_CONTROL_MUST_REVALIDATE,
HeaderConstants.CACHE_CONTROL_PROXY_REVALIDATE,
@@ -268,13 +268,13 @@ class ResponseCachingPolicy {
private boolean expiresHeaderLessOrEqualToDateHeaderAndNoCacheControl(
final HttpResponse response) {
if (response.getFirstHeader(HeaderConstants.CACHE_CONTROL) != null) {
- return false;
- }
+ return false;
+ }
Header expiresHdr = response.getFirstHeader(HeaderConstants.EXPIRES);
Header dateHdr = response.getFirstHeader(HTTP.DATE_HEADER);
if (expiresHdr == null || dateHdr == null) {
- return false;
- }
+ return false;
+ }
try {
Date expires = DateUtils.parseDate(expiresHdr.getValue());
Date date = DateUtils.parseDate(dateHdr.getValue());
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java Tue Jan 15 20:08:10 2013
@@ -95,8 +95,8 @@ class ResponseProtocolCompliance {
private void consumeBody(final HttpResponse response) throws IOException {
HttpEntity body = response.getEntity();
if (body != null) {
- EntityUtils.consume(body);
- }
+ EntityUtils.consume(body);
+ }
}
private void warningsWithNonMatchingWarnDatesAreRemoved(
@@ -109,14 +109,14 @@ class ResponseProtocolCompliance {
}
if (responseDate == null) {
- return;
- }
+ return;
+ }
Header[] warningHeaders = response.getHeaders(HeaderConstants.WARNING);
if (warningHeaders == null || warningHeaders.length == 0) {
- return;
- }
+ return;
+ }
List<Header> newWarningHeaders = new ArrayList<Header>();
boolean modified = false;
@@ -141,8 +141,8 @@ class ResponseProtocolCompliance {
private void identityIsNotUsedInContentEncoding(final HttpResponse response) {
Header[] hdrs = response.getHeaders(HTTP.CONTENT_ENCODING);
if (hdrs == null || hdrs.length == 0) {
- return;
- }
+ return;
+ }
List<Header> newHeaders = new ArrayList<Header>();
boolean modified = false;
for (Header h : hdrs) {
@@ -153,8 +153,8 @@ class ResponseProtocolCompliance {
modified = true;
} else {
if (!first) {
- buf.append(",");
- }
+ buf.append(",");
+ }
buf.append(elt.toString());
first = false;
}
@@ -165,8 +165,8 @@ class ResponseProtocolCompliance {
}
}
if (!modified) {
- return;
- }
+ return;
+ }
response.removeHeaders(HTTP.CONTENT_ENCODING);
for (Header h : newHeaders) {
response.addHeader(h);
@@ -184,8 +184,8 @@ class ResponseProtocolCompliance {
final HttpResponse response) throws IOException {
if (request.getFirstHeader(HeaderConstants.RANGE) != null
|| response.getStatusLine().getStatusCode() != HttpStatus.SC_PARTIAL_CONTENT) {
- return;
- }
+ return;
+ }
consumeBody(response);
throw new ClientProtocolException(UNEXPECTED_PARTIAL_CONTENT);
@@ -234,8 +234,8 @@ class ResponseProtocolCompliance {
HttpRequest originalRequest = request.getOriginal();
if (originalRequest instanceof HttpEntityEnclosingRequest) {
if (((HttpEntityEnclosingRequest)originalRequest).expectContinue()) {
- return;
- }
+ return;
+ }
}
consumeBody(response);
throw new ClientProtocolException(UNEXPECTED_100_CONTINUE);
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/WarningValue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/WarningValue.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/WarningValue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/WarningValue.java Tue Jan 15 20:08:10 2013
@@ -81,8 +81,8 @@ class WarningValue {
} catch (IllegalArgumentException e) {
final int nextComma = src.indexOf(',', offs);
if (nextComma == -1) {
- break;
- }
+ break;
+ }
offs = nextComma + 1;
}
}
@@ -152,12 +152,12 @@ class WarningValue {
*/
protected void consumeToken() {
if (!isTokenChar(src.charAt(offs))) {
- parseError();
- }
+ parseError();
+ }
while(offs < src.length()) {
if (!isTokenChar(src.charAt(offs))) {
- break;
- }
+ break;
+ }
offs++;
}
}
@@ -178,11 +178,11 @@ class WarningValue {
protected void consumeHostPort() {
Matcher m = HOSTPORT_PATTERN.matcher(src.substring(offs));
if (!m.find()) {
- parseError();
- }
+ parseError();
+ }
if (m.start() != 0) {
- parseError();
- }
+ parseError();
+ }
offs += m.end();
}
@@ -212,8 +212,8 @@ class WarningValue {
*/
protected void consumeQuotedString() {
if (src.charAt(offs) != '\"') {
- parseError();
- }
+ parseError();
+ }
offs++;
boolean foundEnd = false;
while(offs < src.length() && !foundEnd) {
@@ -231,8 +231,8 @@ class WarningValue {
}
}
if (!foundEnd) {
- parseError();
- }
+ parseError();
+ }
}
/*
@@ -265,8 +265,8 @@ class WarningValue {
int curr = offs;
Matcher m = WARN_DATE_PATTERN.matcher(src.substring(offs));
if (!m.lookingAt()) {
- parseError();
- }
+ parseError();
+ }
offs += m.end();
try {
warnDate = DateUtils.parseDate(src.substring(curr+1,offs-1));
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java Tue Jan 15 20:08:10 2013
@@ -162,8 +162,8 @@ public class MemcachedHttpCacheStorage i
byte[] bytes = serializeEntry(url, entry);
String key = getCacheKey(url);
if (key == null) {
- return;
- }
+ return;
+ }
try {
client.set(key, 0, bytes);
} catch (OperationTimeoutException ex) {
@@ -192,8 +192,8 @@ public class MemcachedHttpCacheStorage i
private byte[] convertToByteArray(final Object o) {
if (o == null) {
- return null;
- }
+ return null;
+ }
if (!(o instanceof byte[])) {
log.warn("got a non-bytearray back from memcached: " + o);
return null;
@@ -204,8 +204,8 @@ public class MemcachedHttpCacheStorage i
private MemcachedCacheEntry reconstituteEntry(final Object o) throws IOException {
byte[] bytes = convertToByteArray(o);
if (bytes == null) {
- return null;
- }
+ return null;
+ }
MemcachedCacheEntry mce = memcachedCacheEntryFactory.getUnsetCacheEntry();
try {
mce.set(bytes);
@@ -218,13 +218,13 @@ public class MemcachedHttpCacheStorage i
public HttpCacheEntry getEntry(final String url) throws IOException {
String key = getCacheKey(url);
if (key == null) {
- return null;
- }
+ return null;
+ }
try {
MemcachedCacheEntry mce = reconstituteEntry(client.get(key));
if (mce == null || !url.equals(mce.getStorageKey())) {
- return null;
- }
+ return null;
+ }
return mce.getHttpCacheEntry();
} catch (OperationTimeoutException ex) {
throw new MemcachedOperationTimeoutException(ex);
@@ -234,8 +234,8 @@ public class MemcachedHttpCacheStorage i
public void removeEntry(final String url) throws IOException {
String key = getCacheKey(url);
if (key == null) {
- return;
- }
+ return;
+ }
try {
client.delete(key);
} catch (OperationTimeoutException ex) {
@@ -273,8 +273,8 @@ public class MemcachedHttpCacheStorage i
if (casResult != CASResponse.OK) {
numRetries++;
} else {
- return;
- }
+ return;
+ }
}
} catch (OperationTimeoutException ex) {
throw new MemcachedOperationTimeoutException(ex);
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/HttpTestUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/HttpTestUtils.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/HttpTestUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/HttpTestUtils.java Tue Jan 15 20:08:10 2013
@@ -97,8 +97,8 @@ public class HttpTestUtils {
public static boolean isHopByHopHeader(final String name) {
for (String s : HOP_BY_HOP_HEADERS) {
if (s.equalsIgnoreCase(name)) {
- return true;
- }
+ return true;
+ }
}
return false;
}
@@ -109,8 +109,8 @@ public class HttpTestUtils {
public static boolean isMultiHeader(final String name) {
for (String s : MULTI_HEADERS) {
if (s.equalsIgnoreCase(name)) {
- return true;
- }
+ return true;
+ }
}
return false;
}
@@ -121,8 +121,8 @@ public class HttpTestUtils {
public static boolean isSingleHeader(final String name) {
for (String s : SINGLE_HEADERS) {
if (s.equalsIgnoreCase(name)) {
- return true;
- }
+ return true;
+ }
}
return false;
}
@@ -133,17 +133,17 @@ public class HttpTestUtils {
InputStream i1 = e1.getContent();
InputStream i2 = e2.getContent();
if (i1 == null && i2 == null) {
- return true;
- }
+ return true;
+ }
if (i1 == null || i2 == null)
- {
- return false; // avoid possible NPEs below
- }
+ {
+ return false; // avoid possible NPEs below
+ }
int b1 = -1;
while ((b1 = i1.read()) != -1) {
if (b1 != i2.read()) {
- return false;
- }
+ return false;
+ }
}
return (-1 == i2.read());
}
@@ -207,8 +207,8 @@ public class HttpTestUtils {
String r1val = getCanonicalHeaderValue(r1, h.getName());
String r2val = getCanonicalHeaderValue(r2, h.getName());
if (!r1val.equals(r2val)) {
- return false;
- }
+ return false;
+ }
}
}
return true;
@@ -227,12 +227,12 @@ public class HttpTestUtils {
throws Exception {
final boolean entitiesEquivalent = equivalent(r1.getEntity(), r2.getEntity());
if (!entitiesEquivalent) {
- return false;
- }
+ return false;
+ }
final boolean statusLinesEquivalent = semanticallyTransparent(r1.getStatusLine(), r2.getStatusLine());
if (!statusLinesEquivalent) {
- return false;
- }
+ return false;
+ }
final boolean e2eHeadersEquivalentSubset = isEndToEndHeaderSubset(
r1, r2);
return e2eHeadersEquivalentSubset;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/RequestEquivalent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/RequestEquivalent.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/RequestEquivalent.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/RequestEquivalent.java Tue Jan 15 20:08:10 2013
@@ -39,8 +39,8 @@ public class RequestEquivalent implement
public boolean matches(final Object actual) {
if (!(actual instanceof HttpRequest)) {
- return false;
- }
+ return false;
+ }
HttpRequest other = (HttpRequest) actual;
return HttpTestUtils.equivalent(expected, other);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java Tue Jan 15 20:08:10 2013
@@ -1414,8 +1414,8 @@ public class TestCachingExec {
@Override
public int read() throws IOException {
if (closed) {
- throw new SocketException("Socket closed");
- }
+ throw new SocketException("Socket closed");
+ }
throw new SocketTimeoutException("Read timed out");
}
}, 128));
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java Tue Jan 15 20:08:10 2013
@@ -103,35 +103,35 @@ public class TestHttpCacheEntrySerialize
// dates are only stored with second precision, so scrub milliseconds
if (!((one.getRequestDate().getTime() / 1000) == (two.getRequestDate()
.getTime() / 1000))) {
- return false;
- }
+ return false;
+ }
if (!((one.getResponseDate().getTime() / 1000) == (two
.getResponseDate().getTime() / 1000))) {
- return false;
- }
+ return false;
+ }
if (!one.getProtocolVersion().equals(two.getProtocolVersion())) {
- return false;
- }
+ return false;
+ }
byte[] onesByteArray = resourceToBytes(one.getResource());
byte[] twosByteArray = resourceToBytes(two.getResource());
if (!Arrays.equals(onesByteArray,twosByteArray)) {
- return false;
- }
+ return false;
+ }
Header[] oneHeaders = one.getAllHeaders();
Header[] twoHeaders = two.getAllHeaders();
if (!(oneHeaders.length == twoHeaders.length)) {
- return false;
- }
+ return false;
+ }
for (int i = 0; i < oneHeaders.length; i++) {
if (!oneHeaders[i].getName().equals(twoHeaders[i].getName())) {
- return false;
- }
+ return false;
+ }
if (!oneHeaders[i].getValue().equals(twoHeaders[i].getValue())) {
- return false;
- }
+ return false;
+ }
}
return true;
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -1652,11 +1652,11 @@ public class TestProtocolRequirements ex
boolean found2 = false;
while ((b = i.read()) != -1) {
if (b == 1) {
- found1 = true;
- }
+ found1 = true;
+ }
if (b == 2) {
- found2 = true;
- }
+ found2 = true;
+ }
}
i.close();
Assert.assertFalse(found1 && found2); // mixture of content
@@ -1746,11 +1746,11 @@ public class TestProtocolRequirements ex
boolean found2 = false;
while ((b = i.read()) != -1) {
if (b == 1) {
- found1 = true;
- }
+ found1 = true;
+ }
if (b == 2) {
- found2 = true;
- }
+ found2 = true;
+ }
}
i.close();
Assert.assertFalse(found1 && found2); // mixture of content
@@ -2614,8 +2614,8 @@ public class TestProtocolRequirements ex
boolean foundWarning = false;
for (Header h : result.getHeaders("Warning")) {
if (h.getValue().split(" ")[0].equals("111")) {
- foundWarning = true;
- }
+ foundWarning = true;
+ }
}
Assert.assertTrue(foundWarning);
} else {
@@ -2692,15 +2692,15 @@ public class TestProtocolRequirements ex
for (Header h : result1.getHeaders("Warning")) {
for (HeaderElement elt : h.getElements()) {
if (elt.getName().startsWith("1")) {
- found1xxWarning = true;
- }
+ found1xxWarning = true;
+ }
}
}
for (Header h : result2.getHeaders("Warning")) {
for (HeaderElement elt : h.getElements()) {
if (elt.getName().startsWith("1")) {
- found1xxWarning = true;
- }
+ found1xxWarning = true;
+ }
}
}
Assert.assertFalse(found1xxWarning);
@@ -2765,8 +2765,8 @@ public class TestProtocolRequirements ex
for (HeaderElement elt : h.getElements()) {
String[] parts = elt.getName().split(" ");
if ("214".equals(parts[0])) {
- found214Warning = true;
- }
+ found214Warning = true;
+ }
}
}
Assert.assertTrue(found214Warning);
@@ -2776,8 +2776,8 @@ public class TestProtocolRequirements ex
for (HeaderElement elt : h.getElements()) {
String[] parts = elt.getName().split(" ");
if ("214".equals(parts[0])) {
- found214Warning = true;
- }
+ found214Warning = true;
+ }
}
}
Assert.assertTrue(found214Warning);
@@ -3170,15 +3170,15 @@ public class TestProtocolRequirements ex
for (Header h : validation.getHeaders("If-Match")) {
for (HeaderElement elt : h.getElements()) {
if ("W/\"etag\"".equals(elt.getName())) {
- foundETag = true;
- }
+ foundETag = true;
+ }
}
}
for (Header h : validation.getHeaders("If-None-Match")) {
for (HeaderElement elt : h.getElements()) {
if ("W/\"etag\"".equals(elt.getName())) {
- foundETag = true;
- }
+ foundETag = true;
+ }
}
}
Assert.assertTrue(foundETag);
@@ -6062,16 +6062,16 @@ public class TestProtocolRequirements ex
final String nestedSuffix = "\\)([^\\p{Cntrl}()]|\\\\\\p{ASCII})*\\)$";
if (Pattern.matches(leafComment,s)) {
- return true;
- }
+ return true;
+ }
Matcher pref = Pattern.compile(nestedPrefix).matcher(s);
Matcher suff = Pattern.compile(nestedSuffix).matcher(s);
if (!pref.find()) {
- return false;
- }
+ return false;
+ }
if (!suff.find()) {
- return false;
- }
+ return false;
+ }
return isValidComment(s.substring(pref.end() - 1, suff.start() + 1));
}
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -487,8 +487,8 @@ public class TestMemcachedHttpCacheStora
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
public HttpCacheEntry update(final HttpCacheEntry old) {
if (old == existingValue) {
- return updatedValue;
- }
+ return updatedValue;
+ }
assertSame(existingValue2, old);
return updatedValue2;
}
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -65,8 +65,8 @@ public final class BasicUserPrincipal im
@Override
public boolean equals(final Object o) {
if (this == o) {
- return true;
- }
+ return true;
+ }
if (o instanceof BasicUserPrincipal) {
BasicUserPrincipal that = (BasicUserPrincipal) o;
if (LangUtils.equals(this.username, that.username)) {
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -151,8 +151,8 @@ public class NTCredentials implements Cr
@Override
public boolean equals(final Object o) {
if (this == o) {
- return true;
- }
+ return true;
+ }
if (o instanceof NTCredentials) {
NTCredentials that = (NTCredentials) o;
if (LangUtils.equals(this.principal, that.principal)
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -93,8 +93,8 @@ public class NTUserPrincipal implements
@Override
public boolean equals(final Object o) {
if (this == o) {
- return true;
- }
+ return true;
+ }
if (o instanceof NTUserPrincipal) {
NTUserPrincipal that = (NTUserPrincipal) o;
if (LangUtils.equals(this.username, that.username)
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -100,8 +100,8 @@ public class UsernamePasswordCredentials
@Override
public boolean equals(final Object o) {
if (this == o) {
- return true;
- }
+ return true;
+ }
if (o instanceof UsernamePasswordCredentials) {
UsernamePasswordCredentials that = (UsernamePasswordCredentials) o;
if (LangUtils.equals(this.principal, that.principal)) {
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -49,10 +49,10 @@ public class Rfc3492Idn implements Idn {
private int adapt(int delta, final int numpoints, final boolean firsttime) {
if (firsttime) {
- delta = delta / damp;
- } else {
- delta = delta / 2;
- }
+ delta = delta / damp;
+ } else {
+ delta = delta / 2;
+ }
delta = delta + (delta / numpoints);
int k = 0;
while (delta > ((base - tmin) * tmax) / 2) {
@@ -64,14 +64,14 @@ public class Rfc3492Idn implements Idn {
private int digit(final char c) {
if ((c >= 'A') && (c <= 'Z')) {
- return (c - 'A');
- }
+ return (c - 'A');
+ }
if ((c >= 'a') && (c <= 'z')) {
- return (c - 'a');
- }
+ return (c - 'a');
+ }
if ((c >= '0') && (c <= '9')) {
- return (c - '0') + 26;
- }
+ return (c - '0') + 26;
+ }
throw new IllegalArgumentException("illegal digit: "+ c);
}
@@ -81,11 +81,11 @@ public class Rfc3492Idn implements Idn {
while (tok.hasMoreTokens()) {
String t = tok.nextToken();
if (unicode.length() > 0) {
- unicode.append('.');
- }
+ unicode.append('.');
+ }
if (t.startsWith(ACE_PREFIX)) {
- t = decode(t.substring(4));
- }
+ t = decode(t.substring(4));
+ }
unicode.append(t);
}
return unicode.toString();
@@ -107,8 +107,8 @@ public class Rfc3492Idn implements Idn {
int w = 1;
for (int k = base;; k += base) {
if (input.length() == 0) {
- break;
- }
+ break;
+ }
char c = input.charAt(0);
input = input.substring(1);
int digit = digit(c);
@@ -122,8 +122,8 @@ public class Rfc3492Idn implements Idn {
t = k - bias;
}
if (digit < t) {
- break;
- }
+ break;
+ }
w = w * (base - t); // FIXME fail on overflow
}
bias = adapt(i - oldi, output.length() + 1, (oldi == 0));
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -89,8 +89,8 @@ public class BasicManagedEntity extends
private void ensureConsumed() throws IOException {
if (managedConn == null) {
- return;
- }
+ return;
+ }
try {
if (attemptReuse) {
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -196,11 +196,11 @@ public class EofSensorInputStream extend
try {
boolean scws = true; // should close wrapped stream?
if (eofWatcher != null) {
- scws = eofWatcher.eofDetected(wrappedStream);
- }
+ scws = eofWatcher.eofDetected(wrappedStream);
+ }
if (scws) {
- wrappedStream.close();
- }
+ wrappedStream.close();
+ }
} finally {
wrappedStream = null;
}
@@ -224,11 +224,11 @@ public class EofSensorInputStream extend
try {
boolean scws = true; // should close wrapped stream?
if (eofWatcher != null) {
- scws = eofWatcher.streamClosed(wrappedStream);
- }
+ scws = eofWatcher.streamClosed(wrappedStream);
+ }
if (scws) {
- wrappedStream.close();
- }
+ wrappedStream.close();
+ }
} finally {
wrappedStream = null;
}
@@ -254,11 +254,11 @@ public class EofSensorInputStream extend
try {
boolean scws = true; // should close wrapped stream?
if (eofWatcher != null) {
- scws = eofWatcher.streamAbort(wrappedStream);
- }
+ scws = eofWatcher.streamAbort(wrappedStream);
+ }
if (scws) {
- wrappedStream.close();
- }
+ wrappedStream.close();
+ }
} finally {
wrappedStream = null;
}
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -111,16 +111,16 @@ public final class MultihomePlainSocketF
Args.notNull(params, "HTTP parameters");
if (sock == null) {
- sock = createSocket();
- }
+ sock = createSocket();
+ }
if ((localAddress != null) || (localPort > 0)) {
// we need to bind explicitly
if (localPort < 0)
- {
- localPort = 0; // indicates "any"
- }
+ {
+ localPort = 0; // indicates "any"
+ }
InetSocketAddress isa =
new InetSocketAddress(localAddress, localPort);
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -56,12 +56,12 @@ public class BasicRouteDirector implemen
int step = UNREACHABLE;
if ((fact == null) || (fact.getHopCount() < 1)) {
- step = firstStep(plan);
- } else if (plan.getHopCount() > 1) {
- step = proxiedStep(plan, fact);
- } else {
- step = directStep(plan, fact);
- }
+ step = firstStep(plan);
+ } else if (plan.getHopCount() > 1) {
+ step = proxiedStep(plan, fact);
+ } else {
+ step = directStep(plan, fact);
+ }
return step;
@@ -94,29 +94,29 @@ public class BasicRouteDirector implemen
protected int directStep(final RouteInfo plan, final RouteInfo fact) {
if (fact.getHopCount() > 1) {
- return UNREACHABLE;
- }
+ return UNREACHABLE;
+ }
if (!plan.getTargetHost().equals(fact.getTargetHost()))
- {
- return UNREACHABLE;
+ {
+ return UNREACHABLE;
// If the security is too low, we could now suggest to layer
// a secure protocol on the direct connection. Layering on direct
// connections has not been supported in HttpClient 3.x, we don't
// consider it here until there is a real-life use case for it.
- }
+ }
// Should we tolerate if security is better than planned?
// (plan.isSecure() && !fact.isSecure())
if (plan.isSecure() != fact.isSecure()) {
- return UNREACHABLE;
- }
+ return UNREACHABLE;
+ }
// Local address has to match only if the plan specifies one.
if ((plan.getLocalAddress() != null) &&
!plan.getLocalAddress().equals(fact.getLocalAddress())
) {
- return UNREACHABLE;
- }
+ return UNREACHABLE;
+ }
return COMPLETE;
}
@@ -134,47 +134,47 @@ public class BasicRouteDirector implemen
protected int proxiedStep(final RouteInfo plan, final RouteInfo fact) {
if (fact.getHopCount() <= 1) {
- return UNREACHABLE;
- }
+ return UNREACHABLE;
+ }
if (!plan.getTargetHost().equals(fact.getTargetHost())) {
- return UNREACHABLE;
- }
+ return UNREACHABLE;
+ }
final int phc = plan.getHopCount();
final int fhc = fact.getHopCount();
if (phc < fhc) {
- return UNREACHABLE;
- }
+ return UNREACHABLE;
+ }
for (int i=0; i<fhc-1; i++) {
if (!plan.getHopTarget(i).equals(fact.getHopTarget(i))) {
- return UNREACHABLE;
- }
+ return UNREACHABLE;
+ }
}
// now we know that the target matches and proxies so far are the same
if (phc > fhc)
- {
- return TUNNEL_PROXY; // need to extend the proxy chain
- }
+ {
+ return TUNNEL_PROXY; // need to extend the proxy chain
+ }
// proxy chain and target are the same, check tunnelling and layering
if ((fact.isTunnelled() && !plan.isTunnelled()) ||
(fact.isLayered() && !plan.isLayered())) {
- return UNREACHABLE;
- }
+ return UNREACHABLE;
+ }
if (plan.isTunnelled() && !fact.isTunnelled()) {
- return TUNNEL_TARGET;
- }
+ return TUNNEL_TARGET;
+ }
if (plan.isLayered() && !fact.isLayered()) {
- return LAYER_PROTOCOL;
- }
+ return LAYER_PROTOCOL;
+ }
// tunnel and layering are the same, remains to check the security
// Should we tolerate if security is better than planned?
// (plan.isSecure() && !fact.isSecure())
if (plan.isSecure() != fact.isSecure()) {
- return UNREACHABLE;
- }
+ return UNREACHABLE;
+ }
return COMPLETE;
}
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -102,11 +102,11 @@ public final class HttpRoute implements
}
// tunnelled is already checked above, that is in line with the default
if (tunnelled == null) {
- tunnelled = TunnelType.PLAIN;
- }
+ tunnelled = TunnelType.PLAIN;
+ }
if (layered == null) {
- layered = LayerType.PLAIN;
- }
+ layered = LayerType.PLAIN;
+ }
this.targetHost = target;
this.localAddress = local;
@@ -215,8 +215,8 @@ public final class HttpRoute implements
*/
private static HttpHost[] toChain(final HttpHost proxy) {
if (proxy == null) {
- return EMPTY_HTTP_HOST_ARRAY;
- }
+ return EMPTY_HTTP_HOST_ARRAY;
+ }
return new HttpHost[]{ proxy };
}
@@ -232,8 +232,8 @@ public final class HttpRoute implements
*/
private static HttpHost[] toChain(final HttpHost[] proxies) {
if ((proxies == null) || (proxies.length < 1)) {
- return EMPTY_HTTP_HOST_ARRAY;
- }
+ return EMPTY_HTTP_HOST_ARRAY;
+ }
// copy the proxy chain, the traditional way
HttpHost[] result = new HttpHost[proxies.length];
System.arraycopy(proxies, 0, result, 0, proxies.length);
@@ -267,10 +267,10 @@ public final class HttpRoute implements
HttpHost result = null;
if (hop < hopcount-1) {
- result = this.proxyChain[hop];
- } else {
- result = this.targetHost;
- }
+ result = this.proxyChain[hop];
+ } else {
+ result = this.targetHost;
+ }
return result;
}
@@ -317,8 +317,8 @@ public final class HttpRoute implements
@Override
public final boolean equals(final Object obj) {
if (this == obj) {
- return true;
- }
+ return true;
+ }
if (obj instanceof HttpRoute) {
HttpRoute that = (HttpRoute) obj;
return
@@ -369,14 +369,14 @@ public final class HttpRoute implements
}
cab.append('{');
if (this.tunnelled == TunnelType.TUNNELLED) {
- cab.append('t');
- }
+ cab.append('t');
+ }
if (this.layered == LayerType.LAYERED) {
- cab.append('l');
- }
+ cab.append('l');
+ }
if (this.secure) {
- cab.append('s');
- }
+ cab.append('s');
+ }
cab.append("}->");
for (HttpHost aProxyChain : this.proxyChain) {
cab.append(aProxyChain);
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -197,10 +197,10 @@ public final class RouteTracker implemen
int hops = 0;
if (this.connected) {
if (proxyChain == null) {
- hops = 1;
- } else {
- hops = proxyChain.length + 1;
- }
+ hops = 1;
+ } else {
+ hops = proxyChain.length + 1;
+ }
}
return hops;
}
@@ -211,10 +211,10 @@ public final class RouteTracker implemen
Args.check(hop < hopcount, "Hop index exceeds tracked route length");
HttpHost result = null;
if (hop < hopcount-1) {
- result = this.proxyChain[hop];
- } else {
- result = this.targetHost;
- }
+ result = this.proxyChain[hop];
+ } else {
+ result = this.targetHost;
+ }
return result;
}
@@ -273,11 +273,11 @@ public final class RouteTracker implemen
@Override
public final boolean equals(final Object o) {
if (o == this) {
- return true;
- }
+ return true;
+ }
if (!(o instanceof RouteTracker)) {
- return false;
- }
+ return false;
+ }
RouteTracker that = (RouteTracker) o;
return
@@ -332,17 +332,17 @@ public final class RouteTracker implemen
}
cab.append('{');
if (this.connected) {
- cab.append('c');
- }
+ cab.append('c');
+ }
if (this.tunnelled == TunnelType.TUNNELLED) {
- cab.append('t');
- }
+ cab.append('t');
+ }
if (this.layered == LayerType.LAYERED) {
- cab.append('l');
- }
+ cab.append('l');
+ }
if (this.secure) {
- cab.append('s');
- }
+ cab.append('s');
+ }
cab.append("}->");
if (this.proxyChain != null) {
for (HttpHost element : this.proxyChain) {
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=1433610&r1=1433609&r2=1433610&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 20:08:10 2013
@@ -238,8 +238,8 @@ public final class Scheme {
@Override
public final boolean equals(final Object obj) {
if (this == obj) {
- return true;
- }
+ return true;
+ }
if (obj instanceof Scheme) {
Scheme that = (Scheme) obj;
return this.name.equals(that.name)
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactoryAdaptor.java Tue Jan 15 20:08:10 2013
@@ -80,11 +80,11 @@ class SchemeSocketFactoryAdaptor impleme
@Override
public boolean equals(final Object obj) {
if (obj == null) {
- return false;
- }
+ return false;
+ }
if (this == obj) {
- return true;
- }
+ return true;
+ }
if (obj instanceof SchemeSocketFactoryAdaptor) {
return this.factory.equals(((SchemeSocketFactoryAdaptor)obj).factory);
} else {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java Tue Jan 15 20:08:10 2013
@@ -84,11 +84,11 @@ class SocketFactoryAdaptor implements So
@Override
public boolean equals(final Object obj) {
if (obj == null) {
- return false;
- }
+ return false;
+ }
if (this == obj) {
- return true;
- }
+ return true;
+ }
if (obj instanceof SocketFactoryAdaptor) {
return this.factory.equals(((SocketFactoryAdaptor)obj).factory);
} else {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java?rev=1433610&r1=1433609&r2=1433610&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java Tue Jan 15 20:08:10 2013
@@ -162,16 +162,16 @@ public abstract class GGSSchemeBase exte
state = State.FAILED;
if (gsse.getMajor() == GSSException.DEFECTIVE_CREDENTIAL
|| gsse.getMajor() == GSSException.CREDENTIALS_EXPIRED) {
- throw new InvalidCredentialsException(gsse.getMessage(), gsse);
- }
+ throw new InvalidCredentialsException(gsse.getMessage(), gsse);
+ }
if (gsse.getMajor() == GSSException.NO_CRED ) {
- throw new InvalidCredentialsException(gsse.getMessage(), gsse);
- }
+ throw new InvalidCredentialsException(gsse.getMessage(), gsse);
+ }
if (gsse.getMajor() == GSSException.DEFECTIVE_TOKEN
|| gsse.getMajor() == GSSException.DUPLICATE_TOKEN
|| gsse.getMajor() == GSSException.OLD_TOKEN) {
- throw new AuthenticationException(gsse.getMessage(), gsse);
- }
+ throw new AuthenticationException(gsse.getMessage(), gsse);
+ }
// other error
throw new AuthenticationException(gsse.getMessage());
}