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 2021/10/16 07:54:34 UTC
[httpcomponents-core] branch master updated: Fix typos and better
names.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
The following commit(s) were added to refs/heads/master by this push:
new c86e8af Fix typos and better names.
c86e8af is described below
commit c86e8af8af3b4e703bc0ae30990d55e036151b97
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sat Oct 16 09:21:21 2021 +0200
Fix typos and better names.
---
.../http2/impl/nio/bootstrap/FilterEntry.java | 8 ++---
.../impl/nio/bootstrap/H2ServerBootstrap.java | 12 ++++----
.../http/impl/bootstrap/AsyncServerBootstrap.java | 12 ++++----
.../hc/core5/http/impl/bootstrap/FilterEntry.java | 8 ++---
.../core5/http/impl/bootstrap/ServerBootstrap.java | 12 ++++----
.../http/impl/nio/ClientHttp1StreamHandler.java | 4 +--
.../http/impl/nio/SessionOutputBufferImpl.java | 10 +++---
.../core5/http/message/BasicHeaderValueParser.java | 8 ++---
.../apache/hc/core5/http/nio/HandlerFactory.java | 2 +-
.../nio/entity/AbstractBinAsyncEntityProducer.java | 36 +++++++++++-----------
.../http/nio/entity/AbstractCharDataConsumer.java | 16 +++++-----
.../org/apache/hc/core5/net/URLEncodedUtils.java | 20 ++++++------
.../java/org/apache/hc/core5/pool/LaxConnPool.java | 4 +--
13 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/FilterEntry.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/FilterEntry.java
index 07e572c..3d40c90 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/FilterEntry.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/FilterEntry.java
@@ -29,19 +29,19 @@ package org.apache.hc.core5.http2.impl.nio.bootstrap;
class FilterEntry<T> {
- enum Postion {BEFORE, AFTER, REPLACE, FIRST, LAST}
+ enum Position {BEFORE, AFTER, REPLACE, FIRST, LAST}
- final Postion postion;
+ final Position position;
final String name;
final T filterHandler;
final String existing;
FilterEntry(
- final Postion postion,
+ final Position position,
final String name,
final T filterHandler,
final String existing) {
- this.postion = postion;
+ this.position = position;
this.name = name;
this.filterHandler = filterHandler;
this.existing = existing;
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2ServerBootstrap.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2ServerBootstrap.java
index 7622f31..9201feb 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2ServerBootstrap.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/H2ServerBootstrap.java
@@ -295,7 +295,7 @@ public class H2ServerBootstrap {
Args.notBlank(existing, "Existing");
Args.notBlank(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.BEFORE, name, filterHandler, existing));
+ filters.add(new FilterEntry<>(FilterEntry.Position.BEFORE, name, filterHandler, existing));
return this;
}
@@ -306,7 +306,7 @@ public class H2ServerBootstrap {
Args.notBlank(existing, "Existing");
Args.notBlank(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.AFTER, name, filterHandler, existing));
+ filters.add(new FilterEntry<>(FilterEntry.Position.AFTER, name, filterHandler, existing));
return this;
}
@@ -316,7 +316,7 @@ public class H2ServerBootstrap {
public final H2ServerBootstrap replaceFilter(final String existing, final AsyncFilterHandler filterHandler) {
Args.notBlank(existing, "Existing");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.REPLACE, existing, filterHandler, existing));
+ filters.add(new FilterEntry<>(FilterEntry.Position.REPLACE, existing, filterHandler, existing));
return this;
}
@@ -326,7 +326,7 @@ public class H2ServerBootstrap {
public final H2ServerBootstrap addFilterFirst(final String name, final AsyncFilterHandler filterHandler) {
Args.notNull(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.FIRST, name, filterHandler, null));
+ filters.add(new FilterEntry<>(FilterEntry.Position.FIRST, name, filterHandler, null));
return this;
}
@@ -336,7 +336,7 @@ public class H2ServerBootstrap {
public final H2ServerBootstrap addFilterLast(final String name, final AsyncFilterHandler filterHandler) {
Args.notNull(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.LAST, name, filterHandler, null));
+ filters.add(new FilterEntry<>(FilterEntry.Position.LAST, name, filterHandler, null));
return this;
}
@@ -361,7 +361,7 @@ public class H2ServerBootstrap {
StandardFilter.EXPECT_CONTINUE.name());
for (final FilterEntry<AsyncFilterHandler> entry: filters) {
- switch (entry.postion) {
+ switch (entry.position) {
case AFTER:
filterChainDefinition.addAfter(entry.existing, entry.filterHandler, entry.name);
break;
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncServerBootstrap.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncServerBootstrap.java
index 0b3fa81..dfbe1fa 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncServerBootstrap.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/AsyncServerBootstrap.java
@@ -273,7 +273,7 @@ public class AsyncServerBootstrap {
Args.notBlank(existing, "Existing");
Args.notBlank(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.BEFORE, name, filterHandler, existing));
+ filters.add(new FilterEntry<>(FilterEntry.Position.BEFORE, name, filterHandler, existing));
return this;
}
@@ -284,7 +284,7 @@ public class AsyncServerBootstrap {
Args.notBlank(existing, "Existing");
Args.notBlank(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.AFTER, name, filterHandler, existing));
+ filters.add(new FilterEntry<>(FilterEntry.Position.AFTER, name, filterHandler, existing));
return this;
}
@@ -294,7 +294,7 @@ public class AsyncServerBootstrap {
public final AsyncServerBootstrap replaceFilter(final String existing, final AsyncFilterHandler filterHandler) {
Args.notBlank(existing, "Existing");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.REPLACE, existing, filterHandler, existing));
+ filters.add(new FilterEntry<>(FilterEntry.Position.REPLACE, existing, filterHandler, existing));
return this;
}
@@ -304,7 +304,7 @@ public class AsyncServerBootstrap {
public final AsyncServerBootstrap addFilterFirst(final String name, final AsyncFilterHandler filterHandler) {
Args.notNull(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.FIRST, name, filterHandler, null));
+ filters.add(new FilterEntry<>(FilterEntry.Position.FIRST, name, filterHandler, null));
return this;
}
@@ -314,7 +314,7 @@ public class AsyncServerBootstrap {
public final AsyncServerBootstrap addFilterLast(final String name, final AsyncFilterHandler filterHandler) {
Args.notNull(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.LAST, name, filterHandler, null));
+ filters.add(new FilterEntry<>(FilterEntry.Position.LAST, name, filterHandler, null));
return this;
}
@@ -338,7 +338,7 @@ public class AsyncServerBootstrap {
StandardFilter.EXPECT_CONTINUE.name());
for (final FilterEntry<AsyncFilterHandler> entry: filters) {
- switch (entry.postion) {
+ switch (entry.position) {
case AFTER:
filterChainDefinition.addAfter(entry.existing, entry.filterHandler, entry.name);
break;
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/FilterEntry.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/FilterEntry.java
index 7f2f99c..1adbbcf 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/FilterEntry.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/FilterEntry.java
@@ -29,19 +29,19 @@ package org.apache.hc.core5.http.impl.bootstrap;
final class FilterEntry<T> {
- enum Postion {BEFORE, AFTER, REPLACE, FIRST, LAST}
+ enum Position {BEFORE, AFTER, REPLACE, FIRST, LAST}
- final Postion postion;
+ final Position position;
final String name;
final T filterHandler;
final String existing;
FilterEntry(
- final Postion postion,
+ final Position position,
final String name,
final T filterHandler,
final String existing) {
- this.postion = postion;
+ this.position = position;
this.name = name;
this.filterHandler = filterHandler;
this.existing = existing;
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ServerBootstrap.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ServerBootstrap.java
index e26d989..8c9f654 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ServerBootstrap.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/ServerBootstrap.java
@@ -276,7 +276,7 @@ public class ServerBootstrap {
Args.notBlank(existing, "Existing");
Args.notBlank(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.BEFORE, name, filterHandler, existing));
+ filters.add(new FilterEntry<>(FilterEntry.Position.BEFORE, name, filterHandler, existing));
return this;
}
@@ -287,7 +287,7 @@ public class ServerBootstrap {
Args.notBlank(existing, "Existing");
Args.notBlank(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.AFTER, name, filterHandler, existing));
+ filters.add(new FilterEntry<>(FilterEntry.Position.AFTER, name, filterHandler, existing));
return this;
}
@@ -297,7 +297,7 @@ public class ServerBootstrap {
public final ServerBootstrap replaceFilter(final String existing, final HttpFilterHandler filterHandler) {
Args.notBlank(existing, "Existing");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.REPLACE, existing, filterHandler, existing));
+ filters.add(new FilterEntry<>(FilterEntry.Position.REPLACE, existing, filterHandler, existing));
return this;
}
@@ -307,7 +307,7 @@ public class ServerBootstrap {
public final ServerBootstrap addFilterFirst(final String name, final HttpFilterHandler filterHandler) {
Args.notNull(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.FIRST, name, filterHandler, null));
+ filters.add(new FilterEntry<>(FilterEntry.Position.FIRST, name, filterHandler, null));
return this;
}
@@ -317,7 +317,7 @@ public class ServerBootstrap {
public final ServerBootstrap addFilterLast(final String name, final HttpFilterHandler filterHandler) {
Args.notNull(name, "Name");
Args.notNull(filterHandler, "Filter handler");
- filters.add(new FilterEntry<>(FilterEntry.Postion.LAST, name, filterHandler, null));
+ filters.add(new FilterEntry<>(FilterEntry.Position.LAST, name, filterHandler, null));
return this;
}
@@ -343,7 +343,7 @@ public class ServerBootstrap {
StandardFilter.EXPECT_CONTINUE.name());
for (final FilterEntry<HttpFilterHandler> entry: filters) {
- switch (entry.postion) {
+ switch (entry.position) {
case AFTER:
filterChainDefinition.addAfter(entry.existing, entry.filterHandler, entry.name);
break;
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
index 0a5a15b..244a696 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamHandler.java
@@ -154,13 +154,13 @@ class ClientHttp1StreamHandler implements ResourceHolder {
final boolean endStream = entityDetails == null;
if (endStream) {
- outputChannel.submit(request, endStream, FlushMode.IMMEDIATE);
+ outputChannel.submit(request, true, FlushMode.IMMEDIATE);
committedRequest = request;
requestState = MessageState.COMPLETE;
} else {
final Header h = request.getFirstHeader(HttpHeaders.EXPECT);
final boolean expectContinue = h != null && HeaderElements.CONTINUE.equalsIgnoreCase(h.getValue());
- outputChannel.submit(request, endStream, expectContinue ? FlushMode.IMMEDIATE : FlushMode.BUFFER);
+ outputChannel.submit(request, false, expectContinue ? FlushMode.IMMEDIATE : FlushMode.BUFFER);
committedRequest = request;
if (expectContinue) {
requestState = MessageState.ACK;
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java
index 23b8da2..77cd995 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java
@@ -47,7 +47,7 @@ class SessionOutputBufferImpl extends ExpandableBuffer implements SessionOutputB
private static final byte[] CRLF = new byte[] {Chars.CR, Chars.LF};
private final CharsetEncoder charEncoder;
- private final int lineBuffersize;
+ private final int lineBufferSize;
private CharBuffer charbuffer;
@@ -55,7 +55,7 @@ class SessionOutputBufferImpl extends ExpandableBuffer implements SessionOutputB
* Creates SessionOutputBufferImpl instance.
*
* @param bufferSize input buffer size
- * @param lineBuffersize buffer size for line operations. Has effect only if
+ * @param lineBufferSize buffer size for line operations. Has effect only if
* {@code charEncoder} is not {@code null}.
* @param charEncoder charEncoder to be used for encoding HTTP protocol elements.
* If {@code null} simple type cast will be used for char to byte conversion.
@@ -64,10 +64,10 @@ class SessionOutputBufferImpl extends ExpandableBuffer implements SessionOutputB
*/
public SessionOutputBufferImpl(
final int bufferSize,
- final int lineBuffersize,
+ final int lineBufferSize,
final CharsetEncoder charEncoder) {
super(bufferSize);
- this.lineBuffersize = Args.positive(lineBuffersize, "Line buffer size");
+ this.lineBufferSize = Args.positive(lineBufferSize, "Line buffer size");
this.charEncoder = charEncoder;
}
@@ -181,7 +181,7 @@ class SessionOutputBufferImpl extends ExpandableBuffer implements SessionOutputB
}
} else {
if (this.charbuffer == null) {
- this.charbuffer = CharBuffer.allocate(this.lineBuffersize);
+ this.charbuffer = CharBuffer.allocate(this.lineBufferSize);
}
this.charEncoder.reset();
// transfer the string in small chunks
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueParser.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueParser.java
index 70b8fc2..5399e52 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueParser.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHeaderValueParser.java
@@ -53,8 +53,8 @@ public class BasicHeaderValueParser implements HeaderValueParser {
// IMPORTANT!
// These private static variables must be treated as immutable and never exposed outside this class
- private static final BitSet TOKEN_DELIMS = Tokenizer.INIT_BITSET('=', PARAM_DELIMITER, ELEM_DELIMITER);
- private static final BitSet VALUE_DELIMS = Tokenizer.INIT_BITSET(PARAM_DELIMITER, ELEM_DELIMITER);
+ private static final BitSet TOKEN_DELIMITER = Tokenizer.INIT_BITSET('=', PARAM_DELIMITER, ELEM_DELIMITER);
+ private static final BitSet VALUE_DELIMITER = Tokenizer.INIT_BITSET(PARAM_DELIMITER, ELEM_DELIMITER);
private final Tokenizer tokenizer;
@@ -123,7 +123,7 @@ public class BasicHeaderValueParser implements HeaderValueParser {
Args.notNull(buffer, "Char sequence");
Args.notNull(cursor, "Parser cursor");
- final String name = tokenizer.parseToken(buffer, cursor, TOKEN_DELIMS);
+ final String name = tokenizer.parseToken(buffer, cursor, TOKEN_DELIMITER);
if (cursor.atEnd()) {
return new BasicNameValuePair(name, null);
}
@@ -132,7 +132,7 @@ public class BasicHeaderValueParser implements HeaderValueParser {
if (delim != '=') {
return new BasicNameValuePair(name, null);
}
- final String value = tokenizer.parseValue(buffer, cursor, VALUE_DELIMS);
+ final String value = tokenizer.parseValue(buffer, cursor, VALUE_DELIMITER);
if (!cursor.atEnd()) {
cursor.updatePos(cursor.getPos() + 1);
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HandlerFactory.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HandlerFactory.java
index fb3b73e..97b9131 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HandlerFactory.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/HandlerFactory.java
@@ -43,7 +43,7 @@ public interface HandlerFactory<T extends ResourceHolder> {
* Creates a new handler instance based on properties of
* an incoming request message..
*
- * @param request the incoming reqquest head.
+ * @param request the incoming request head.
* @param context the actual execution context.
* @return handler
*/
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractBinAsyncEntityProducer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractBinAsyncEntityProducer.java
index 1631adb..f8cd055 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractBinAsyncEntityProducer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractBinAsyncEntityProducer.java
@@ -49,23 +49,23 @@ public abstract class AbstractBinAsyncEntityProducer implements AsyncEntityProdu
enum State { ACTIVE, FLUSHING, END_STREAM }
private final int fragmentSizeHint;
- private final ByteBuffer bytebuf;
+ private final ByteBuffer byteBuffer;
private final ContentType contentType;
private volatile State state;
public AbstractBinAsyncEntityProducer(final int fragmentSizeHint, final ContentType contentType) {
this.fragmentSizeHint = fragmentSizeHint >= 0 ? fragmentSizeHint : 0;
- this.bytebuf = ByteBuffer.allocate(this.fragmentSizeHint);
+ this.byteBuffer = ByteBuffer.allocate(this.fragmentSizeHint);
this.contentType = contentType;
this.state = State.ACTIVE;
}
private void flush(final StreamChannel<ByteBuffer> channel) throws IOException {
- if (bytebuf.position() > 0) {
- bytebuf.flip();
- channel.write(bytebuf);
- bytebuf.compact();
+ if (byteBuffer.position() > 0) {
+ byteBuffer.flip();
+ channel.write(byteBuffer);
+ byteBuffer.compact();
}
}
@@ -80,7 +80,7 @@ public abstract class AbstractBinAsyncEntityProducer implements AsyncEntityProdu
// flush the buffer if not empty
flush(channel);
- if (bytebuf.position() == 0) {
+ if (byteBuffer.position() == 0) {
return channel.write(src);
}
} else {
@@ -88,12 +88,12 @@ public abstract class AbstractBinAsyncEntityProducer implements AsyncEntityProdu
// attempt to buffer it
// flush the buffer if there is not enough space to store the chunk
- if (bytebuf.remaining() < chunk) {
+ if (byteBuffer.remaining() < chunk) {
flush(channel);
}
- if (bytebuf.remaining() >= chunk) {
- bytebuf.put(src);
- if (!bytebuf.hasRemaining()) {
+ if (byteBuffer.remaining() >= chunk) {
+ byteBuffer.put(src);
+ if (!byteBuffer.hasRemaining()) {
flush(channel);
}
return chunk;
@@ -106,7 +106,7 @@ public abstract class AbstractBinAsyncEntityProducer implements AsyncEntityProdu
if (state == State.ACTIVE) {
state = State.FLUSHING;
flush(channel);
- if (bytebuf.position() == 0) {
+ if (byteBuffer.position() == 0) {
state = State.END_STREAM;
channel.endStream();
}
@@ -163,29 +163,29 @@ public abstract class AbstractBinAsyncEntityProducer implements AsyncEntityProdu
if (state == State.ACTIVE) {
return availableData();
} else {
- synchronized (bytebuf) {
- return bytebuf.position();
+ synchronized (byteBuffer) {
+ return byteBuffer.position();
}
}
}
@Override
public final void produce(final DataStreamChannel channel) throws IOException {
- synchronized (bytebuf) {
+ synchronized (byteBuffer) {
if (state == State.ACTIVE) {
produceData(new StreamChannel<ByteBuffer>() {
@Override
public int write(final ByteBuffer src) throws IOException {
Args.notNull(src, "Buffer");
- synchronized (bytebuf) {
+ synchronized (byteBuffer) {
return writeData(channel, src);
}
}
@Override
public void endStream() throws IOException {
- synchronized (bytebuf) {
+ synchronized (byteBuffer) {
streamEnd(channel);
}
}
@@ -194,7 +194,7 @@ public abstract class AbstractBinAsyncEntityProducer implements AsyncEntityProdu
}
if (state == State.FLUSHING) {
flush(channel);
- if (bytebuf.position() == 0) {
+ if (byteBuffer.position() == 0) {
state = State.END_STREAM;
channel.endStream();
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharDataConsumer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharDataConsumer.java
index d89a431..48a2498 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharDataConsumer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharDataConsumer.java
@@ -52,14 +52,14 @@ public abstract class AbstractCharDataConsumer implements AsyncDataConsumer {
protected static final int DEF_BUF_SIZE = 8192;
private static final ByteBuffer EMPTY_BIN = ByteBuffer.wrap(new byte[0]);
- private final CharBuffer charbuf;
+ private final CharBuffer charBuffer;
private final CharCodingConfig charCodingConfig;
private volatile Charset charset;
private volatile CharsetDecoder charsetDecoder;
protected AbstractCharDataConsumer(final int bufSize, final CharCodingConfig charCodingConfig) {
- this.charbuf = CharBuffer.allocate(Args.positive(bufSize, "Buffer size"));
+ this.charBuffer = CharBuffer.allocate(Args.positive(bufSize, "Buffer size"));
this.charCodingConfig = charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT;
}
@@ -104,9 +104,9 @@ public abstract class AbstractCharDataConsumer implements AsyncDataConsumer {
}
private void doDecode(final boolean endOfStream) throws IOException {
- charbuf.flip();
- data(charbuf, endOfStream);
- charbuf.clear();
+ charBuffer.flip();
+ data(charBuffer, endOfStream);
+ charBuffer.clear();
}
private CharsetDecoder getCharsetDecoder() {
@@ -133,7 +133,7 @@ public abstract class AbstractCharDataConsumer implements AsyncDataConsumer {
public final void consume(final ByteBuffer src) throws IOException {
final CharsetDecoder charsetDecoder = getCharsetDecoder();
while (src.hasRemaining()) {
- checkResult(charsetDecoder.decode(src, charbuf, false));
+ checkResult(charsetDecoder.decode(src, charBuffer, false));
doDecode(false);
}
}
@@ -141,9 +141,9 @@ public abstract class AbstractCharDataConsumer implements AsyncDataConsumer {
@Override
public final void streamEnd(final List<? extends Header> trailers) throws HttpException, IOException {
final CharsetDecoder charsetDecoder = getCharsetDecoder();
- checkResult(charsetDecoder.decode(EMPTY_BIN, charbuf, true));
+ checkResult(charsetDecoder.decode(EMPTY_BIN, charBuffer, true));
doDecode(false);
- checkResult(charsetDecoder.flush(charbuf));
+ checkResult(charsetDecoder.flush(charBuffer));
doDecode(true);
completed();
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java b/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java
index a3e3676..d068702 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/net/URLEncodedUtils.java
@@ -209,10 +209,10 @@ public class URLEncodedUtils {
if (i > 0) {
buf.append(parameterSeparator);
}
- PercentCodec.encode(buf, parameter.getName(), charset, URLENCODER, true);
+ PercentCodec.encode(buf, parameter.getName(), charset, URL_ENCODER, true);
if (parameter.getValue() != null) {
buf.append('=');
- PercentCodec.encode(buf, parameter.getValue(), charset, URLENCODER, true);
+ PercentCodec.encode(buf, parameter.getValue(), charset, URL_ENCODER, true);
}
i++;
}
@@ -235,25 +235,25 @@ public class URLEncodedUtils {
return format(parameters, QP_SEP_A, charset);
}
- private static final BitSet URLENCODER = new BitSet(256);
+ private static final BitSet URL_ENCODER = new BitSet(256);
static {
// unreserved chars
// alpha characters
for (int i = 'a'; i <= 'z'; i++) {
- URLENCODER.set(i);
+ URL_ENCODER.set(i);
}
for (int i = 'A'; i <= 'Z'; i++) {
- URLENCODER.set(i);
+ URL_ENCODER.set(i);
}
// numeric characters
for (int i = '0'; i <= '9'; i++) {
- URLENCODER.set(i);
+ URL_ENCODER.set(i);
}
- URLENCODER.set('_'); // these are the characters of the "mark" list
- URLENCODER.set('-');
- URLENCODER.set('.');
- URLENCODER.set('*');
+ URL_ENCODER.set('_'); // these are the characters of the "mark" list
+ URL_ENCODER.set('-');
+ URL_ENCODER.set('.');
+ URL_ENCODER.set('*');
}
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/pool/LaxConnPool.java b/httpcore5/src/main/java/org/apache/hc/core5/pool/LaxConnPool.java
index 8fbdac1..f14a998 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/pool/LaxConnPool.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/pool/LaxConnPool.java
@@ -406,11 +406,11 @@ public class LaxConnPool<T, C extends ModalCloseable> implements ManagedConnPool
}
private PoolEntry<T, C> createPoolEntry() {
- final int poolmax = max;
+ final int poolMax = max;
int prev, next;
do {
prev = allocated.get();
- next = (prev<poolmax)? prev+1 : prev;
+ next = (prev<poolMax)? prev+1 : prev;
} while (!allocated.compareAndSet(prev, next));
return (prev < next)? new PoolEntry<>(route, timeToLive, disposalCallback) : null;
}