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 17:10:41 UTC
svn commit: r1837433 - in /httpcomponents/httpasyncclient/branches/4.1.x:
httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/
httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/
httpasyncclient/src/main/java-dep...
Author: ggregory
Date: Sat Aug 4 17:10:41 2018
New Revision: 1837433
URL: http://svn.apache.org/viewvc?rev=1837433&view=rev
Log:
Access static methods and fields directly. Remove exceptions not thrown from private method signatures. Don't nest blocks unnecessarily. Remove unnecessary cast. Remove unnecessary semicolon. Remove @SuppressWarnings.
Modified:
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/AsyncScheme.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/localserver/AbstractAsyncTest.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java Sat Aug 4 17:10:41 2018
@@ -73,6 +73,7 @@ import org.apache.http.nio.protocol.Http
import org.apache.http.nio.reactor.IOReactorException;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpCoreContext;
import org.apache.http.util.Args;
import org.apache.http.util.EntityUtils;
import org.apache.http.util.VersionInfo;
@@ -365,10 +366,10 @@ public class CachingHttpAsyncClient impl
return;
}
clientContext.setAttribute(HttpClientContext.HTTP_ROUTE, new HttpRoute(target));
- clientContext.setAttribute(HttpClientContext.HTTP_TARGET_HOST, target);
- clientContext.setAttribute(HttpClientContext.HTTP_REQUEST, request);
- clientContext.setAttribute(HttpClientContext.HTTP_RESPONSE, out);
- clientContext.setAttribute(HttpClientContext.HTTP_REQ_SENT, Boolean.TRUE);
+ clientContext.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, target);
+ clientContext.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
+ clientContext.setAttribute(HttpCoreContext.HTTP_RESPONSE, out);
+ clientContext.setAttribute(HttpCoreContext.HTTP_REQ_SENT, Boolean.TRUE);
future.completed(out);
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java Sat Aug 4 17:10:41 2018
@@ -687,11 +687,9 @@ class DefaultAsyncRequestDirector<T> imp
}
private RequestWrapper wrapRequest(final HttpRequest request) throws ProtocolException {
- if (request instanceof HttpEntityEnclosingRequest) {
- return new EntityEnclosingRequestWrapper((HttpEntityEnclosingRequest) request);
- } else {
- return new RequestWrapper(request);
- }
+ return request instanceof HttpEntityEnclosingRequest
+ ? new EntityEnclosingRequestWrapper((HttpEntityEnclosingRequest) request)
+ : new RequestWrapper(request);
}
protected void rewriteRequestURI(
@@ -772,7 +770,7 @@ class DefaultAsyncRequestDirector<T> imp
return null;
}
- private RoutedRequest handleConnectResponse() throws HttpException {
+ private RoutedRequest handleConnectResponse() {
RoutedRequest followup = null;
if (HttpClientParams.isAuthenticating(this.params)) {
final CredentialsProvider credsProvider = (CredentialsProvider) this.localContext.getAttribute(
@@ -841,7 +839,7 @@ class DefaultAsyncRequestDirector<T> imp
}
private RoutedRequest handleTargetChallenge(
- final CredentialsProvider credsProvider) throws HttpException {
+ final CredentialsProvider credsProvider) {
final HttpRoute route = this.mainRequest.getRoute();
HttpHost target = (HttpHost) this.localContext.getAttribute(
ExecutionContext.HTTP_TARGET_HOST);
@@ -854,15 +852,14 @@ class DefaultAsyncRequestDirector<T> imp
this.targetAuthStrategy, this.targetAuthState, this.localContext)) {
// Re-try the same request via the same route
return this.mainRequest;
- } else {
- return null;
}
+ return null;
}
return null;
}
private RoutedRequest handleProxyChallenge(
- final CredentialsProvider credsProvider) throws HttpException {
+ final CredentialsProvider credsProvider) {
final HttpRoute route = this.mainRequest.getRoute();
final HttpHost proxy = route.getProxyHost();
if (this.authenticator.isAuthenticationRequested(proxy, this.currentResponse,
@@ -871,9 +868,8 @@ class DefaultAsyncRequestDirector<T> imp
this.proxyAuthStrategy, this.proxyAuthState, this.localContext)) {
// Re-try the same request via the same route
return this.mainRequest;
- } else {
- return null;
}
+ return null;
}
return null;
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java Sat Aug 4 17:10:41 2018
@@ -134,11 +134,7 @@ class ManagedClientAsyncConnectionImpl i
@Override
public boolean isOpen() {
final ClientAsyncConnection conn = getConnection();
- if (conn != null) {
- return conn.isOpen();
- } else {
- return false;
- }
+ return conn != null ? conn.isOpen() : false;
}
@Override
@@ -276,11 +272,9 @@ class ManagedClientAsyncConnectionImpl i
public SSLSession getSSLSession() {
final ClientAsyncConnection conn = ensureConnection();
final IOSession iosession = conn.getIOSession();
- if (iosession instanceof SSLIOSession) {
- return ((SSLIOSession) iosession).getSSLSession();
- } else {
- return null;
- }
+ return iosession instanceof SSLIOSession
+ ? ((SSLIOSession) iosession).getSSLSession()
+ : null;
}
@Override
@@ -413,7 +407,7 @@ class ManagedClientAsyncConnectionImpl i
final IOSession iosession = entry.getConnection();
final ClientAsyncConnection conn = (ClientAsyncConnection) iosession.getAttribute(
IOEventDispatch.CONNECTION_KEY);
- conn.upgrade((SSLIOSession) layeringStrategy.layer(iosession));
+ conn.upgrade(layeringStrategy.layer(iosession));
tracker.layerProtocol(layeringStrategy.isSecure());
}
@@ -445,11 +439,7 @@ class ManagedClientAsyncConnectionImpl i
@Override
public synchronized String toString() {
- if (this.poolEntry != null) {
- return this.poolEntry.toString();
- } else {
- return "released";
- }
+ return this.poolEntry != null ? this.poolEntry.toString() : "released";
}
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/AsyncScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/AsyncScheme.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/AsyncScheme.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/AsyncScheme.java Sat Aug 4 17:10:41 2018
@@ -99,9 +99,8 @@ public final class AsyncScheme {
return this.name.equals(that.name)
&& this.defaultPort == that.defaultPort
&& this.strategy.equals(that.strategy);
- } else {
- return false;
}
+ return false;
}
@Override
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalHttpAsyncClient.java Sat Aug 4 17:10:41 2018
@@ -126,7 +126,6 @@ class InternalHttpAsyncClient extends Cl
context != null ? context : new BasicHttpContext());
setupContext(localcontext);
- @SuppressWarnings("resource")
final DefaultClientExchangeHandlerImpl<T> handler = new DefaultClientExchangeHandlerImpl<T>(
this.log,
requestProducer,
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java Sat Aug 4 17:10:41 2018
@@ -286,7 +286,7 @@ class MainClientExec implements Internal
this.log.debug("[exchange: " + state.getId() + "] Response received " + response.getStatusLine());
}
final HttpClientContext context = state.getLocalContext();
- context.setAttribute(HttpClientContext.HTTP_RESPONSE, response);
+ context.setAttribute(HttpCoreContext.HTTP_RESPONSE, response);
this.httpProcessor.process(response, context);
handler.setCurrentResponse(response);
@@ -514,8 +514,8 @@ class MainClientExec implements Internal
}
}
- localContext.setAttribute(HttpClientContext.HTTP_REQUEST, currentRequest);
- localContext.setAttribute(HttpClientContext.HTTP_TARGET_HOST, target);
+ localContext.setAttribute(HttpCoreContext.HTTP_REQUEST, currentRequest);
+ localContext.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, target);
localContext.setAttribute(HttpClientContext.HTTP_ROUTE, route);
this.httpProcessor.process(currentRequest, localContext);
}
@@ -540,7 +540,7 @@ class MainClientExec implements Internal
private boolean handleConnectResponse(
final InternalState state,
- final AbstractClientExchangeHandler handler) throws HttpException {
+ final AbstractClientExchangeHandler handler) {
final HttpClientContext localContext = state.getLocalContext();
final RequestConfig config = localContext.getRequestConfig();
if (config.isAuthenticationEnabled()) {
@@ -599,7 +599,7 @@ class MainClientExec implements Internal
private boolean needAuthentication(
final InternalState state,
- final AbstractClientExchangeHandler handler) throws HttpException {
+ final AbstractClientExchangeHandler handler) {
final HttpClientContext localContext = state.getLocalContext();
final CredentialsProvider credsProvider = localContext.getCredentialsProvider();
if (credsProvider != null) {
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java Sat Aug 4 17:10:41 2018
@@ -143,8 +143,8 @@ class MinimalClientExchangeHandlerImpl<T
setCurrentRequest(request);
setRoute(route);
- this.localContext.setAttribute(HttpClientContext.HTTP_REQUEST, request);
- this.localContext.setAttribute(HttpClientContext.HTTP_TARGET_HOST, target);
+ this.localContext.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
+ this.localContext.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, target);
this.localContext.setAttribute(HttpClientContext.HTTP_ROUTE, route);
this.httpProcessor.process(request, this.localContext);
@@ -195,7 +195,7 @@ class MinimalClientExchangeHandlerImpl<T
if (this.log.isDebugEnabled()) {
this.log.debug("[exchange: " + getId() + "] Response received " + response.getStatusLine());
}
- this.localContext.setAttribute(HttpClientContext.HTTP_RESPONSE, response);
+ this.localContext.setAttribute(HttpCoreContext.HTTP_RESPONSE, response);
this.httpProcessor.process(response, this.localContext);
setCurrentResponse(response);
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClient.java Sat Aug 4 17:10:41 2018
@@ -95,7 +95,6 @@ class MinimalHttpAsyncClient extends Clo
final HttpClientContext localcontext = HttpClientContext.adapt(
context != null ? context : new BasicHttpContext());
- @SuppressWarnings("resource")
final MinimalClientExchangeHandlerImpl<T> handler = new MinimalClientExchangeHandlerImpl<T>(
this.log,
requestProducer,
@@ -125,7 +124,6 @@ class MinimalHttpAsyncClient extends Clo
final BasicFuture<List<T>> future = new BasicFuture<List<T>>(callback);
final HttpClientContext localcontext = HttpClientContext.adapt(
context != null ? context : new BasicHttpContext());
- @SuppressWarnings("resource")
final PipeliningClientExchangeHandlerImpl<T> handler = new PipeliningClientExchangeHandlerImpl<T>(
this.log,
target,
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java Sat Aug 4 17:10:41 2018
@@ -174,7 +174,7 @@ class PipeliningClientExchangeHandlerImp
final HttpRoute route = new HttpRoute(this.target);
setRoute(route);
- this.localContext.setAttribute(HttpClientContext.HTTP_TARGET_HOST, this.target);
+ this.localContext.setAttribute(HttpCoreContext.HTTP_TARGET_HOST, this.target);
this.localContext.setAttribute(HttpClientContext.HTTP_ROUTE, route);
requestConnection();
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java Sat Aug 4 17:10:41 2018
@@ -152,21 +152,13 @@ class CPoolProxy implements ManagedNHttp
@Override
public boolean isOpen() {
final CPoolEntry local = this.poolEntry;
- if (local != null) {
- return !local.isClosed();
- } else {
- return false;
- }
+ return local != null ? !local.isClosed() : false;
}
@Override
public boolean isStale() {
final NHttpClientConnection conn = getConnection();
- if (conn != null) {
- return !conn.isOpen();
- } else {
- return false;
- }
+ return conn != null ? !conn.isOpen() : false;
}
@Override
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java Sat Aug 4 17:10:41 2018
@@ -107,11 +107,9 @@ class ManagedNHttpClientConnectionImpl
@Override
public SSLSession getSSLSession() {
- if (this.original instanceof SSLIOSession) {
- return ((SSLIOSession) this.original).getSSLSession();
- } else {
- return null;
- }
+ return this.original instanceof SSLIOSession
+ ? ((SSLIOSession) this.original).getSSLSession()
+ : null;
}
@Override
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java Sat Aug 4 17:10:41 2018
@@ -61,6 +61,7 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
+import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
@@ -131,11 +132,11 @@ public class TestPoolingHttpClientAsyncC
Assert.assertNotNull(future);
Mockito.verify(pool).lease(
- Mockito.same(route),
- Mockito.eq("some state"),
- Mockito.eq(1000L),
- Mockito.eq(2000L),
- Mockito.eq(TimeUnit.MILLISECONDS),
+ Matchers.same(route),
+ Matchers.eq("some state"),
+ Matchers.eq(1000L),
+ Matchers.eq(2000L),
+ Matchers.eq(TimeUnit.MILLISECONDS),
poolEntryCallbackCaptor.capture());
final FutureCallback<CPoolEntry> callaback = poolEntryCallbackCaptor.getValue();
final Log log = Mockito.mock(Log.class);
@@ -145,7 +146,7 @@ public class TestPoolingHttpClientAsyncC
Assert.assertTrue(future.isDone());
final NHttpClientConnection managedConn = future.get();
- Mockito.verify(connCallback).completed(Mockito.<NHttpClientConnection>any());
+ Mockito.verify(connCallback).completed(Matchers.<NHttpClientConnection>any());
Mockito.when(conn.isOpen()).thenReturn(Boolean.TRUE);
connman.releaseConnection(managedConn, "new state", 5, TimeUnit.SECONDS);
@@ -167,11 +168,11 @@ public class TestPoolingHttpClientAsyncC
Assert.assertNotNull(future);
Mockito.verify(pool).lease(
- Mockito.same(route),
- Mockito.eq("some state"),
- Mockito.eq(1000L),
- Mockito.eq(2000L),
- Mockito.eq(TimeUnit.MILLISECONDS),
+ Matchers.same(route),
+ Matchers.eq("some state"),
+ Matchers.eq(1000L),
+ Matchers.eq(2000L),
+ Matchers.eq(TimeUnit.MILLISECONDS),
poolEntryCallbackCaptor.capture());
final FutureCallback<CPoolEntry> callaback = poolEntryCallbackCaptor.getValue();
final Log log = Mockito.mock(Log.class);
@@ -180,7 +181,7 @@ public class TestPoolingHttpClientAsyncC
Assert.assertTrue(future.isDone());
final NHttpClientConnection managedConn = future.get();
- Mockito.verify(connCallback).completed(Mockito.<NHttpClientConnection>any());
+ Mockito.verify(connCallback).completed(Matchers.<NHttpClientConnection>any());
Mockito.when(conn.isOpen()).thenReturn(Boolean.TRUE);
connman.releaseConnection(managedConn, "new state", 5, TimeUnit.SECONDS);
@@ -198,11 +199,11 @@ public class TestPoolingHttpClientAsyncC
future.cancel(true);
Mockito.verify(pool).lease(
- Mockito.same(route),
- Mockito.eq("some state"),
- Mockito.eq(1000L),
- Mockito.eq(2000L),
- Mockito.eq(TimeUnit.MILLISECONDS),
+ Matchers.same(route),
+ Matchers.eq("some state"),
+ Matchers.eq(1000L),
+ Matchers.eq(2000L),
+ Matchers.eq(TimeUnit.MILLISECONDS),
poolEntryCallbackCaptor.capture());
final FutureCallback<CPoolEntry> callaback = poolEntryCallbackCaptor.getValue();
final Log log = Mockito.mock(Log.class);
@@ -222,11 +223,11 @@ public class TestPoolingHttpClientAsyncC
Assert.assertNotNull(future);
Mockito.verify(pool).lease(
- Mockito.same(route),
- Mockito.eq("some state"),
- Mockito.eq(1000L),
- Mockito.eq(2000L),
- Mockito.eq(TimeUnit.MILLISECONDS),
+ Matchers.same(route),
+ Matchers.eq("some state"),
+ Matchers.eq(1000L),
+ Matchers.eq(2000L),
+ Matchers.eq(TimeUnit.MILLISECONDS),
poolEntryCallbackCaptor.capture());
final FutureCallback<CPoolEntry> callaback = poolEntryCallbackCaptor.getValue();
callaback.failed(new Exception());
@@ -244,11 +245,11 @@ public class TestPoolingHttpClientAsyncC
Assert.assertNotNull(future);
Mockito.verify(pool).lease(
- Mockito.same(route),
- Mockito.eq("some state"),
- Mockito.eq(1000L),
- Mockito.eq(2000L),
- Mockito.eq(TimeUnit.MILLISECONDS),
+ Matchers.same(route),
+ Matchers.eq("some state"),
+ Matchers.eq(1000L),
+ Matchers.eq(2000L),
+ Matchers.eq(TimeUnit.MILLISECONDS),
poolEntryCallbackCaptor.capture());
final FutureCallback<CPoolEntry> callaback = poolEntryCallbackCaptor.getValue();
callaback.cancelled();
@@ -459,9 +460,9 @@ public class TestPoolingHttpClientAsyncC
final HttpRoute route = new HttpRoute(new HttpHost("somehost", 80));
internalConnFactory.create(route, iosession);
- Mockito.verify(sslStrategy, Mockito.never()).upgrade(Mockito.eq(new HttpHost("somehost", 80)),
- Mockito.<IOSession>any());
- Mockito.verify(connFactory).create(Mockito.same(iosession), Mockito.<ConnectionConfig>any());
+ Mockito.verify(sslStrategy, Mockito.never()).upgrade(Matchers.eq(new HttpHost("somehost", 80)),
+ Matchers.<IOSession>any());
+ Mockito.verify(connFactory).create(Matchers.same(iosession), Matchers.<ConnectionConfig>any());
}
@Test
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/localserver/AbstractAsyncTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/localserver/AbstractAsyncTest.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/localserver/AbstractAsyncTest.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/localserver/AbstractAsyncTest.java Sat Aug 4 17:10:41 2018
@@ -55,7 +55,7 @@ import org.junit.Before;
public abstract class AbstractAsyncTest {
- public enum ProtocolScheme { http, https };
+ public enum ProtocolScheme { http, https }
protected final ProtocolScheme scheme;
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java?rev=1837433&r1=1837432&r2=1837433&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java Sat Aug 4 17:10:41 2018
@@ -48,6 +48,7 @@ import org.apache.http.protocol.HttpCont
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Matchers;
import org.mockito.Mockito;
public class TestAsyncConsumers extends HttpAsyncTestBase {
@@ -206,7 +207,7 @@ public class TestAsyncConsumers extends
final Future<String> future = this.httpclient.execute(httppost, consumer, null);
final String result = future.get();
Assert.assertEquals(s, result);
- Mockito.verify(consumer).buildResult(Mockito.any(HttpContext.class));
+ Mockito.verify(consumer).buildResult(Matchers.any(HttpContext.class));
Mockito.verify(consumer).releaseResources();
}
@@ -218,7 +219,7 @@ public class TestAsyncConsumers extends
ContentType.create("text/plain", Consts.ASCII));
final AsyncCharConsumer<String> consumer = Mockito.spy(new BufferingCharConsumer());
Mockito.doThrow(new IOException("Kaboom")).when(consumer).onCharReceived(
- Mockito.any(CharBuffer.class), Mockito.any(IOControl.class));
+ Matchers.any(CharBuffer.class), Matchers.any(IOControl.class));
final Future<String> future = this.httpclient.execute(httppost, consumer, null);
try {
@@ -240,7 +241,7 @@ public class TestAsyncConsumers extends
target.toURI() + "/echo/stuff", "stuff",
ContentType.create("text/plain", Consts.ASCII));
final BufferingCharConsumer consumer = Mockito.spy(new BufferingCharConsumer());
- Mockito.doThrow(new HttpException("Kaboom")).when(consumer).buildResult(Mockito.any(HttpContext.class));
+ Mockito.doThrow(new HttpException("Kaboom")).when(consumer).buildResult(Matchers.any(HttpContext.class));
final Future<String> future = this.httpclient.execute(httppost, consumer, null);
try {