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 2015/12/01 14:15:03 UTC
svn commit: r1717426 - in
/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5:
http/ http/impl/io/ http/impl/nio/ util/
Author: olegk
Date: Tue Dec 1 13:15:03 2015
New Revision: 1717426
URL: http://svn.apache.org/viewvc?rev=1717426&view=rev
Log:
Renamed Consts to Chars
Added:
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Chars.java (contents, props changed)
- copied, changed from r1717425, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Consts.java
Removed:
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Consts.java
Modified:
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java
Copied: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Chars.java (from r1717425, httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Consts.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Chars.java?p2=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Chars.java&p1=httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Consts.java&r1=1717425&r2=1717426&rev=1717426&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Consts.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Chars.java Tue Dec 1 13:15:03 2015
@@ -28,19 +28,18 @@
package org.apache.hc.core5.http;
/**
- * Commons constants.
+ * Commons chars used by HTTP/1.1 protocol.
*
- * @since 4.2
- * @since 5.0 Removed Charset constants, reuse Java 7's {@link java.nio.charset.StandardCharsets} class instead.
+ * @since 5.0
*/
-public final class Consts {
+public final class Chars {
public static final int CR = 13; // <US-ASCII CR, carriage return (13)>
public static final int LF = 10; // <US-ASCII LF, linefeed (10)>
public static final int SP = 32; // <US-ASCII SP, space (32)>
public static final int HT = 9; // <US-ASCII HT, horizontal-tab (9)>
- private Consts() {
+ private Chars() {
}
}
Propchange: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Chars.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Chars.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/Chars.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java?rev=1717426&r1=1717425&r2=1717426&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionInputBufferImpl.java Tue Dec 1 13:15:03 2015
@@ -35,7 +35,7 @@ import java.nio.charset.CharsetDecoder;
import java.nio.charset.CoderResult;
import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.Chars;
import org.apache.hc.core5.http.MessageConstraintException;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.io.HttpTransportMetrics;
@@ -247,7 +247,7 @@ public class SessionInputBufferImpl impl
// attempt to find end of line (LF)
int pos = -1;
for (int i = this.bufferpos; i < this.bufferlen; i++) {
- if (this.buffer[i] == Consts.LF) {
+ if (this.buffer[i] == Chars.LF) {
pos = i;
break;
}
@@ -309,12 +309,12 @@ public class SessionInputBufferImpl impl
// discard LF if found
int len = this.linebuffer.length();
if (len > 0) {
- if (this.linebuffer.byteAt(len - 1) == Consts.LF) {
+ if (this.linebuffer.byteAt(len - 1) == Chars.LF) {
len--;
}
// discard CR if found
if (len > 0) {
- if (this.linebuffer.byteAt(len - 1) == Consts.CR) {
+ if (this.linebuffer.byteAt(len - 1) == Chars.CR) {
len--;
}
}
@@ -335,7 +335,7 @@ public class SessionInputBufferImpl impl
final int off = this.bufferpos;
int len;
this.bufferpos = pos + 1;
- if (pos > off && this.buffer[pos - 1] == Consts.CR) {
+ if (pos > off && this.buffer[pos - 1] == Chars.CR) {
// skip CR if found
pos--;
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java?rev=1717426&r1=1717425&r2=1717426&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferImpl.java Tue Dec 1 13:15:03 2015
@@ -35,7 +35,7 @@ import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.Chars;
import org.apache.hc.core5.http.io.HttpTransportMetrics;
import org.apache.hc.core5.http.io.SessionOutputBuffer;
import org.apache.hc.core5.util.Args;
@@ -56,7 +56,7 @@ import org.apache.hc.core5.util.CharArra
@NotThreadSafe
public class SessionOutputBufferImpl implements SessionOutputBuffer {
- private static final byte[] CRLF = new byte[] {Consts.CR, Consts.LF};
+ private static final byte[] CRLF = new byte[] {Chars.CR, Chars.LF};
private final HttpTransportMetricsImpl metrics;
private final ByteArrayBuffer buffer;
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java?rev=1717426&r1=1717425&r2=1717426&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionInputBufferImpl.java Tue Dec 1 13:15:03 2015
@@ -37,7 +37,7 @@ import java.nio.charset.CharsetDecoder;
import java.nio.charset.CoderResult;
import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.Chars;
import org.apache.hc.core5.http.MessageConstraintException;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.nio.SessionInputBuffer;
@@ -230,7 +230,7 @@ public class SessionInputBufferImpl exte
int pos = -1;
for (int i = buffer().position(); i < buffer().limit(); i++) {
final int b = buffer().get(i);
- if (b == Consts.LF) {
+ if (b == Chars.LF) {
pos = i + 1;
break;
}
@@ -317,13 +317,13 @@ public class SessionInputBufferImpl exte
// discard LF if found
int l = linebuffer.length();
if (l > 0) {
- if (linebuffer.charAt(l - 1) == Consts.LF) {
+ if (linebuffer.charAt(l - 1) == Chars.LF) {
l--;
linebuffer.setLength(l);
}
// discard CR if found
if (l > 0) {
- if (linebuffer.charAt(l - 1) == Consts.CR) {
+ if (linebuffer.charAt(l - 1) == Chars.CR) {
l--;
linebuffer.setLength(l);
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java?rev=1717426&r1=1717425&r2=1717426&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/http/impl/nio/SessionOutputBufferImpl.java Tue Dec 1 13:15:03 2015
@@ -38,7 +38,7 @@ import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.Chars;
import org.apache.hc.core5.http.nio.SessionOutputBuffer;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.ByteBufferAllocator;
@@ -54,7 +54,7 @@ import org.apache.hc.core5.util.HeapByte
@NotThreadSafe
public class SessionOutputBufferImpl extends ExpandableBuffer implements SessionOutputBuffer {
- private static final byte[] CRLF = new byte[] {Consts.CR, Consts.LF};
+ private static final byte[] CRLF = new byte[] {Chars.CR, Chars.LF};
private final CharsetEncoder charencoder;
private final int lineBuffersize;
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java?rev=1717426&r1=1717425&r2=1717426&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/hc/core5/util/CharArrayBuffer.java Tue Dec 1 13:15:03 2015
@@ -31,7 +31,7 @@ import java.io.Serializable;
import java.nio.CharBuffer;
import org.apache.hc.core5.annotation.NotThreadSafe;
-import org.apache.hc.core5.http.Consts;
+import org.apache.hc.core5.http.Chars;
/**
* A resizable char array.
@@ -432,7 +432,7 @@ public final class CharArrayBuffer imple
}
private static boolean isWhitespace(final char ch) {
- return ch == Consts.SP || ch == Consts.HT || ch == Consts.CR || ch == Consts.LF;
+ return ch == Chars.SP || ch == Chars.HT || ch == Chars.CR || ch == Chars.LF;
}
/**