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 15:59:07 UTC
httpcomponents-core git commit: Remove redundant super-interfaces.
Access static methods directly. Remove unnecessary @SuppressWarnings. Remove
exceptions not thrown from private method signatures.
Repository: httpcomponents-core
Updated Branches:
refs/heads/4.4.x 12aab1303 -> 755ae0300
Remove redundant super-interfaces. Access static methods directly.
Remove unnecessary @SuppressWarnings. Remove exceptions not thrown from
private 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/755ae030
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/755ae030
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/755ae030
Branch: refs/heads/4.4.x
Commit: 755ae0300b0cb7cdaf35af10424069153b8c5dc8
Parents: 12aab13
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Aug 4 09:59:03 2018 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Aug 4 09:59:03 2018 -0600
----------------------------------------------------------------------
.../http/nio/protocol/HttpAsyncService.java | 4 +-
.../impl/nio/codecs/TestHttpMessageParser.java | 7 +--
.../nio/reactor/TestSessionInOutBuffers.java | 7 +--
.../apache/http/nio/pool/TestNIOConnPool.java | 1 -
.../TestBasicAsyncClientExchangeHandler.java | 4 +-
.../nio/protocol/TestHttpAsyncRequester.java | 5 +-
.../http/nio/protocol/TestHttpAsyncService.java | 1 -
.../http/nio/testserver/HttpClientNio.java | 1 -
.../http/nio/testserver/HttpServerNio.java | 2 +-
.../main/java/org/apache/http/HttpVersion.java | 6 +--
.../org/apache/http/entity/ByteArrayEntity.java | 2 -
.../apache/http/impl/BHttpConnectionBase.java | 3 +-
.../http/impl/TestBHttpConnectionBase.java | 23 ++++----
.../apache/http/impl/io/TestRequestParser.java | 4 +-
.../apache/http/impl/io/TestResponseParser.java | 4 +-
.../http/impl/io/TestSessionInOutBuffers.java | 9 ++--
.../java/org/apache/http/pool/TestConnPool.java | 57 ++++++++++----------
.../apache/http/pool/TestRouteSpecificPool.java | 3 --
.../http/protocol/TestHttpRequestExecutor.java | 9 ++--
.../apache/http/protocol/TestHttpService.java | 5 +-
20 files changed, 70 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java b/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
index 59e3080..a7cb2a6 100644
--- a/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
+++ b/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
@@ -688,7 +688,7 @@ public class HttpAsyncService implements NHttpServerEventHandler {
private void completeRequest(
final Incoming incoming,
final NHttpServerConnection conn,
- final State state) throws IOException, HttpException {
+ final State state) throws IOException {
state.setRequestState(MessageState.READY);
state.setIncoming(null);
@@ -743,7 +743,7 @@ public class HttpAsyncService implements NHttpServerEventHandler {
private void completeResponse(
final Outgoing outgoing,
final NHttpServerConnection conn,
- final State state) throws IOException, HttpException {
+ final State state) throws IOException {
final HttpContext context = outgoing.getContext();
final HttpResponse response = outgoing.getResponse();
final HttpAsyncResponseProducer responseProducer = outgoing.getProducer();
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestHttpMessageParser.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestHttpMessageParser.java b/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestHttpMessageParser.java
index 4f6b8e7..0b0caed 100644
--- a/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestHttpMessageParser.java
+++ b/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestHttpMessageParser.java
@@ -29,7 +29,6 @@ package org.apache.http.impl.nio.codecs;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.nio.charset.Charset;
@@ -51,13 +50,11 @@ import org.junit.Test;
*/
public class TestHttpMessageParser {
- 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, Consts.ASCII);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java b/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
index 89f6c54..d4e9b95 100644
--- a/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
+++ b/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
@@ -29,7 +29,6 @@ package org.apache.http.impl.nio.reactor;
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;
@@ -86,13 +85,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, Consts.ASCII);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java b/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
index e64a6d3..d1b1953 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
@@ -320,7 +320,6 @@ public class TestNIOConnPool {
Mockito.when(sessionRequest.getAttachment()).thenReturn("somehost");
Mockito.when(sessionRequest.getException()).thenReturn(new IOException());
final ConnectingIOReactor ioreactor = Mockito.mock(ConnectingIOReactor.class);
- @SuppressWarnings("unchecked")
final SocketAddressResolver<String> addressResolver = Mockito.mock(SocketAddressResolver.class);
Mockito.when(addressResolver.resolveRemoteAddress("somehost")).thenThrow(new UnknownHostException());
final LocalSessionPool pool = new LocalSessionPool(ioreactor, addressResolver, 2, 10);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java
index c04cbfb..f5e895e 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java
@@ -46,6 +46,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Matchers;
import org.mockito.Mockito;
public class TestBasicAsyncClientExchangeHandler {
@@ -60,7 +61,6 @@ public class TestBasicAsyncClientExchangeHandler {
private ContentEncoder encoder;
private ContentDecoder decoder;
- @SuppressWarnings("unchecked")
@Before
public void setUp() throws Exception {
this.requestProducer = Mockito.mock(HttpAsyncRequestProducer.class);
@@ -343,7 +343,7 @@ public class TestBasicAsyncClientExchangeHandler {
@Test
public void testInputTerminated() throws Exception {
this.exchangeHandler.inputTerminated();
- Mockito.verify(this.responseConsumer).failed(Mockito.<ConnectionClosedException>any());
+ Mockito.verify(this.responseConsumer).failed(Matchers.<ConnectionClosedException>any());
try {
this.exchangeHandler.getFuture().get();
Assert.fail("ExecutionException expected");
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequester.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequester.java b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequester.java
index 93b079d..ff9f753 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequester.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequester.java
@@ -63,7 +63,6 @@ public class TestHttpAsyncRequester {
private FutureCallback<Object> callback;
private ConnPool<HttpHost, PoolEntry<HttpHost, NHttpClientConnection>> connPool;
- @SuppressWarnings("unchecked")
@Before
public void setUp() throws Exception {
this.httpProcessor = Mockito.mock(HttpProcessor.class);
@@ -191,7 +190,7 @@ public class TestHttpAsyncRequester {
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({ "rawtypes" })
@Test
public void testPooledConnectionRequestFailed() throws Exception {
final HttpHost host = new HttpHost("somehost");
@@ -215,7 +214,7 @@ public class TestHttpAsyncRequester {
Mockito.verify(this.requestProducer).close();
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({ "rawtypes" })
@Test
public void testPooledConnectionRequestCancelled() throws Exception {
final HttpHost host = new HttpHost("somehost");
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java
index 235915b..dcb92a6 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncService.java
@@ -84,7 +84,6 @@ public class TestHttpAsyncService {
private ContentDecoder decoder;
private Cancellable cancellable;
- @SuppressWarnings("unchecked")
@Before
public void setUp() throws Exception {
this.requestHandler = Mockito.mock(HttpAsyncRequestHandler.class);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java b/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
index 3e46a57..f6d1173 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
@@ -73,7 +73,6 @@ import org.apache.http.protocol.RequestExpectContinue;
import org.apache.http.protocol.RequestTargetHost;
import org.apache.http.protocol.RequestUserAgent;
-@SuppressWarnings("deprecation")
public class HttpClientNio {
public static final HttpProcessor DEFAULT_HTTP_PROC = new ImmutableHttpProcessor(
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java b/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java
index 4126fec..eb8e3c0 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpServerNio.java
@@ -57,7 +57,7 @@ public class HttpServerNio {
private volatile HttpServer server;
- public HttpServerNio() throws IOException {
+ public HttpServerNio() {
super();
this.reqistry = new UriHttpAsyncRequestHandlerMapper();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/main/java/org/apache/http/HttpVersion.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java/org/apache/http/HttpVersion.java b/httpcore/src/main/java/org/apache/http/HttpVersion.java
index 587a4be..79e3638 100644
--- a/httpcore/src/main/java/org/apache/http/HttpVersion.java
+++ b/httpcore/src/main/java/org/apache/http/HttpVersion.java
@@ -27,10 +27,8 @@
package org.apache.http;
-import org.apache.http.annotation.ThreadingBehavior;
import org.apache.http.annotation.Contract;
-
-import java.io.Serializable;
+import org.apache.http.annotation.ThreadingBehavior;
/**
* Represents an HTTP version. HTTP uses a "major.minor" numbering
@@ -46,7 +44,7 @@ import java.io.Serializable;
* @since 4.0
*/
@Contract(threading = ThreadingBehavior.IMMUTABLE)
-public final class HttpVersion extends ProtocolVersion implements Serializable {
+public final class HttpVersion extends ProtocolVersion {
private static final long serialVersionUID = -5856653513894415344L;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java b/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
index 9e2c113..226e8bd 100644
--- a/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
+++ b/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
@@ -52,7 +52,6 @@ public class ByteArrayEntity extends AbstractHttpEntity implements Cloneable {
/**
* @since 4.2
*/
- @SuppressWarnings("deprecation")
public ByteArrayEntity(final byte[] b, final ContentType contentType) {
super();
Args.notNull(b, "Source byte array");
@@ -68,7 +67,6 @@ public class ByteArrayEntity extends AbstractHttpEntity implements Cloneable {
/**
* @since 4.2
*/
- @SuppressWarnings("deprecation")
public ByteArrayEntity(final byte[] b, final int off, final int len, final ContentType contentType) {
super();
Args.notNull(b, "Source byte array");
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java b/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java
index c62a027..4176286 100644
--- a/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java
+++ b/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java
@@ -41,7 +41,6 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.http.ConnectionClosedException;
import org.apache.http.Header;
-import org.apache.http.HttpConnection;
import org.apache.http.HttpConnectionMetrics;
import org.apache.http.HttpEntity;
import org.apache.http.HttpException;
@@ -74,7 +73,7 @@ import org.apache.http.util.NetUtils;
*
* @since 4.0
*/
-public class BHttpConnectionBase implements HttpConnection, HttpInetConnection {
+public class BHttpConnectionBase implements HttpInetConnection {
private final SessionInputBufferImpl inbuffer;
private final SessionOutputBufferImpl outbuffer;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/test/java/org/apache/http/impl/TestBHttpConnectionBase.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/impl/TestBHttpConnectionBase.java b/httpcore/src/test/java/org/apache/http/impl/TestBHttpConnectionBase.java
index 705ba74..f966181 100644
--- a/httpcore/src/test/java/org/apache/http/impl/TestBHttpConnectionBase.java
+++ b/httpcore/src/test/java/org/apache/http/impl/TestBHttpConnectionBase.java
@@ -52,6 +52,7 @@ import org.apache.http.message.BasicHttpResponse;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -126,7 +127,7 @@ public class TestBHttpConnectionBase {
Assert.assertFalse(conn.isOpen());
Mockito.verify(outstream, Mockito.times(1)).write(
- Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt());
+ Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt());
Mockito.verify(socket, Mockito.times(1)).shutdownInput();
Mockito.verify(socket, Mockito.times(1)).shutdownOutput();
Mockito.verify(socket, Mockito.times(1)).close();
@@ -134,7 +135,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());
+ Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt());
}
@Test
@@ -155,7 +156,7 @@ public class TestBHttpConnectionBase {
Assert.assertFalse(conn.isOpen());
Mockito.verify(outstream, Mockito.never()).write(
- Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt());
+ Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt());
Mockito.verify(socket, Mockito.never()).shutdownInput();
Mockito.verify(socket, Mockito.never()).shutdownOutput();
Mockito.verify(socket, Mockito.times(1)).close();
@@ -252,7 +253,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(Matchers.anyInt());
conn.setSocketTimeout(123);
@@ -291,9 +292,9 @@ public class TestBHttpConnectionBase {
Assert.assertTrue(conn.awaitInput(432));
- Mockito.verify(socket, Mockito.never()).setSoTimeout(Mockito.anyInt());
+ Mockito.verify(socket, Mockito.never()).setSoTimeout(Matchers.anyInt());
Mockito.verify(instream, Mockito.times(1)).read(
- Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt());
+ Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt());
}
@Test
@@ -311,14 +312,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());
+ Matchers.<byte []>any(), Matchers.anyInt(), Matchers.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(Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt()))
.thenReturn(-1);
conn.bind(socket);
@@ -351,7 +352,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(Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt()))
.thenReturn(-1);
conn.bind(socket);
@@ -364,7 +365,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(Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt()))
.thenThrow(new SocketTimeoutException());
conn.bind(socket);
@@ -377,7 +378,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(Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt()))
.thenThrow(new SocketException());
conn.bind(socket);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java b/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java
index 82d2892..ad6a050 100644
--- a/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java
+++ b/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java
@@ -111,9 +111,7 @@ public class TestRequestParser {
Assert.assertNotNull(httprequest);
Assert.assertEquals(5, timeoutCount);
- @SuppressWarnings("null") // httprequest cannot be null here
- final
- RequestLine reqline = httprequest.getRequestLine();
+ final RequestLine reqline = httprequest.getRequestLine();
Assert.assertNotNull(reqline);
Assert.assertEquals("GET", reqline.getMethod());
Assert.assertEquals("/", reqline.getUri());
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java b/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java
index 40bedff..5c5fc93 100644
--- a/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java
+++ b/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java
@@ -112,9 +112,7 @@ public class TestResponseParser {
Assert.assertNotNull(httpresponse);
Assert.assertEquals(5, timeoutCount);
- @SuppressWarnings("null") // httpresponse cannot be null here
- final
- StatusLine statusline = httpresponse.getStatusLine();
+ final StatusLine statusline = httpresponse.getStatusLine();
Assert.assertNotNull(statusline);
Assert.assertEquals(200, statusline.getStatusCode());
Assert.assertEquals("OK", statusline.getReasonPhrase());
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java b/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java
index 139aa2d..b5cff65 100644
--- a/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java
+++ b/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java
@@ -42,6 +42,7 @@ import org.apache.http.io.HttpTransportMetrics;
import org.apache.http.util.CharArrayBuffer;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.Matchers;
import org.mockito.Mockito;
public class TestSessionInOutBuffers {
@@ -339,8 +340,8 @@ public class TestSessionInOutBuffers {
outbuffer.write(new byte[]{3, 4});
outbuffer.flush();
Mockito.verify(outstream, Mockito.times(1)).write(
- Mockito.<byte[]>any(), Mockito.anyInt(), Mockito.anyInt());
- Mockito.verify(outstream, Mockito.never()).write(Mockito.anyInt());
+ Matchers.<byte[]>any(), Matchers.anyInt(), Matchers.anyInt());
+ Mockito.verify(outstream, Mockito.never()).write(Matchers.anyInt());
}
@Test
@@ -352,8 +353,8 @@ public class TestSessionInOutBuffers {
outbuffer.write(new byte[] {1, 2});
outbuffer.write(new byte[]{3, 4});
Mockito.verify(outstream, Mockito.times(2)).write(
- Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt());
- Mockito.verify(outstream, Mockito.times(2)).write(Mockito.anyInt());
+ Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt());
+ Mockito.verify(outstream, Mockito.times(2)).write(Matchers.anyInt());
}
@Test
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java b/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java
index b40806b..e5417a3 100644
--- a/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java
+++ b/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java
@@ -36,6 +36,7 @@ import java.util.concurrent.TimeoutException;
import org.apache.http.HttpConnection;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.Matchers;
import org.mockito.Mockito;
public class TestConnPool {
@@ -132,8 +133,8 @@ public class TestConnPool {
Mockito.when(conn2.isOpen()).thenReturn(true);
final LocalConnFactory connFactory = Mockito.mock(LocalConnFactory.class);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1);
- Mockito.when(connFactory.create(Mockito.eq("otherhost"))).thenReturn(conn2);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1);
+ Mockito.when(connFactory.create(Matchers.eq("otherhost"))).thenReturn(conn2);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 10);
final Future<LocalPoolEntry> future1 = pool.lease("somehost", null);
@@ -232,11 +233,11 @@ public class TestConnPool {
final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
Mockito.when(conn1.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1);
final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
Mockito.when(conn2.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("otherhost"))).thenReturn(conn2);
+ Mockito.when(connFactory.create(Matchers.eq("otherhost"))).thenReturn(conn2);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 10);
pool.setMaxPerRoute("somehost", 2);
@@ -311,7 +312,7 @@ public class TestConnPool {
Assert.assertFalse(t8.isDone());
Assert.assertFalse(t9.isDone());
- Mockito.verify(connFactory, Mockito.times(3)).create(Mockito.any(String.class));
+ Mockito.verify(connFactory, Mockito.times(3)).create(Matchers.any(String.class));
pool.release(entry4, true);
pool.release(entry5, false);
@@ -324,7 +325,7 @@ public class TestConnPool {
t9.join();
Assert.assertTrue(future9.isDone());
- Mockito.verify(connFactory, Mockito.times(4)).create(Mockito.any(String.class));
+ Mockito.verify(connFactory, Mockito.times(4)).create(Matchers.any(String.class));
}
@Test
@@ -337,13 +338,13 @@ public class TestConnPool {
Mockito.when(conn2.isOpen()).thenReturn(true);
final HttpConnection conn3 = Mockito.mock(HttpConnection.class);
Mockito.when(conn3.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1, conn2, conn3);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1, conn2, conn3);
final HttpConnection conn4 = Mockito.mock(HttpConnection.class);
Mockito.when(conn4.isOpen()).thenReturn(true);
final HttpConnection conn5 = Mockito.mock(HttpConnection.class);
Mockito.when(conn5.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("otherhost"))).thenReturn(conn4, conn5);
+ Mockito.when(connFactory.create(Matchers.eq("otherhost"))).thenReturn(conn4, conn5);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 10);
pool.setMaxPerRoute("somehost", 2);
@@ -376,8 +377,8 @@ public class TestConnPool {
Assert.assertFalse(t3.isDone());
Assert.assertFalse(t4.isDone());
- Mockito.verify(connFactory, Mockito.times(2)).create(Mockito.eq("somehost"));
- Mockito.verify(connFactory, Mockito.never()).create(Mockito.eq("otherhost"));
+ Mockito.verify(connFactory, Mockito.times(2)).create(Matchers.eq("somehost"));
+ Mockito.verify(connFactory, Mockito.never()).create(Matchers.eq("otherhost"));
PoolStats totals = pool.getTotalStats();
Assert.assertEquals(0, totals.getAvailable());
@@ -395,8 +396,8 @@ public class TestConnPool {
final LocalPoolEntry entry4 = t4.getEntry();
Assert.assertNotNull(entry4);
- Mockito.verify(connFactory, Mockito.times(2)).create(Mockito.eq("somehost"));
- Mockito.verify(connFactory, Mockito.times(2)).create(Mockito.eq("otherhost"));
+ Mockito.verify(connFactory, Mockito.times(2)).create(Matchers.eq("somehost"));
+ Mockito.verify(connFactory, Mockito.times(2)).create(Matchers.eq("otherhost"));
totals = pool.getTotalStats();
Assert.assertEquals(0, totals.getAvailable());
@@ -421,8 +422,8 @@ public class TestConnPool {
final LocalPoolEntry entry6 = t6.getEntry();
Assert.assertNotNull(entry6);
- Mockito.verify(connFactory, Mockito.times(3)).create(Mockito.eq("somehost"));
- Mockito.verify(connFactory, Mockito.times(2)).create(Mockito.eq("otherhost"));
+ Mockito.verify(connFactory, Mockito.times(3)).create(Matchers.eq("somehost"));
+ Mockito.verify(connFactory, Mockito.times(2)).create(Matchers.eq("otherhost"));
totals = pool.getTotalStats();
Assert.assertEquals(0, totals.getAvailable());
@@ -446,7 +447,7 @@ public class TestConnPool {
Mockito.when(conn2.isOpen()).thenReturn(true);
final HttpConnection conn3 = Mockito.mock(HttpConnection.class);
Mockito.when(conn3.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1, conn2, conn3);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1, conn2, conn3);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 10);
pool.setMaxPerRoute("somehost", 2);
@@ -480,7 +481,7 @@ public class TestConnPool {
entry2.setState("some-stuff");
pool.release(entry2, true);
- Mockito.verify(connFactory, Mockito.times(2)).create(Mockito.eq("somehost"));
+ Mockito.verify(connFactory, Mockito.times(2)).create(Matchers.eq("somehost"));
final Future<LocalPoolEntry> future3 = pool.lease("somehost", "some-other-stuff");
final GetPoolEntryThread t3 = new GetPoolEntryThread(future3);
@@ -491,7 +492,7 @@ public class TestConnPool {
final LocalPoolEntry entry3 = t3.getEntry();
Assert.assertNotNull(entry3);
- Mockito.verify(connFactory, Mockito.times(3)).create(Mockito.eq("somehost"));
+ Mockito.verify(connFactory, Mockito.times(3)).create(Matchers.eq("somehost"));
Mockito.verify(conn1).close();
Mockito.verify(conn2, Mockito.never()).close();
@@ -508,7 +509,7 @@ public class TestConnPool {
final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
Mockito.when(conn1.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 2);
@@ -516,7 +517,7 @@ public class TestConnPool {
final LocalPoolEntry entry1 = future1.get(1, TimeUnit.SECONDS);
Assert.assertNotNull(entry1);
- Mockito.verify(connFactory, Mockito.times(1)).create(Mockito.eq("somehost"));
+ Mockito.verify(connFactory, Mockito.times(1)).create(Matchers.eq("somehost"));
entry1.updateExpiry(1, TimeUnit.MILLISECONDS);
pool.release(entry1, true);
@@ -527,7 +528,7 @@ public class TestConnPool {
final LocalPoolEntry entry2 = future2.get(1, TimeUnit.SECONDS);
Assert.assertNotNull(entry2);
- Mockito.verify(connFactory, Mockito.times(2)).create(Mockito.eq("somehost"));
+ Mockito.verify(connFactory, Mockito.times(2)).create(Matchers.eq("somehost"));
final PoolStats totals = pool.getTotalStats();
Assert.assertEquals(0, totals.getAvailable());
@@ -547,7 +548,7 @@ public class TestConnPool {
final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
Mockito.when(conn2.isOpen()).thenReturn(Boolean.TRUE);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1, conn2);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1, conn2);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 2);
@@ -585,7 +586,7 @@ public class TestConnPool {
final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
Mockito.when(conn1.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1);
final LocalConnPool pool = new LocalConnPool(connFactory, 1, 1);
@@ -632,7 +633,7 @@ public class TestConnPool {
final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
Mockito.when(conn1.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1);
final LocalConnPool pool = new LocalConnPool(connFactory, 1, 1);
@@ -671,7 +672,7 @@ public class TestConnPool {
final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
Mockito.when(conn2.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1, conn2);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1, conn2);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 2);
@@ -767,10 +768,10 @@ public class TestConnPool {
final HttpConnection conn1 = Mockito.mock(HttpConnection.class);
Mockito.when(conn1.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn1);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn1);
final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
Mockito.when(conn2.isOpen()).thenReturn(true);
- Mockito.when(connFactory.create(Mockito.eq("otherhost"))).thenReturn(conn2);
+ Mockito.when(connFactory.create(Matchers.eq("otherhost"))).thenReturn(conn2);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 2);
final Future<LocalPoolEntry> future1 = pool.lease("somehost", null);
@@ -810,7 +811,7 @@ public class TestConnPool {
Mockito.when(conn.isStale()).thenReturn(false);
final LocalConnFactory connFactory = Mockito.mock(LocalConnFactory.class);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 10);
pool.setValidateAfterInactivity(100);
@@ -838,7 +839,7 @@ public class TestConnPool {
Mockito.when(conn.isStale()).thenReturn(false);
final LocalConnFactory connFactory = Mockito.mock(LocalConnFactory.class);
- Mockito.when(connFactory.create(Mockito.eq("somehost"))).thenReturn(conn);
+ Mockito.when(connFactory.create(Matchers.eq("somehost"))).thenReturn(conn);
final LocalConnPool pool = new LocalConnPool(connFactory, 2, 10);
pool.setValidateAfterInactivity(5);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java b/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java
index 3e48c5e..7af708f 100644
--- a/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java
+++ b/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java
@@ -278,9 +278,7 @@ public class TestRouteSpecificPool {
@Test
public void testWaitingThreadQueuing() throws Exception {
final LocalRoutePool pool = new LocalRoutePool();
- @SuppressWarnings("unchecked")
final Future<LocalPoolEntry> future1 = Mockito.mock(Future.class);
- @SuppressWarnings("unchecked")
final Future<LocalPoolEntry> future2 = Mockito.mock(Future.class);
Assert.assertEquals(0, pool.getPendingCount());
@@ -308,7 +306,6 @@ public class TestRouteSpecificPool {
final HttpConnection conn2 = Mockito.mock(HttpConnection.class);
final LocalPoolEntry entry2 = pool.add(conn2);
- @SuppressWarnings("unchecked")
final Future<LocalPoolEntry> future1 = Mockito.mock(Future.class);
pool.queue(future1);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java b/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java
index 8370c2a..0b078c3 100644
--- a/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java
+++ b/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java
@@ -41,6 +41,7 @@ import org.apache.http.message.BasicHttpRequest;
import org.apache.http.message.BasicHttpResponse;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.Matchers;
import org.mockito.Mockito;
public class TestHttpRequestExecutor {
@@ -307,7 +308,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicHttpResponse(HttpVersion.HTTP_1_1, 100, "Continue"),
new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK"));
- Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(Boolean.TRUE);
+ Mockito.when(conn.isResponseAvailable(Matchers.anyInt())).thenReturn(Boolean.TRUE);
final HttpResponse response = executor.execute(request, conn, context);
Mockito.verify(conn).sendRequestHeader(request);
@@ -340,7 +341,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicHttpResponse(HttpVersion.HTTP_1_1, 402, "OK"));
- Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(Boolean.TRUE);
+ Mockito.when(conn.isResponseAvailable(Matchers.anyInt())).thenReturn(Boolean.TRUE);
final HttpResponse response = executor.execute(request, conn, context);
Mockito.verify(conn).sendRequestHeader(request);
@@ -371,7 +372,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicHttpResponse(HttpVersion.HTTP_1_1, 101, "OK"));
- Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(Boolean.TRUE);
+ Mockito.when(conn.isResponseAvailable(Matchers.anyInt())).thenReturn(Boolean.TRUE);
try {
executor.execute(request, conn, context);
@@ -399,7 +400,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK"));
- Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(Boolean.FALSE);
+ Mockito.when(conn.isResponseAvailable(Matchers.anyInt())).thenReturn(Boolean.FALSE);
final HttpResponse response = executor.execute(request, conn, context);
Mockito.verify(conn).sendRequestHeader(request);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/755ae030/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java b/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
index e436fe5..cd60179 100644
--- a/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
+++ b/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
@@ -47,6 +47,7 @@ import org.apache.http.message.BasicHttpRequest;
import org.apache.http.message.BasicHttpResponse;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.Matchers;
import org.mockito.Mockito;
public class TestHttpService {
@@ -542,7 +543,7 @@ public class TestHttpService {
Mockito.verify(requestHandler).handle(request, response, context);
Mockito.verify(conn).sendResponseHeader(response);
- Mockito.verify(conn, Mockito.never()).sendResponseEntity(Mockito.<HttpResponse>any());
+ Mockito.verify(conn, Mockito.never()).sendResponseEntity(Matchers.<HttpResponse>any());
Mockito.verify(conn).flush();
Mockito.verify(conn, Mockito.never()).close();
}
@@ -579,7 +580,7 @@ public class TestHttpService {
Mockito.verify(requestHandler).handle(request, response, context);
Mockito.verify(conn).sendResponseHeader(response);
- Mockito.verify(conn, Mockito.never()).sendResponseEntity(Mockito.<HttpResponse>any());
+ Mockito.verify(conn, Mockito.never()).sendResponseEntity(Matchers.<HttpResponse>any());
Mockito.verify(conn).flush();
Mockito.verify(conn, Mockito.never()).close();
}