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 20:24:33 UTC
[15/19] 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
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/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/d619748c/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
index 91226bd..f015ed3 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
@@ -127,11 +127,10 @@ public class MessageSupport {
final ParserCursor cursor = new ParserCursor(0, buf.length());
cursor.updatePos(((FormattedHeader) header).getValuePos());
return parseTokens(buf, cursor);
- } else {
- final String value = header.getValue();
- final ParserCursor cursor = new ParserCursor(0, value.length());
- return parseTokens(value, cursor);
}
+ final String value = header.getValue();
+ final ParserCursor cursor = new ParserCursor(0, value.length());
+ return parseTokens(value, cursor);
}
public static void addContentTypeHeader(final HttpMessage message, final EntityDetails entity) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java
index 443af98..24ccd01 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java
@@ -94,41 +94,39 @@ public abstract class AbstractAsyncServerAuthFilter<T> implements AsyncFilterHan
responseTrigger.sendInformation(new BasicClassicHttpResponse(HttpStatus.SC_CONTINUE));
}
return chain.proceed(request, entityDetails, context, responseTrigger);
- } else {
- final HttpResponse unauthorized = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED);
- unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, generateChallenge(challengeResponse, authority, requestUri, context));
- final AsyncEntityProducer responseContentProducer = generateResponseContent(unauthorized);
- if (respondImmediately || expectContinue || entityDetails == null) {
+ }
+ final HttpResponse unauthorized = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED);
+ unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, generateChallenge(challengeResponse, authority, requestUri, context));
+ final AsyncEntityProducer responseContentProducer = generateResponseContent(unauthorized);
+ if (respondImmediately || expectContinue || entityDetails == null) {
+ responseTrigger.submitResponse(unauthorized, responseContentProducer);
+ return null;
+ }
+ return new AsyncDataConsumer() {
+
+ @Override
+ public void updateCapacity(final CapacityChannel capacityChannel) throws IOException {
+ capacityChannel.update(Integer.MAX_VALUE);
+ }
+
+ @Override
+ public int consume(final ByteBuffer src) throws IOException {
+ return Integer.MAX_VALUE;
+ }
+
+ @Override
+ public void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
responseTrigger.submitResponse(unauthorized, responseContentProducer);
- return null;
- } else {
- return new AsyncDataConsumer() {
-
- @Override
- public void updateCapacity(final CapacityChannel capacityChannel) throws IOException {
- capacityChannel.update(Integer.MAX_VALUE);
- }
-
- @Override
- public int consume(final ByteBuffer src) throws IOException {
- return Integer.MAX_VALUE;
- }
-
- @Override
- public void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
- responseTrigger.submitResponse(unauthorized, responseContentProducer);
- }
-
- @Override
- public void releaseResources() {
- if (responseContentProducer != null) {
- responseContentProducer.releaseResources();
- }
- }
-
- };
}
- }
+
+ @Override
+ public void releaseResources() {
+ if (responseContentProducer != null) {
+ responseContentProducer.releaseResources();
+ }
+ }
+
+ };
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java
index c74c3c7..c70a8c3 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java
@@ -119,11 +119,7 @@ public final class AsyncServerFilterChainExchangeHandlerFactory implements Handl
@Override
public int consume(final ByteBuffer src) throws IOException {
final AsyncDataConsumer dataConsumer = dataConsumerRef.get();
- if (dataConsumer != null) {
- return dataConsumer.consume(src);
- } else {
- return Integer.MAX_VALUE;
- }
+ return dataConsumer != null ? dataConsumer.consume(src) : Integer.MAX_VALUE;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java
index bfaf6fa..7fecddc 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java
@@ -99,11 +99,7 @@ public class BasicAsyncServerExpectationDecorator implements AsyncServerExchange
@Override
public final int consume(final ByteBuffer src) throws IOException {
final AsyncResponseProducer responseProducer = responseProducerRef.get();
- if (responseProducer == null) {
- return handler.consume(src);
- } else {
- return Integer.MAX_VALUE;
- }
+ return responseProducer == null ? handler.consume(src) : Integer.MAX_VALUE;
}
@Override
@@ -117,11 +113,7 @@ public class BasicAsyncServerExpectationDecorator implements AsyncServerExchange
@Override
public final int available() {
final AsyncResponseProducer responseProducer = responseProducerRef.get();
- if (responseProducer == null) {
- return handler.available();
- } else {
- return responseProducer.available();
- }
+ return responseProducer == null ? handler.available() : responseProducer.available();
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/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 28d0ee5..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
@@ -57,16 +57,16 @@ public final class DefaultAsyncResponseExchangeHandlerFactory implements Handler
this(mapper, null);
}
- private AsyncServerExchangeHandler createHandler(final HttpRequest request, final HttpContext context) throws HttpException {
+ private AsyncServerExchangeHandler createHandler(final HttpRequest request,
+ final HttpContext context) throws HttpException {
try {
final Supplier<AsyncServerExchangeHandler> supplier = mapper.resolve(request, context);
- if (supplier != null) {
- return supplier.get();
- } else {
- return new ImmediateResponseExchangeHandler(HttpStatus.SC_NOT_FOUND, "Resource not found");
- }
+ return supplier != null
+ ? supplier.get()
+ : new ImmediateResponseExchangeHandler(HttpStatus.SC_NOT_FOUND, "Resource not found");
} catch (final MisdirectedRequestException ex) {
- return new ImmediateResponseExchangeHandler(HttpStatus.SC_MISDIRECTED_REQUEST, "Not authoritative");
+ return new ImmediateResponseExchangeHandler(HttpStatus.SC_MISDIRECTED_REQUEST,
+ "Not authoritative");
}
}
@@ -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/d619748c/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java
index 348f69e..efc9804 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java
@@ -142,10 +142,9 @@ public final class TerminalAsyncServerFilter implements AsyncFilterHandler {
}, context);
return exchangeHandler;
- } else {
- responseTrigger.submitResponse(new BasicHttpResponse(HttpStatus.SC_NOT_FOUND), new BasicAsyncEntityProducer("Not found"));
- return null;
}
+ responseTrigger.submitResponse(new BasicHttpResponse(HttpStatus.SC_NOT_FOUND), new BasicAsyncEntityProducer("Not found"));
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java b/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
index ba138a1..9f8b2b7 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
@@ -65,9 +65,8 @@ public final class Host implements NamedEndpoint, Serializable {
throw new URISyntaxException(s, "hostname contains blanks");
}
return new Host(hostname, port);
- } else {
- throw new URISyntaxException(s, "port not found");
}
+ throw new URISyntaxException(s, "port not found");
}
@Override
@@ -88,9 +87,8 @@ public final class Host implements NamedEndpoint, Serializable {
if (o instanceof Host) {
final Host that = (Host) o;
return this.lcName.equals(that.lcName) && this.port == that.port;
- } else {
- return false;
}
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java b/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
index 6990eb6..f6cc1c0 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
@@ -509,11 +509,8 @@ public class URIBuilder {
}
public List<NameValuePair> getQueryParams() {
- if (this.queryParams != null) {
- return new ArrayList<>(this.queryParams);
- } else {
- return new ArrayList<>();
- }
+ return this.queryParams != null ? new ArrayList<>(this.queryParams)
+ : new ArrayList<NameValuePair>();
}
public String getFragment() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
index abd81db..cc80ff7 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
@@ -37,11 +37,9 @@ final class IOWorkers {
}
static Selector newSelector(final SingleCoreIOReactor[] dispatchers) {
- if (isPowerOfTwo(dispatchers.length)) {
- return new PowerOfTwoSelector(dispatchers);
- } else {
- return new GenericSelector(dispatchers);
- }
+ return isPowerOfTwo(dispatchers.length)
+ ? new PowerOfTwoSelector(dispatchers)
+ : new GenericSelector(dispatchers);
}
private static boolean isPowerOfTwo(final int val) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java
index 2b0cc00..30cf0cc 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java
@@ -259,11 +259,7 @@ final class InternalDataChannel extends InternalChannel implements ProtocolIOSes
private IOSession getSessionImpl() {
final SSLIOSession tlsSession = tlsSessionRef.get();
- if (tlsSession != null) {
- return tlsSession;
- } else {
- return ioSession;
- }
+ return tlsSession != null ? tlsSession : ioSession;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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/d619748c/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;
}
};