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 2018/08/14 07:51:38 UTC
[03/12] httpcomponents-core git commit: Use camel-case for ivars and
param names; don't nest with else clauses unnecessarily;
comment intention of empty blocks;
use "readLen" name for local var instead of "i" or other cryptic name to hold
read length of
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java b/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java
index b5cff65..680a84c 100644
--- a/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java
+++ b/httpcore/src/test/java/org/apache/http/impl/io/TestSessionInOutBuffers.java
@@ -49,13 +49,13 @@ public class TestSessionInOutBuffers {
@Test
public void testBasicBufferProperties() throws Exception {
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(new byte[] { 1, 2 , 3});
- Assert.assertEquals(SessionInputBufferMock.BUFFER_SIZE, inbuffer.capacity());
- Assert.assertEquals(SessionInputBufferMock.BUFFER_SIZE, inbuffer.available());
- Assert.assertEquals(0, inbuffer.length());
- inbuffer.read();
- Assert.assertEquals(SessionInputBufferMock.BUFFER_SIZE - 2, inbuffer.available());
- Assert.assertEquals(2, inbuffer.length());
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(new byte[] { 1, 2 , 3});
+ Assert.assertEquals(SessionInputBufferMock.BUFFER_SIZE, inBuffer.capacity());
+ Assert.assertEquals(SessionInputBufferMock.BUFFER_SIZE, inBuffer.available());
+ Assert.assertEquals(0, inBuffer.length());
+ inBuffer.read();
+ Assert.assertEquals(SessionInputBufferMock.BUFFER_SIZE - 2, inBuffer.available());
+ Assert.assertEquals(2, inBuffer.length());
final SessionOutputBufferMock outbuffer = new SessionOutputBufferMock();
Assert.assertEquals(SessionOutputBufferMock.BUFFER_SIZE, outbuffer.capacity());
@@ -102,16 +102,16 @@ public class TestSessionInOutBuffers {
}
Assert.assertEquals(expected, bytesWritten);
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(
outbuffer.getData());
for (final String teststr : teststrs) {
- Assert.assertEquals(teststr, inbuffer.readLine());
+ Assert.assertEquals(teststr, inBuffer.readLine());
}
- Assert.assertNull(inbuffer.readLine());
- Assert.assertNull(inbuffer.readLine());
- tmetrics = inbuffer.getMetrics();
+ Assert.assertNull(inBuffer.readLine());
+ Assert.assertNull(inBuffer.readLine());
+ tmetrics = inBuffer.getMetrics();
final long bytesRead = tmetrics.getBytesTransferred();
Assert.assertEquals(expected, bytesRead);
}
@@ -170,20 +170,20 @@ public class TestSessionInOutBuffers {
bytesWritten = outbuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(8 + 14 + 2 + 15 + 2 + 16 + 2 + 1, bytesWritten);
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(
outbuffer.getData());
- Assert.assertEquals("a", inbuffer.readLine());
- Assert.assertEquals("", inbuffer.readLine());
- Assert.assertEquals("\r", inbuffer.readLine());
- Assert.assertEquals("", inbuffer.readLine());
- Assert.assertEquals(s1, inbuffer.readLine());
- Assert.assertEquals(s2, inbuffer.readLine());
- Assert.assertEquals(s3, inbuffer.readLine());
- Assert.assertEquals("a", inbuffer.readLine());
- Assert.assertNull(inbuffer.readLine());
- Assert.assertNull(inbuffer.readLine());
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals("a", inBuffer.readLine());
+ Assert.assertEquals("", inBuffer.readLine());
+ Assert.assertEquals("\r", inBuffer.readLine());
+ Assert.assertEquals("", inBuffer.readLine());
+ Assert.assertEquals(s1, inBuffer.readLine());
+ Assert.assertEquals(s2, inBuffer.readLine());
+ Assert.assertEquals(s3, inBuffer.readLine());
+ Assert.assertEquals("a", inBuffer.readLine());
+ Assert.assertNull(inBuffer.readLine());
+ Assert.assertNull(inBuffer.readLine());
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(bytesWritten, bytesRead);
}
@@ -222,15 +222,15 @@ public class TestSessionInOutBuffers {
}
Assert.assertEquals(expected, bytesWritten);
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(
outbuffer.getData(), 1024);
for (final String teststr : teststrs) {
- Assert.assertEquals(teststr, inbuffer.readLine());
+ Assert.assertEquals(teststr, inBuffer.readLine());
}
- Assert.assertNull(inbuffer.readLine());
- Assert.assertNull(inbuffer.readLine());
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertNull(inBuffer.readLine());
+ Assert.assertNull(inBuffer.readLine());
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(expected, bytesRead);
}
@@ -263,12 +263,12 @@ public class TestSessionInOutBuffers {
Assert.assertEquals(out[i], tmp[i]);
}
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(tmp);
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(tmp);
// these read operations will have no effect
- Assert.assertEquals(0, inbuffer.read(null, 0, 10));
- Assert.assertEquals(0, inbuffer.read(null));
- long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals(0, inBuffer.read(null, 0, 10));
+ Assert.assertEquals(0, inBuffer.read(null));
+ long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(0, bytesRead);
final byte[] in = new byte[40];
@@ -279,19 +279,19 @@ public class TestSessionInOutBuffers {
if (chunk > remaining) {
chunk = remaining;
}
- final int l = inbuffer.read(in, off, chunk);
- if (l == -1) {
+ final int readLen = inBuffer.read(in, off, chunk);
+ if (readLen == -1) {
break;
}
- off += l;
- remaining -= l;
+ off += readLen;
+ remaining -= readLen;
}
for (int i = 0; i < out.length; i++) {
Assert.assertEquals(out[i], in[i]);
}
- Assert.assertEquals(-1, inbuffer.read(tmp));
- Assert.assertEquals(-1, inbuffer.read(tmp));
- bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals(-1, inBuffer.read(tmp));
+ Assert.assertEquals(-1, inBuffer.read(tmp));
+ bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(out.length, bytesRead);
}
@@ -316,45 +316,45 @@ public class TestSessionInOutBuffers {
Assert.assertEquals(out[i], tmp[i]);
}
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(tmp);
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(tmp);
final byte[] in = new byte[40];
for (int i = 0; i < in.length; i++) {
- in[i] = (byte)inbuffer.read();
+ in[i] = (byte)inBuffer.read();
}
for (int i = 0; i < out.length; i++) {
Assert.assertEquals(out[i], in[i]);
}
- Assert.assertEquals(-1, inbuffer.read());
- Assert.assertEquals(-1, inbuffer.read());
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals(-1, inBuffer.read());
+ Assert.assertEquals(-1, inBuffer.read());
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(out.length, bytesRead);
}
@Test
public void testWriteSmallFragmentBuffering() throws Exception {
- final ByteArrayOutputStream outstream = Mockito.spy(new ByteArrayOutputStream());
- final SessionOutputBufferMock outbuffer = new SessionOutputBufferMock(outstream, 16, 16, null);
+ final ByteArrayOutputStream outStream = Mockito.spy(new ByteArrayOutputStream());
+ final SessionOutputBufferMock outbuffer = new SessionOutputBufferMock(outStream, 16, 16, null);
outbuffer.write(1);
outbuffer.write(2);
outbuffer.write(new byte[] {1, 2});
outbuffer.write(new byte[]{3, 4});
outbuffer.flush();
- Mockito.verify(outstream, Mockito.times(1)).write(
+ Mockito.verify(outStream, Mockito.times(1)).write(
Matchers.<byte[]>any(), Matchers.anyInt(), Matchers.anyInt());
- Mockito.verify(outstream, Mockito.never()).write(Matchers.anyInt());
+ Mockito.verify(outStream, Mockito.never()).write(Matchers.anyInt());
}
@Test
public void testWriteSmallFragmentNoBuffering() throws Exception {
- final ByteArrayOutputStream outstream = Mockito.spy(new ByteArrayOutputStream());
- final SessionOutputBufferMock outbuffer = new SessionOutputBufferMock(outstream, 16, 0, null);
+ final ByteArrayOutputStream outStream = Mockito.spy(new ByteArrayOutputStream());
+ final SessionOutputBufferMock outbuffer = new SessionOutputBufferMock(outStream, 16, 0, null);
outbuffer.write(1);
outbuffer.write(2);
outbuffer.write(new byte[] {1, 2});
outbuffer.write(new byte[]{3, 4});
- Mockito.verify(outstream, Mockito.times(2)).write(
+ Mockito.verify(outStream, Mockito.times(2)).write(
Matchers.<byte []>any(), Matchers.anyInt(), Matchers.anyInt());
- Mockito.verify(outstream, Mockito.times(2)).write(Matchers.anyInt());
+ Mockito.verify(outStream, Mockito.times(2)).write(Matchers.anyInt());
}
@Test
@@ -362,17 +362,17 @@ public class TestSessionInOutBuffers {
final String s = "a very looooooooooooooooooooooooooooooooooooooooooong line\r\n";
final byte[] tmp = s.getBytes(Consts.ASCII);
// no limit
- final SessionInputBufferMock inbuffer1 = new SessionInputBufferMock(tmp, 5,
+ final SessionInputBufferMock inBuffer1 = new SessionInputBufferMock(tmp, 5,
MessageConstraints.DEFAULT);
- Assert.assertNotNull(inbuffer1.readLine());
- final long bytesRead = inbuffer1.getMetrics().getBytesTransferred();
+ Assert.assertNotNull(inBuffer1.readLine());
+ final long bytesRead = inBuffer1.getMetrics().getBytesTransferred();
Assert.assertEquals(60, bytesRead);
// 15 char limit
- final SessionInputBufferMock inbuffer2 = new SessionInputBufferMock(tmp, 5,
+ final SessionInputBufferMock inBuffer2 = new SessionInputBufferMock(tmp, 5,
MessageConstraints.lineLen(15));
try {
- inbuffer2.readLine();
+ inBuffer2.readLine();
Assert.fail("MessageConstraintException expected");
} catch (final MessageConstraintException ex) {
}
@@ -383,17 +383,17 @@ public class TestSessionInOutBuffers {
final String s = "just a line\r\n";
final byte[] tmp = s.getBytes(Consts.ASCII);
// no limit
- final SessionInputBufferMock inbuffer1 = new SessionInputBufferMock(tmp, 25,
+ final SessionInputBufferMock inBuffer1 = new SessionInputBufferMock(tmp, 25,
MessageConstraints.DEFAULT);
- Assert.assertNotNull(inbuffer1.readLine());
- final long bytesRead = inbuffer1.getMetrics().getBytesTransferred();
+ Assert.assertNotNull(inBuffer1.readLine());
+ final long bytesRead = inBuffer1.getMetrics().getBytesTransferred();
Assert.assertEquals(13, bytesRead);
// 10 char limit
- final SessionInputBufferMock inbuffer2 = new SessionInputBufferMock(tmp, 25,
+ final SessionInputBufferMock inBuffer2 = new SessionInputBufferMock(tmp, 25,
MessageConstraints.lineLen(10));
try {
- inbuffer2.readLine();
+ inBuffer2.readLine();
Assert.fail("MessageConstraintException expected");
} catch (final MessageConstraintException ex) {
}
@@ -403,21 +403,21 @@ public class TestSessionInOutBuffers {
public void testLineLimit3() throws Exception {
final String s = "012345678\r\nblaaaaaaaaaaaaaaaaaah";
final byte[] tmp = s.getBytes(Consts.ASCII);
- final SessionInputBufferMock inbuffer1 = new SessionInputBufferMock(tmp, 10,
+ final SessionInputBufferMock inBuffer1 = new SessionInputBufferMock(tmp, 10,
MessageConstraints.lineLen(20));
- Assert.assertEquals("012345678", inbuffer1.readLine());
+ Assert.assertEquals("012345678", inBuffer1.readLine());
}
@Test
public void testReadLineFringeCase1() throws Exception {
final String s = "abc\r\n";
final byte[] tmp = s.getBytes(Consts.ASCII);
- final SessionInputBufferMock inbuffer1 = new SessionInputBufferMock(tmp, 128);
- Assert.assertEquals('a', inbuffer1.read());
- Assert.assertEquals('b', inbuffer1.read());
- Assert.assertEquals('c', inbuffer1.read());
- Assert.assertEquals('\r', inbuffer1.read());
- Assert.assertEquals("", inbuffer1.readLine());
+ final SessionInputBufferMock inBuffer1 = new SessionInputBufferMock(tmp, 128);
+ Assert.assertEquals('a', inBuffer1.read());
+ Assert.assertEquals('b', inBuffer1.read());
+ Assert.assertEquals('c', inBuffer1.read());
+ Assert.assertEquals('\r', inBuffer1.read());
+ Assert.assertEquals("", inBuffer1.readLine());
}
static final int SWISS_GERMAN_HELLO [] = {
@@ -466,17 +466,17 @@ public class TestSessionInOutBuffers {
(s3.getBytes(Consts.UTF_8).length + 2)) * 10;
Assert.assertEquals(expected, bytesWritten);
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(
outbuffer.getData(), Consts.UTF_8);
for (int i = 0; i < 10; i++) {
- Assert.assertEquals(s1, inbuffer.readLine());
- Assert.assertEquals(s2, inbuffer.readLine());
- Assert.assertEquals(s3, inbuffer.readLine());
+ Assert.assertEquals(s1, inBuffer.readLine());
+ Assert.assertEquals(s2, inBuffer.readLine());
+ Assert.assertEquals(s3, inBuffer.readLine());
}
- Assert.assertNull(inbuffer.readLine());
- Assert.assertNull(inbuffer.readLine());
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertNull(inBuffer.readLine());
+ Assert.assertNull(inBuffer.readLine());
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(expected, bytesRead);
}
@@ -498,10 +498,10 @@ public class TestSessionInOutBuffers {
outbuffer.writeLine(chbuffer);
outbuffer.flush();
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(
outbuffer.getData(), Consts.UTF_8);
- Assert.assertEquals(s, inbuffer.readLine());
+ Assert.assertEquals(s, inBuffer.readLine());
}
@Test
@@ -526,21 +526,21 @@ public class TestSessionInOutBuffers {
final long expected = ((s1.toString().getBytes(Consts.ISO_8859_1).length + 2)) * 10 + 2;
Assert.assertEquals(expected, bytesWritten);
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(
outbuffer.getData(), Consts.ISO_8859_1);
final CharArrayBuffer buf = new CharArrayBuffer(64);
for (int i = 0; i < 10; i++) {
buf.clear();
- final int len = inbuffer.readLine(buf);
- Assert.assertEquals(len, SWISS_GERMAN_HELLO.length);
+ final int readLen = inBuffer.readLine(buf);
+ Assert.assertEquals(readLen, SWISS_GERMAN_HELLO.length);
Assert.assertEquals(s1, buf.toString());
}
buf.clear();
- Assert.assertEquals("", inbuffer.readLine());
- Assert.assertNull(inbuffer.readLine());
- Assert.assertNull(inbuffer.readLine());
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals("", inBuffer.readLine());
+ Assert.assertNull(inBuffer.readLine());
+ Assert.assertNull(inBuffer.readLine());
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(expected, bytesRead);
}
@@ -586,8 +586,8 @@ public class TestSessionInOutBuffers {
final CharsetDecoder decoder = Consts.UTF_8.newDecoder();
decoder.onMalformedInput(CodingErrorAction.REPORT);
decoder.onUnmappableCharacter(CodingErrorAction.IGNORE);
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(tmp, decoder);
- inbuffer.readLine();
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(tmp, decoder);
+ inBuffer.readLine();
}
@Test
@@ -596,8 +596,8 @@ public class TestSessionInOutBuffers {
final CharsetDecoder decoder = Consts.UTF_8.newDecoder();
decoder.onMalformedInput(CodingErrorAction.REPLACE);
decoder.onUnmappableCharacter(CodingErrorAction.IGNORE);
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(tmp, decoder);
- final String s = inbuffer.readLine();
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(tmp, decoder);
+ final String s = inBuffer.readLine();
Assert.assertEquals("Gr\ufffdezi_z\ufffdm\ufffd", s);
}
@@ -607,20 +607,20 @@ public class TestSessionInOutBuffers {
final CharsetDecoder decoder = Consts.UTF_8.newDecoder();
decoder.onMalformedInput(CodingErrorAction.IGNORE);
decoder.onUnmappableCharacter(CodingErrorAction.IGNORE);
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(tmp, decoder);
- final String s = inbuffer.readLine();
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(tmp, decoder);
+ final String s = inBuffer.readLine();
Assert.assertEquals("Grezi_zm", s);
}
@Test
public void testInvalidCharArrayBuffer() throws Exception {
- final SessionInputBufferMock inbuffer = new SessionInputBufferMock(new byte[] {});
+ final SessionInputBufferMock inBuffer = new SessionInputBufferMock(new byte[] {});
try {
- inbuffer.readLine(null);
+ inBuffer.readLine(null);
Assert.fail("IllegalArgumentException should have been thrown");
} catch (final IllegalArgumentException ex) {
//expected
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(0, bytesRead);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java b/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java
index fd8934e..2a6aa5b 100644
--- a/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java
+++ b/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java
@@ -638,13 +638,13 @@ public class TestSyncHttp {
}
@Override
- public void writeTo(final OutputStream outstream) throws IOException {
+ public void writeTo(final OutputStream outStream) throws IOException {
for (int i = 0; i < this.n; i++) {
- outstream.write(this.raw);
- outstream.write('\r');
- outstream.write('\n');
+ outStream.write(this.raw);
+ outStream.write('\r');
+ outStream.write('\n');
}
- outstream.flush();
+ outStream.flush();
}
}
@@ -735,14 +735,14 @@ public class TestSyncHttp {
final HttpResponse response = this.client.execute(post, host, conn);
final HttpEntity incoming = response.getEntity();
Assert.assertNotNull(incoming);
- final InputStream instream = incoming.getContent();
+ final InputStream inStream = incoming.getContent();
final ContentType contentType = ContentType.getOrDefault(incoming);
Charset charset = contentType.getCharset();
if (charset == null) {
charset = HTTP.DEF_CONTENT_CHARSET;
}
- Assert.assertNotNull(instream);
- final BufferedReader reader = new BufferedReader(new InputStreamReader(instream, charset));
+ Assert.assertNotNull(inStream);
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(inStream, charset));
String line;
int count = 0;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/message/TestBufferedHeader.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/message/TestBufferedHeader.java b/httpcore/src/test/java/org/apache/http/message/TestBufferedHeader.java
index ae26655..94f0c76 100644
--- a/httpcore/src/test/java/org/apache/http/message/TestBufferedHeader.java
+++ b/httpcore/src/test/java/org/apache/http/message/TestBufferedHeader.java
@@ -97,13 +97,13 @@ public class TestBufferedHeader {
buf.append("name: value");
final BufferedHeader orig = new BufferedHeader(buf);
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final BufferedHeader clone = (BufferedHeader) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final BufferedHeader clone = (BufferedHeader) inStream.readObject();
Assert.assertEquals(orig.getName(), clone.getName());
Assert.assertEquals(orig.getValue(), clone.getValue());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/message/TestHeader.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/message/TestHeader.java b/httpcore/src/test/java/org/apache/http/message/TestHeader.java
index 57bf7ea..3760c42 100644
--- a/httpcore/src/test/java/org/apache/http/message/TestHeader.java
+++ b/httpcore/src/test/java/org/apache/http/message/TestHeader.java
@@ -106,13 +106,13 @@ public class TestHeader {
public void testSerialization() throws Exception {
final BasicHeader orig = new BasicHeader("name1", "value1");
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final BasicHeader clone = (BasicHeader) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final BasicHeader clone = (BasicHeader) inStream.readObject();
Assert.assertEquals(orig.getName(), clone.getName());
Assert.assertEquals(orig.getValue(), clone.getValue());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java b/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java
index 6fb6dfb..9899ce6 100644
--- a/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java
+++ b/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java
@@ -195,13 +195,13 @@ public class TestHeaderGroup {
final Header header3 = new BasicHeader("name", "value3");
orig.setHeaders(new Header[] { header1, header2, header3 });
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final HeaderGroup clone = (HeaderGroup) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final HeaderGroup clone = (HeaderGroup) inStream.readObject();
final Header[] headers1 = orig.getAllHeaders();
final Header[] headers2 = clone.getAllHeaders();
Assert.assertNotNull(headers1);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java b/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java
index 8432830..2f04b45 100644
--- a/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java
+++ b/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java
@@ -79,13 +79,13 @@ public class TestRequestLine {
public void testSerialization() throws Exception {
final BasicRequestLine orig = new BasicRequestLine("GET", "/stuff", HttpVersion.HTTP_1_1);
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final BasicRequestLine clone = (BasicRequestLine) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final BasicRequestLine clone = (BasicRequestLine) inStream.readObject();
Assert.assertEquals(orig.getMethod(), clone.getMethod());
Assert.assertEquals(orig.getUri(), clone.getUri());
Assert.assertEquals(orig.getProtocolVersion(), clone.getProtocolVersion());
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java b/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java
index d1f7e58..5574ebe 100644
--- a/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java
+++ b/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java
@@ -85,13 +85,13 @@ public class TestStatusLine {
public void testSerialization() throws Exception {
final BasicStatusLine orig = new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final BasicStatusLine clone = (BasicStatusLine) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final BasicStatusLine clone = (BasicStatusLine) inStream.readObject();
Assert.assertEquals(orig.getReasonPhrase(), clone.getReasonPhrase());
Assert.assertEquals(orig.getStatusCode(), clone.getStatusCode());
Assert.assertEquals(orig.getProtocolVersion(), clone.getProtocolVersion());
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java b/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
index cd60179..3bcd4bb 100644
--- a/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
+++ b/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
@@ -169,8 +169,8 @@ public class TestHttpService {
final HttpCoreContext context = HttpCoreContext.create();
final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final HttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
- final InputStream instream = Mockito.mock(InputStream.class);
- final InputStreamEntity entity = new InputStreamEntity(instream, -1);
+ final InputStream inStream = Mockito.mock(InputStream.class);
+ final InputStreamEntity entity = new InputStreamEntity(inStream, -1);
request.setEntity(entity);
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
@@ -188,7 +188,7 @@ public class TestHttpService {
Mockito.verify(conn).receiveRequestEntity(request);
Mockito.verify(httprocessor).process(request, context);
- Mockito.verify(instream).close();
+ Mockito.verify(inStream).close();
Mockito.verify(httprocessor).process(response, context);
Mockito.verify(conn).sendResponseHeader(response);
Mockito.verify(conn).sendResponseEntity(response);
@@ -212,8 +212,8 @@ public class TestHttpService {
final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final HttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
request.addHeader(HTTP.EXPECT_DIRECTIVE, HTTP.EXPECT_CONTINUE);
- final InputStream instream = Mockito.mock(InputStream.class);
- final InputStreamEntity entity = new InputStreamEntity(instream, -1);
+ final InputStream inStream = Mockito.mock(InputStream.class);
+ final InputStreamEntity entity = new InputStreamEntity(inStream, -1);
request.setEntity(entity);
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
@@ -234,7 +234,7 @@ public class TestHttpService {
Mockito.verify(conn).sendResponseHeader(resp100);
Mockito.verify(conn).receiveRequestEntity(request);
Mockito.verify(httprocessor).process(request, context);
- Mockito.verify(instream).close();
+ Mockito.verify(inStream).close();
Mockito.verify(httprocessor).process(response, context);
Mockito.verify(conn).sendResponseHeader(response);
Mockito.verify(conn).sendResponseEntity(response);
@@ -271,8 +271,8 @@ public class TestHttpService {
final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final HttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
request.addHeader(HTTP.EXPECT_DIRECTIVE, HTTP.EXPECT_CONTINUE);
- final InputStream instream = Mockito.mock(InputStream.class);
- final InputStreamEntity entity = new InputStreamEntity(instream, -1);
+ final InputStream inStream = Mockito.mock(InputStream.class);
+ final InputStreamEntity entity = new InputStreamEntity(inStream, -1);
request.setEntity(entity);
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
@@ -315,8 +315,8 @@ public class TestHttpService {
final HttpServerConnection conn = Mockito.mock(HttpServerConnection.class);
final HttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
request.addHeader(HTTP.EXPECT_DIRECTIVE, HTTP.EXPECT_CONTINUE);
- final InputStream instream = Mockito.mock(InputStream.class);
- final InputStreamEntity entity = new InputStreamEntity(instream, -1);
+ final InputStream inStream = Mockito.mock(InputStream.class);
+ final InputStreamEntity entity = new InputStreamEntity(inStream, -1);
request.setEntity(entity);
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpClientConnection.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpClientConnection.java b/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpClientConnection.java
index c6bfb83..a623a10 100644
--- a/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpClientConnection.java
+++ b/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpClientConnection.java
@@ -56,7 +56,7 @@ public class LoggingBHttpClientConnection extends DefaultBHttpClientConnection {
private final Wire wire;
public LoggingBHttpClientConnection(
- final int buffersize,
+ final int bufferSize,
final int fragmentSizeHint,
final CharsetDecoder chardecoder,
final CharsetEncoder charencoder,
@@ -65,7 +65,7 @@ public class LoggingBHttpClientConnection extends DefaultBHttpClientConnection {
final ContentLengthStrategy outgoingContentStrategy,
final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
final HttpMessageParserFactory<HttpResponse> responseParserFactory) {
- super(buffersize, fragmentSizeHint, chardecoder, charencoder,
+ super(bufferSize, fragmentSizeHint, chardecoder, charencoder,
constraints, incomingContentStrategy, outgoingContentStrategy,
requestWriterFactory, responseParserFactory);
this.id = "http-outgoing-" + COUNT.incrementAndGet();
@@ -74,8 +74,8 @@ public class LoggingBHttpClientConnection extends DefaultBHttpClientConnection {
this.wire = new Wire(LogFactory.getLog("org.apache.http.wire"), this.id);
}
- public LoggingBHttpClientConnection(final int buffersize) {
- this(buffersize, buffersize, null, null, null, null, null, null, null);
+ public LoggingBHttpClientConnection(final int bufferSize) {
+ this(bufferSize, bufferSize, null, null, null, null, null, null, null);
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpServerConnection.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpServerConnection.java b/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpServerConnection.java
index 7ae4050..030a25f 100644
--- a/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpServerConnection.java
+++ b/httpcore/src/test/java/org/apache/http/testserver/LoggingBHttpServerConnection.java
@@ -56,7 +56,7 @@ public class LoggingBHttpServerConnection extends DefaultBHttpServerConnection {
private final Wire wire;
public LoggingBHttpServerConnection(
- final int buffersize,
+ final int bufferSize,
final int fragmentSizeHint,
final CharsetDecoder chardecoder,
final CharsetEncoder charencoder,
@@ -65,7 +65,7 @@ public class LoggingBHttpServerConnection extends DefaultBHttpServerConnection {
final ContentLengthStrategy outgoingContentStrategy,
final HttpMessageParserFactory<HttpRequest> requestParserFactory,
final HttpMessageWriterFactory<HttpResponse> responseWriterFactory) {
- super(buffersize, fragmentSizeHint, chardecoder, charencoder, constraints,
+ super(bufferSize, fragmentSizeHint, chardecoder, charencoder, constraints,
incomingContentStrategy, outgoingContentStrategy,
requestParserFactory, responseWriterFactory);
this.id = "http-incoming-" + COUNT.incrementAndGet();
@@ -74,8 +74,8 @@ public class LoggingBHttpServerConnection extends DefaultBHttpServerConnection {
this.wire = new Wire(LogFactory.getLog("org.apache.http.wire"), this.id);
}
- public LoggingBHttpServerConnection(final int buffersize) {
- this(buffersize, buffersize, null, null, null, null, null, null, null);
+ public LoggingBHttpServerConnection(final int bufferSize) {
+ this(bufferSize, bufferSize, null, null, null, null, null, null, null);
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java b/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java
index 876b218..c0745ee 100644
--- a/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java
+++ b/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java
@@ -295,13 +295,13 @@ public class TestByteArrayBuffer {
orig.append(2);
orig.append(3);
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final ByteArrayBuffer clone = (ByteArrayBuffer) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final ByteArrayBuffer clone = (ByteArrayBuffer) inStream.readObject();
Assert.assertEquals(orig.capacity(), clone.capacity());
Assert.assertEquals(orig.length(), clone.length());
final byte[] data = clone.toByteArray();
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9dc8fe89/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java
----------------------------------------------------------------------
diff --git a/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java b/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java
index 8dca3b1..19a8d2c 100644
--- a/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java
+++ b/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java
@@ -382,13 +382,13 @@ public class TestCharArrayBuffer {
orig.append('b');
orig.append('c');
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final CharArrayBuffer clone = (CharArrayBuffer) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final CharArrayBuffer clone = (CharArrayBuffer) inStream.readObject();
Assert.assertEquals(orig.capacity(), clone.capacity());
Assert.assertEquals(orig.length(), clone.length());
final char[] data = clone.toCharArray();