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/10/01 14:20:57 UTC
httpcomponents-core git commit: Rename
org.apache.hc.core5.http.MessageHeaders.getAllHeaders() to getHeaders().
Repository: httpcomponents-core
Updated Branches:
refs/heads/master de9e4d6d9 -> 9060f91e6
Rename org.apache.hc.core5.http.MessageHeaders.getAllHeaders() to
getHeaders().
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/9060f91e
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/9060f91e
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/9060f91e
Branch: refs/heads/master
Commit: 9060f91e6d7f282cec7c80ca5cab0c35d4207145
Parents: de9e4d6
Author: Gary Gregory <gg...@rocketsoftware.com>
Authored: Mon Oct 1 08:20:53 2018 -0600
Committer: Gary Gregory <gg...@rocketsoftware.com>
Committed: Mon Oct 1 08:20:53 2018 -0600
----------------------------------------------------------------------
RELEASE_NOTES.txt | 3 ++
.../impl/TestDefaultH2RequestConverter.java | 2 +-
.../impl/TestDefaultH2ResponseConverter.java | 2 +-
.../hc/core5/benchmark/HttpBenchmark.java | 4 +--
.../classic/LoggingBHttpClientConnection.java | 4 +--
.../classic/LoggingBHttpServerConnection.java | 4 +--
.../framework/ClassicTestClientAdapter.java | 2 +-
.../TestingFrameworkRequestHandler.java | 2 +-
.../apache/hc/core5/http/MessageHeaders.java | 2 +-
.../http/message/AbstractMessageWrapper.java | 4 +--
.../hc/core5/http/message/HeaderGroup.java | 2 +-
.../core5/http/impl/io/TestRequestParser.java | 6 ++--
.../core5/http/impl/io/TestResponseParser.java | 6 ++--
.../hc/core5/http/message/TestHeaderGroup.java | 34 ++++++++++----------
.../http/protocol/TestStandardInterceptors.java | 4 +--
15 files changed, 42 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index cf0c3f4..aa2183d 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -15,6 +15,9 @@ Changelog
* Rename org.apache.hc.core5.http.EndpointDetails.getSocketTimeout() to getSocketTimeoutMillis().
Contributed by Gary Gregory <ggregory at apache.org>
+
+* Rename org.apache.hc.core5.http.MessageHeaders.getAllHeaders() to getHeaders().
+ Contributed by Gary Gregory <ggregory at apache.org>
Release 5.0-BETA3
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2RequestConverter.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2RequestConverter.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2RequestConverter.java
index 4037950..ea734fc 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2RequestConverter.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2RequestConverter.java
@@ -64,7 +64,7 @@ public class TestDefaultH2RequestConverter {
Assert.assertEquals("http", request.getScheme());
Assert.assertEquals(new URIAuthority("www.example.com"), request.getAuthority());
Assert.assertEquals("/", request.getPath());
- final Header[] allHeaders = request.getAllHeaders();
+ final Header[] allHeaders = request.getHeaders();
Assert.assertEquals(1, allHeaders.length);
Assert.assertEquals("custom123", allHeaders[0].getName());
Assert.assertEquals("value", allHeaders[0].getValue());
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2ResponseConverter.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2ResponseConverter.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2ResponseConverter.java
index 0d04915..1307f25 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2ResponseConverter.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2ResponseConverter.java
@@ -57,7 +57,7 @@ public class TestDefaultH2ResponseConverter {
final HttpResponse response = converter.convert(headers);
Assert.assertNotNull(response );
Assert.assertEquals(200, response .getCode());
- final Header[] allHeaders = response.getAllHeaders();
+ final Header[] allHeaders = response.getHeaders();
Assert.assertEquals(2, allHeaders.length);
Assert.assertEquals("location", allHeaders[0].getName());
Assert.assertEquals("http://www.example.com/", allHeaders[0].getValue());
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/HttpBenchmark.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/HttpBenchmark.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/HttpBenchmark.java
index b267c78..a6962f7 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/HttpBenchmark.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/HttpBenchmark.java
@@ -304,7 +304,7 @@ public class HttpBenchmark {
public void onRequestHead(final HttpConnection connection, final HttpRequest request) {
if (config.getVerbosity() >= 3) {
System.out.println(">> " + request.getMethod() + " " + request.getRequestUri());
- final Header[] headers = request.getAllHeaders();
+ final Header[] headers = request.getHeaders();
for (final Header header : headers) {
System.out.println(">> " + header.toString());
}
@@ -316,7 +316,7 @@ public class HttpBenchmark {
public void onResponseHead(final HttpConnection connection, final HttpResponse response) {
if (config.getVerbosity() >= 3) {
System.out.println("<< " + response.getCode() + " " + response.getReasonPhrase());
- final Header[] headers = response.getAllHeaders();
+ final Header[] headers = response.getHeaders();
for (final Header header : headers) {
System.out.println("<< " + header.toString());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
index a472848..53b1134 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpClientConnection.java
@@ -109,7 +109,7 @@ public class LoggingBHttpClientConnection extends DefaultBHttpClientConnection i
protected void onResponseReceived(final ClassicHttpResponse response) {
if (response != null && this.headerLog.isDebugEnabled()) {
this.headerLog.debug(this.id + " << " + new StatusLine(response));
- final Header[] headers = response.getAllHeaders();
+ final Header[] headers = response.getHeaders();
for (final Header header : headers) {
this.headerLog.debug(this.id + " << " + header.toString());
}
@@ -120,7 +120,7 @@ public class LoggingBHttpClientConnection extends DefaultBHttpClientConnection i
protected void onRequestSubmitted(final ClassicHttpRequest request) {
if (request != null && this.headerLog.isDebugEnabled()) {
this.headerLog.debug(id + " >> " + new RequestLine(request));
- final Header[] headers = request.getAllHeaders();
+ final Header[] headers = request.getHeaders();
for (final Header header : headers) {
this.headerLog.debug(this.id + " >> " + header.toString());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
index 74065a4..7d5c48a 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/LoggingBHttpServerConnection.java
@@ -109,7 +109,7 @@ public class LoggingBHttpServerConnection extends DefaultBHttpServerConnection i
protected void onRequestReceived(final ClassicHttpRequest request) {
if (request != null && this.headerLog.isDebugEnabled()) {
this.headerLog.debug(id + " >> " + new RequestLine(request));
- final Header[] headers = request.getAllHeaders();
+ final Header[] headers = request.getHeaders();
for (final Header header : headers) {
this.headerLog.debug(this.id + " >> " + header.toString());
}
@@ -120,7 +120,7 @@ public class LoggingBHttpServerConnection extends DefaultBHttpServerConnection i
protected void onResponseSubmitted(final ClassicHttpResponse response) {
if (response != null && this.headerLog.isDebugEnabled()) {
this.headerLog.debug(this.id + " << " + new StatusLine(response));
- final Header[] headers = response.getAllHeaders();
+ final Header[] headers = response.getHeaders();
for (final Header header : headers) {
this.headerLog.debug(this.id + " << " + header.toString());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClassicTestClientAdapter.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClassicTestClientAdapter.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClassicTestClientAdapter.java
index d416e4b..9ffa4cc 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClassicTestClientAdapter.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/ClassicTestClientAdapter.java
@@ -152,7 +152,7 @@ public class ClassicTestClientAdapter extends ClientPOJOAdapter {
// convert the headers to a Map
final Map<String, Object> headerMap = new HashMap<>();
- for (final Header header : response.getAllHeaders()) {
+ for (final Header header : response.getHeaders()) {
headerMap.put(header.getName(), header.getValue());
}
ret.put(HEADERS, headerMap);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFrameworkRequestHandler.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFrameworkRequestHandler.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFrameworkRequestHandler.java
index 2ab78eb..07bd7d5 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFrameworkRequestHandler.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/TestingFrameworkRequestHandler.java
@@ -163,7 +163,7 @@ public class TestingFrameworkRequestHandler implements HttpRequestHandler {
final Map<String, String> expectedHeaders = (Map<String, String>) requestExpectations.get(HEADERS);
if (expectedHeaders != null) {
final Map<String, String> actualHeadersMap = new HashMap<>();
- final Header[] actualHeaders = request.getAllHeaders();
+ final Header[] actualHeaders = request.getHeaders();
for (final Header header : actualHeaders) {
actualHeadersMap.put(header.getName(), header.getValue());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java b/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java
index e33f35a..9cbb7e5 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/MessageHeaders.java
@@ -105,7 +105,7 @@ public interface MessageHeaders {
*
* @return all the headers of this message
*/
- Header[] getAllHeaders();
+ Header[] getHeaders();
/**
* Returns an iterator of all the headers.
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java
index 4d8e342..5d6a376 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/AbstractMessageWrapper.java
@@ -122,8 +122,8 @@ public abstract class AbstractMessageWrapper implements HttpMessage {
}
@Override
- public Header[] getAllHeaders() {
- return message.getAllHeaders();
+ public Header[] getHeaders() {
+ return message.getHeaders();
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
index 7d99852..cd54050 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
@@ -299,7 +299,7 @@ public class HeaderGroup implements MessageHeaders, Serializable {
* @return an array of length ≥ 0
*/
@Override
- public Header[] getAllHeaders() {
+ public Header[] getHeaders() {
return headers.toArray(new Header[headers.size()]);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
index 462e293..3343948 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
@@ -60,7 +60,7 @@ public class TestRequestParser {
Assert.assertEquals("GET", httprequest.getMethod());
Assert.assertEquals("/", httprequest.getPath());
- final Header[] headers = httprequest.getAllHeaders();
+ final Header[] headers = httprequest.getHeaders();
Assert.assertEquals(3, headers.length);
}
@@ -90,7 +90,7 @@ public class TestRequestParser {
Assert.assertEquals("GET", httprequest.getMethod());
Assert.assertEquals("/", httprequest.getPath());
- final Header[] headers = httprequest.getAllHeaders();
+ final Header[] headers = httprequest.getHeaders();
Assert.assertEquals(1, headers.length);
}
@@ -141,7 +141,7 @@ public class TestRequestParser {
Assert.assertEquals("GET", httprequest.getMethod());
Assert.assertEquals("/", httprequest.getPath());
- final Header[] headers = httprequest.getAllHeaders();
+ final Header[] headers = httprequest.getHeaders();
Assert.assertEquals(3, headers.length);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
index 480ee87..d3078b3 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
@@ -61,7 +61,7 @@ public class TestResponseParser {
Assert.assertEquals(200, httpresponse.getCode());
Assert.assertEquals("OK", httpresponse.getReasonPhrase());
- final Header[] headers = httpresponse.getAllHeaders();
+ final Header[] headers = httpresponse.getHeaders();
Assert.assertEquals(3, headers.length);
}
@@ -91,7 +91,7 @@ public class TestResponseParser {
Assert.assertEquals(200, httpresponse.getCode());
Assert.assertEquals("OK", httpresponse.getReasonPhrase());
- final Header[] headers = httpresponse.getAllHeaders();
+ final Header[] headers = httpresponse.getHeaders();
Assert.assertEquals(1, headers.length);
}
@@ -141,7 +141,7 @@ public class TestResponseParser {
Assert.assertEquals(200, httpresponse.getCode());
Assert.assertEquals("OK", httpresponse.getReasonPhrase());
- final Header[] headers = httpresponse.getAllHeaders();
+ final Header[] headers = httpresponse.getHeaders();
Assert.assertEquals(3, headers.length);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
index 4d8ee21..8c87821 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
@@ -46,17 +46,17 @@ public class TestHeaderGroup {
@Test
public void testConstructor() {
final HeaderGroup headergroup = new HeaderGroup();
- Assert.assertNotNull(headergroup.getAllHeaders());
- Assert.assertEquals(0, headergroup.getAllHeaders().length);
+ Assert.assertNotNull(headergroup.getHeaders());
+ Assert.assertEquals(0, headergroup.getHeaders().length);
}
@Test
public void testClear() {
final HeaderGroup headergroup = new HeaderGroup();
headergroup.addHeader(new BasicHeader("name", "value"));
- Assert.assertEquals(1, headergroup.getAllHeaders().length);
+ Assert.assertEquals(1, headergroup.getHeaders().length);
headergroup.clear();
- Assert.assertEquals(0, headergroup.getAllHeaders().length);
+ Assert.assertEquals(0, headergroup.getHeaders().length);
}
@Test
@@ -65,10 +65,10 @@ public class TestHeaderGroup {
final Header header = new BasicHeader("name", "value");
headerGroup.addHeader(header);
headerGroup.addHeader(null);
- Assert.assertEquals(1, headerGroup.getAllHeaders().length);
+ Assert.assertEquals(1, headerGroup.getHeaders().length);
Assert.assertTrue(headerGroup.removeHeader(header));
Assert.assertFalse(headerGroup.removeHeader(null));
- Assert.assertEquals(0, headerGroup.getAllHeaders().length);
+ Assert.assertEquals(0, headerGroup.getHeaders().length);
}
@Test
@@ -77,11 +77,11 @@ public class TestHeaderGroup {
final Header header = new BasicHeader("name", "value");
headergroup.addHeader(header);
headergroup.addHeader(header);
- Assert.assertEquals(2, headergroup.getAllHeaders().length);
+ Assert.assertEquals(2, headergroup.getHeaders().length);
Assert.assertFalse(headergroup.removeHeaders((Header) null));
Assert.assertTrue(headergroup.removeHeaders(header));
Assert.assertFalse(headergroup.removeHeaders((Header) null));
- Assert.assertEquals(0, headergroup.getAllHeaders().length);
+ Assert.assertEquals(0, headergroup.getHeaders().length);
}
@Test
@@ -90,9 +90,9 @@ public class TestHeaderGroup {
final Header header = new BasicHeader("name", "value");
final Header header2 = new BasicHeader("name", "value");
headergroup.addHeader(header);
- Assert.assertEquals(1, headergroup.getAllHeaders().length);
+ Assert.assertEquals(1, headergroup.getHeaders().length);
Assert.assertTrue(headergroup.removeHeader(header2));
- Assert.assertEquals(0, headergroup.getAllHeaders().length);
+ Assert.assertEquals(0, headergroup.getHeaders().length);
}
@Test
@@ -107,7 +107,7 @@ public class TestHeaderGroup {
headergroup.setHeader(new BasicHeader("name2", "newvalue"));
headergroup.setHeader(new BasicHeader("name4", "value4"));
headergroup.setHeader(null);
- Assert.assertEquals(4, headergroup.getAllHeaders().length);
+ Assert.assertEquals(4, headergroup.getHeaders().length);
Assert.assertEquals("newvalue", headergroup.getFirstHeader("name2").getValue());
}
@@ -119,7 +119,7 @@ public class TestHeaderGroup {
final Header header3 = new BasicHeader("name3", "value3");
headergroup.addHeader(header1);
headergroup.setHeaders(new Header[] { header2, header3 });
- Assert.assertEquals(2, headergroup.getAllHeaders().length);
+ Assert.assertEquals(2, headergroup.getHeaders().length);
Assert.assertEquals(0, headergroup.getHeaders("name1").length);
Assert.assertFalse(headergroup.containsHeader("name1"));
Assert.assertEquals(1, headergroup.getHeaders("name2").length);
@@ -127,7 +127,7 @@ public class TestHeaderGroup {
Assert.assertEquals(1, headergroup.getHeaders("name3").length);
Assert.assertTrue(headergroup.containsHeader("name3"));
headergroup.setHeaders(null);
- Assert.assertEquals(0, headergroup.getAllHeaders().length);
+ Assert.assertEquals(0, headergroup.getHeaders().length);
}
@Test
@@ -183,11 +183,11 @@ public class TestHeaderGroup {
Assert.assertTrue(i.hasNext());
i.next();
i.remove();
- Assert.assertEquals(2, headergroup.getAllHeaders().length);
+ Assert.assertEquals(2, headergroup.getHeaders().length);
Assert.assertTrue(i.hasNext());
i.next();
i.remove();
- Assert.assertEquals(1, headergroup.getAllHeaders().length);
+ Assert.assertEquals(1, headergroup.getHeaders().length);
Assert.assertFalse(i.hasNext());
}
@@ -206,8 +206,8 @@ public class TestHeaderGroup {
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();
+ final Header[] headers1 = orig.getHeaders();
+ final Header[] headers2 = clone.getHeaders();
Assert.assertNotNull(headers1);
Assert.assertNotNull(headers2);
Assert.assertEquals(headers1.length, headers2.length);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/9060f91e/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java b/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java
index 156f49d..9002454 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java
@@ -278,7 +278,7 @@ public class TestStandardInterceptors {
final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final RequestContent interceptor = new RequestContent();
interceptor.process(request, request.getEntity(), context);
- Assert.assertEquals(0, request.getAllHeaders().length);
+ Assert.assertEquals(0, request.getHeaders().length);
}
@Test
@@ -385,7 +385,7 @@ public class TestStandardInterceptors {
final BasicClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, request.getEntity(), context);
- Assert.assertEquals(0, request.getAllHeaders().length);
+ Assert.assertEquals(0, request.getHeaders().length);
}
@Test