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 2021/01/05 19:01:27 UTC
[httpcomponents-client] branch master updated: Minor Improvements:
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
The following commit(s) were added to refs/heads/master by this push:
new 6a02e81 Minor Improvements:
6a02e81 is described below
commit 6a02e818fff4c71ea11945e45f6e42aeb1e12a33
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Mon Jan 4 21:16:34 2021 +0100
Minor Improvements:
* Remove redundant initialization
---
.../http/impl/cache/ConsumableInputStream.java | 2 +-
.../hc/client5/http/impl/cache/DummyBackend.java | 2 +-
.../http/impl/cache/TestCachingExecChain.java | 2 +-
.../client5/testing/sync/TestContentCodings.java | 2 +-
.../client5/testing/sync/TestSSLSocketFactory.java | 2 +-
.../hc/client5/http/entity/DeflateInputStream.java | 2 +-
.../http/entity/mime/MultipartEntityBuilder.java | 6 ++--
.../hc/client5/http/impl/auth/NTLMEngineImpl.java | 40 +++++++++++-----------
.../http/impl/classic/RequestEntityProxy.java | 2 +-
.../PoolingHttpClientConnectionManagerBuilder.java | 4 +--
...PoolingAsyncClientConnectionManagerBuilder.java | 4 +--
11 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ConsumableInputStream.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ConsumableInputStream.java
index 4506020..a6de12a 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ConsumableInputStream.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ConsumableInputStream.java
@@ -35,7 +35,7 @@ import org.apache.hc.core5.io.Closer;
public class ConsumableInputStream extends InputStream {
private final ByteArrayInputStream buf;
- private boolean closed = false;
+ private boolean closed;
public ConsumableInputStream(final ByteArrayInputStream buf) {
this.buf = buf;
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java
index 50b49cd..4694e38 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/DummyBackend.java
@@ -40,7 +40,7 @@ public class DummyBackend implements ExecChain {
private ClassicHttpRequest request;
private ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
- private int executions = 0;
+ private int executions;
public void setResponse(final ClassicHttpResponse resp) {
response = resp;
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
index eb56165..edbe9b8 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
@@ -1207,7 +1207,7 @@ public abstract class TestCachingExecChain {
final ClassicHttpResponse resp1 = new BasicClassicHttpResponse(HttpStatus.SC_OK,
"OK");
resp1.setEntity(new InputStreamEntity(new InputStream() {
- private boolean closed = false;
+ private boolean closed;
@Override
public void close() throws IOException {
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java
index df37bd9..a074259 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java
@@ -397,7 +397,7 @@ public class TestContentCodings extends LocalServerTestBase {
private final CountDownLatch startGate;
private final CountDownLatch endGate;
- private boolean failed = false;
+ private boolean failed;
private String text;
WorkerTask(final CloseableHttpClient client, final HttpHost target, final boolean identity, final CountDownLatch startGate, final CountDownLatch endGate) {
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSSLSocketFactory.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSSLSocketFactory.java
index 082f621..65e47d9 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSSLSocketFactory.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSSLSocketFactory.java
@@ -79,7 +79,7 @@ public class TestSSLSocketFactory {
static class TestX509HostnameVerifier implements HostnameVerifier {
- private boolean fired = false;
+ private boolean fired;
@Override
public boolean verify(final String host, final SSLSession session) {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java
index dc8d5a4..66ef7e4 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/DeflateInputStream.java
@@ -138,7 +138,7 @@ public class DeflateInputStream extends InputStream {
static class DeflateStream extends InflaterInputStream {
- private boolean closed = false;
+ private boolean closed;
public DeflateStream(final InputStream in, final Inflater inflater) {
super(in, inflater);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
index 8ed0b44..dfeaded 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/entity/mime/MultipartEntityBuilder.java
@@ -59,9 +59,9 @@ public class MultipartEntityBuilder {
private ContentType contentType;
private HttpMultipartMode mode = HttpMultipartMode.STRICT;
- private String boundary = null;
- private Charset charset = null;
- private List<MultipartPart> multipartParts = null;
+ private String boundary;
+ private Charset charset;
+ private List<MultipartPart> multipartParts;
public static MultipartEntityBuilder create() {
return new MultipartEntityBuilder();
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java
index 5092226..85e6320 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java
@@ -332,22 +332,22 @@ final class NTLMEngineImpl implements NTLMEngine {
byte[] timestamp;
// Stuff we always generate
- byte[] lmHash = null;
- byte[] lmResponse = null;
- byte[] ntlmHash = null;
- byte[] ntlmResponse = null;
- byte[] ntlmv2Hash = null;
- byte[] lmv2Hash = null;
- byte[] lmv2Response = null;
- byte[] ntlmv2Blob = null;
- byte[] ntlmv2Response = null;
- byte[] ntlm2SessionResponse = null;
- byte[] lm2SessionResponse = null;
- byte[] lmUserSessionKey = null;
- byte[] ntlmUserSessionKey = null;
- byte[] ntlmv2UserSessionKey = null;
- byte[] ntlm2SessionResponseUserSessionKey = null;
- byte[] lanManagerSessionKey = null;
+ byte[] lmHash;
+ byte[] lmResponse;
+ byte[] ntlmHash;
+ byte[] ntlmResponse;
+ byte[] ntlmv2Hash;
+ byte[] lmv2Hash;
+ byte[] lmv2Response;
+ byte[] ntlmv2Blob;
+ byte[] ntlmv2Response;
+ byte[] ntlm2SessionResponse;
+ byte[] lm2SessionResponse;
+ byte[] lmUserSessionKey;
+ byte[] ntlmUserSessionKey;
+ byte[] ntlmv2UserSessionKey;
+ byte[] ntlm2SessionResponseUserSessionKey;
+ byte[] lanManagerSessionKey;
public CipherGen(final Random random, final long currentTime,
final String domain, final String user, final char[] password,
@@ -808,7 +808,7 @@ final class NTLMEngineImpl implements NTLMEngine {
private final Cipher rc4;
final Mode mode;
final private boolean isConnection;
- int sequenceNumber = 0;
+ int sequenceNumber;
Handle( final byte[] exportedSessionKey, final Mode mode, final boolean isConnection ) throws NTLMEngineException
@@ -1080,10 +1080,10 @@ final class NTLMEngineImpl implements NTLMEngine {
/** NTLM message generation, base class */
static class NTLMMessage {
/** The current response */
- byte[] messageContents = null;
+ byte[] messageContents;
/** The current output position */
- int currentOutputPosition = 0;
+ int currentOutputPosition;
/** Constructor to use when message contents are not yet known */
NTLMMessage() {
@@ -1862,7 +1862,7 @@ final class NTLMEngineImpl implements NTLMEngine {
int B = 0xefcdab89;
int C = 0x98badcfe;
int D = 0x10325476;
- long count = 0L;
+ long count;
final byte[] dataBuffer = new byte[64];
MD4() {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestEntityProxy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestEntityProxy.java
index e7e4835..c6d46b2 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestEntityProxy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RequestEntityProxy.java
@@ -51,7 +51,7 @@ class RequestEntityProxy implements HttpEntity {
}
private final HttpEntity original;
- private boolean consumed = false;
+ private boolean consumed;
RequestEntityProxy(final HttpEntity original) {
super();
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java
index 955c3e7..121127e 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java
@@ -80,8 +80,8 @@ public class PoolingHttpClientConnectionManagerBuilder {
private boolean systemProperties;
- private int maxConnTotal = 0;
- private int maxConnPerRoute = 0;
+ private int maxConnTotal;
+ private int maxConnPerRoute;
private TimeValue timeToLive;
private TimeValue validateAfterInactivity;
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java
index ad390b6..cafe7e4 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java
@@ -74,8 +74,8 @@ public class PoolingAsyncClientConnectionManagerBuilder {
private boolean systemProperties;
- private int maxConnTotal = 0;
- private int maxConnPerRoute = 0;
+ private int maxConnTotal;
+ private int maxConnPerRoute;
private TimeValue timeToLive;
private TimeValue validateAfterInactivity;