You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2018/08/04 20:24:29 UTC
[11/19] httpcomponents-core git commit: No need to nest else clauses.
Replace some if/else with a ternary return/
No need to nest else clauses. Replace some if/else with a ternary
return/
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/24fb4ece
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/24fb4ece
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/24fb4ece
Branch: refs/heads/master
Commit: 24fb4ecea403d94b5d5f71b48580efb874a2e283
Parents: 3af89cc
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Aug 4 07:57:13 2018 -0600
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sat Aug 4 17:29:11 2018 +0200
----------------------------------------------------------------------
.../apache/hc/core5/http2/frame/RawFrame.java | 6 +-
.../nio/AbstractHttp2StreamMultiplexer.java | 3 +-
.../hc/core5/concurrent/ComplexCancellable.java | 3 +-
.../hc/core5/http/config/NamedElementChain.java | 24 ++------
.../hc/core5/http/message/MessageSupport.java | 7 +--
.../support/AbstractAsyncServerAuthFilter.java | 64 ++++++++++----------
...ServerFilterChainExchangeHandlerFactory.java | 6 +-
.../BasicAsyncServerExpectationDecorator.java | 12 +---
...aultAsyncResponseExchangeHandlerFactory.java | 14 ++---
.../nio/support/TerminalAsyncServerFilter.java | 5 +-
.../main/java/org/apache/hc/core5/net/Host.java | 6 +-
.../org/apache/hc/core5/net/URIBuilder.java | 7 +--
.../org/apache/hc/core5/reactor/IOWorkers.java | 8 +--
.../hc/core5/reactor/InternalDataChannel.java | 6 +-
14 files changed, 62 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/RawFrame.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/RawFrame.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/RawFrame.java
index 8cf9455..d043b8c 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/RawFrame.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/RawFrame.java
@@ -65,12 +65,10 @@ public final class RawFrame extends Frame<ByteBuffer> {
}
dup.limit(dup.limit() - padding);
return dup;
- } else {
- return payload.duplicate();
}
- } else {
- return null;
+ return payload.duplicate();
}
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
index 56808e8..51a87d7 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
@@ -363,9 +363,8 @@ abstract class AbstractHttp2StreamMultiplexer implements Identifiable, HttpConne
payload.position(payload.position() + chunk);
ioSession.setEvent(SelectionKey.OP_WRITE);
return chunk;
- } else {
- return 0;
}
+ return 0;
}
private void updateInputCapacity(
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/concurrent/ComplexCancellable.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/concurrent/ComplexCancellable.java b/httpcore5/src/main/java/org/apache/hc/core5/concurrent/ComplexCancellable.java
index 83b61d0..7f2b46f 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/concurrent/ComplexCancellable.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/concurrent/ComplexCancellable.java
@@ -70,9 +70,8 @@ public final class ComplexCancellable implements Cancellable, CancellableDepende
dependency.cancel();
}
return true;
- } else {
- return false;
}
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/http/config/NamedElementChain.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/config/NamedElementChain.java b/httpcore5/src/main/java/org/apache/hc/core5/http/config/NamedElementChain.java
index 7759cbc..77f882a 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/config/NamedElementChain.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/config/NamedElementChain.java
@@ -49,19 +49,11 @@ public class NamedElementChain<E> {
}
public Node getFirst() {
- if (master.next != master) {
- return master.next;
- } else {
- return null;
- }
+ return master.next != master ? master.next : null;
}
public Node getLast() {
- if (master.previous != master) {
- return master.previous;
- } else {
- return null;
- }
+ return master.previous != master ? master.previous : null;
}
public Node addFirst(final E value, final String name) {
@@ -187,19 +179,11 @@ public class NamedElementChain<E> {
}
public Node getPrevious() {
- if (previous != master) {
- return previous;
- } else {
- return null;
- }
+ return previous != master ? previous : null;
}
public Node getNext() {
- if (next != master) {
- return next;
- } else {
- return null;
- }
+ return next != master ? next: null;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
index 91226bd..f015ed3 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
@@ -127,11 +127,10 @@ public class MessageSupport {
final ParserCursor cursor = new ParserCursor(0, buf.length());
cursor.updatePos(((FormattedHeader) header).getValuePos());
return parseTokens(buf, cursor);
- } else {
- final String value = header.getValue();
- final ParserCursor cursor = new ParserCursor(0, value.length());
- return parseTokens(value, cursor);
}
+ final String value = header.getValue();
+ final ParserCursor cursor = new ParserCursor(0, value.length());
+ return parseTokens(value, cursor);
}
public static void addContentTypeHeader(final HttpMessage message, final EntityDetails entity) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java
index 443af98..24ccd01 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AbstractAsyncServerAuthFilter.java
@@ -94,41 +94,39 @@ public abstract class AbstractAsyncServerAuthFilter<T> implements AsyncFilterHan
responseTrigger.sendInformation(new BasicClassicHttpResponse(HttpStatus.SC_CONTINUE));
}
return chain.proceed(request, entityDetails, context, responseTrigger);
- } else {
- final HttpResponse unauthorized = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED);
- unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, generateChallenge(challengeResponse, authority, requestUri, context));
- final AsyncEntityProducer responseContentProducer = generateResponseContent(unauthorized);
- if (respondImmediately || expectContinue || entityDetails == null) {
+ }
+ final HttpResponse unauthorized = new BasicHttpResponse(HttpStatus.SC_UNAUTHORIZED);
+ unauthorized.addHeader(HttpHeaders.WWW_AUTHENTICATE, generateChallenge(challengeResponse, authority, requestUri, context));
+ final AsyncEntityProducer responseContentProducer = generateResponseContent(unauthorized);
+ if (respondImmediately || expectContinue || entityDetails == null) {
+ responseTrigger.submitResponse(unauthorized, responseContentProducer);
+ return null;
+ }
+ return new AsyncDataConsumer() {
+
+ @Override
+ public void updateCapacity(final CapacityChannel capacityChannel) throws IOException {
+ capacityChannel.update(Integer.MAX_VALUE);
+ }
+
+ @Override
+ public int consume(final ByteBuffer src) throws IOException {
+ return Integer.MAX_VALUE;
+ }
+
+ @Override
+ public void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
responseTrigger.submitResponse(unauthorized, responseContentProducer);
- return null;
- } else {
- return new AsyncDataConsumer() {
-
- @Override
- public void updateCapacity(final CapacityChannel capacityChannel) throws IOException {
- capacityChannel.update(Integer.MAX_VALUE);
- }
-
- @Override
- public int consume(final ByteBuffer src) throws IOException {
- return Integer.MAX_VALUE;
- }
-
- @Override
- public void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
- responseTrigger.submitResponse(unauthorized, responseContentProducer);
- }
-
- @Override
- public void releaseResources() {
- if (responseContentProducer != null) {
- responseContentProducer.releaseResources();
- }
- }
-
- };
}
- }
+
+ @Override
+ public void releaseResources() {
+ if (responseContentProducer != null) {
+ responseContentProducer.releaseResources();
+ }
+ }
+
+ };
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java
index c74c3c7..c70a8c3 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncServerFilterChainExchangeHandlerFactory.java
@@ -119,11 +119,7 @@ public final class AsyncServerFilterChainExchangeHandlerFactory implements Handl
@Override
public int consume(final ByteBuffer src) throws IOException {
final AsyncDataConsumer dataConsumer = dataConsumerRef.get();
- if (dataConsumer != null) {
- return dataConsumer.consume(src);
- } else {
- return Integer.MAX_VALUE;
- }
+ return dataConsumer != null ? dataConsumer.consume(src) : Integer.MAX_VALUE;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java
index bfaf6fa..7fecddc 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicAsyncServerExpectationDecorator.java
@@ -99,11 +99,7 @@ public class BasicAsyncServerExpectationDecorator implements AsyncServerExchange
@Override
public final int consume(final ByteBuffer src) throws IOException {
final AsyncResponseProducer responseProducer = responseProducerRef.get();
- if (responseProducer == null) {
- return handler.consume(src);
- } else {
- return Integer.MAX_VALUE;
- }
+ return responseProducer == null ? handler.consume(src) : Integer.MAX_VALUE;
}
@Override
@@ -117,11 +113,7 @@ public class BasicAsyncServerExpectationDecorator implements AsyncServerExchange
@Override
public final int available() {
final AsyncResponseProducer responseProducer = responseProducerRef.get();
- if (responseProducer == null) {
- return handler.available();
- } else {
- return responseProducer.available();
- }
+ return responseProducer == null ? handler.available() : responseProducer.available();
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java
index 28d0ee5..921c915 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/DefaultAsyncResponseExchangeHandlerFactory.java
@@ -57,16 +57,16 @@ public final class DefaultAsyncResponseExchangeHandlerFactory implements Handler
this(mapper, null);
}
- private AsyncServerExchangeHandler createHandler(final HttpRequest request, final HttpContext context) throws HttpException {
+ private AsyncServerExchangeHandler createHandler(final HttpRequest request,
+ final HttpContext context) throws HttpException {
try {
final Supplier<AsyncServerExchangeHandler> supplier = mapper.resolve(request, context);
- if (supplier != null) {
- return supplier.get();
- } else {
- return new ImmediateResponseExchangeHandler(HttpStatus.SC_NOT_FOUND, "Resource not found");
- }
+ return supplier != null
+ ? supplier.get()
+ : new ImmediateResponseExchangeHandler(HttpStatus.SC_NOT_FOUND, "Resource not found");
} catch (final MisdirectedRequestException ex) {
- return new ImmediateResponseExchangeHandler(HttpStatus.SC_MISDIRECTED_REQUEST, "Not authoritative");
+ return new ImmediateResponseExchangeHandler(HttpStatus.SC_MISDIRECTED_REQUEST,
+ "Not authoritative");
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java
index 348f69e..efc9804 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/TerminalAsyncServerFilter.java
@@ -142,10 +142,9 @@ public final class TerminalAsyncServerFilter implements AsyncFilterHandler {
}, context);
return exchangeHandler;
- } else {
- responseTrigger.submitResponse(new BasicHttpResponse(HttpStatus.SC_NOT_FOUND), new BasicAsyncEntityProducer("Not found"));
- return null;
}
+ responseTrigger.submitResponse(new BasicHttpResponse(HttpStatus.SC_NOT_FOUND), new BasicAsyncEntityProducer("Not found"));
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java b/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
index ba138a1..9f8b2b7 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/net/Host.java
@@ -65,9 +65,8 @@ public final class Host implements NamedEndpoint, Serializable {
throw new URISyntaxException(s, "hostname contains blanks");
}
return new Host(hostname, port);
- } else {
- throw new URISyntaxException(s, "port not found");
}
+ throw new URISyntaxException(s, "port not found");
}
@Override
@@ -88,9 +87,8 @@ public final class Host implements NamedEndpoint, Serializable {
if (o instanceof Host) {
final Host that = (Host) o;
return this.lcName.equals(that.lcName) && this.port == that.port;
- } else {
- return false;
}
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java b/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
index 6990eb6..f6cc1c0 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/net/URIBuilder.java
@@ -509,11 +509,8 @@ public class URIBuilder {
}
public List<NameValuePair> getQueryParams() {
- if (this.queryParams != null) {
- return new ArrayList<>(this.queryParams);
- } else {
- return new ArrayList<>();
- }
+ return this.queryParams != null ? new ArrayList<>(this.queryParams)
+ : new ArrayList<NameValuePair>();
}
public String getFragment() {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
index abd81db..cc80ff7 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/IOWorkers.java
@@ -37,11 +37,9 @@ final class IOWorkers {
}
static Selector newSelector(final SingleCoreIOReactor[] dispatchers) {
- if (isPowerOfTwo(dispatchers.length)) {
- return new PowerOfTwoSelector(dispatchers);
- } else {
- return new GenericSelector(dispatchers);
- }
+ return isPowerOfTwo(dispatchers.length)
+ ? new PowerOfTwoSelector(dispatchers)
+ : new GenericSelector(dispatchers);
}
private static boolean isPowerOfTwo(final int val) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/24fb4ece/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java
index 2b0cc00..30cf0cc 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/InternalDataChannel.java
@@ -259,11 +259,7 @@ final class InternalDataChannel extends InternalChannel implements ProtocolIOSes
private IOSession getSessionImpl() {
final SSLIOSession tlsSession = tlsSessionRef.get();
- if (tlsSession != null) {
- return tlsSession;
- } else {
- return ioSession;
- }
+ return tlsSession != null ? tlsSession : ioSession;
}
@Override