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 2017/08/01 05:47:45 UTC
httpcomponents-client git commit: Use final.
Repository: httpcomponents-client
Updated Branches:
refs/heads/4.6.x 0591f4907 -> 88c261d8c
Use final.
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/88c261d8
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/88c261d8
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/88c261d8
Branch: refs/heads/4.6.x
Commit: 88c261d8ce1623a2737ae12c661988f5dfca9a35
Parents: 0591f49
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Jul 31 22:47:43 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Jul 31 22:47:43 2017 -0700
----------------------------------------------------------------------
.../impl/client/cache/CachingHttpClient.java | 6 ++---
.../impl/client/cache/CacheKeyGenerator.java | 2 +-
.../http/impl/client/cache/CachingExec.java | 2 +-
.../impl/client/cache/HeapResourceFactory.java | 2 +-
.../memcached/MemcachedCacheEntryImpl.java | 8 +++----
.../impl/HttpProxyConfigurationActivator.java | 2 +-
.../apache/http/conn/ssl/AbstractVerifier.java | 2 +-
.../apache/http/impl/auth/CredSspScheme.java | 24 ++++++++++----------
.../org/apache/http/impl/auth/DebugUtil.java | 2 +-
.../apache/http/impl/auth/NTLMEngineImpl.java | 14 ++++++------
.../http/impl/client/HttpClientBuilder.java | 2 +-
.../apache/http/impl/cookie/RFC2109Spec.java | 2 +-
.../http/conn/ssl/TestHostnameVerifier.java | 2 +-
.../http/impl/auth/TestNTLMEngineImpl.java | 2 +-
.../apache/http/localserver/EchoHandler.java | 2 +-
15 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java
----------------------------------------------------------------------
diff --git a/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java b/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java
index c066eaf..20f54cf 100644
--- a/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java
+++ b/httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/CachingHttpClient.java
@@ -387,7 +387,7 @@ public class CachingHttpClient implements HttpClient {
private <T> T handleAndConsume(
final ResponseHandler<? extends T> responseHandler,
final HttpResponse response) throws Error, IOException {
- T result;
+ final T result;
try {
result = responseHandler.handleResponse(response);
} catch (final Exception t) {
@@ -429,7 +429,7 @@ public class CachingHttpClient implements HttpClient {
public HttpResponse execute(final HttpHost target, final HttpRequest originalRequest, final HttpContext context)
throws IOException {
- HttpRequestWrapper request;
+ final HttpRequestWrapper request;
if (originalRequest instanceof HttpRequestWrapper) {
request = ((HttpRequestWrapper) originalRequest);
} else {
@@ -693,7 +693,7 @@ public class CachingHttpClient implements HttpClient {
final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.http.client", getClass().getClassLoader());
final String release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
- String value;
+ final String value;
if ("http".equalsIgnoreCase(pv.getProtocol())) {
value = String.format("%d.%d localhost (Apache-HttpClient/%s (cache))", pv.getMajor(), pv.getMinor(),
release);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
----------------------------------------------------------------------
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
index 91ca500..70df8cd 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
+++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheKeyGenerator.java
@@ -155,7 +155,7 @@ class CacheKeyGenerator {
}
Collections.sort(variantHeaderNames);
- StringBuilder buf;
+ final StringBuilder buf;
try {
buf = new StringBuilder("{");
boolean first = true;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
----------------------------------------------------------------------
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
index 33bdbf1..f7da4d0 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
+++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
@@ -527,7 +527,7 @@ public class CachingExec implements ClientExecChain {
final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.http.client", getClass().getClassLoader());
final String release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
- String value;
+ final String value;
final int major = pv.getMajor();
final int minor = pv.getMinor();
if ("http".equalsIgnoreCase(pv.getProtocol())) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java
----------------------------------------------------------------------
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java
index 11506e2..8cb9a2d 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java
+++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/HeapResourceFactory.java
@@ -68,7 +68,7 @@ public class HeapResourceFactory implements ResourceFactory {
public Resource copy(
final String requestId,
final Resource resource) throws IOException {
- byte[] body;
+ final byte[] body;
if (resource instanceof HeapResource) {
body = ((HeapResource) resource).getByteArray();
} else {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java
----------------------------------------------------------------------
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java
index e1c4e37..9bc11e5 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java
+++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java
@@ -58,7 +58,7 @@ public class MemcachedCacheEntryImpl implements MemcachedCacheEntry {
@Override
synchronized public byte[] toByteArray() {
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream oos;
+ final ObjectOutputStream oos;
try {
oos = new ObjectOutputStream(bos);
oos.writeObject(this.key);
@@ -92,9 +92,9 @@ public class MemcachedCacheEntryImpl implements MemcachedCacheEntry {
@Override
synchronized public void set(final byte[] bytes) {
final ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
- ObjectInputStream ois;
- String s;
- HttpCacheEntry entry;
+ final ObjectInputStream ois;
+ final String s;
+ final HttpCacheEntry entry;
try {
ois = new ObjectInputStream(bis);
s = (String)ois.readObject();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.java
----------------------------------------------------------------------
diff --git a/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.java b/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.java
index 16d5c1b..4ca17f1 100644
--- a/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.java
+++ b/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/HttpProxyConfigurationActivator.java
@@ -155,7 +155,7 @@ public final class HttpProxyConfigurationActivator implements BundleActivator, M
@Override
public void updated(final String pid, @SuppressWarnings("rawtypes") final Dictionary config) throws ConfigurationException {
final ServiceRegistration registration = registeredConfigurations.get(pid);
- OSGiProxyConfiguration proxyConfiguration;
+ final OSGiProxyConfiguration proxyConfiguration;
if (registration == null) {
proxyConfiguration = new OSGiProxyConfiguration();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java b/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
index 3777113..ec7c0bf 100644
--- a/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
+++ b/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
@@ -203,7 +203,7 @@ public abstract class AbstractVerifier implements X509HostnameVerifier {
final boolean doWildcard = parts.length >= 3 && parts[0].endsWith("*") &&
(!strict || validCountryWildcard(parts));
if (doWildcard) {
- boolean match;
+ final boolean match;
final String firstpart = parts[0];
if (firstpart.length() > 1) { // e.g. server*
final String prefix = firstpart.substring(0, firstpart.length() - 1); // e.g. server
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient/src/main/java/org/apache/http/impl/auth/CredSspScheme.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/CredSspScheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/CredSspScheme.java
index 148f5c0..721c84e 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/CredSspScheme.java
+++ b/httpclient/src/main/java/org/apache/http/impl/auth/CredSspScheme.java
@@ -172,16 +172,16 @@ public class CredSspScheme extends AuthSchemeBase
private SSLEngine createSSLEngine()
{
- SSLContext sslContext;
+ final SSLContext sslContext;
try
{
sslContext = SSLContexts.custom().build();
}
- catch ( NoSuchAlgorithmException e )
+ catch ( final NoSuchAlgorithmException e )
{
throw new SSLInitializationException( "Error creating SSL Context: " + e.getMessage(), e );
}
- catch ( KeyManagementException e )
+ catch ( final KeyManagementException e )
{
throw new SSLInitializationException( "Error creating SSL Context: " + e.getMessage(), e );
}
@@ -219,7 +219,7 @@ public class CredSspScheme extends AuthSchemeBase
sslContext.init( null, new TrustManager[]
{ tm }, null );
}
- catch ( KeyManagementException e )
+ catch ( final KeyManagementException e )
{
throw new SSLInitializationException( "SSL Context initialization error: " + e.getMessage(), e );
}
@@ -420,16 +420,16 @@ public class CredSspScheme extends AuthSchemeBase
private Certificate getPeerServerCertificate() throws AuthenticationException
{
- Certificate[] peerCertificates;
+ final Certificate[] peerCertificates;
try
{
peerCertificates = sslEngine.getSession().getPeerCertificates();
}
- catch ( SSLPeerUnverifiedException e )
+ catch ( final SSLPeerUnverifiedException e )
{
throw new AuthenticationException( e.getMessage(), e );
}
- for ( Certificate peerCertificate : peerCertificates )
+ for ( final Certificate peerCertificate : peerCertificates )
{
if ( !( peerCertificate instanceof X509Certificate ) )
{
@@ -551,7 +551,7 @@ public class CredSspScheme extends AuthSchemeBase
{
return ntlmOutgoingHandle.signAndEncryptMessage( authInfo );
}
- catch ( NTLMEngineException e )
+ catch ( final NTLMEngineException e )
{
throw new AuthenticationException( e.getMessage(), e );
}
@@ -600,7 +600,7 @@ public class CredSspScheme extends AuthSchemeBase
buf.get( subjectPublicKey );
return subjectPublicKey;
}
- catch ( MalformedChallengeException e )
+ catch ( final MalformedChallengeException e )
{
throw new AuthenticationException( e.getMessage(), e );
}
@@ -613,7 +613,7 @@ public class CredSspScheme extends AuthSchemeBase
{
getSSLEngine().beginHandshake();
}
- catch ( SSLException e )
+ catch ( final SSLException e )
{
throw new AuthenticationException( "SSL Engine error: " + e.getMessage(), e );
}
@@ -668,7 +668,7 @@ public class CredSspScheme extends AuthSchemeBase
throw new AuthenticationException( "SSL Engine error status: " + engineResult.getStatus() );
}
}
- catch ( SSLException e )
+ catch ( final SSLException e )
{
throw new AuthenticationException( "SSL Engine wrap error: " + e.getMessage(), e );
}
@@ -718,7 +718,7 @@ public class CredSspScheme extends AuthSchemeBase
}
}
- catch ( SSLException e )
+ catch ( final SSLException e )
{
throw new MalformedChallengeException( "SSL Engine unwrap error: " + e.getMessage(), e );
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient/src/main/java/org/apache/http/impl/auth/DebugUtil.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/DebugUtil.java b/httpclient/src/main/java/org/apache/http/impl/auth/DebugUtil.java
index 51fbbbf..2c8110e 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/DebugUtil.java
+++ b/httpclient/src/main/java/org/apache/http/impl/auth/DebugUtil.java
@@ -57,7 +57,7 @@ class DebugUtil
sb.append( "null" );
return;
}
- for ( byte b : bytes )
+ for ( final byte b : bytes )
{
sb.append( String.format( "%02X ", b ) );
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
index 216f43f..a8d1472 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
+++ b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
@@ -770,7 +770,7 @@ final class NTLMEngineImpl implements NTLMEngine {
final private byte[] exportedSessionKey;
private byte[] signingKey;
private byte[] sealingKey;
- private Cipher rc4;
+ private final Cipher rc4;
final Mode mode;
final private boolean isConnection;
int sequenceNumber = 0;
@@ -821,7 +821,7 @@ final class NTLMEngineImpl implements NTLMEngine {
private Cipher initCipher() throws NTLMEngineException
{
- Cipher cipher;
+ final Cipher cipher;
try
{
cipher = Cipher.getInstance( "RC4" );
@@ -834,7 +834,7 @@ final class NTLMEngineImpl implements NTLMEngine {
cipher.init( Cipher.DECRYPT_MODE, new SecretKeySpec( sealingKey, "RC4" ) );
}
}
- catch ( Exception e )
+ catch ( final Exception e )
{
throw new NTLMEngineException( e.getMessage(), e );
}
@@ -1779,7 +1779,7 @@ final class NTLMEngineImpl implements NTLMEngine {
writeUShort( newTargetInfo, MSV_AV_CHANNEL_BINDINGS, appendLength + 8 );
writeUShort( newTargetInfo, 16, appendLength + 10 );
- byte[] channelBindingsHash;
+ final byte[] channelBindingsHash;
try
{
final byte[] certBytes = peerServerCertificate.getEncoded();
@@ -1795,11 +1795,11 @@ final class NTLMEngineImpl implements NTLMEngine {
final MessageDigest md5 = getMD5();
channelBindingsHash = md5.digest( channelBindingStruct );
}
- catch ( CertificateEncodingException e )
+ catch ( final CertificateEncodingException e )
{
throw new NTLMEngineException( e.getMessage(), e );
}
- catch ( NoSuchAlgorithmException e )
+ catch ( final NoSuchAlgorithmException e )
{
throw new NTLMEngineException( e.getMessage(), e );
}
@@ -1841,7 +1841,7 @@ final class NTLMEngineImpl implements NTLMEngine {
static MessageDigest getMD5() {
try {
return MessageDigest.getInstance("MD5");
- } catch (NoSuchAlgorithmException ex) {
+ } catch (final NoSuchAlgorithmException ex) {
throw new RuntimeException("MD5 message digest doesn't seem to exist - fatal error: "+ex.getMessage(), ex);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
index 4806e38..68259f3 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
+++ b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
@@ -1216,7 +1216,7 @@ public class HttpClientBuilder {
connectionEvictor.shutdown();
try {
connectionEvictor.awaitTermination(1L, TimeUnit.SECONDS);
- } catch (InterruptedException interrupted) {
+ } catch (final InterruptedException interrupted) {
Thread.currentThread().interrupt();
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
index cee6d96..dbc205e 100644
--- a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
+++ b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
@@ -135,7 +135,7 @@ public class RFC2109Spec extends CookieSpecBase {
@Override
public List<Header> formatCookies(final List<Cookie> cookies) {
Args.notEmpty(cookies, "List of cookies");
- List<Cookie> cookieList;
+ final List<Cookie> cookieList;
if (cookies.size() > 1) {
// Create a mutable copy and sort the copy.
cookieList = new ArrayList<Cookie>(cookies);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
----------------------------------------------------------------------
diff --git a/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java b/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
index 657f8df..d04b7ca 100644
--- a/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
+++ b/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
@@ -316,7 +316,7 @@ public class TestHostnameVerifier {
@Test
public void testHTTPCLIENT_1097() {
- String cns[];
+ final String cns[];
final String alt[] = {};
final X509HostnameVerifier bhv = new BrowserCompatHostnameVerifier();
final X509HostnameVerifier shv = new StrictHostnameVerifier();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
----------------------------------------------------------------------
diff --git a/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java b/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
index 8af33b6..3bd3a82 100644
--- a/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
+++ b/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
@@ -76,7 +76,7 @@ public class TestNTLMEngineImpl {
/* Test suite MD4 helper */
static void checkMD4(final String input, final String hexOutput) throws Exception {
- NTLMEngineImpl.MD4 md4;
+ final NTLMEngineImpl.MD4 md4;
md4 = new NTLMEngineImpl.MD4();
md4.update(input.getBytes(Consts.ASCII));
final byte[] answer = md4.getOutput();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/88c261d8/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java
----------------------------------------------------------------------
diff --git a/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java b/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java
index 380607e..298e77b 100644
--- a/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java
+++ b/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java
@@ -89,7 +89,7 @@ public class EchoHandler
// For some reason, just putting the incoming entity into
// the response will not work. We have to buffer the message.
- byte[] data;
+ final byte[] data;
if (entity == null) {
data = new byte [0];
} else {