You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2017/10/27 13:22:15 UTC
httpcomponents-core git commit: Fixed style check violations (no
functional changes)
Repository: httpcomponents-core
Updated Branches:
refs/heads/master aabcf7544 -> 44adba140
Fixed style check violations (no functional changes)
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/44adba14
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/44adba14
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/44adba14
Branch: refs/heads/master
Commit: 44adba140a8b2af23c3793dc61fedf40df85ac24
Parents: aabcf75
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Fri Oct 27 15:09:33 2017 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Fri Oct 27 15:20:18 2017 +0200
----------------------------------------------------------------------
.../hc/core5/http2/impl/io/FrameOutputBuffer.java | 2 +-
.../core5/testing/framework/TestingFramework.java | 4 ++--
.../hc/core5/testing/nio/IOReactorExecutor.java | 2 +-
.../TestClassicTestClientTestingAdapter.java | 18 +++++++++---------
.../core5/testing/nio/Http1IntegrationTest.java | 2 +-
.../http/impl/bootstrap/HttpAsyncRequester.java | 4 ++--
.../core5/http/impl/bootstrap/HttpRequester.java | 4 ++--
.../core5/http/impl/io/BHttpConnectionBase.java | 2 +-
.../support/AbstractServerExchangeHandler.java | 2 +-
.../apache/hc/core5/reactor/IOReactorConfig.java | 4 ++--
.../hc/core5/reactor/SingleCoreIOReactor.java | 2 +-
11 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/io/FrameOutputBuffer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/io/FrameOutputBuffer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/io/FrameOutputBuffer.java
index bf73dcf..dba9181 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/io/FrameOutputBuffer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/io/FrameOutputBuffer.java
@@ -85,7 +85,7 @@ public final class FrameOutputBuffer {
buffer[5] = (byte) (streamId >> 24 & 0xff);
buffer[6] = (byte) (streamId >> 16 & 0xff);
- buffer[7] = (byte) (streamId >> 8 & 0xff);;
+ buffer[7] = (byte) (streamId >> 8 & 0xff);
buffer[8] = (byte) (streamId & 0xff);
int frameLen = FrameConsts.HEAD_LEN;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java
index f5ffea9..bc2b0a2 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFramework.java
@@ -446,8 +446,8 @@ public class TestingFramework {
final ByteArrayInputStream bin = new ByteArrayInputStream(bos.toByteArray());
final ObjectInputStream ois = new ObjectInputStream(bin);
return ois.readObject();
- } catch (ClassNotFoundException | IOException e) {
- throw new TestingFrameworkException(e);
+ } catch (final ClassNotFoundException | IOException ex) {
+ throw new TestingFrameworkException(ex);
}
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java
index 3b7236d..04e1c99 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java
@@ -137,7 +137,7 @@ abstract class IOReactorExecutor<T extends IOReactorService> implements AutoClos
}
try {
ioReactor.awaitShutdown(graceTime);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException ex) {
Thread.currentThread().interrupt();
}
ioReactor.shutdown(ShutdownType.IMMEDIATE);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestClassicTestClientTestingAdapter.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestClassicTestClientTestingAdapter.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestClassicTestClientTestingAdapter.java
index 3f3a198..a9f4da1 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestClassicTestClientTestingAdapter.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestClassicTestClientTestingAdapter.java
@@ -84,7 +84,7 @@ public class TestClassicTestClientTestingAdapter {
try {
adapter.execute(defaultURI, request, requestHandler, responseExpectations);
Assert.fail("WebServerTestingFrameworkException should have been thrown");
- } catch (TestingFrameworkException e) {
+ } catch (final TestingFrameworkException ex) {
// expected
}
}
@@ -101,7 +101,7 @@ public class TestClassicTestClientTestingAdapter {
try {
adapter.execute(defaultURI, request, requestHandler, responseExpectations);
Assert.fail("WebServerTestingFrameworkException should have been thrown");
- } catch (TestingFrameworkException e) {
+ } catch (final TestingFrameworkException ex) {
// expected
}
}
@@ -118,7 +118,7 @@ public class TestClassicTestClientTestingAdapter {
try {
adapter.execute(defaultURI, request, requestHandler, responseExpectations);
Assert.fail("WebServerTestingFrameworkException should have been thrown");
- } catch (TestingFrameworkException e) {
+ } catch (final TestingFrameworkException ex) {
// expected
}
}
@@ -135,7 +135,7 @@ public class TestClassicTestClientTestingAdapter {
try {
adapter.execute(defaultURI, request, requestHandler, responseExpectations);
Assert.fail("WebServerTestingFrameworkException should have been thrown");
- } catch (TestingFrameworkException e) {
+ } catch (final TestingFrameworkException ex) {
// expected
}
}
@@ -152,7 +152,7 @@ public class TestClassicTestClientTestingAdapter {
try {
adapter.execute(defaultURI, request, requestHandler, responseExpectations);
Assert.fail("WebServerTestingFrameworkException should have been thrown");
- } catch (TestingFrameworkException e) {
+ } catch (final TestingFrameworkException ex) {
// expected
}
}
@@ -172,7 +172,7 @@ public class TestClassicTestClientTestingAdapter {
try {
adapter.execute(defaultURI, request, requestHandler, responseExpectations);
Assert.fail("WebServerTestingFrameworkException should have been thrown");
- } catch (TestingFrameworkException e) {
+ } catch (final TestingFrameworkException ex) {
// expected
}
}
@@ -193,7 +193,7 @@ public class TestClassicTestClientTestingAdapter {
try {
adapter.execute(defaultURI, request, requestHandler, responseExpectations);
Assert.fail("WebServerTestingFrameworkException should have been thrown");
- } catch (TestingFrameworkException e) {
+ } catch (final TestingFrameworkException ex) {
// expected
}
}
@@ -245,7 +245,7 @@ public class TestClassicTestClientTestingAdapter {
throws HttpException, IOException {
try {
Assert.assertEquals("method not expected", "junk", request.getMethod());
- } catch (Throwable t) {
+ } catch (final Throwable t) {
thrown = t;
}
}
@@ -260,7 +260,7 @@ public class TestClassicTestClientTestingAdapter {
final Map<String, Object> request = new HashMap<String, Object>();
request.put(PATH, CUSTOM_PATH);
- for (String method : TestingFramework.ALL_METHODS) {
+ for (final String method : TestingFramework.ALL_METHODS) {
request.put(METHOD, method);
adapter.execute(defaultURI, request, requestHandler, responseExpectations);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
index fd6ac50..ba0a634 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
@@ -1246,7 +1246,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
try {
future4.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.fail("CancellationException expected");
- } catch (CancellationException ignore) {
+ } catch (final CancellationException ignore) {
Assert.assertTrue(future4.isCancelled());
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java
index e6de70b..a5745fc 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java
@@ -357,7 +357,7 @@ public class HttpAsyncRequester extends AsyncRequester implements ConnPoolContro
});
- } catch (IOException | HttpException ex) {
+ } catch (final IOException | HttpException ex) {
exchangeHandler.failed(ex);
}
}
@@ -437,7 +437,7 @@ public class HttpAsyncRequester extends AsyncRequester implements ConnPoolContro
final PoolEntry<HttpHost, IOSession> poolEntry = poolEntryRef.getAndSet(null);
if (poolEntry != null) {
poolEntry.discardConnection(ShutdownType.IMMEDIATE);
- connPool.release(poolEntry, false); ;
+ connPool.release(poolEntry, false);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java
index c02d297..6281989 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpRequester.java
@@ -211,7 +211,7 @@ public class HttpRequester implements ConnPoolControl<HttpHost>, GracefullyClose
connection.close();
}
return result;
- } catch (HttpException | IOException | RuntimeException ex) {
+ } catch (final HttpException | IOException | RuntimeException ex) {
connection.shutdown(ShutdownType.IMMEDIATE);
throw ex;
}
@@ -358,7 +358,7 @@ public class HttpRequester implements ConnPoolControl<HttpHost>, GracefullyClose
connectionHolder.releaseConnection();
}
return response;
- } catch (HttpException | IOException | RuntimeException ex) {
+ } catch (final HttpException | IOException | RuntimeException ex) {
connectionHolder.discardConnection();
throw ex;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
index 1c5eae5..c89ade6 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/BHttpConnectionBase.java
@@ -231,7 +231,7 @@ class BHttpConnectionBase implements BHttpConnection {
} finally {
try {
socket.close();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
}
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractServerExchangeHandler.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractServerExchangeHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractServerExchangeHandler.java
index 88b13d4..0a69337 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractServerExchangeHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractServerExchangeHandler.java
@@ -121,7 +121,7 @@ public abstract class AbstractServerExchangeHandler<T> implements AsyncServerExc
try {
responseTrigger.submitResponse(
new BasicResponseProducer(HttpStatus.SC_INTERNAL_SERVER_ERROR, ex.getMessage()));
- } catch (HttpException | IOException ex2) {
+ } catch (final HttpException | IOException ex2) {
failed(ex2);
}
} catch (final IOException ex) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java
index ba1d4ea..63a5a9d 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOReactorConfig.java
@@ -251,7 +251,7 @@ public final class IOReactorConfig {
}
public Builder setSoTimeout(final int soTimeout, final TimeUnit timeUnit) {
- this.soTimeout = Timeout.of(soTimeout, timeUnit);;
+ this.soTimeout = Timeout.of(soTimeout, timeUnit);
return this;
}
@@ -266,7 +266,7 @@ public final class IOReactorConfig {
}
public Builder setSoLinger(final int soLinger, final TimeUnit timeUnit) {
- this.soLinger = TimeValue.of(soLinger, timeUnit);;
+ this.soLinger = TimeValue.of(soLinger, timeUnit);
return this;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/44adba14/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
index e7a4736..27830a9 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
@@ -295,7 +295,7 @@ class SingleCoreIOReactor extends AbstractSingleCoreIOReactor implements Connect
} catch (final IOException ex) {
try {
socketChannel.close();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
}
sessionRequest.failed(ex);
}