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 2018/08/04 18:17:08 UTC
[11/13] httpcomponents-core git commit: No need to nest else clauses.
Replace some if/else with a ternary return. Remove unnecessary semicolons.
Remove unnecessary cast. Remove unnecessary @SuppressWarnings. Access static
methods directly. Remove excepti
No need to nest else clauses. Replace some if/else with a ternary
return. Remove unnecessary semicolons. Remove unnecessary cast. Remove
unnecessary @SuppressWarnings. Access static methods directly. Remove
exception not thrown from method signatures.
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/ef6bc7ca
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/ef6bc7ca
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/ef6bc7ca
Branch: refs/heads/master
Commit: ef6bc7ca645261a9ccb24bdedc8cfacfb6c16dbc
Parents: 8abb823
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Aug 4 09:41:30 2018 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Aug 4 09:41:30 2018 -0600
----------------------------------------------------------------------
.../apache/hc/core5/http2/hpack/FifoBuffer.java | 6 +-
.../hc/core5/http2/hpack/FifoLinkedList.java | 5 +-
.../hc/core5/http2/hpack/HPackDecoder.java | 30 +++++----
.../hc/core5/http2/hpack/HPackEncoder.java | 31 +++++----
.../core5/http2/hpack/InboundDynamicTable.java | 8 +--
.../core5/http2/hpack/OutboundDynamicTable.java | 8 +--
.../impl/nio/ClientHttp2StreamMultiplexer.java | 3 +-
.../impl/nio/ServerHttpProtocolNegotiator.java | 3 +-
.../nio/bootstrap/CancellableExecution.java | 3 +-
.../DefaultAsyncPushConsumerFactory.java | 6 +-
.../hc/core5/http2/WritableByteChannelMock.java | 8 +--
.../http2/frame/TestDefaultFrameFactory.java | 2 +-
.../hc/core5/http2/frame/TestFrameFlag.java | 2 +-
.../hc/core5/http2/frame/TestH2Settings.java | 2 +-
.../impl/nio/entity/TestSharedInputBuffer.java | 3 +-
.../testing/classic/ClassicTestServer.java | 6 +-
.../testing/framework/ClientPOJOAdapter.java | 2 +-
.../testing/framework/ClientTestingAdapter.java | 4 +-
.../testing/framework/TestingFramework.java | 2 +-
.../testing/framework/TestTestingFramework.java | 9 ++-
.../http/examples/AsyncServerFilterExample.java | 45 +++++++------
.../hc/core5/http/impl/HttpProcessors.java | 2 +-
.../http/impl/bootstrap/HttpRequester.java | 3 +-
.../hc/core5/http/impl/io/HttpService.java | 23 ++++---
.../hc/core5/http/impl/io/SocketHolder.java | 24 +++----
.../impl/nio/AbstractHttp1StreamDuplexer.java | 19 +++---
.../impl/nio/ClientHttp1StreamDuplexer.java | 3 +-
...aultAsyncResponseExchangeHandlerFactory.java | 3 +-
.../apache/hc/core5/ssl/ReflectionSupport.java | 1 -
.../hc/core5/http/WritableByteChannelMock.java | 8 +--
.../http/impl/io/TestBHttpConnectionBase.java | 23 +++----
.../http/impl/io/TestHttpRequestExecutor.java | 13 ++--
.../hc/core5/http/impl/io/TestHttpService.java | 13 ++--
.../http/impl/io/TestSessionInOutBuffers.java | 9 +--
.../impl/io/TimeoutByteArrayInputStream.java | 8 +--
.../http/impl/nio/TestSessionInOutBuffers.java | 7 +--
.../core5/http/message/TestBasicLineParser.java | 2 +-
.../TestAbstractBinAsyncEntityConsumer.java | 2 +-
.../TestAbstractBinAsyncEntityProducer.java | 2 +-
.../TestAbstractCharAsyncEntityConsumer.java | 2 +-
.../TestAbstractCharAsyncEntityProducer.java | 2 +-
.../apache/hc/core5/pool/TestLaxConnPool.java | 9 +--
.../hc/core5/pool/TestStrictConnPool.java | 11 ++--
.../reactor/TestAbstractIOSessionPool.java | 66 ++++++++++----------
.../hc/core5/ssl/TestSSLContextBuilder.java | 9 +--
45 files changed, 206 insertions(+), 246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoBuffer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoBuffer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoBuffer.java
index 0c0a183..73a03ec 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoBuffer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoBuffer.java
@@ -81,11 +81,7 @@ final class FifoBuffer {
}
public HPackHeader getFirst() {
- if (head > 0) {
- return array[head - 1];
- } else {
- return array[array.length - 1];
- }
+ return array[head > 0 ? head - 1 : array.length - 1];
}
public HPackHeader getLast() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java
index 9813ac3..a9b3ee9 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java
@@ -101,10 +101,9 @@ final class FifoLinkedList {
last.seqNum = 0;
length--;
return last;
- } else {
- master.seqNum = 0;
- return null;
}
+ master.seqNum = 0;
+ return null;
}
public void clear() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackDecoder.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackDecoder.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackDecoder.java
index 8fad602..bc460f4 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackDecoder.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackDecoder.java
@@ -96,23 +96,22 @@ public final class HPackDecoder {
int value = readByte(src) & nbits;
if (value < nbits) {
return value;
- } else {
- int m = 0;
- while (m < 32) {
- final int b = readByte(src);
- if ((b & 0x80) != 0) {
- value += (b & 0x7f) << m;
- m += 7;
- } else {
- if (m == 28 && (b & 0xf8) != 0) {
- break;
- }
- value += b << m;
- return value;
+ }
+ int m = 0;
+ while (m < 32) {
+ final int b = readByte(src);
+ if ((b & 0x80) != 0) {
+ value += (b & 0x7f) << m;
+ m += 7;
+ } else {
+ if (m == 28 && (b & 0xf8) != 0) {
+ break;
}
+ value += b << m;
+ return value;
}
- throw new HPackException(MAX_LIMIT_EXCEEDED);
}
+ throw new HPackException(MAX_LIMIT_EXCEEDED);
}
static void decodePlainString(final ByteArrayBuffer buffer, final ByteBuffer src) throws HPackException {
@@ -287,9 +286,8 @@ public final class HPackDecoder {
final Header header = decodeHeader(src);
if (header == null) {
break;
- } else {
- list.add(header);
}
+ list.add(header);
}
return list;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackEncoder.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackEncoder.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackEncoder.java
index de5176d..8d46253 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackEncoder.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackEncoder.java
@@ -163,29 +163,28 @@ public final class HPackEncoder {
dst.ensureCapacity(len + 8);
encodeInt(dst, 7, len, 0x0);
for (int i = 0; i < len; i++) {
- dst.append((int) charSequence.charAt(off + i));
+ dst.append(charSequence.charAt(off + i));
}
}
return len;
- } else {
- final CharBuffer in = CharBuffer.wrap(charSequence, off, len);
- while (in.hasRemaining()) {
- ensureCapacity((int) (in.remaining() * this.charsetEncoder.averageBytesPerChar()) + 8);
- final CoderResult result = this.charsetEncoder.encode(in, this.tmpBuf, true);
- if (result.isError()) {
- result.throwException();
- }
- }
- ensureCapacity(8);
- final CoderResult result = this.charsetEncoder.flush(this.tmpBuf);
+ }
+ final CharBuffer in = CharBuffer.wrap(charSequence, off, len);
+ while (in.hasRemaining()) {
+ ensureCapacity((int) (in.remaining() * this.charsetEncoder.averageBytesPerChar()) + 8);
+ final CoderResult result = this.charsetEncoder.encode(in, this.tmpBuf, true);
if (result.isError()) {
result.throwException();
}
- this.tmpBuf.flip();
- final int binaryLen = this.tmpBuf.remaining();
- encodeString(dst, this.tmpBuf, huffman);
- return binaryLen;
}
+ ensureCapacity(8);
+ final CoderResult result = this.charsetEncoder.flush(this.tmpBuf);
+ if (result.isError()) {
+ result.throwException();
+ }
+ this.tmpBuf.flip();
+ final int binaryLen = this.tmpBuf.remaining();
+ encodeString(dst, this.tmpBuf, huffman);
+ return binaryLen;
}
int encodeString(final ByteArrayBuffer dst, final String s, final boolean huffman) throws CharacterCodingException {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/InboundDynamicTable.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/InboundDynamicTable.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/InboundDynamicTable.java
index bd0f528..d04c9c5 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/InboundDynamicTable.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/InboundDynamicTable.java
@@ -82,11 +82,9 @@ final class InboundDynamicTable {
if (index < 1 || index > length()) {
throw new IndexOutOfBoundsException();
}
- if (index <= staticTable.length()) {
- return staticTable.get(index);
- } else {
- return headers.get(index - staticTable.length() - 1);
- }
+ return index <= staticTable.length()
+ ? staticTable.get(index)
+ : headers.get(index - staticTable.length() - 1);
}
public void add(final HPackHeader header) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/OutboundDynamicTable.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/OutboundDynamicTable.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/OutboundDynamicTable.java
index cc709e8..a1c2e6a 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/OutboundDynamicTable.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/OutboundDynamicTable.java
@@ -89,11 +89,9 @@ final class OutboundDynamicTable {
if (index < 1 || index > length()) {
throw new IndexOutOfBoundsException();
}
- if (index <= staticTable.length()) {
- return staticTable.get(index);
- } else {
- return headers.get(index - staticTable.length() - 1);
- }
+ return index <= staticTable.length()
+ ? staticTable.get(index)
+ : headers.get(index - staticTable.length() - 1);
}
public void add(final HPackHeader header) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java
index 6a46b96..fcc1337 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttp2StreamMultiplexer.java
@@ -114,9 +114,8 @@ public class ClientHttp2StreamMultiplexer extends AbstractHttp2StreamMultiplexer
return new ClientHttp2StreamHandler(channel, httpProcessor, connMetrics, exchangeHandler,
pushHandlerFactory != null ? pushHandlerFactory : this.pushHandlerFactory,
context);
- } else {
- throw new H2ConnectionException(H2Error.INTERNAL_ERROR, "Unexpected executable command");
}
+ throw new H2ConnectionException(H2Error.INTERNAL_ERROR, "Unexpected executable command");
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java
index 87891bd..e097e00 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java
@@ -126,9 +126,8 @@ public class ServerHttpProtocolNegotiator implements HttpConnectionEventHandler
if (bytebuf.get() != PREFACE[i]) {
if (expectValidH2Preface) {
throw new HttpException("Unexpected HTTP/2 preface");
- } else {
- validH2Preface = false;
}
+ validH2Preface = false;
}
}
if (validH2Preface) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/CancellableExecution.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/CancellableExecution.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/CancellableExecution.java
index 9468fee..7257782 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/CancellableExecution.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/CancellableExecution.java
@@ -66,9 +66,8 @@ final class CancellableExecution implements CancellableDependency {
dependency.cancel();
}
return true;
- } else {
- return false;
}
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/support/DefaultAsyncPushConsumerFactory.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/support/DefaultAsyncPushConsumerFactory.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/support/DefaultAsyncPushConsumerFactory.java
index 2e76c23..271040e 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/support/DefaultAsyncPushConsumerFactory.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/support/DefaultAsyncPushConsumerFactory.java
@@ -51,11 +51,7 @@ public final class DefaultAsyncPushConsumerFactory implements HandlerFactory<Asy
public AsyncPushConsumer create(final HttpRequest request, final HttpContext context) throws HttpException {
try {
final Supplier<AsyncPushConsumer> supplier = mapper.resolve(request, context);
- if (supplier != null) {
- return supplier.get();
- } else {
- return null;
- }
+ return supplier != null ? supplier.get() : null;
} catch (final MisdirectedRequestException ex) {
return null;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/WritableByteChannelMock.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/WritableByteChannelMock.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/WritableByteChannelMock.java
index d4a45b8..54377f3 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/WritableByteChannelMock.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/WritableByteChannelMock.java
@@ -78,13 +78,11 @@ public class WritableByteChannelMock implements WritableByteChannel {
src.limit(limit);
this.capacityUsed += chunk;
return chunk;
- } else {
- return 0;
}
- } else {
- this.buf.put(src);
- return len;
+ return 0;
}
+ this.buf.put(src);
+ return len;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestDefaultFrameFactory.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestDefaultFrameFactory.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestDefaultFrameFactory.java
index 4a7bd4b..05946bb 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestDefaultFrameFactory.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestDefaultFrameFactory.java
@@ -99,4 +99,4 @@ public class TestDefaultFrameFactory {
Assert.assertEquals("Oopsie", new String(tmp, StandardCharsets.US_ASCII));
}
-};
+}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestFrameFlag.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestFrameFlag.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestFrameFlag.java
index 53912e1..1a52618 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestFrameFlag.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestFrameFlag.java
@@ -38,4 +38,4 @@ public class TestFrameFlag {
Assert.assertEquals(0x01 | 0x08 | 0x20, flags);
}
-};
+}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java
index 6f73e08..5090b1a 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java
@@ -55,4 +55,4 @@ public class TestH2Settings {
Assert.assertEquals("INITIAL_WINDOW_SIZE: 1024", setting2.toString());
}
-};
+}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/entity/TestSharedInputBuffer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/entity/TestSharedInputBuffer.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/entity/TestSharedInputBuffer.java
index 158efdb..7c259c7 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/entity/TestSharedInputBuffer.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/entity/TestSharedInputBuffer.java
@@ -41,6 +41,7 @@ import org.apache.hc.core5.http.nio.entity.SharedInputBuffer;
import org.apache.hc.core5.http.nio.CapacityChannel;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
public class TestSharedInputBuffer {
@@ -200,7 +201,7 @@ public class TestSharedInputBuffer {
Assert.assertEquals(Boolean.TRUE, task1.get(5, TimeUnit.SECONDS));
Assert.assertEquals("12345678901234567890123456789012345678901234567890", task2.get(5, TimeUnit.SECONDS));
- Mockito.verify(capacityChannel, Mockito.atLeast(1)).update(Mockito.anyInt());
+ Mockito.verify(capacityChannel, Mockito.atLeast(1)).update(ArgumentMatchers.anyInt());
}
@Test
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/ClassicTestServer.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/ClassicTestServer.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/ClassicTestServer.java
index f194e08..75398a6 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/ClassicTestServer.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/ClassicTestServer.java
@@ -88,18 +88,16 @@ public class ClassicTestServer {
final HttpServer server = this.serverRef.get();
if (server != null) {
return server.getLocalPort();
- } else {
- throw new IllegalStateException("Server not running");
}
+ throw new IllegalStateException("Server not running");
}
public InetAddress getInetAddress() {
final HttpServer server = this.serverRef.get();
if (server != null) {
return server.getInetAddress();
- } else {
- throw new IllegalStateException("Server not running");
}
+ throw new IllegalStateException("Server not running");
}
public void start(final HttpProcessor httpProcessor, final Decorator<HttpServerRequestHandler> handlerDecorator) throws IOException {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientPOJOAdapter.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientPOJOAdapter.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientPOJOAdapter.java
index 1c17128..946ba6c 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientPOJOAdapter.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientPOJOAdapter.java
@@ -151,5 +151,5 @@ public abstract class ClientPOJOAdapter {
*/
public Map<String, Object> modifyRequest(final Map<String, Object> request) {
return request;
- };
+ }
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientTestingAdapter.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientTestingAdapter.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientTestingAdapter.java
index 33ba080..ee2282e 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientTestingAdapter.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientTestingAdapter.java
@@ -111,14 +111,14 @@ public class ClientTestingAdapter {
*/
public boolean isRequestSupported(final Map<String, Object> request) {
return (adapter == null) || adapter.checkRequestSupport(request) == null;
- };
+ }
/**
* See the documentation for the same method in {@link ClientPOJOAdapter}.
*/
public Map<String, Object> modifyRequest(final Map<String, Object> request) {
return (adapter == null) ? request : adapter.modifyRequest(request);
- };
+ }
/**
* Generally a test's response expectations should not need to be modified, but
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java
index 8335efb..36761d3 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java
@@ -373,7 +373,7 @@ public class TestingFramework {
if (expectedHeaders == null) {
return;
}
- for (final Map.Entry<String, String> expectedHeader : ((Map<String, String>) expectedHeaders).entrySet()) {
+ for (final Map.Entry<String, String> expectedHeader : expectedHeaders.entrySet()) {
final String expectedHeaderName = expectedHeader.getKey();
if (! actualHeaders.containsKey(expectedHeaderName)) {
throw new TestingFrameworkException("Expected header not found: name=" + expectedHeaderName);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestTestingFramework.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestTestingFramework.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestTestingFramework.java
index f1c6e4e..c9b7980 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestTestingFramework.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestTestingFramework.java
@@ -52,6 +52,7 @@ import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
public class TestTestingFramework {
@@ -123,13 +124,12 @@ public class TestTestingFramework {
}
}
- @SuppressWarnings("unchecked")
@Test
public void goodAdapterWithConstructor() throws Exception {
final ClientTestingAdapter adapter = Mockito.mock(ClientTestingAdapter.class);
// Have isRequestSupported() return false so no test will run.
- Mockito.when(adapter.isRequestSupported(Mockito.<String, Object>anyMap()))
+ Mockito.when(adapter.isRequestSupported(ArgumentMatchers.<String, Object>anyMap()))
.thenReturn(false);
final TestingFramework framework = newWebServerTestingFramework(adapter);
@@ -140,10 +140,9 @@ public class TestTestingFramework {
verifyCallMethodNeverCalled(adapter);
}
- @SuppressWarnings("unchecked")
private void verifyCallMethodNeverCalled(final ClientTestingAdapter adapter) throws Exception {
- Mockito.verify(adapter, Mockito.never()).execute(Mockito.anyString(), Mockito.<String, Object>anyMap(),
- Mockito.any(TestingFrameworkRequestHandler.class), Mockito.<String, Object>anyMap());
+ Mockito.verify(adapter, Mockito.never()).execute(ArgumentMatchers.anyString(), ArgumentMatchers.<String, Object>anyMap(),
+ ArgumentMatchers.any(TestingFrameworkRequestHandler.class), ArgumentMatchers.<String, Object>anyMap());
}
private TestingFramework newFrameworkAndSetAdapter(final ClientTestingAdapter adapter)
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/examples/org/apache/hc/core5/http/examples/AsyncServerFilterExample.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/examples/org/apache/hc/core5/http/examples/AsyncServerFilterExample.java b/httpcore5/src/examples/org/apache/hc/core5/http/examples/AsyncServerFilterExample.java
index 6168b07..a23159f 100644
--- a/httpcore5/src/examples/org/apache/hc/core5/http/examples/AsyncServerFilterExample.java
+++ b/httpcore5/src/examples/org/apache/hc/core5/http/examples/AsyncServerFilterExample.java
@@ -126,30 +126,29 @@ public class AsyncServerFilterExample {
new BasicHttpResponse(HttpStatus.SC_OK),
new BasicAsyncEntityProducer("Welcome", ContentType.TEXT_PLAIN));
return null;
- } else {
- return chain.proceed(request, entityDetails, context, new AsyncFilterChain.ResponseTrigger() {
-
- @Override
- public void sendInformation(
- final HttpResponse response) throws HttpException, IOException {
- responseTrigger.sendInformation(response);
- }
-
- @Override
- public void submitResponse(
- final HttpResponse response, final AsyncEntityProducer entityProducer) throws HttpException, IOException {
- response.addHeader("X-Filter", "My-Filter");
- responseTrigger.submitResponse(response, entityProducer);
- }
-
- @Override
- public void pushPromise(
- final HttpRequest promise, final AsyncPushProducer responseProducer) throws HttpException, IOException {
- responseTrigger.pushPromise(promise, responseProducer);
- }
-
- });
}
+ return chain.proceed(request, entityDetails, context, new AsyncFilterChain.ResponseTrigger() {
+
+ @Override
+ public void sendInformation(
+ final HttpResponse response) throws HttpException, IOException {
+ responseTrigger.sendInformation(response);
+ }
+
+ @Override
+ public void submitResponse(
+ final HttpResponse response, final AsyncEntityProducer entityProducer) throws HttpException, IOException {
+ response.addHeader("X-Filter", "My-Filter");
+ responseTrigger.submitResponse(response, entityProducer);
+ }
+
+ @Override
+ public void pushPromise(
+ final HttpRequest promise, final AsyncPushProducer responseProducer) throws HttpException, IOException {
+ responseTrigger.pushPromise(promise, responseProducer);
+ }
+
+ });
}
})
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java
index affbee1..803b679 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/HttpProcessors.java
@@ -77,7 +77,7 @@ public final class HttpProcessors {
new RequestUserAgent(!TextUtils.isBlank(agentInfo) ? agentInfo :
VersionInfo.getSoftwareInfo(SOFTWARE, "org.apache.hc.core5", HttpProcessors.class)),
new RequestExpectContinue());
- };
+ }
public static HttpProcessor client(final String agentInfo) {
return customClient(agentInfo).build();
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java
index 2f2334b..7be2e36 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java
@@ -238,9 +238,8 @@ public class HttpRequester implements ConnPoolControl<HttpHost>, ModalCloseable
sock.connect(targetAddress, socketConfig.getSoTimeout().toMillisIntBound());
if (URIScheme.HTTPS.same(targetHost.getSchemeName())) {
return sslSocketFactory.createSocket(sock, targetHost.getHostName(), targetAddress.getPort(), true);
- } else {
- return sock;
}
+ return sock;
}
public ClassicHttpResponse execute(
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java
index fe2715d..91a3955 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpService.java
@@ -241,20 +241,19 @@ public class HttpService {
} catch (final HttpException ex) {
if (responseSubmitted.get()) {
throw ex;
- } else {
- try (final ClassicHttpResponse errorResponse = new BasicClassicHttpResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR)) {
- handleException(ex, errorResponse);
- errorResponse.setHeader(HttpHeaders.CONNECTION, HeaderElements.CLOSE);
- context.setAttribute(HttpCoreContext.HTTP_RESPONSE, errorResponse);
- this.processor.process(errorResponse, errorResponse.getEntity(), context);
+ }
+ try (final ClassicHttpResponse errorResponse = new BasicClassicHttpResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR)) {
+ handleException(ex, errorResponse);
+ errorResponse.setHeader(HttpHeaders.CONNECTION, HeaderElements.CLOSE);
+ context.setAttribute(HttpCoreContext.HTTP_RESPONSE, errorResponse);
+ this.processor.process(errorResponse, errorResponse.getEntity(), context);
- conn.sendResponseHeader(errorResponse);
- if (streamListener != null) {
- streamListener.onResponseHead(conn, errorResponse);
- }
- conn.sendResponseEntity(errorResponse);
- conn.close();
+ conn.sendResponseHeader(errorResponse);
+ if (streamListener != null) {
+ streamListener.onResponseHead(conn, errorResponse);
}
+ conn.sendResponseEntity(errorResponse);
+ conn.close();
}
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SocketHolder.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SocketHolder.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SocketHolder.java
index 879d791..4a8496f 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SocketHolder.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/SocketHolder.java
@@ -61,14 +61,12 @@ public class SocketHolder {
InputStream local = inputStreamRef.get();
if (local != null) {
return local;
- } else {
- local = getInputStream(socket);
- if (inputStreamRef.compareAndSet(null, local)) {
- return local;
- } else {
- return inputStreamRef.get();
- }
}
+ local = getInputStream(socket);
+ if (inputStreamRef.compareAndSet(null, local)) {
+ return local;
+ }
+ return inputStreamRef.get();
}
protected InputStream getInputStream(final Socket socket) throws IOException {
@@ -83,14 +81,12 @@ public class SocketHolder {
OutputStream local = outputStreamRef.get();
if (local != null) {
return local;
- } else {
- local = getOutputStream(socket);
- if (outputStreamRef.compareAndSet(null, local)) {
- return local;
- } else {
- return outputStreamRef.get();
- }
}
+ local = getOutputStream(socket);
+ if (outputStreamRef.compareAndSet(null, local)) {
+ return local;
+ }
+ return outputStreamRef.get();
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
index 21a1433..9ae7b5f 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
@@ -276,13 +276,12 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
if (contentDecoder != null) {
incomingMessage = new Message<>(messageHead, contentDecoder);
break;
+ }
+ inputEnd();
+ if (connState.compareTo(ConnectionState.ACTIVE) == 0) {
+ ioSession.setEvent(SelectionKey.OP_READ);
} else {
- inputEnd();
- if (connState.compareTo(ConnectionState.ACTIVE) == 0) {
- ioSession.setEvent(SelectionKey.OP_READ);
- } else {
- break;
- }
+ break;
}
}
} while (bytesRead > 0);
@@ -524,11 +523,9 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
contentEncoder.complete(trailers);
ioSession.setEvent(SelectionKey.OP_WRITE);
outgoingMessage = null;
- if (contentEncoder instanceof ChunkEncoder) {
- return MessageDelineation.CHUNK_CODED;
- } else {
- return MessageDelineation.MESSAGE_HEAD;
- }
+ return contentEncoder instanceof ChunkEncoder
+ ? MessageDelineation.CHUNK_CODED
+ : MessageDelineation.MESSAGE_HEAD;
} finally {
outputLock.unlock();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
index 1762a57..e9f1acd 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
@@ -154,9 +154,8 @@ public class ClientHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
if (messageDelineation == MessageDelineation.MESSAGE_HEAD) {
requestShutdown(CloseMode.GRACEFUL);
return false;
- } else {
- return true;
}
+ return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java
index 921c915..1097a08 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java
@@ -75,9 +75,8 @@ public final class DefaultAsyncResponseExchangeHandlerFactory implements Handler
final AsyncServerExchangeHandler handler = createHandler(request, context);
if (handler != null) {
return decorator != null ? decorator.decorate(handler) : handler;
- } else {
- return null;
}
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/main/java/org/apache/hc/core5/ssl/ReflectionSupport.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/ssl/ReflectionSupport.java b/httpcore5/src/main/java/org/apache/hc/core5/ssl/ReflectionSupport.java
index 308bbab..8b1ab6d 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/ssl/ReflectionSupport.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/ssl/ReflectionSupport.java
@@ -40,7 +40,6 @@ public final class ReflectionSupport {
}
}
- @SuppressWarnings("unchecked")
public static <T> T callGetter(final Object object, final String getterName, final Class<T> resultType) {
try {
final Class<?> clazz = object.getClass();
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java b/httpcore5/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java
index 9ca574e..99b001c 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java
@@ -81,13 +81,11 @@ public class WritableByteChannelMock implements WritableByteChannel {
src.limit(limit);
this.capacityUsed += chunk;
return chunk;
- } else {
- return 0;
}
- } else {
- this.buf.put(src);
- return len;
+ return 0;
}
+ this.buf.put(src);
+ return len;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java
index 2913f55..e667001 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java
@@ -44,6 +44,7 @@ import org.apache.hc.core5.io.CloseMode;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -113,7 +114,7 @@ public class TestBHttpConnectionBase {
Assert.assertFalse(conn.isOpen());
Mockito.verify(outstream, Mockito.times(1)).write(
- Mockito.<byte[]>any(), Mockito.anyInt(), Mockito.anyInt());
+ ArgumentMatchers.<byte[]>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt());
Mockito.verify(socket, Mockito.times(1)).shutdownInput();
Mockito.verify(socket, Mockito.times(1)).shutdownOutput();
Mockito.verify(socket, Mockito.times(1)).close();
@@ -121,7 +122,7 @@ public class TestBHttpConnectionBase {
conn.close();
Mockito.verify(socket, Mockito.times(1)).close();
Mockito.verify(outstream, Mockito.times(1)).write(
- Mockito.<byte[]>any(), Mockito.anyInt(), Mockito.anyInt());
+ ArgumentMatchers.<byte[]>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt());
}
@Test
@@ -142,7 +143,7 @@ public class TestBHttpConnectionBase {
Assert.assertFalse(conn.isOpen());
Mockito.verify(outstream, Mockito.never()).write(
- Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt());
+ ArgumentMatchers.<byte []>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt());
Mockito.verify(socket, Mockito.never()).shutdownInput();
Mockito.verify(socket, Mockito.never()).shutdownOutput();
Mockito.verify(socket, Mockito.times(1)).close();
@@ -211,7 +212,7 @@ public class TestBHttpConnectionBase {
public void testSetSocketTimeoutException() throws Exception {
conn.bind(socket);
- Mockito.doThrow(new SocketException()).when(socket).setSoTimeout(Mockito.anyInt());
+ Mockito.doThrow(new SocketException()).when(socket).setSoTimeout(ArgumentMatchers.anyInt());
conn.setSocketTimeoutMillis(123);
@@ -250,9 +251,9 @@ public class TestBHttpConnectionBase {
Assert.assertTrue(conn.awaitInput(432));
- Mockito.verify(socket, Mockito.never()).setSoTimeout(Mockito.anyInt());
+ Mockito.verify(socket, Mockito.never()).setSoTimeout(ArgumentMatchers.anyInt());
Mockito.verify(instream, Mockito.times(1)).read(
- Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt());
+ ArgumentMatchers.<byte []>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt());
}
@Test
@@ -270,14 +271,14 @@ public class TestBHttpConnectionBase {
Mockito.verify(socket, Mockito.times(1)).setSoTimeout(432);
Mockito.verify(socket, Mockito.times(1)).setSoTimeout(345);
Mockito.verify(instream, Mockito.times(1)).read(
- Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt());
+ ArgumentMatchers.<byte []>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt());
}
@Test
public void testAwaitInputNoData() throws Exception {
final InputStream instream = Mockito.mock(InputStream.class);
Mockito.when(socket.getInputStream()).thenReturn(instream);
- Mockito.when(instream.read(Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt()))
+ Mockito.when(instream.read(ArgumentMatchers.<byte []>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt()))
.thenReturn(-1);
conn.bind(socket);
@@ -314,7 +315,7 @@ public class TestBHttpConnectionBase {
public void testStaleWhenEndOfStream() throws Exception {
final InputStream instream = Mockito.mock(InputStream.class);
Mockito.when(socket.getInputStream()).thenReturn(instream);
- Mockito.when(instream.read(Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt()))
+ Mockito.when(instream.read(ArgumentMatchers.<byte []>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt()))
.thenReturn(-1);
conn.bind(socket);
@@ -327,7 +328,7 @@ public class TestBHttpConnectionBase {
public void testNotStaleWhenTimeout() throws Exception {
final InputStream instream = Mockito.mock(InputStream.class);
Mockito.when(socket.getInputStream()).thenReturn(instream);
- Mockito.when(instream.read(Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt()))
+ Mockito.when(instream.read(ArgumentMatchers.<byte []>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt()))
.thenThrow(new SocketTimeoutException());
conn.bind(socket);
@@ -340,7 +341,7 @@ public class TestBHttpConnectionBase {
public void testStaleWhenIOError() throws Exception {
final InputStream instream = Mockito.mock(InputStream.class);
Mockito.when(socket.getInputStream()).thenReturn(instream);
- Mockito.when(instream.read(Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt()))
+ Mockito.when(instream.read(ArgumentMatchers.<byte []>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt()))
.thenThrow(new SocketException());
conn.bind(socket);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
index d60ba6d..5bb06aa 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
@@ -45,6 +45,7 @@ import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
public class TestHttpRequestExecutor {
@@ -169,7 +170,7 @@ public class TestHttpRequestExecutor {
Mockito.verify(conn, Mockito.times(1)).receiveResponseEntity(response);
final ArgumentCaptor<HttpResponse> responseCaptor = ArgumentCaptor.forClass(HttpResponse.class);
- Mockito.verify(callback, Mockito.times(2)).execute(responseCaptor.capture(), Mockito.eq(conn), Mockito.eq(context));
+ Mockito.verify(callback, Mockito.times(2)).execute(responseCaptor.capture(), ArgumentMatchers.eq(conn), ArgumentMatchers.eq(context));
final List<HttpResponse> infos = responseCaptor.getAllValues();
Assert.assertNotNull(infos);
Assert.assertEquals(2, infos.size());
@@ -283,7 +284,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicClassicHttpResponse(100, "Continue"),
new BasicClassicHttpResponse(200, "OK"));
- Mockito.when(conn.isDataAvailable(Mockito.anyInt())).thenReturn(Boolean.TRUE);
+ Mockito.when(conn.isDataAvailable(ArgumentMatchers.anyInt())).thenReturn(Boolean.TRUE);
final ClassicHttpResponse response = executor.execute(request, conn, context);
Mockito.verify(conn).sendRequestHeader(request);
@@ -314,7 +315,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicClassicHttpResponse(402, "OK"));
- Mockito.when(conn.isDataAvailable(Mockito.anyInt())).thenReturn(Boolean.TRUE);
+ Mockito.when(conn.isDataAvailable(ArgumentMatchers.anyInt())).thenReturn(Boolean.TRUE);
final ClassicHttpResponse response = executor.execute(request, conn, context);
Mockito.verify(conn).sendRequestHeader(request);
@@ -349,7 +350,7 @@ public class TestHttpRequestExecutor {
new BasicClassicHttpResponse(100, "Continue"),
new BasicClassicHttpResponse(111, "Huh?"),
new BasicClassicHttpResponse(200, "OK"));
- Mockito.when(conn.isDataAvailable(Mockito.anyInt())).thenReturn(Boolean.TRUE);
+ Mockito.when(conn.isDataAvailable(ArgumentMatchers.anyInt())).thenReturn(Boolean.TRUE);
final HttpResponseInformationCallback callback = Mockito.mock(HttpResponseInformationCallback.class);
@@ -362,7 +363,7 @@ public class TestHttpRequestExecutor {
Mockito.verify(conn).receiveResponseEntity(response);
final ArgumentCaptor<HttpResponse> responseCaptor = ArgumentCaptor.forClass(HttpResponse.class);
- Mockito.verify(callback, Mockito.times(2)).execute(responseCaptor.capture(), Mockito.eq(conn), Mockito.eq(context));
+ Mockito.verify(callback, Mockito.times(2)).execute(responseCaptor.capture(), ArgumentMatchers.eq(conn), ArgumentMatchers.eq(context));
final List<HttpResponse> infos = responseCaptor.getAllValues();
Assert.assertNotNull(infos);
Assert.assertEquals(2, infos.size());
@@ -394,7 +395,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicClassicHttpResponse(200, "OK"));
- Mockito.when(conn.isDataAvailable(Mockito.anyInt())).thenReturn(Boolean.FALSE);
+ Mockito.when(conn.isDataAvailable(ArgumentMatchers.anyInt())).thenReturn(Boolean.FALSE);
final ClassicHttpResponse response = executor.execute(request, conn, context);
Mockito.verify(conn).sendRequestHeader(request);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
index 7dd9717..1dcd472 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
@@ -57,6 +57,7 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -138,14 +139,14 @@ public class TestHttpService {
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
- Mockito.when(connReuseStrategy.keepAlive(Mockito.eq(request), Mockito.argThat(new ArgumentMatcher<HttpResponse>() {
+ Mockito.when(connReuseStrategy.keepAlive(ArgumentMatchers.eq(request), ArgumentMatchers.argThat(new ArgumentMatcher<HttpResponse>() {
@Override
public boolean matches(final HttpResponse errorResponse) {
return errorResponse.getCode() == HttpStatus.SC_NOT_IMPLEMENTED;
}
- }), Mockito.eq(context))).thenReturn(Boolean.TRUE);
+ }), ArgumentMatchers.eq(context))).thenReturn(Boolean.TRUE);
httpservice.handleRequest(conn, context);
final ArgumentCaptor<ClassicHttpResponse> responseCaptor = ArgumentCaptor.forClass(ClassicHttpResponse.class);
@@ -178,14 +179,14 @@ public class TestHttpService {
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
- Mockito.when(connReuseStrategy.keepAlive(Mockito.eq(request), Mockito.argThat(new ArgumentMatcher<HttpResponse>() {
+ Mockito.when(connReuseStrategy.keepAlive(ArgumentMatchers.eq(request), ArgumentMatchers.argThat(new ArgumentMatcher<HttpResponse>() {
@Override
public boolean matches(final HttpResponse errorResponse) {
return errorResponse.getCode() == HttpStatus.SC_NOT_IMPLEMENTED;
}
- }), Mockito.eq(context))).thenReturn(Boolean.TRUE);
+ }), ArgumentMatchers.eq(context))).thenReturn(Boolean.TRUE);
httpservice.handleRequest(conn, context);
final ArgumentCaptor<ClassicHttpResponse> responseCaptor = ArgumentCaptor.forClass(ClassicHttpResponse.class);
@@ -343,7 +344,7 @@ public class TestHttpService {
Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Mockito.verify(conn).sendResponseHeader(response);
- Mockito.verify(conn, Mockito.never()).sendResponseEntity(Mockito.<ClassicHttpResponse>any());
+ Mockito.verify(conn, Mockito.never()).sendResponseEntity(ArgumentMatchers.<ClassicHttpResponse>any());
Mockito.verify(conn).flush();
Mockito.verify(conn, Mockito.never()).close();
Mockito.verify(response).close();
@@ -367,7 +368,7 @@ public class TestHttpService {
Mockito.verify(requestHandler).handle(request, response, context);
Mockito.verify(conn).sendResponseHeader(response);
- Mockito.verify(conn, Mockito.never()).sendResponseEntity(Mockito.<ClassicHttpResponse>any());
+ Mockito.verify(conn, Mockito.never()).sendResponseEntity(ArgumentMatchers.<ClassicHttpResponse>any());
Mockito.verify(conn).flush();
Mockito.verify(conn, Mockito.never()).close();
Mockito.verify(response).close();
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
index f532c81..64f8891 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
@@ -44,6 +44,7 @@ import org.apache.hc.core5.http.io.SessionOutputBuffer;
import org.apache.hc.core5.util.CharArrayBuffer;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
public class TestSessionInOutBuffers {
@@ -376,8 +377,8 @@ public class TestSessionInOutBuffers {
outbuffer.write(new byte[] {1, 2}, outputStream);
outbuffer.write(new byte[]{3, 4}, outputStream);
outbuffer.flush(outputStream);
- Mockito.verify(outputStream, Mockito.times(1)).write(Mockito.<byte[]>any(), Mockito.anyInt(), Mockito.anyInt());
- Mockito.verify(outputStream, Mockito.never()).write(Mockito.anyInt());
+ Mockito.verify(outputStream, Mockito.times(1)).write(ArgumentMatchers.<byte[]>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt());
+ Mockito.verify(outputStream, Mockito.never()).write(ArgumentMatchers.anyInt());
}
@Test
@@ -388,8 +389,8 @@ public class TestSessionInOutBuffers {
outbuffer.write(2, outputStream);
outbuffer.write(new byte[] {1, 2}, outputStream);
outbuffer.write(new byte[]{3, 4}, outputStream);
- Mockito.verify(outputStream, Mockito.times(2)).write(Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt());
- Mockito.verify(outputStream, Mockito.times(2)).write(Mockito.anyInt());
+ Mockito.verify(outputStream, Mockito.times(2)).write(ArgumentMatchers.<byte []>any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt());
+ Mockito.verify(outputStream, Mockito.times(2)).write(ArgumentMatchers.anyInt());
}
@Test
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TimeoutByteArrayInputStream.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TimeoutByteArrayInputStream.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TimeoutByteArrayInputStream.java
index 2417b7d..97bdf49 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TimeoutByteArrayInputStream.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TimeoutByteArrayInputStream.java
@@ -61,9 +61,8 @@ class TimeoutByteArrayInputStream extends InputStream {
final int v = this.buf[this.pos++] & 0xff;
if (v != 0) {
return v;
- } else {
- throw new InterruptedIOException("Timeout");
}
+ throw new InterruptedIOException("Timeout");
}
@Override
@@ -92,10 +91,9 @@ class TimeoutByteArrayInputStream extends InputStream {
final int v = this.buf[this.pos] & 0xff;
if (v == 0) {
return i;
- } else {
- b[off + i] = (byte) v;
- this.pos++;
}
+ b[off + i] = (byte) v;
+ this.pos++;
}
return chunk;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java
index b1fb8db..614b02a 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java
@@ -29,7 +29,6 @@ package org.apache.hc.core5.http.impl.nio;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
@@ -61,13 +60,11 @@ public class TestSessionInOutBuffers {
return Channels.newChannel(new ByteArrayInputStream(bytes));
}
- private static ReadableByteChannel newChannel(final String s, final Charset charset)
- throws UnsupportedEncodingException {
+ private static ReadableByteChannel newChannel(final String s, final Charset charset) {
return Channels.newChannel(new ByteArrayInputStream(s.getBytes(charset)));
}
- private static ReadableByteChannel newChannel(final String s)
- throws UnsupportedEncodingException {
+ private static ReadableByteChannel newChannel(final String s) {
return newChannel(s, StandardCharsets.US_ASCII);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java
index a3813a2..03356b8 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java
@@ -45,7 +45,7 @@ public class TestBasicLineParser {
@Before
public void setup() {
- this.parser = this.parser.INSTANCE;
+ this.parser = BasicLineParser.INSTANCE;
}
@Test
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityConsumer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityConsumer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityConsumer.java
index 29b62a1..a118c32 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityConsumer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityConsumer.java
@@ -83,7 +83,7 @@ public class TestAbstractBinAsyncEntityConsumer {
public void releaseResources() {
}
- };
+ }
@Test
public void testConsumeData() throws Exception {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityProducer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityProducer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityProducer.java
index a38b968..ba026fe 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityProducer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractBinAsyncEntityProducer.java
@@ -90,7 +90,7 @@ public class TestAbstractBinAsyncEntityProducer {
public void releaseResources() {
}
- };
+ }
@Test
public void testProduceDataNoBuffering() throws Exception {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityConsumer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityConsumer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityConsumer.java
index 68898a9..54f20cb 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityConsumer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityConsumer.java
@@ -75,7 +75,7 @@ public class TestAbstractCharAsyncEntityConsumer {
buffer.setLength(0);
}
- };
+ }
@Test
public void testConsumeData() throws Exception {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityProducer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityProducer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityProducer.java
index 221ea42..329302c 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityProducer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/entity/TestAbstractCharAsyncEntityProducer.java
@@ -86,7 +86,7 @@ public class TestAbstractCharAsyncEntityProducer {
public void failed(final Exception cause) {
}
- };
+ }
@Test
public void testProduceDataNoBuffering() throws Exception {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/pool/TestLaxConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/pool/TestLaxConnPool.java b/httpcore5/src/test/java/org/apache/hc/core5/pool/TestLaxConnPool.java
index 5f0284b..9b95d35 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/pool/TestLaxConnPool.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/pool/TestLaxConnPool.java
@@ -36,6 +36,7 @@ import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
public class TestLaxConnPool {
@@ -90,8 +91,8 @@ public class TestLaxConnPool {
pool.release(entry1, true);
pool.release(entry2, true);
pool.release(entry3, false);
- Mockito.verify(conn1, Mockito.never()).close(Mockito.<CloseMode>any());
- Mockito.verify(conn2, Mockito.never()).close(Mockito.<CloseMode>any());
+ Mockito.verify(conn1, Mockito.never()).close(ArgumentMatchers.<CloseMode>any());
+ Mockito.verify(conn2, Mockito.never()).close(ArgumentMatchers.<CloseMode>any());
Mockito.verify(conn3, Mockito.times(1)).close(CloseMode.GRACEFUL);
final PoolStats totals = pool.getTotalStats();
@@ -258,7 +259,7 @@ public class TestLaxConnPool {
pool.closeExpired();
Mockito.verify(conn1).close(CloseMode.GRACEFUL);
- Mockito.verify(conn2, Mockito.never()).close(Mockito.<CloseMode>any());
+ Mockito.verify(conn2, Mockito.never()).close(ArgumentMatchers.<CloseMode>any());
final PoolStats totals = pool.getTotalStats();
Assert.assertEquals(1, totals.getAvailable());
@@ -300,7 +301,7 @@ public class TestLaxConnPool {
pool.closeIdle(TimeValue.of(50, TimeUnit.MILLISECONDS));
Mockito.verify(conn1).close(CloseMode.GRACEFUL);
- Mockito.verify(conn2, Mockito.never()).close(Mockito.<CloseMode>any());
+ Mockito.verify(conn2, Mockito.never()).close(ArgumentMatchers.<CloseMode>any());
PoolStats totals = pool.getTotalStats();
Assert.assertEquals(1, totals.getAvailable());
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/pool/TestStrictConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/pool/TestStrictConnPool.java b/httpcore5/src/test/java/org/apache/hc/core5/pool/TestStrictConnPool.java
index a7e4087..3eedf45 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/pool/TestStrictConnPool.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/pool/TestStrictConnPool.java
@@ -36,6 +36,7 @@ import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
public class TestStrictConnPool {
@@ -95,8 +96,8 @@ public class TestStrictConnPool {
pool.release(entry1, true);
pool.release(entry2, true);
pool.release(entry3, false);
- Mockito.verify(conn1, Mockito.never()).close(Mockito.<CloseMode>any());
- Mockito.verify(conn2, Mockito.never()).close(Mockito.<CloseMode>any());
+ Mockito.verify(conn1, Mockito.never()).close(ArgumentMatchers.<CloseMode>any());
+ Mockito.verify(conn2, Mockito.never()).close(ArgumentMatchers.<CloseMode>any());
Mockito.verify(conn3, Mockito.times(1)).close(CloseMode.GRACEFUL);
final PoolStats totals = pool.getTotalStats();
@@ -349,7 +350,7 @@ public class TestStrictConnPool {
Assert.assertTrue(future5.isDone());
Mockito.verify(conn2).close(CloseMode.GRACEFUL);
- Mockito.verify(conn1, Mockito.never()).close(Mockito.<CloseMode>any());
+ Mockito.verify(conn1, Mockito.never()).close(ArgumentMatchers.<CloseMode>any());
totals = pool.getTotalStats();
Assert.assertEquals(1, totals.getAvailable());
@@ -419,7 +420,7 @@ public class TestStrictConnPool {
pool.closeExpired();
Mockito.verify(conn1).close(CloseMode.GRACEFUL);
- Mockito.verify(conn2, Mockito.never()).close(Mockito.<CloseMode>any());
+ Mockito.verify(conn2, Mockito.never()).close(ArgumentMatchers.<CloseMode>any());
final PoolStats totals = pool.getTotalStats();
Assert.assertEquals(1, totals.getAvailable());
@@ -461,7 +462,7 @@ public class TestStrictConnPool {
pool.closeIdle(TimeValue.of(50, TimeUnit.MILLISECONDS));
Mockito.verify(conn1).close(CloseMode.GRACEFUL);
- Mockito.verify(conn2, Mockito.never()).close(Mockito.<CloseMode>any());
+ Mockito.verify(conn2, Mockito.never()).close(ArgumentMatchers.<CloseMode>any());
PoolStats totals = pool.getTotalStats();
Assert.assertEquals(1, totals.getAvailable());
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/reactor/TestAbstractIOSessionPool.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/reactor/TestAbstractIOSessionPool.java b/httpcore5/src/test/java/org/apache/hc/core5/reactor/TestAbstractIOSessionPool.java
index bb38e29..1247524 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/reactor/TestAbstractIOSessionPool.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/reactor/TestAbstractIOSessionPool.java
@@ -40,6 +40,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.ArgumentMatcher;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
@@ -63,7 +64,6 @@ public class TestAbstractIOSessionPool {
private AbstractIOSessionPool<String> impl;
@Before
- @SuppressWarnings("unchecked")
public void setup() {
impl = Mockito.mock(AbstractIOSessionPool.class, Mockito.withSettings()
.defaultAnswer(Answers.CALLS_REAL_METHODS)
@@ -74,9 +74,9 @@ public class TestAbstractIOSessionPool {
public void testGetSessions() throws Exception {
Mockito.when(impl.connectSession(
- Mockito.anyString(),
- Mockito.<Timeout>any(),
- Mockito.<FutureCallback<IOSession>>any())).thenReturn(connectFuture);
+ ArgumentMatchers.anyString(),
+ ArgumentMatchers.<Timeout>any(),
+ ArgumentMatchers.<FutureCallback<IOSession>>any())).thenReturn(connectFuture);
Mockito.doAnswer(new Answer() {
@@ -87,7 +87,7 @@ public class TestAbstractIOSessionPool {
return null;
}
- }).when(impl).validateSession(Mockito.<IOSession>any(), Mockito.<Callback<Boolean>>any());
+ }).when(impl).validateSession(ArgumentMatchers.<IOSession>any(), ArgumentMatchers.<Callback<Boolean>>any());
final Future<IOSession> future1 = impl.getSession("somehost", Timeout.ofSeconds(123L), null);
Assert.assertThat(future1, CoreMatchers.notNullValue());
@@ -95,9 +95,9 @@ public class TestAbstractIOSessionPool {
Assert.assertThat(impl.getRoutes(), CoreMatchers.hasItem("somehost"));
Mockito.verify(impl).connectSession(
- Mockito.eq("somehost"),
- Mockito.eq(Timeout.ofSeconds(123L)),
- Mockito.<FutureCallback<IOSession>>any());
+ ArgumentMatchers.eq("somehost"),
+ ArgumentMatchers.eq(Timeout.ofSeconds(123L)),
+ ArgumentMatchers.<FutureCallback<IOSession>>any());
final Future<IOSession> future2 = impl.getSession("somehost", Timeout.ofSeconds(123L), null);
Assert.assertThat(future2, CoreMatchers.notNullValue());
@@ -105,9 +105,9 @@ public class TestAbstractIOSessionPool {
Assert.assertThat(impl.getRoutes(), CoreMatchers.hasItem("somehost"));
Mockito.verify(impl, Mockito.times(1)).connectSession(
- Mockito.eq("somehost"),
- Mockito.<Timeout>any(),
- Mockito.argThat(new ArgumentMatcher<FutureCallback<IOSession>>() {
+ ArgumentMatchers.eq("somehost"),
+ ArgumentMatchers.<Timeout>any(),
+ ArgumentMatchers.argThat(new ArgumentMatcher<FutureCallback<IOSession>>() {
@Override
public boolean matches(final FutureCallback<IOSession> callback) {
@@ -123,16 +123,16 @@ public class TestAbstractIOSessionPool {
Assert.assertThat(future2.isDone(), CoreMatchers.equalTo(true));
Assert.assertThat(future2.get(), CoreMatchers.sameInstance(ioSession1));
- Mockito.verify(impl, Mockito.times(2)).validateSession(Mockito.<IOSession>any(), Mockito.<Callback<Boolean>>any());
+ Mockito.verify(impl, Mockito.times(2)).validateSession(ArgumentMatchers.<IOSession>any(), ArgumentMatchers.<Callback<Boolean>>any());
final Future<IOSession> future3 = impl.getSession("somehost", Timeout.ofSeconds(123L), null);
Mockito.verify(impl, Mockito.times(1)).connectSession(
- Mockito.eq("somehost"),
- Mockito.<Timeout>any(),
- Mockito.<FutureCallback<IOSession>>any());
+ ArgumentMatchers.eq("somehost"),
+ ArgumentMatchers.<Timeout>any(),
+ ArgumentMatchers.<FutureCallback<IOSession>>any());
- Mockito.verify(impl, Mockito.times(3)).validateSession(Mockito.<IOSession>any(), Mockito.<Callback<Boolean>>any());
+ Mockito.verify(impl, Mockito.times(3)).validateSession(ArgumentMatchers.<IOSession>any(), ArgumentMatchers.<Callback<Boolean>>any());
Assert.assertThat(future3.isDone(), CoreMatchers.equalTo(true));
Assert.assertThat(future3.get(), CoreMatchers.sameInstance(ioSession1));
@@ -142,9 +142,9 @@ public class TestAbstractIOSessionPool {
public void testGetSessionFailure() throws Exception {
Mockito.when(impl.connectSession(
- Mockito.anyString(),
- Mockito.<Timeout>any(),
- Mockito.<FutureCallback<IOSession>>any())).thenReturn(connectFuture);
+ ArgumentMatchers.anyString(),
+ ArgumentMatchers.<Timeout>any(),
+ ArgumentMatchers.<FutureCallback<IOSession>>any())).thenReturn(connectFuture);
final Future<IOSession> future1 = impl.getSession("somehost", Timeout.ofSeconds(123L), null);
Assert.assertThat(future1, CoreMatchers.notNullValue());
@@ -152,9 +152,9 @@ public class TestAbstractIOSessionPool {
Assert.assertThat(impl.getRoutes(), CoreMatchers.hasItem("somehost"));
Mockito.verify(impl).connectSession(
- Mockito.eq("somehost"),
- Mockito.eq(Timeout.ofSeconds(123L)),
- Mockito.<FutureCallback<IOSession>>any());
+ ArgumentMatchers.eq("somehost"),
+ ArgumentMatchers.eq(Timeout.ofSeconds(123L)),
+ ArgumentMatchers.<FutureCallback<IOSession>>any());
final Future<IOSession> future2 = impl.getSession("somehost", Timeout.ofSeconds(123L), null);
Assert.assertThat(future2, CoreMatchers.notNullValue());
@@ -162,9 +162,9 @@ public class TestAbstractIOSessionPool {
Assert.assertThat(impl.getRoutes(), CoreMatchers.hasItem("somehost"));
Mockito.verify(impl, Mockito.times(1)).connectSession(
- Mockito.eq("somehost"),
- Mockito.<Timeout>any(),
- Mockito.argThat(new ArgumentMatcher<FutureCallback<IOSession>>() {
+ ArgumentMatchers.eq("somehost"),
+ ArgumentMatchers.<Timeout>any(),
+ ArgumentMatchers.argThat(new ArgumentMatcher<FutureCallback<IOSession>>() {
@Override
public boolean matches(final FutureCallback<IOSession> callback) {
@@ -198,7 +198,7 @@ public class TestAbstractIOSessionPool {
Mockito.verify(impl).closeSession(ioSession1, CloseMode.GRACEFUL);
Mockito.verify(impl).closeSession(ioSession2, CloseMode.GRACEFUL);
- Mockito.verify(connectFuture).cancel(Mockito.anyBoolean());
+ Mockito.verify(connectFuture).cancel(ArgumentMatchers.anyBoolean());
Mockito.verify(callback1).cancelled();
Mockito.verify(callback2).cancelled();
}
@@ -260,14 +260,14 @@ public class TestAbstractIOSessionPool {
return null;
}
- }).when(impl).validateSession(Mockito.<IOSession>any(), Mockito.<Callback<Boolean>>any());
+ }).when(impl).validateSession(ArgumentMatchers.<IOSession>any(), ArgumentMatchers.<Callback<Boolean>>any());
impl.getSession("somehost", Timeout.ofSeconds(123L), null);
Mockito.verify(impl, Mockito.times(1)).connectSession(
- Mockito.eq("somehost"),
- Mockito.eq(Timeout.ofSeconds(123L)),
- Mockito.<FutureCallback<IOSession>>any());
+ ArgumentMatchers.eq("somehost"),
+ ArgumentMatchers.eq(Timeout.ofSeconds(123L)),
+ ArgumentMatchers.<FutureCallback<IOSession>>any());
}
@Test
@@ -281,9 +281,9 @@ public class TestAbstractIOSessionPool {
impl.getSession("somehost", Timeout.ofSeconds(123L), null);
Mockito.verify(impl).connectSession(
- Mockito.eq("somehost"),
- Mockito.eq(Timeout.ofSeconds(123L)),
- Mockito.<FutureCallback<IOSession>>any());
+ ArgumentMatchers.eq("somehost"),
+ ArgumentMatchers.eq(Timeout.ofSeconds(123L)),
+ ArgumentMatchers.<FutureCallback<IOSession>>any());
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/ef6bc7ca/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java b/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
index 1e77179..ba2db45 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
@@ -562,12 +562,9 @@ public class TestSSLContextBuilder {
final PrivateKeyStrategy privateKeyStrategy = new PrivateKeyStrategy() {
@Override
- public String chooseAlias(final Map<String, PrivateKeyDetails> aliases, final SSLParameters sslParameters) {
- if (aliases.keySet().contains("client2")) {
- return "client2";
- } else {
- return null;
- }
+ public String chooseAlias(final Map<String, PrivateKeyDetails> aliases,
+ final SSLParameters sslParameters) {
+ return aliases.keySet().contains("client2") ? "client2" : null;
}
};