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 2017/03/26 02:43:05 UTC
svn commit: r1788709 [2/5] - in /httpcomponents:
httpclient/trunk/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/
httpclient/trunk/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/
httpclient/trunk/httpclient5-o...
Modified: httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithRequestFuture.java Sun Mar 26 02:43:03 2017
@@ -47,61 +47,61 @@ import org.apache.hc.core5.http.io.Respo
public class ClientWithRequestFuture {
- public static void main(String[] args) throws Exception {
+ public static void main(final String[] args) throws Exception {
// the simplest way to create a HttpAsyncClientWithFuture
- HttpClientConnectionManager cm = PoolingHttpClientConnectionManagerBuilder.create()
+ final HttpClientConnectionManager cm = PoolingHttpClientConnectionManagerBuilder.create()
.setMaxConnPerRoute(5)
.setMaxConnTotal(5)
.build();
- CloseableHttpClient httpclient = HttpClientBuilder.create()
+ final CloseableHttpClient httpclient = HttpClientBuilder.create()
.setConnectionManager(cm)
.build();
- ExecutorService execService = Executors.newFixedThreadPool(5);
+ final ExecutorService execService = Executors.newFixedThreadPool(5);
try (FutureRequestExecutionService requestExecService = new FutureRequestExecutionService(
httpclient, execService)) {
// Because things are asynchronous, you must provide a ResponseHandler
- ResponseHandler<Boolean> handler = new ResponseHandler<Boolean>() {
+ final ResponseHandler<Boolean> handler = new ResponseHandler<Boolean>() {
@Override
- public Boolean handleResponse(ClassicHttpResponse response) throws IOException {
+ public Boolean handleResponse(final ClassicHttpResponse response) throws IOException {
// simply return true if the status was OK
return response.getCode() == HttpStatus.SC_OK;
}
};
// Simple request ...
- HttpGet request1 = new HttpGet("http://httpbin.org/get");
- HttpRequestFutureTask<Boolean> futureTask1 = requestExecService.execute(request1,
+ final HttpGet request1 = new HttpGet("http://httpbin.org/get");
+ final HttpRequestFutureTask<Boolean> futureTask1 = requestExecService.execute(request1,
HttpClientContext.create(), handler);
- Boolean wasItOk1 = futureTask1.get();
+ final Boolean wasItOk1 = futureTask1.get();
System.out.println("It was ok? " + wasItOk1);
// Cancel a request
try {
- HttpGet request2 = new HttpGet("http://httpbin.org/get");
- HttpRequestFutureTask<Boolean> futureTask2 = requestExecService.execute(request2,
+ final HttpGet request2 = new HttpGet("http://httpbin.org/get");
+ final HttpRequestFutureTask<Boolean> futureTask2 = requestExecService.execute(request2,
HttpClientContext.create(), handler);
futureTask2.cancel(true);
- Boolean wasItOk2 = futureTask2.get();
+ final Boolean wasItOk2 = futureTask2.get();
System.out.println("It was cancelled so it should never print this: " + wasItOk2);
- } catch (CancellationException e) {
+ } catch (final CancellationException e) {
System.out.println("We cancelled it, so this is expected");
}
// Request with a timeout
- HttpGet request3 = new HttpGet("http://httpbin.org/get");
- HttpRequestFutureTask<Boolean> futureTask3 = requestExecService.execute(request3,
+ final HttpGet request3 = new HttpGet("http://httpbin.org/get");
+ final HttpRequestFutureTask<Boolean> futureTask3 = requestExecService.execute(request3,
HttpClientContext.create(), handler);
- Boolean wasItOk3 = futureTask3.get(10, TimeUnit.SECONDS);
+ final Boolean wasItOk3 = futureTask3.get(10, TimeUnit.SECONDS);
System.out.println("It was ok? " + wasItOk3);
- FutureCallback<Boolean> callback = new FutureCallback<Boolean>() {
+ final FutureCallback<Boolean> callback = new FutureCallback<Boolean>() {
@Override
- public void completed(Boolean result) {
+ public void completed(final Boolean result) {
System.out.println("completed with " + result);
}
@Override
- public void failed(Exception ex) {
+ public void failed(final Exception ex) {
System.out.println("failed with " + ex.getMessage());
}
@@ -112,12 +112,12 @@ public class ClientWithRequestFuture {
};
// Simple request with a callback
- HttpGet request4 = new HttpGet("http://httpbin.org/get");
+ final HttpGet request4 = new HttpGet("http://httpbin.org/get");
// using a null HttpContext here since it is optional
// the callback will be called when the task completes, fails, or is cancelled
- HttpRequestFutureTask<Boolean> futureTask4 = requestExecService.execute(request4,
+ final HttpRequestFutureTask<Boolean> futureTask4 = requestExecService.execute(request4,
HttpClientContext.create(), handler, callback);
- Boolean wasItOk4 = futureTask4.get(10, TimeUnit.SECONDS);
+ final Boolean wasItOk4 = futureTask4.get(10, TimeUnit.SECONDS);
System.out.println("It was ok? " + wasItOk4);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientWithResponseHandler.java Sun Mar 26 02:43:03 2017
@@ -46,24 +46,24 @@ import org.apache.hc.core5.http.io.entit
*/
public class ClientWithResponseHandler {
- public final static void main(String[] args) throws Exception {
+ public final static void main(final String[] args) throws Exception {
try (CloseableHttpClient httpclient = HttpClients.createDefault()) {
- HttpGet httpget = new HttpGet("http://httpbin.org/get");
+ final HttpGet httpget = new HttpGet("http://httpbin.org/get");
System.out.println("Executing request " + httpget.getMethod() + " " + httpget.getUri());
// Create a custom response handler
- ResponseHandler<String> responseHandler = new ResponseHandler<String>() {
+ final ResponseHandler<String> responseHandler = new ResponseHandler<String>() {
@Override
public String handleResponse(
final ClassicHttpResponse response) throws IOException {
- int status = response.getCode();
+ final int status = response.getCode();
if (status >= HttpStatus.SC_SUCCESS && status < HttpStatus.SC_REDIRECTION) {
- HttpEntity entity = response.getEntity();
+ final HttpEntity entity = response.getEntity();
try {
return entity != null ? EntityUtils.toString(entity) : null;
- } catch (ParseException ex) {
+ } catch (final ParseException ex) {
throw new ClientProtocolException(ex);
}
} else {
@@ -72,7 +72,7 @@ public class ClientWithResponseHandler {
}
};
- String responseBody = httpclient.execute(httpget, responseHandler);
+ final String responseBody = httpclient.execute(httpget, responseHandler);
System.out.println("----------------------------------------");
System.out.println(responseBody);
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ProxyTunnelDemo.java Sun Mar 26 02:43:03 2017
@@ -43,21 +43,21 @@ import org.apache.hc.core5.http.HttpHost
*/
public class ProxyTunnelDemo {
- public final static void main(String[] args) throws Exception {
+ public final static void main(final String[] args) throws Exception {
- ProxyClient proxyClient = new ProxyClient();
- HttpHost target = new HttpHost("www.yahoo.com", 80);
- HttpHost proxy = new HttpHost("localhost", 8888);
- UsernamePasswordCredentials credentials = new UsernamePasswordCredentials("user", "pwd".toCharArray());
+ final ProxyClient proxyClient = new ProxyClient();
+ final HttpHost target = new HttpHost("www.yahoo.com", 80);
+ final HttpHost proxy = new HttpHost("localhost", 8888);
+ final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials("user", "pwd".toCharArray());
try (Socket socket = proxyClient.tunnel(proxy, target, credentials)) {
- Writer out = new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.ISO_8859_1);
+ final Writer out = new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.ISO_8859_1);
out.write("GET / HTTP/1.1\r\n");
out.write("Host: " + target.toHostString() + "\r\n");
out.write("Agent: whatever\r\n");
out.write("Connection: close\r\n");
out.write("\r\n");
out.flush();
- BufferedReader in = new BufferedReader(
+ final BufferedReader in = new BufferedReader(
new InputStreamReader(socket.getInputStream(), StandardCharsets.ISO_8859_1));
String line = null;
while ((line = in.readLine()) != null) {
Modified: httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/QuickStart.java Sun Mar 26 02:43:03 2017
@@ -42,9 +42,9 @@ import org.apache.hc.core5.http.message.
public class QuickStart {
- public static void main(String[] args) throws Exception {
+ public static void main(final String[] args) throws Exception {
try (CloseableHttpClient httpclient = HttpClients.createDefault()) {
- HttpGet httpGet = new HttpGet("http://httpbin.org/get");
+ final HttpGet httpGet = new HttpGet("http://httpbin.org/get");
// The underlying HTTP connection is still held by the response object
// to allow the response content to be streamed directly from the network socket.
// In order to ensure correct deallocation of system resources
@@ -54,21 +54,21 @@ public class QuickStart {
// by the connection manager.
try (CloseableHttpResponse response1 = httpclient.execute(httpGet)) {
System.out.println(response1.getCode() + " " + response1.getReasonPhrase());
- HttpEntity entity1 = response1.getEntity();
+ final HttpEntity entity1 = response1.getEntity();
// do something useful with the response body
// and ensure it is fully consumed
EntityUtils.consume(entity1);
}
- HttpPost httpPost = new HttpPost("http://httpbin.org/post");
- List<NameValuePair> nvps = new ArrayList<>();
+ final HttpPost httpPost = new HttpPost("http://httpbin.org/post");
+ final List<NameValuePair> nvps = new ArrayList<>();
nvps.add(new BasicNameValuePair("username", "vip"));
nvps.add(new BasicNameValuePair("password", "secret"));
httpPost.setEntity(new UrlEncodedFormEntity(nvps));
try (CloseableHttpResponse response2 = httpclient.execute(httpPost)) {
System.out.println(response2.getCode() + " " + response2.getReasonPhrase());
- HttpEntity entity2 = response2.getEntity();
+ final HttpEntity entity2 = response2.getEntity();
// do something useful with the response body
// and ensure it is fully consumed
EntityUtils.consume(entity2);
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractAsyncResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractAsyncResponseConsumer.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractAsyncResponseConsumer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractAsyncResponseConsumer.java Sun Mar 26 02:43:03 2017
@@ -67,7 +67,7 @@ public abstract class AbstractAsyncRespo
try {
contentType = ContentType.parse(entityDetails.getContentType());
resultCallback.completed(buildResult(response, result, contentType));
- } catch (UnsupportedCharsetException ex) {
+ } catch (final UnsupportedCharsetException ex) {
resultCallback.failed(ex);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractBinPushConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractBinPushConsumer.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractBinPushConsumer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractBinPushConsumer.java Sun Mar 26 02:43:03 2017
@@ -50,7 +50,7 @@ public abstract class AbstractBinPushCon
final ContentType contentType;
try {
contentType = ContentType.parse(entityDetails.getContentType());
- } catch (UnsupportedCharsetException ex) {
+ } catch (final UnsupportedCharsetException ex) {
throw new UnsupportedEncodingException(ex.getMessage());
}
start(promise, response, contentType);
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractBinResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractBinResponseConsumer.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractBinResponseConsumer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractBinResponseConsumer.java Sun Mar 26 02:43:03 2017
@@ -55,7 +55,7 @@ public abstract class AbstractBinRespons
try {
final ContentType contentType = ContentType.parse(entityDetails.getContentType());
start(response, contentType);
- } catch (UnsupportedCharsetException ex) {
+ } catch (final UnsupportedCharsetException ex) {
throw new UnsupportedEncodingException(ex.getMessage());
}
} else {
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharPushConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharPushConsumer.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharPushConsumer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharPushConsumer.java Sun Mar 26 02:43:03 2017
@@ -52,7 +52,7 @@ public abstract class AbstractCharPushCo
final ContentType contentType;
try {
contentType = ContentType.parse(entityDetails.getContentType());
- } catch (UnsupportedCharsetException ex) {
+ } catch (final UnsupportedCharsetException ex) {
throw new UnsupportedEncodingException(ex.getMessage());
}
Charset charset = contentType != null ? contentType.getCharset() : null;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharResponseConsumer.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharResponseConsumer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AbstractCharResponseConsumer.java Sun Mar 26 02:43:03 2017
@@ -57,7 +57,7 @@ public abstract class AbstractCharRespon
final ContentType contentType;
try {
contentType = ContentType.parse(entityDetails.getContentType());
- } catch (UnsupportedCharsetException ex) {
+ } catch (final UnsupportedCharsetException ex) {
throw new UnsupportedEncodingException(ex.getMessage());
}
Charset charset = contentType != null ? contentType.getCharset() : null;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java Sun Mar 26 02:43:03 2017
@@ -101,7 +101,7 @@ abstract class AbstractHttpAsyncClientBa
public void run() {
try {
ioReactor.execute();
- } catch (Exception ex) {
+ } catch (final Exception ex) {
exceptionListener.onError(ex);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/DefaultAsyncHttp2ClientEventHandlerFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/DefaultAsyncHttp2ClientEventHandlerFactory.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/DefaultAsyncHttp2ClientEventHandlerFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/DefaultAsyncHttp2ClientEventHandlerFactory.java Sun Mar 26 02:43:03 2017
@@ -133,7 +133,7 @@ public class DefaultAsyncHttp2ClientEven
final LogAppendable logAppendable = new LogAppendable(frameLog, prefix);
framePrinter.printFrameInfo(frame, logAppendable);
logAppendable.flush();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
}
}
@@ -142,7 +142,7 @@ public class DefaultAsyncHttp2ClientEven
final LogAppendable logAppendable = new LogAppendable(framePayloadLog, prefix);
framePrinter.printPayload(frame, logAppendable);
logAppendable.flush();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java Sun Mar 26 02:43:03 2017
@@ -576,7 +576,7 @@ public class HttpAsyncClientBuilder {
userTokenHandlerCopy,
defaultRequestConfig,
closeablesCopy);
- } catch (IOReactorException ex) {
+ } catch (final IOReactorException ex) {
throw new IllegalStateException(ex.getMessage(), ex);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java Sun Mar 26 02:43:03 2017
@@ -131,7 +131,7 @@ public class HttpAsyncClients {
new DefaultThreadFactory("httpclient-main", true),
new DefaultThreadFactory("httpclient-dispatch", true),
connmgr);
- } catch (IOReactorException ex) {
+ } catch (final IOReactorException ex) {
throw new IllegalStateException(ex.getMessage(), ex);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncClient.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncClient.java Sun Mar 26 02:43:03 2017
@@ -201,7 +201,7 @@ class InternalHttpAsyncClient extends Ab
}
});
- } catch (HttpException ex) {
+ } catch (final HttpException ex) {
future.failed(ex);
}
return future;
@@ -265,7 +265,7 @@ class InternalHttpAsyncClient extends Ab
}
});
- } catch (HttpException ex) {
+ } catch (final HttpException ex) {
future.failed(ex);
}
return future;
@@ -419,7 +419,7 @@ class InternalHttpAsyncClient extends Ab
private void closeEndpoint() {
try {
connectionEndpoint.close();
- } catch (IOException ex) {
+ } catch (final IOException ex) {
log.debug("I/O error closing connection endpoint: " + ex.getMessage(), ex);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java Sun Mar 26 02:43:03 2017
@@ -265,7 +265,7 @@ class MinimalHttpAsyncClient extends Abs
if (released.compareAndSet(false, true)) {
try {
connectionEndpoint.close();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
}
connmgr.release(connectionEndpoint, null, -1L, TimeUnit.MILLISECONDS);
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicScheme.java Sun Mar 26 02:43:03 2017
@@ -184,7 +184,7 @@ public class BasicScheme implements Auth
in.defaultReadObject();
try {
this.charset = Charset.forName(in.readUTF());
- } catch (UnsupportedCharsetException ex) {
+ } catch (final UnsupportedCharsetException ex) {
this.charset = StandardCharsets.US_ASCII;
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java Sun Mar 26 02:43:03 2017
@@ -209,7 +209,7 @@ public class CredSspScheme implements Au
sslContext.init( null, new TrustManager[]
{ tm }, null );
}
- catch ( KeyManagementException e )
+ catch ( final KeyManagementException e )
{
throw new RuntimeException( "SSL Context initialization error: " + e.getMessage(), e );
}
@@ -409,11 +409,11 @@ public class CredSspScheme implements Au
{
peerCertificates = sslEngine.getSession().getPeerCertificates();
}
- catch ( SSLPeerUnverifiedException e )
+ catch ( final SSLPeerUnverifiedException e )
{
throw new AuthenticationException( e.getMessage(), e );
}
- for ( Certificate peerCertificate : peerCertificates )
+ for ( final Certificate peerCertificate : peerCertificates )
{
if ( !( peerCertificate instanceof X509Certificate ) )
{
@@ -535,7 +535,7 @@ public class CredSspScheme implements Au
{
return ntlmOutgoingHandle.signAndEncryptMessage( authInfo );
}
- catch ( NTLMEngineException e )
+ catch ( final NTLMEngineException e )
{
throw new AuthenticationException( e.getMessage(), e );
}
@@ -607,7 +607,7 @@ public class CredSspScheme implements Au
buf.get( subjectPublicKey );
return subjectPublicKey;
}
- catch ( MalformedChallengeException e )
+ catch ( final MalformedChallengeException e )
{
throw new AuthenticationException( e.getMessage(), e );
}
@@ -620,7 +620,7 @@ public class CredSspScheme implements Au
{
getSSLEngine().beginHandshake();
}
- catch ( SSLException e )
+ catch ( final SSLException e )
{
throw new AuthenticationException( "SSL Engine error: " + e.getMessage(), e );
}
@@ -675,7 +675,7 @@ public class CredSspScheme implements Au
throw new AuthenticationException( "SSL Engine error status: " + engineResult.getStatus() );
}
}
- catch ( SSLException e )
+ catch ( final SSLException e )
{
throw new AuthenticationException( "SSL Engine wrap error: " + e.getMessage(), e );
}
@@ -725,7 +725,7 @@ public class CredSspScheme implements Au
}
}
- catch ( SSLException e )
+ catch ( final SSLException e )
{
throw new MalformedChallengeException( "SSL Engine unwrap error: " + e.getMessage(), e );
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DebugUtil.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DebugUtil.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DebugUtil.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DebugUtil.java Sun Mar 26 02:43:03 2017
@@ -56,7 +56,7 @@ class DebugUtil
sb.append( "null" );
return;
}
- for ( byte b : bytes )
+ for ( final byte b : bytes )
{
sb.append( String.format( "%02X ", b ) );
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/DigestScheme.java Sun Mar 26 02:43:03 2017
@@ -257,7 +257,7 @@ public class DigestScheme implements Aut
Charset charset;
try {
charset = charsetName != null ? Charset.forName(charsetName) : StandardCharsets.ISO_8859_1;
- } catch (UnsupportedCharsetException ex) {
+ } catch (final UnsupportedCharsetException ex) {
charset = StandardCharsets.ISO_8859_1;
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/NTLMEngineImpl.java Sun Mar 26 02:43:03 2017
@@ -874,7 +874,7 @@ final class NTLMEngineImpl implements NT
cipher.init( Cipher.DECRYPT_MODE, new SecretKeySpec( sealingKey, "RC4" ) );
}
}
- catch ( Exception e )
+ catch ( final Exception e )
{
throw new NTLMEngineException( e.getMessage(), e );
}
@@ -1854,7 +1854,7 @@ final class NTLMEngineImpl implements NT
static MessageDigest getMD5() {
try {
return MessageDigest.getInstance("MD5");
- } catch (NoSuchAlgorithmException ex) {
+ } catch (final NoSuchAlgorithmException ex) {
throw new RuntimeException("MD5 message digest doesn't seem to exist - fatal error: "+ex.getMessage(), ex);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java Sun Mar 26 02:43:03 2017
@@ -152,7 +152,7 @@ public class SystemDefaultCredentialsPro
systemcreds = new PasswordAuthentication(proxyUser, proxyPassword != null ? proxyPassword.toCharArray() : new char[] {});
}
}
- } catch (NumberFormatException ex) {
+ } catch (final NumberFormatException ex) {
}
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java Sun Mar 26 02:43:03 2017
@@ -189,7 +189,7 @@ public class BasicHttpClientConnectionMa
final TimeUnit tunit) throws InterruptedException, ExecutionException, TimeoutException {
try {
return new InternalConnectionEndpoint(route, getConnection(route, state));
- } catch (IOException ex) {
+ } catch (final IOException ex) {
throw new ExecutionException(ex.getMessage(), ex);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java Sun Mar 26 02:43:03 2017
@@ -268,7 +268,7 @@ public class PoolingHttpClientConnection
boolean stale;
try {
stale = conn.isStale();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
stale = true;
}
if (stale) {
@@ -292,7 +292,7 @@ public class PoolingHttpClientConnection
this.endpoint = new InternalConnectionEndpoint(poolEntry);
}
return this.endpoint;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
pool.release(poolEntry, false);
throw new ExecutionException(ex.getMessage(), ex);
}
@@ -333,7 +333,7 @@ public class PoolingHttpClientConnection
this.log.debug("Connection " + ConnPoolSupport.getId(conn) + " can be kept alive " + s);
}
}
- } catch (RuntimeException ex) {
+ } catch (final RuntimeException ex) {
reusable = false;
throw ex;
} finally {
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/AsyncClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/AsyncClientConnectionOperator.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/AsyncClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/AsyncClientConnectionOperator.java Sun Mar 26 02:43:03 2017
@@ -82,14 +82,14 @@ final class AsyncClientConnectionOperato
final InetAddress[] remoteAddresses;
try {
remoteAddresses = dnsResolver.resolve(host.getHostName());
- } catch (UnknownHostException ex) {
+ } catch (final UnknownHostException ex) {
future.failed(ex);
return future;
}
final int port;
try {
port = schemePortResolver.resolve(host);
- } catch (UnsupportedSchemeException ex) {
+ } catch (final UnsupportedSchemeException ex) {
future.failed(ex);
return future;
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java Sun Mar 26 02:43:03 2017
@@ -229,7 +229,7 @@ public class PoolingAsyncClientConnectio
log.debug("Connection " + ConnPoolSupport.getId(connection) + " can be kept alive " + s);
}
}
- } catch (RuntimeException ex) {
+ } catch (final RuntimeException ex) {
reusable = false;
throw ex;
} finally {
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java Sun Mar 26 02:43:03 2017
@@ -80,7 +80,7 @@ public class DefaultRedirectStrategy<T e
public DefaultRedirectStrategy(final String... safeMethods) {
super();
this.safeMethods = new ConcurrentHashMap<>();
- for (String safeMethod: safeMethods) {
+ for (final String safeMethod: safeMethods) {
this.safeMethods.put(safeMethod.toUpperCase(Locale.ROOT), Boolean.TRUE);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java Sun Mar 26 02:43:03 2017
@@ -90,7 +90,7 @@ public abstract class CloseableHttpClien
URI requestURI = null;
try {
requestURI = request.getUri();
- } catch (URISyntaxException ignore) {
+ } catch (final URISyntaxException ignore) {
}
if (requestURI != null && requestURI.isAbsolute()) {
target = URIUtils.extractHost(requestURI);
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/HttpClientBuilder.java Sun Mar 26 02:43:03 2017
@@ -876,7 +876,7 @@ public class HttpClientBuilder {
connectionEvictor.shutdown();
try {
connectionEvictor.awaitTermination(1L, TimeUnit.SECONDS);
- } catch (InterruptedException interrupted) {
+ } catch (final InterruptedException interrupted) {
Thread.currentThread().interrupt();
}
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java Sun Mar 26 02:43:03 2017
@@ -120,7 +120,7 @@ public class RedirectExec implements Cli
final URI redirectUri;
try {
redirectUri = redirect.getUri();
- } catch (URISyntaxException ex) {
+ } catch (final URISyntaxException ex) {
// Should not happen
throw new ProtocolException(ex.getMessage(), ex);
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java Sun Mar 26 02:43:03 2017
@@ -301,7 +301,7 @@ public final class DefaultHostnameVerifi
return Collections.emptyList();
}
final List<SubjectName> result = new ArrayList<>();
- for (List<?> entry: entries) {
+ for (final List<?> entry: entries) {
final Integer type = entry.size() >= 2 ? (Integer) entry.get(0) : null;
if (type != null) {
final String s = (String) entry.get(1);
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsSupport.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsSupport.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsSupport.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsSupport.java Sun Mar 26 02:43:03 2017
@@ -332,7 +332,7 @@ public final class H2TlsSupport {
return null;
}
List<String> enabledProtocols = null;
- for (String protocol: protocols) {
+ for (final String protocol: protocols) {
if (!protocol.startsWith("SSL") && !BLACKLISED_PROTOCOLS.contains(protocol)) {
if (enabledProtocols == null) {
enabledProtocols = new ArrayList<>();
@@ -348,7 +348,7 @@ public final class H2TlsSupport {
return null;
}
List<String> enabledCiphers = null;
- for (String cipher: ciphers) {
+ for (final String cipher: ciphers) {
if (!BLACKLISED_CIPHERS.contains(cipher)) {
if (enabledCiphers == null) {
enabledCiphers = new ArrayList<>();
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/sync/methods/RequestBuilder.java Sun Mar 26 02:43:03 2017
@@ -289,7 +289,7 @@ public class RequestBuilder {
try {
uri = request.getUri();
- } catch (URISyntaxException ignore) {
+ } catch (final URISyntaxException ignore) {
}
if (request instanceof Configurable) {
config = ((Configurable) request).getConfig();
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2Error.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2Error.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2Error.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/H2Error.java Sun Mar 26 02:43:03 2017
@@ -144,7 +144,7 @@ public enum H2Error {
private static final ConcurrentMap<Integer, H2Error> MAP_BY_CODE;
static {
MAP_BY_CODE = new ConcurrentHashMap<>();
- for (H2Error error: values()) {
+ for (final H2Error error: values()) {
MAP_BY_CODE.putIfAbsent(error.code, error);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/config/H2Param.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/config/H2Param.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/config/H2Param.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/config/H2Param.java Sun Mar 26 02:43:03 2017
@@ -47,7 +47,7 @@ public enum H2Param {
private static final H2Param[] LOOKUP_TABLE = new H2Param[6];
static {
- for (H2Param param: H2Param.values()) {
+ for (final H2Param param: H2Param.values()) {
LOOKUP_TABLE[param.code - 1] = param;
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFactory.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFactory.java Sun Mar 26 02:43:03 2017
@@ -38,7 +38,7 @@ public abstract class FrameFactory {
public RawFrame createSettings(final H2Setting... settings) {
final ByteBuffer payload = ByteBuffer.allocate(settings.length * 12);
- for (H2Setting setting: settings) {
+ for (final H2Setting setting: settings) {
payload.putShort((short) setting.getCode());
payload.putInt(setting.getValue());
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFlag.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFlag.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFlag.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameFlag.java Sun Mar 26 02:43:03 2017
@@ -46,7 +46,7 @@ public enum FrameFlag {
public static int of(final FrameFlag... flags) {
int value = 0;
- for (FrameFlag flag: flags) {
+ for (final FrameFlag flag: flags) {
value |= flag.value;
}
return value;
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameType.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameType.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameType.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/FrameType.java Sun Mar 26 02:43:03 2017
@@ -51,7 +51,7 @@ public enum FrameType {
private static final FrameType[] LOOKUP_TABLE = new FrameType[10];
static {
- for (FrameType frameType: FrameType.values()) {
+ for (final FrameType frameType: FrameType.values()) {
LOOKUP_TABLE[frameType.value] = frameType;
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackDecoder.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/HPackDecoder.java Sun Mar 26 02:43:03 2017
@@ -275,7 +275,7 @@ public final class HPackDecoder {
}
}
return null;
- } catch (CharacterCodingException ex) {
+ } catch (final CharacterCodingException ex) {
throw new HPackException(ex.getMessage(), ex);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java Sun Mar 26 02:43:03 2017
@@ -134,7 +134,7 @@ public final class DefaultH2RequestConve
httpRequest.setScheme(scheme);
try {
httpRequest.setAuthority(URIAuthority.create(authority));
- } catch (URISyntaxException ex) {
+ } catch (final URISyntaxException ex) {
throw new ProtocolException(ex.getMessage(), ex);
}
httpRequest.setPath(path);
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2ResponseConverter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2ResponseConverter.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2ResponseConverter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2ResponseConverter.java Sun Mar 26 02:43:03 2017
@@ -96,7 +96,7 @@ public class DefaultH2ResponseConverter
final int statusCode;
try {
statusCode = Integer.parseInt(statusText);
- } catch (NumberFormatException ex) {
+ } catch (final NumberFormatException ex) {
throw new ProtocolException("Invalid response status: " + statusText);
}
final HttpResponse response = new BasicHttpResponse(statusCode, null);
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java Sun Mar 26 02:43:03 2017
@@ -662,7 +662,7 @@ abstract class AbstractHttp2StreamMultip
commitFrame(goAway);
}
connState = ConnectionHandshake.SHUTDOWN;
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
} finally {
ioSession.shutdown();
}
@@ -700,7 +700,7 @@ abstract class AbstractHttp2StreamMultip
final Http2Stream stream = getValidStream(streamId);
try {
consumeDataFrame(frame, stream);
- } catch (H2StreamResetException ex) {
+ } catch (final H2StreamResetException ex) {
stream.localReset(ex);
}
@@ -741,7 +741,7 @@ abstract class AbstractHttp2StreamMultip
if (stream.isOutputReady()) {
stream.produceOutput();
}
- } catch (H2StreamResetException ex) {
+ } catch (final H2StreamResetException ex) {
stream.localReset(ex);
}
@@ -763,7 +763,7 @@ abstract class AbstractHttp2StreamMultip
try {
consumeContinuationFrame(frame, stream);
- } catch (H2StreamResetException ex) {
+ } catch (final H2StreamResetException ex) {
stream.localReset(ex);
}
@@ -785,7 +785,7 @@ abstract class AbstractHttp2StreamMultip
if (streamId == 0) {
try {
updateOutputWindow(0, connOutputWindow, delta);
- } catch (ArithmeticException ex) {
+ } catch (final ArithmeticException ex) {
throw new H2ConnectionException(H2Error.FLOW_CONTROL_ERROR, ex.getMessage());
}
} else {
@@ -793,7 +793,7 @@ abstract class AbstractHttp2StreamMultip
if (stream != null) {
try {
updateOutputWindow(streamId, stream.getOutputWindow(), delta);
- } catch (ArithmeticException ex) {
+ } catch (final ArithmeticException ex) {
throw new H2ConnectionException(H2Error.FLOW_CONTROL_ERROR, ex.getMessage());
}
}
@@ -911,7 +911,7 @@ abstract class AbstractHttp2StreamMultip
try {
consumePushPromiseFrame(frame, payload, promisedStream);
- } catch (H2StreamResetException ex) {
+ } catch (final H2StreamResetException ex) {
promisedStream.localReset(ex);
}
}
@@ -1091,7 +1091,7 @@ abstract class AbstractHttp2StreamMultip
case MAX_CONCURRENT_STREAMS:
try {
configBuilder.setMaxConcurrentStreams(value);
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
throw new H2ConnectionException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
break;
@@ -1101,7 +1101,7 @@ abstract class AbstractHttp2StreamMultip
case INITIAL_WINDOW_SIZE:
try {
configBuilder.setInitialWindowSize(value);
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
throw new H2ConnectionException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
final int delta = value - remoteConfig.getInitialWindowSize();
@@ -1113,7 +1113,7 @@ abstract class AbstractHttp2StreamMultip
final Http2Stream stream = entry.getValue();
try {
updateOutputWindow(stream.getId(), stream.getOutputWindow(), delta);
- } catch (ArithmeticException ex) {
+ } catch (final ArithmeticException ex) {
throw new H2ConnectionException(H2Error.FLOW_CONTROL_ERROR, ex.getMessage());
}
}
@@ -1123,14 +1123,14 @@ abstract class AbstractHttp2StreamMultip
case MAX_FRAME_SIZE:
try {
configBuilder.setMaxFrameSize(value);
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
throw new H2ConnectionException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
break;
case MAX_HEADER_LIST_SIZE:
try {
configBuilder.setMaxHeaderListSize(value);
- } catch (IllegalArgumentException ex) {
+ } catch (final IllegalArgumentException ex) {
throw new H2ConnectionException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
break;
@@ -1480,7 +1480,7 @@ abstract class AbstractHttp2StreamMultip
try {
handler.consumePromise(headers);
channel.setLocalEndStream();
- } catch (ProtocolException ex) {
+ } catch (final ProtocolException ex) {
localReset(ex, H2Error.PROTOCOL_ERROR);
}
}
@@ -1488,7 +1488,7 @@ abstract class AbstractHttp2StreamMultip
void consumeHeader(final List<Header> headers) throws HttpException, IOException {
try {
handler.consumeHeader(headers, channel.isRemoteClosed());
- } catch (ProtocolException ex) {
+ } catch (final ProtocolException ex) {
localReset(ex, H2Error.PROTOCOL_ERROR);
}
}
@@ -1496,9 +1496,9 @@ abstract class AbstractHttp2StreamMultip
void consumeData(final ByteBuffer src) throws HttpException, IOException {
try {
handler.consumeData(src, channel.isRemoteClosed());
- } catch (CharacterCodingException ex) {
+ } catch (final CharacterCodingException ex) {
localReset(ex, H2Error.INTERNAL_ERROR);
- } catch (ProtocolException ex) {
+ } catch (final ProtocolException ex) {
localReset(ex, H2Error.PROTOCOL_ERROR);
}
}
@@ -1510,7 +1510,7 @@ abstract class AbstractHttp2StreamMultip
void produceOutput() throws HttpException, IOException {
try {
handler.produceOutput();
- } catch (ProtocolException ex) {
+ } catch (final ProtocolException ex) {
localReset(ex, H2Error.PROTOCOL_ERROR);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java Sun Mar 26 02:43:03 2017
@@ -111,7 +111,7 @@ public class ClientHttpProtocolNegotiato
try {
final ByteChannel channel = ioSession.channel();
channel.write(preface);
- } catch (IOException ex) {
+ } catch (final IOException ex) {
ioSession.shutdown();
if (connectionListener != null) {
connectionListener.onError(this, ex);
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushHttp2StreamHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushHttp2StreamHandler.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushHttp2StreamHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientPushHttp2StreamHandler.java Sun Mar 26 02:43:03 2017
@@ -101,7 +101,7 @@ class ClientPushHttp2StreamHandler imple
final AsyncPushConsumer handler;
try {
handler = pushHandlerFactory != null ? pushHandlerFactory.create(request) : null;
- } catch (ProtocolException ex) {
+ } catch (final ProtocolException ex) {
throw new H2StreamResetException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
if (handler == null) {
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2StreamHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2StreamHandler.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2StreamHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttp2StreamHandler.java Sun Mar 26 02:43:03 2017
@@ -184,7 +184,7 @@ public class ServerHttp2StreamHandler im
final AsyncServerExchangeHandler handler;
try {
handler = exchangeHandlerFactory != null ? exchangeHandlerFactory.create(request) : null;
- } catch (ProtocolException ex) {
+ } catch (final ProtocolException ex) {
throw new H2StreamResetException(H2Error.PROTOCOL_ERROR, ex.getMessage());
}
if (handler == null) {
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java Sun Mar 26 02:43:03 2017
@@ -111,7 +111,7 @@ public class ServerHttpProtocolNegotiato
streamMultiplexer.onInput();
session.setHandler(new ServerHttp2IOEventHandler(streamMultiplexer));
}
- } catch (Exception ex) {
+ } catch (final Exception ex) {
session.close();
if (connectionListener != null) {
connectionListener.onError(this, ex);
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2RequesterBootstrap.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2RequesterBootstrap.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2RequesterBootstrap.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2RequesterBootstrap.java Sun Mar 26 02:43:03 2017
@@ -201,7 +201,7 @@ public class H2RequesterBootstrap {
connPoolPolicy,
connPoolListener);
final AsyncPushConsumerRegistry pushConsumerRegistry = new AsyncPushConsumerRegistry();
- for (PushConsumerEntry entry: pushConsumerList) {
+ for (final PushConsumerEntry entry: pushConsumerList) {
pushConsumerRegistry.register(entry.hostname, entry.uriPattern, entry.supplier);
}
final ClientHttpProtocolNegotiatorFactory ioEventHandlerFactory = new ClientHttpProtocolNegotiatorFactory(
@@ -218,7 +218,7 @@ public class H2RequesterBootstrap {
connPool,
tlsStrategy != null ? tlsStrategy : new H2ClientTlsStrategy(),
exceptionListener);
- } catch (IOReactorException ex) {
+ } catch (final IOReactorException ex) {
throw new IllegalStateException(ex);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2ServerBootstrap.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2ServerBootstrap.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2ServerBootstrap.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2ServerBootstrap.java Sun Mar 26 02:43:03 2017
@@ -198,7 +198,7 @@ public class H2ServerBootstrap {
public HttpAsyncServer create() {
final AsyncServerExchangeHandlerRegistry exchangeHandlerFactory = new AsyncServerExchangeHandlerRegistry(
canonicalHostName != null ? canonicalHostName : InetAddressUtils.getCanonicalLocalHostName());
- for (HandlerEntry entry: handlerList) {
+ for (final HandlerEntry entry: handlerList) {
exchangeHandlerFactory.register(entry.hostname, entry.uriPattern, entry.supplier);
}
final ServerHttpProtocolNegotiatorFactory ioEventHandlerFactory = new ServerHttpProtocolNegotiatorFactory(
@@ -214,7 +214,7 @@ public class H2ServerBootstrap {
ioEventHandlerFactory,
ioReactorConfig,
exceptionListener);
- } catch (IOReactorException ex) {
+ } catch (final IOReactorException ex) {
throw new IllegalStateException(ex);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2ServerTlsStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2ServerTlsStrategy.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2ServerTlsStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2ServerTlsStrategy.java Sun Mar 26 02:43:03 2017
@@ -99,7 +99,7 @@ public class H2ServerTlsStrategy impleme
final SocketAddress remoteAddress,
final String... parameters) {
final int port = ((InetSocketAddress) localAddress).getPort();
- for (int securePort: securePorts) {
+ for (final int securePort: securePorts) {
if (port == securePort) {
tlsSession.start(sslContext, sslBufferManagement,
H2TlsSupport.decorateInitializer(initializer), verifier);
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java Sun Mar 26 02:43:03 2017
@@ -331,7 +331,7 @@ final class H2TlsSupport {
return null;
}
List<String> enabledProtocols = null;
- for (String protocol: protocols) {
+ for (final String protocol: protocols) {
if (!protocol.startsWith("SSL") && !BLACKLISED_PROTOCOLS.contains(protocol)) {
if (enabledProtocols == null) {
enabledProtocols = new ArrayList<>();
@@ -347,7 +347,7 @@ final class H2TlsSupport {
return null;
}
List<String> enabledCiphers = null;
- for (String cipher: ciphers) {
+ for (final String cipher: ciphers) {
if (!BLACKLISED_CIPHERS.contains(cipher)) {
if (enabledCiphers == null) {
enabledCiphers = new ArrayList<>();
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/frame/TestH2Settings.java Sun Mar 26 02:43:03 2017
@@ -35,7 +35,7 @@ public class TestH2Settings {
@Test
public void testH2ParamBasics() throws Exception {
- for (H2Param param: H2Param.values()) {
+ for (final H2Param param: H2Param.values()) {
Assert.assertEquals(param, H2Param.valueOf(param.getCode()));
Assert.assertEquals(param.name(), H2Param.toString(param.getCode()));
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/hpack/TestHPackCoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/hpack/TestHPackCoding.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/hpack/TestHPackCoding.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/hpack/TestHPackCoding.java Sun Mar 26 02:43:03 2017
@@ -103,19 +103,19 @@ public class TestHPackCoding {
final ByteBuffer src2 = createByteBuffer(0x7f, 0x80, 0xff, 0xff, 0xff, 0x08);
try {
HPackDecoder.decodeInt(src2, 7);
- } catch (HPackException expected) {
+ } catch (final HPackException expected) {
}
final ByteBuffer src3 = createByteBuffer(0x7f, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01);
try {
HPackDecoder.decodeInt(src3, 7);
- } catch (HPackException expected) {
+ } catch (final HPackException expected) {
}
}
private static ByteBuffer createByteBuffer(final int... bytes) {
final ByteBuffer buffer = ByteBuffer.allocate(bytes.length);
- for (int b : bytes) {
+ for (final int b : bytes) {
buffer.put((byte) b);
}
buffer.flip();
@@ -239,7 +239,7 @@ public class TestHPackCoding {
@Test
public void testComplexStringCoding1() throws Exception {
- for (Charset charset : new Charset[]{StandardCharsets.ISO_8859_1, StandardCharsets.UTF_8, StandardCharsets.UTF_16}) {
+ for (final Charset charset : new Charset[]{StandardCharsets.ISO_8859_1, StandardCharsets.UTF_8, StandardCharsets.UTF_16}) {
final ByteArrayBuffer buffer = new ByteArrayBuffer(16);
final StringBuilder strBuf = new StringBuilder();
@@ -251,7 +251,7 @@ public class TestHPackCoding {
final String hello = constructHelloString(SWISS_GERMAN_HELLO, 1 + 10 * n);
- for (boolean b : new boolean[]{false, true}) {
+ for (final boolean b : new boolean[]{false, true}) {
buffer.clear();
encoder.encodeString(buffer, hello, b);
@@ -267,7 +267,7 @@ public class TestHPackCoding {
@Test
public void testComplexStringCoding2() throws Exception {
- for (Charset charset : new Charset[]{Charset.forName("KOI8-R"), StandardCharsets.UTF_8, StandardCharsets.UTF_16}) {
+ for (final Charset charset : new Charset[]{Charset.forName("KOI8-R"), StandardCharsets.UTF_8, StandardCharsets.UTF_16}) {
final ByteArrayBuffer buffer = new ByteArrayBuffer(16);
final StringBuilder strBuf = new StringBuilder();
@@ -279,7 +279,7 @@ public class TestHPackCoding {
final String hello = constructHelloString(RUSSIAN_HELLO, 1 + 10 * n);
- for (boolean b : new boolean[]{false, true}) {
+ for (final boolean b : new boolean[]{false, true}) {
buffer.clear();
strBuf.setLength(0);
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/io/MultiByteArrayInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/io/MultiByteArrayInputStream.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/io/MultiByteArrayInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/io/MultiByteArrayInputStream.java Sun Mar 26 02:43:03 2017
@@ -41,7 +41,7 @@ class MultiByteArrayInputStream extends
public MultiByteArrayInputStream(final byte[]... bufs) {
super();
this.bufs = new ArrayDeque<>();
- for (byte[] buf: bufs) {
+ for (final byte[] buf: bufs) {
if (buf.length > 0) {
this.bufs.add(buf);
}
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/entity/TestSharedOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/entity/TestSharedOutputBuffer.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/entity/TestSharedOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/nio/entity/TestSharedOutputBuffer.java Sun Mar 26 02:43:03 2017
@@ -223,7 +223,7 @@ public class TestSharedOutputBuffer {
Assert.assertEquals(Boolean.TRUE, task2.get(5, TimeUnit.SECONDS));
try {
task1.get(5, TimeUnit.SECONDS);
- } catch (ExecutionException ex) {
+ } catch (final ExecutionException ex) {
Assert.assertTrue(ex.getCause() instanceof InterruptedIOException);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/ClassicTestClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/ClassicTestClient.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/ClassicTestClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/ClassicTestClient.java Sun Mar 26 02:43:03 2017
@@ -82,7 +82,7 @@ public class ClassicTestClient {
public void shutdown() {
try {
this.connection.close();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClassicTestClientAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClassicTestClientAdapter.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClassicTestClientAdapter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClassicTestClientAdapter.java Sun Mar 26 02:43:03 2017
@@ -84,7 +84,7 @@ public class ClassicTestClientAdapter ex
final StringBuilder newQuery = new StringBuilder(existingQuery == null ? "" : existingQuery);
// append each parm to the query
- for (Entry<String, String> parm : queryMap.entrySet()) {
+ for (final Entry<String, String> parm : queryMap.entrySet()) {
newQuery.append("&" + parm.getKey() + "=" + parm.getValue());
}
// create a uri with the new query.
@@ -110,7 +110,7 @@ public class ClassicTestClientAdapter ex
@SuppressWarnings("unchecked")
final Map<String, String> headersMap = (Map<String, String>) request.get(HEADERS);
if (headersMap != null) {
- for (Entry<String, String> header : headersMap.entrySet()) {
+ for (final Entry<String, String> header : headersMap.entrySet()) {
httpRequest.addHeader(header.getKey(), header.getValue());
}
}
@@ -150,7 +150,7 @@ public class ClassicTestClientAdapter ex
// convert the headers to a Map
final Map<String, Object> headerMap = new HashMap<String, Object>();
- for (Header header : response.getAllHeaders()) {
+ for (final Header header : response.getAllHeaders()) {
headerMap.put(header.getName(), header.getValue());
}
ret.put(HEADERS, headerMap);
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientTestingAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientTestingAdapter.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientTestingAdapter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClientTestingAdapter.java Sun Mar 26 02:43:03 2017
@@ -99,9 +99,9 @@ public class ClientTestingAdapter {
}
return response;
- } catch (TestingFrameworkException e) {
+ } catch (final TestingFrameworkException e) {
throw e;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new TestingFrameworkException(ex);
}
}
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/FrameworkTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/FrameworkTest.java?rev=1788709&r1=1788708&r2=1788709&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/FrameworkTest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/FrameworkTest.java Sun Mar 26 02:43:03 2017
@@ -115,14 +115,14 @@ public class FrameworkTest {
final List<NameValuePair> params = URLEncodedUtils.parse(uri, StandardCharsets.UTF_8);
@SuppressWarnings("unchecked")
final Map<String, Object> queryMap = (Map<String, Object>) request.get(QUERY);
- for (NameValuePair param : params) {
+ for (final NameValuePair param : params) {
queryMap.put(param.getName(), param.getValue());
}
if (! params.isEmpty()) {
request.put(PATH, uri.getPath());
}
}
- } catch (URISyntaxException e) {
+ } catch (final URISyntaxException e) {
throw new TestingFrameworkException(e);
}
}