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 2019/12/11 11:12:25 UTC
[httpcomponents-core] 01/03: HTTPCLIENT-2031: enum renaming (no
functional changes)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 41a48752736d0e0ddcb64c57e62f588104f53728
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Tue Dec 3 10:01:00 2019 +0100
HTTPCLIENT-2031: enum renaming (no functional changes)
---
.../http2/impl/DefaultH2RequestConverter.java | 6 +-
.../impl/nio/ClientHttpProtocolNegotiator.java | 4 +-
.../impl/nio/H2OnlyClientProtocolNegotiator.java | 4 +-
.../http2/impl/nio/ServerH2StreamHandler.java | 4 +-
.../impl/nio/ServerHttpProtocolNegotiator.java | 6 +-
.../hc/core5/http2/protocol/H2RequestContent.java | 4 +-
...tionProtocols.java => ApplicationProtocol.java} | 4 +-
.../apache/hc/core5/http2/ssl/H2TlsSupport.java | 6 +-
.../H2ConscriptRequestExecutionExample.java | 4 +-
.../examples/H2MultiStreamExecutionExample.java | 4 +-
.../http2/examples/H2RequestExecutionExample.java | 4 +-
.../examples/H2TlsAlpnRequestExecutionExample.java | 4 +-
.../apache/hc/core5/benchmark/BenchmarkWorker.java | 4 +-
.../hc/core5/benchmark/CommandLineUtils.java | 4 +-
.../hc/core5/benchmark/BenchmarkToolTest.java | 4 +-
.../testing/classic/ClassicAuthenticationTest.java | 14 +--
.../testing/classic/ClassicIntegrationTest.java | 28 +++---
.../classic/ClassicServerAndRequesterTest.java | 14 +--
.../testing/classic/ClassicTLSIntegrationTest.java | 12 +--
.../compatibility/http2/H2CompatibilityTest.java | 28 +++---
.../TestClassicTestClientTestingAdapter.java | 4 +-
.../apache/hc/core5/testing/nio/H2AlpnTest.java | 4 +-
.../hc/core5/testing/nio/H2IntegrationTest.java | 46 +++++-----
.../testing/nio/H2ProtocolNegotiationTest.java | 8 +-
.../nio/H2ServerAndMultiplexingRequesterTest.java | 22 ++---
.../testing/nio/H2ServerAndRequesterTest.java | 20 ++---
.../hc/core5/testing/nio/H2TLSIntegrationTest.java | 12 +--
.../core5/testing/nio/Http1AuthenticationTest.java | 14 +--
.../hc/core5/testing/nio/Http1IntegrationTest.java | 82 ++++++++---------
.../testing/nio/Http1ServerAndRequesterTest.java | 28 +++---
.../testing/nio/JSSEProviderIntegrationTest.java | 6 +-
.../core5/testing/reactive/ReactiveClientTest.java | 4 +-
.../hc/core5/http/{Methods.java => Method.java} | 4 +-
.../http/impl/nio/ServerHttp1StreamHandler.java | 4 +-
.../http/io/support/ClassicRequestBuilder.java | 62 ++++++-------
.../http/message/BasicClassicHttpRequest.java | 8 +-
.../hc/core5/http/message/BasicHttpRequest.java | 8 +-
.../hc/core5/http/message/MessageSupport.java | 6 +-
.../http/nio/support/AsyncRequestBuilder.java | 62 ++++++-------
.../http/nio/support/BasicRequestProducer.java | 10 +--
.../hc/core5/http/protocol/RequestConnControl.java | 4 +-
.../hc/core5/http/protocol/RequestContent.java | 4 +-
.../hc/core5/http/protocol/RequestTargetHost.java | 4 +-
.../java/org/apache/hc/core5/http/ssl/TLS.java | 10 +--
.../AsyncPipelinedRequestExecutionExample.java | 4 +-
.../examples/AsyncRequestExecutionExample.java | 4 +-
.../http/examples/ClassicFileServerExample.java | 4 +-
.../http/examples/ClassicGetExecutionExample.java | 4 +-
.../http/examples/ClassicPostExecutionExample.java | 4 +-
.../impl/TestDefaultConnectionReuseStrategy.java | 12 +--
.../impl/io/TestDefaultBHttpClientConnection.java | 18 ++--
.../impl/io/TestDefaultBHttpServerConnection.java | 12 +--
.../http/impl/io/TestHttpRequestExecutor.java | 26 +++---
.../hc/core5/http/impl/io/TestHttpService.java | 14 +--
.../hc/core5/http/impl/io/TestRequestParser.java | 8 +-
.../core5/http/message/TestBasicLineFormatter.java | 6 +-
.../hc/core5/http/message/TestBasicLineParser.java | 8 +-
.../hc/core5/http/message/TestBasicMessages.java | 40 ++++-----
.../http/protocol/TestRequestHandlerRegistry.java | 24 ++---
.../http/protocol/TestStandardInterceptors.java | 100 ++++++++++-----------
60 files changed, 443 insertions(+), 443 deletions(-)
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java
index 14f36b4..65f6fe8 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.message.BasicHeader;
import org.apache.hc.core5.http.message.BasicHttpRequest;
@@ -111,7 +111,7 @@ public final class DefaultH2RequestConverter implements H2MessageConverter<HttpR
if (method == null) {
throw new ProtocolException("Mandatory request header ':method' not found");
}
- if (Methods.CONNECT.isSame(method)) {
+ if (Method.CONNECT.isSame(method)) {
if (authority == null) {
throw new ProtocolException("Header ':authority' is mandatory for CONNECT request");
}
@@ -150,7 +150,7 @@ public final class DefaultH2RequestConverter implements H2MessageConverter<HttpR
if (TextUtils.isBlank(message.getMethod())) {
throw new ProtocolException("Request method is empty");
}
- final boolean optionMethod = Methods.CONNECT.name().equalsIgnoreCase(message.getMethod());
+ final boolean optionMethod = Method.CONNECT.name().equalsIgnoreCase(message.getMethod());
if (optionMethod) {
if (message.getAuthority() == null) {
throw new ProtocolException("CONNECT request authority is not set");
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
index 22a9b4f..30e6117 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
@@ -46,7 +46,7 @@ import org.apache.hc.core5.http.impl.nio.ClientHttp1StreamDuplexerFactory;
import org.apache.hc.core5.http.impl.nio.HttpConnectionEventHandler;
import org.apache.hc.core5.http.nio.command.CommandSupport;
import org.apache.hc.core5.http2.HttpVersionPolicy;
-import org.apache.hc.core5.http2.ssl.ApplicationProtocols;
+import org.apache.hc.core5.http2.ssl.ApplicationProtocol;
import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.io.SocketTimeoutExceptionFactory;
import org.apache.hc.core5.reactor.IOSession;
@@ -145,7 +145,7 @@ public class ClientHttpProtocolNegotiator implements HttpConnectionEventHandler
case NEGOTIATE:
final TlsDetails tlsDetails = ioSession.getTlsDetails();
if (tlsDetails != null) {
- if (ApplicationProtocols.HTTP_2.id.equals(tlsDetails.getApplicationProtocol())) {
+ if (ApplicationProtocol.HTTP_2.id.equals(tlsDetails.getApplicationProtocol())) {
// Proceed with the H2 preface
preface = ByteBuffer.wrap(PREFACE);
}
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/H2OnlyClientProtocolNegotiator.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/H2OnlyClientProtocolNegotiator.java
index 94a145f..c6721cb 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/H2OnlyClientProtocolNegotiator.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/H2OnlyClientProtocolNegotiator.java
@@ -40,7 +40,7 @@ import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.impl.nio.HttpConnectionEventHandler;
import org.apache.hc.core5.http.nio.command.CommandSupport;
-import org.apache.hc.core5.http2.ssl.ApplicationProtocols;
+import org.apache.hc.core5.http2.ssl.ApplicationProtocol;
import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.io.SocketTimeoutExceptionFactory;
import org.apache.hc.core5.reactor.IOEventHandler;
@@ -88,7 +88,7 @@ public class H2OnlyClientProtocolNegotiator implements HttpConnectionEventHandle
throw new HttpException("ALPN: missing application protocol");
}
} else {
- if (!ApplicationProtocols.HTTP_2.id.equals(applicationProtocol)) {
+ if (!ApplicationProtocol.HTTP_2.id.equals(applicationProtocol)) {
throw new HttpException("ALPN: unexpected application protocol '" + applicationProtocol + "'");
}
}
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerH2StreamHandler.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerH2StreamHandler.java
index e0520df..9a5db5f 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerH2StreamHandler.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerH2StreamHandler.java
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.impl.BasicHttpConnectionMetrics;
import org.apache.hc.core5.http.impl.IncomingEntityDetails;
@@ -155,7 +155,7 @@ public class ServerH2StreamHandler implements H2StreamHandler {
Asserts.notNull(receivedRequest, "Received request");
final String method = receivedRequest.getMethod();
- final boolean endStream = responseEntityDetails == null || Methods.HEAD.isSame(method);
+ final boolean endStream = responseEntityDetails == null || Method.HEAD.isSame(method);
outputChannel.submit(responseHeaders, endStream);
connMetrics.incrementResponseCount();
if (responseEntityDetails == null) {
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java
index 174366f..7bb65d2 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ServerHttpProtocolNegotiator.java
@@ -47,7 +47,7 @@ import org.apache.hc.core5.http.impl.nio.ServerHttp1StreamDuplexer;
import org.apache.hc.core5.http.impl.nio.ServerHttp1StreamDuplexerFactory;
import org.apache.hc.core5.http.nio.command.CommandSupport;
import org.apache.hc.core5.http2.HttpVersionPolicy;
-import org.apache.hc.core5.http2.ssl.ApplicationProtocols;
+import org.apache.hc.core5.http2.ssl.ApplicationProtocol;
import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.io.SocketTimeoutExceptionFactory;
import org.apache.hc.core5.reactor.IOSession;
@@ -97,13 +97,13 @@ public class ServerHttpProtocolNegotiator implements HttpConnectionEventHandler
switch (versionPolicy) {
case NEGOTIATE:
if (tlsDetails != null &&
- ApplicationProtocols.HTTP_2.id.equals(tlsDetails.getApplicationProtocol())) {
+ ApplicationProtocol.HTTP_2.id.equals(tlsDetails.getApplicationProtocol())) {
expectValidH2Preface = true;
}
break;
case FORCE_HTTP_2:
if (tlsDetails == null ||
- !ApplicationProtocols.HTTP_1_1.id.equals(tlsDetails.getApplicationProtocol())) {
+ !ApplicationProtocol.HTTP_1_1.id.equals(tlsDetails.getApplicationProtocol())) {
expectValidH2Preface = true;
}
break;
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/protocol/H2RequestContent.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/protocol/H2RequestContent.java
index b8fe9ff..ef61071 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/protocol/H2RequestContent.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/protocol/H2RequestContent.java
@@ -34,7 +34,7 @@ import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.http.EntityDetails;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.message.MessageSupport;
@@ -69,7 +69,7 @@ public class H2RequestContent extends RequestContent {
super.process(request, entity, context);
} else if (entity != null) {
final String method = request.getMethod();
- if (Methods.TRACE.isSame(method)) {
+ if (Method.TRACE.isSame(method)) {
throw new ProtocolException("TRACE request may not enclose an entity");
}
MessageSupport.addContentTypeHeader(request, entity);
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ApplicationProtocols.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ApplicationProtocol.java
similarity index 94%
rename from httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ApplicationProtocols.java
rename to httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ApplicationProtocol.java
index 29f90c9..c4f55ab 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ApplicationProtocols.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ApplicationProtocol.java
@@ -32,13 +32,13 @@ package org.apache.hc.core5.http2.ssl;
*
* @since 5.0
*/
-public enum ApplicationProtocols {
+public enum ApplicationProtocol {
HTTP_2("h2"), HTTP_1_1("http/1.1");
public final String id;
- ApplicationProtocols(final String id) {
+ ApplicationProtocol(final String id) {
this.id = id;
}
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java
index 9e23ed4..da46bc5 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/H2TlsSupport.java
@@ -57,11 +57,11 @@ public final class H2TlsSupport {
(HttpVersionPolicy) attachment : HttpVersionPolicy.NEGOTIATE;
switch (versionPolicy) {
case FORCE_HTTP_1:
- return new String[] { ApplicationProtocols.HTTP_1_1.id };
+ return new String[] { ApplicationProtocol.HTTP_1_1.id };
case FORCE_HTTP_2:
- return new String[] { ApplicationProtocols.HTTP_2.id };
+ return new String[] { ApplicationProtocol.HTTP_2.id };
default:
- return new String[] { ApplicationProtocols.HTTP_2.id, ApplicationProtocols.HTTP_1_1.id };
+ return new String[] { ApplicationProtocol.HTTP_2.id, ApplicationProtocol.HTTP_1_1.id };
}
}
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2ConscriptRequestExecutionExample.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2ConscriptRequestExecutionExample.java
index 13db53e..2b86619 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2ConscriptRequestExecutionExample.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2ConscriptRequestExecutionExample.java
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
@@ -125,7 +125,7 @@ public class H2ConscriptRequestExecutionExample {
final Future<AsyncClientEndpoint> future = requester.connect(target, Timeout.ofDays(5));
final AsyncClientEndpoint clientEndpoint = future.get();
clientEndpoint.execute(
- new BasicRequestProducer(Methods.GET, target, requestUri),
+ new BasicRequestProducer(Method.GET, target, requestUri),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
new FutureCallback<Message<HttpResponse, String>>() {
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2MultiStreamExecutionExample.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2MultiStreamExecutionExample.java
index cc70940..70b7cd8 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2MultiStreamExecutionExample.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2MultiStreamExecutionExample.java
@@ -37,7 +37,7 @@ import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
@@ -125,7 +125,7 @@ public class H2MultiStreamExecutionExample {
final CountDownLatch latch = new CountDownLatch(requestUris.length);
for (final String requestUri: requestUris) {
clientEndpoint.execute(
- new BasicRequestProducer(Methods.GET, target, requestUri),
+ new BasicRequestProducer(Method.GET, target, requestUri),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
new FutureCallback<Message<HttpResponse, String>>() {
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2RequestExecutionExample.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2RequestExecutionExample.java
index cb7f5a4..9b64b28 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2RequestExecutionExample.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2RequestExecutionExample.java
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
@@ -116,7 +116,7 @@ public class H2RequestExecutionExample {
final Future<AsyncClientEndpoint> future = requester.connect(target, Timeout.ofSeconds(5));
final AsyncClientEndpoint clientEndpoint = future.get();
clientEndpoint.execute(
- new BasicRequestProducer(Methods.GET, target, requestUri),
+ new BasicRequestProducer(Method.GET, target, requestUri),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
new FutureCallback<Message<HttpResponse, String>>() {
diff --git a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2TlsAlpnRequestExecutionExample.java b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2TlsAlpnRequestExecutionExample.java
index b14b9b7..3fe8188 100644
--- a/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2TlsAlpnRequestExecutionExample.java
+++ b/httpcore5-h2/src/test/java/org/apache/hc/core5/http2/examples/H2TlsAlpnRequestExecutionExample.java
@@ -39,7 +39,7 @@ import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
@@ -136,7 +136,7 @@ public class H2TlsAlpnRequestExecutionExample {
final Future<AsyncClientEndpoint> future = requester.connect(target, Timeout.ofSeconds(5));
final AsyncClientEndpoint clientEndpoint = future.get();
clientEndpoint.execute(
- new BasicRequestProducer(Methods.GET, target, requestUri),
+ new BasicRequestProducer(Method.GET, target, requestUri),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
new FutureCallback<Message<HttpResponse, String>>() {
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/BenchmarkWorker.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/BenchmarkWorker.java
index ce10276..3d9698b 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/BenchmarkWorker.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/BenchmarkWorker.java
@@ -46,7 +46,7 @@ import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.message.BasicHeader;
import org.apache.hc.core5.http.message.BasicHttpRequest;
@@ -95,7 +95,7 @@ class BenchmarkWorker implements ResourceHolder {
private AsyncRequestProducer createRequestProducer() {
String method = config.getMethod();
if (method == null) {
- method = config.isHeadInsteadOfGet() ? Methods.HEAD.name() : Methods.GET.name();
+ method = config.isHeadInsteadOfGet() ? Method.HEAD.name() : Method.GET.name();
}
final BasicHttpRequest request = new BasicHttpRequest(method, config.getUri());
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/CommandLineUtils.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/CommandLineUtils.java
index 784fdb7..02e77fb 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/CommandLineUtils.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/benchmark/CommandLineUtils.java
@@ -35,7 +35,7 @@ import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
@@ -215,7 +215,7 @@ public class CommandLineUtils {
if (cmd.hasOption('m')) {
builder.setMethod(cmd.getOptionValue('m'));
} else if (cmd.hasOption('p')) {
- builder.setMethod(Methods.POST.name());
+ builder.setMethod(Method.POST.name());
}
if (cmd.hasOption('u')) {
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/benchmark/BenchmarkToolTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/benchmark/BenchmarkToolTest.java
index 185cfff..00f93fe 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/benchmark/BenchmarkToolTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/benchmark/BenchmarkToolTest.java
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
import org.apache.hc.core5.http.nio.AsyncRequestConsumer;
@@ -123,7 +123,7 @@ public class BenchmarkToolTest {
public void testBasics() throws Exception {
final BenchmarkConfig config = BenchmarkConfig.custom()
.setKeepAlive(true)
- .setMethod(Methods.POST.name())
+ .setMethod(Method.POST.name())
.setPayloadText("0123456789ABCDEF")
.setUri(new URIBuilder()
.setScheme(URIScheme.HTTP.id)
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
index 54d255a..418b155 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicAuthenticationTest.java
@@ -42,7 +42,7 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.RequesterBootstrap;
@@ -191,13 +191,13 @@ public class ClassicAuthenticationTest {
server.start();
final HttpHost target = new HttpHost("localhost", server.getLocalPort());
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.GET, "/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.GET, "/stuff");
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
Assert.assertThat(response1.getCode(), CoreMatchers.equalTo(HttpStatus.SC_UNAUTHORIZED));
final String body1 = EntityUtils.toString(response1.getEntity());
Assert.assertThat(body1, CoreMatchers.equalTo("You shall not pass!!!"));
}
- final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Methods.GET, "/stuff");
+ final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Method.GET, "/stuff");
request2.setHeader(HttpHeaders.AUTHORIZATION, "let me pass");
try (final ClassicHttpResponse response2 = requester.execute(target, request2, TIMEOUT, context)) {
Assert.assertThat(response2.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
@@ -216,14 +216,14 @@ public class ClassicAuthenticationTest {
for (int i = 0; i < stuff.length; i++) {
stuff[i] = (byte)('a' + rnd.nextInt(10));
}
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setEntity(new ByteArrayEntity(stuff, ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
Assert.assertThat(response1.getCode(), CoreMatchers.equalTo(HttpStatus.SC_UNAUTHORIZED));
final String body1 = EntityUtils.toString(response1.getEntity());
Assert.assertThat(body1, CoreMatchers.equalTo("You shall not pass!!!"));
}
- final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request2.setHeader(HttpHeaders.AUTHORIZATION, "let me pass");
request2.setEntity(new ByteArrayEntity(stuff, ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response2 = requester.execute(target, request2, TIMEOUT, context)) {
@@ -243,7 +243,7 @@ public class ClassicAuthenticationTest {
for (int i = 0; i < stuff.length; i++) {
stuff[i] = (byte)('a' + rnd.nextInt(10));
}
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setVersion(HttpVersion.HTTP_1_0);
request1.setEntity(new ByteArrayEntity(stuff, ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
@@ -251,7 +251,7 @@ public class ClassicAuthenticationTest {
final String body1 = EntityUtils.toString(response1.getEntity());
Assert.assertThat(body1, CoreMatchers.equalTo("You shall not pass!!!"));
}
- final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request2.setHeader(HttpHeaders.AUTHORIZATION, "let me pass");
request2.setVersion(HttpVersion.HTTP_1_0);
request2.setEntity(new ByteArrayEntity(stuff, ContentType.TEXT_PLAIN));
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java
index 6605085..6971c4e 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicIntegrationTest.java
@@ -55,7 +55,7 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.io.HttpServerRequestHandler;
@@ -201,7 +201,7 @@ public class ClassicIntegrationTest {
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
for (int r = 0; r < reqNo; r++) {
- final BasicClassicHttpRequest get = new BasicClassicHttpRequest(Methods.GET, "/?" + r);
+ final BasicClassicHttpRequest get = new BasicClassicHttpRequest(Method.GET, "/?" + r);
try (final ClassicHttpResponse response = this.client.execute(host, get, context)) {
final byte[] received = EntityUtils.toByteArray(response.getEntity());
final byte[] expected = testData.get(r);
@@ -259,7 +259,7 @@ public class ClassicIntegrationTest {
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
for (int r = 0; r < reqNo; r++) {
- final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
final byte[] data = testData.get(r);
post.setEntity(new ByteArrayEntity(data, null));
@@ -320,7 +320,7 @@ public class ClassicIntegrationTest {
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
for (int r = 0; r < reqNo; r++) {
- final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
final byte[] data = testData.get(r);
post.setEntity(new ByteArrayEntity(data, null, true));
@@ -384,7 +384,7 @@ public class ClassicIntegrationTest {
for (int r = 0; r < reqNo; r++) {
// Set protocol level to HTTP/1.0
- final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
post.setVersion(HttpVersion.HTTP_1_0);
final byte[] data = testData.get(r);
post.setEntity(new ByteArrayEntity(data, null));
@@ -450,7 +450,7 @@ public class ClassicIntegrationTest {
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
for (int r = 0; r < reqNo; r++) {
- final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
final byte[] data = testData.get(r);
post.setEntity(new ByteArrayEntity(data, null, true));
@@ -526,7 +526,7 @@ public class ClassicIntegrationTest {
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
for (int r = 0; r < reqNo; r++) {
- final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
post.addHeader("Secret", Integer.toString(r));
final byte[] b = new byte[2048];
@@ -668,7 +668,7 @@ public class ClassicIntegrationTest {
for (final String pattern : patterns) {
for (int n = 1000; n < 1020; n++) {
final BasicClassicHttpRequest post = new BasicClassicHttpRequest(
- Methods.POST.name(), "/?n=" + n);
+ Method.POST.name(), "/?n=" + n);
post.setEntity(new StringEntity(pattern, ContentType.TEXT_PLAIN, n % 2 == 0));
try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
@@ -720,7 +720,7 @@ public class ClassicIntegrationTest {
final HttpCoreContext context = HttpCoreContext.create();
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
- final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
post.setEntity(null);
try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
@@ -759,7 +759,7 @@ public class ClassicIntegrationTest {
final HttpCoreContext context = HttpCoreContext.create();
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
- final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
post.setEntity(null);
try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
@@ -809,7 +809,7 @@ public class ClassicIntegrationTest {
final HttpCoreContext context = HttpCoreContext.create();
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
- final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest post = new BasicClassicHttpRequest(Method.POST, "/");
post.setEntity(null);
try (final ClassicHttpResponse response = this.client.execute(host, post, context)) {
@@ -842,7 +842,7 @@ public class ClassicIntegrationTest {
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
for (int r = 0; r < reqNo; r++) {
- final BasicClassicHttpRequest get = new BasicClassicHttpRequest(Methods.GET, "/?" + r);
+ final BasicClassicHttpRequest get = new BasicClassicHttpRequest(Method.GET, "/?" + r);
try (final ClassicHttpResponse response = this.client.execute(host, get, context)) {
Assert.assertNull(response.getEntity());
}
@@ -871,14 +871,14 @@ public class ClassicIntegrationTest {
final HttpCoreContext context = HttpCoreContext.create();
final HttpHost host = new HttpHost(scheme.id, "localhost", this.server.getPort());
- final BasicClassicHttpRequest get1 = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest get1 = new BasicClassicHttpRequest(Method.GET, "/");
get1.setVersion(HttpVersion.HTTP_1_0);
try (final ClassicHttpResponse response1 = this.client.execute(host, get1, context)) {
Assert.assertEquals(200, response1.getCode());
EntityUtils.consume(response1.getEntity());
}
- final BasicClassicHttpRequest get2 = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest get2 = new BasicClassicHttpRequest(Method.GET, "/");
try (final ClassicHttpResponse response2 = this.client.execute(host, get2, context)) {
Assert.assertEquals(400, response2.getCode());
EntityUtils.consume(response2.getEntity());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
index a777a49..82b90e7 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicServerAndRequesterTest.java
@@ -39,7 +39,7 @@ import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
@@ -186,21 +186,21 @@ public class ClassicServerAndRequesterTest {
server.start();
final HttpHost target = new HttpHost(scheme.id, "localhost", server.getLocalPort());
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setEntity(new StringEntity("some stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
Assert.assertThat(response1.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
final String body1 = EntityUtils.toString(response1.getEntity());
Assert.assertThat(body1, CoreMatchers.equalTo("some stuff"));
}
- final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Methods.POST, "/other-stuff");
+ final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Method.POST, "/other-stuff");
request2.setEntity(new StringEntity("some other stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response2 = requester.execute(target, request2, TIMEOUT, context)) {
Assert.assertThat(response2.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
final String body2 = EntityUtils.toString(response2.getEntity());
Assert.assertThat(body2, CoreMatchers.equalTo("some other stuff"));
}
- final ClassicHttpRequest request3 = new BasicClassicHttpRequest(Methods.POST, "/more-stuff");
+ final ClassicHttpRequest request3 = new BasicClassicHttpRequest(Method.POST, "/more-stuff");
request3.setEntity(new StringEntity("some more stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response3 = requester.execute(target, request3, TIMEOUT, context)) {
Assert.assertThat(response3.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
@@ -214,21 +214,21 @@ public class ClassicServerAndRequesterTest {
server.start();
final HttpHost target = new HttpHost(scheme.id, "localhost", server.getLocalPort());
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/no-keep-alive/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/no-keep-alive/stuff");
request1.setEntity(new StringEntity("some stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
Assert.assertThat(response1.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
final String body1 = EntityUtils.toString(response1.getEntity());
Assert.assertThat(body1, CoreMatchers.equalTo("some stuff"));
}
- final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Methods.POST, "/no-keep-alive/other-stuff");
+ final ClassicHttpRequest request2 = new BasicClassicHttpRequest(Method.POST, "/no-keep-alive/other-stuff");
request2.setEntity(new StringEntity("some other stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response2 = requester.execute(target, request2, TIMEOUT, context)) {
Assert.assertThat(response2.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
final String body2 = EntityUtils.toString(response2.getEntity());
Assert.assertThat(body2, CoreMatchers.equalTo("some other stuff"));
}
- final ClassicHttpRequest request3 = new BasicClassicHttpRequest(Methods.POST, "/no-keep-alive/more-stuff");
+ final ClassicHttpRequest request3 = new BasicClassicHttpRequest(Method.POST, "/no-keep-alive/more-stuff");
request3.setEntity(new StringEntity("some more stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response3 = requester.execute(target, request3, TIMEOUT, context)) {
Assert.assertThat(response3.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
index 2021d6c..bd344b0 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/ClassicTLSIntegrationTest.java
@@ -41,7 +41,7 @@ import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
@@ -137,7 +137,7 @@ public class ClassicTLSIntegrationTest {
final HttpContext context = new BasicHttpContext();
final HttpHost target = new HttpHost("https", "localhost", server.getLocalPort());
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setEntity(new StringEntity("some stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
Assert.assertThat(response1.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK));
@@ -176,7 +176,7 @@ public class ClassicTLSIntegrationTest {
final HttpContext context = new BasicHttpContext();
final HttpHost target = new HttpHost("https", "localhost", server.getLocalPort());
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setEntity(new StringEntity("some stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
EntityUtils.consume(response1.getEntity());
@@ -216,7 +216,7 @@ public class ClassicTLSIntegrationTest {
final HttpContext context = new BasicHttpContext();
final HttpHost target = new HttpHost("https", "localhost", server.getLocalPort());
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setEntity(new StringEntity("some stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
EntityUtils.consume(response1.getEntity());
@@ -249,7 +249,7 @@ public class ClassicTLSIntegrationTest {
final HttpContext context = new BasicHttpContext();
final HttpHost target = new HttpHost("https", "localhost", server.getLocalPort());
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setEntity(new StringEntity("some stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
EntityUtils.consume(response1.getEntity());
@@ -303,7 +303,7 @@ public class ClassicTLSIntegrationTest {
final HttpContext context = new BasicHttpContext();
final HttpHost target = new HttpHost("https", "localhost", server.getLocalPort());
- final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/stuff");
request1.setEntity(new StringEntity("some stuff", ContentType.TEXT_PLAIN));
try (final ClassicHttpResponse response1 = requester.execute(target, request1, TIMEOUT, context)) {
EntityUtils.consume(response1.getEntity());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java
index cd1b795..2e46e96 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java
@@ -45,7 +45,7 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.config.CharCodingConfig;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.message.BasicHttpRequest;
@@ -134,7 +134,7 @@ public class H2CompatibilityTest {
final AsyncClientEndpoint endpoint = connectFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
final CountDownLatch countDownLatch = new CountDownLatch(1);
- final HttpRequest httpget = new BasicHttpRequest(Methods.GET, target, "/status.html");
+ final HttpRequest httpget = new BasicHttpRequest(Method.GET, target, "/status.html");
endpoint.execute(
new BasicRequestProducer(httpget, null),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
@@ -185,7 +185,7 @@ public class H2CompatibilityTest {
final int reqCount = 20;
final CountDownLatch countDownLatch = new CountDownLatch(reqCount);
for (int i = 0; i < reqCount; i++) {
- final HttpRequest httpget = new BasicHttpRequest(Methods.GET, target, "/status.html");
+ final HttpRequest httpget = new BasicHttpRequest(Method.GET, target, "/status.html");
endpoint.execute(
new BasicRequestProducer(httpget, null),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
@@ -235,7 +235,7 @@ public class H2CompatibilityTest {
final AsyncClientEndpoint endpoint = connectFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
final CountDownLatch countDownLatch = new CountDownLatch(5);
- final HttpRequest httpget = new BasicHttpRequest(Methods.GET, target, "/index.html");
+ final HttpRequest httpget = new BasicHttpRequest(Method.GET, target, "/index.html");
final Future<Message<HttpResponse, String>> future = endpoint.execute(
new BasicRequestProducer(httpget, null),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
@@ -295,28 +295,28 @@ public class H2CompatibilityTest {
final List<Message<HttpRequest, AsyncEntityProducer>> requestMessages = Arrays.asList(
new Message<HttpRequest, AsyncEntityProducer>(
- new BasicHttpRequest(Methods.GET, target, "/headers"),
+ new BasicHttpRequest(Method.GET, target, "/headers"),
null),
new Message<HttpRequest, AsyncEntityProducer>(
- new BasicHttpRequest(Methods.POST, target, "/anything"),
+ new BasicHttpRequest(Method.POST, target, "/anything"),
new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN)),
new Message<HttpRequest, AsyncEntityProducer>(
- new BasicHttpRequest(Methods.PUT, target, "/anything"),
+ new BasicHttpRequest(Method.PUT, target, "/anything"),
new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN)),
new Message<HttpRequest, AsyncEntityProducer>(
- new BasicHttpRequest(Methods.GET, target, "/drip"),
+ new BasicHttpRequest(Method.GET, target, "/drip"),
null),
new Message<HttpRequest, AsyncEntityProducer>(
- new BasicHttpRequest(Methods.GET, target, "/bytes/20000"),
+ new BasicHttpRequest(Method.GET, target, "/bytes/20000"),
null),
new Message<HttpRequest, AsyncEntityProducer>(
- new BasicHttpRequest(Methods.GET, target, "/delay/2"),
+ new BasicHttpRequest(Method.GET, target, "/delay/2"),
null),
new Message<HttpRequest, AsyncEntityProducer>(
- new BasicHttpRequest(Methods.POST, target, "/delay/2"),
+ new BasicHttpRequest(Method.POST, target, "/delay/2"),
new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN)),
new Message<HttpRequest, AsyncEntityProducer>(
- new BasicHttpRequest(Methods.PUT, target, "/delay/2"),
+ new BasicHttpRequest(Method.PUT, target, "/delay/2"),
new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN))
);
@@ -377,10 +377,10 @@ public class H2CompatibilityTest {
final HttpRequest request;
final AsyncEntityProducer entityProducer;
if (i % 2 == 0) {
- request = new BasicHttpRequest(Methods.GET, target, "/headers");
+ request = new BasicHttpRequest(Method.GET, target, "/headers");
entityProducer = null;
} else {
- request = new BasicHttpRequest(Methods.POST, target, "/anything");
+ request = new BasicHttpRequest(Method.POST, target, "/anything");
entityProducer = new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN);
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestClassicTestClientTestingAdapter.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestClassicTestClientTestingAdapter.java
index 1c434db..6aaa20e 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestClassicTestClientTestingAdapter.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/framework/TestClassicTestClientTestingAdapter.java
@@ -42,7 +42,7 @@ import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.io.CloseMode;
@@ -213,7 +213,7 @@ public class TestClassicTestClientTestingAdapter {
final String defaultURI = target.toString();
final Map<String, Object> request = new HashMap<>();
request.put(PATH, ECHO_PATH);
- request.put(METHOD, Methods.POST.name());
+ request.put(METHOD, Method.POST.name());
final String body = "mybody";
request.put(BODY, body);
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
index d865a2c..f4b1b46 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2AlpnTest.java
@@ -34,7 +34,7 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler;
@@ -188,7 +188,7 @@ public class H2AlpnTest {
final HttpHost target = new HttpHost(URIScheme.HTTPS.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message1;
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
index ab05811..2d18d27 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2IntegrationTest.java
@@ -76,7 +76,7 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.message.BasicHttpRequest;
@@ -200,7 +200,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 10; i++) {
queue.add(streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
}
@@ -235,7 +235,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
for (int i = 0; i < 5; i++) {
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.HEAD, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.HEAD, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
@@ -264,11 +264,11 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/"), null),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/"), null),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Future<Message<HttpResponse, String>> future2 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer(512)), null);
final Message<HttpResponse, String> result1 = future1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -315,7 +315,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 10; i++) {
- final HttpRequest request = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/hello"));
queue.add(streamEndpoint.execute(
new BasicRequestProducer(request, new StringAsyncEntityProducer("Hi there", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
@@ -351,7 +351,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/echo"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/echo"),
new MultiLineEntityProducer("0123456789abcdef", 5000)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result1 = future1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -385,7 +385,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/"), null),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/"), null),
new BasicResponseConsumer<>(new AbstractClassicEntityConsumer<String>(16, Executors.newSingleThreadExecutor()) {
@Override
@@ -443,7 +443,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, new AbstractClassicEntityProducer(4096, ContentType.TEXT_PLAIN, Executors.newSingleThreadExecutor()) {
@@ -502,7 +502,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
response.setCode(HttpStatus.SC_NOT_FOUND);
return;
}
- if (!Methods.POST.name().equalsIgnoreCase(request.getMethod())) {
+ if (!Method.POST.name().equalsIgnoreCase(request.getMethod())) {
response.setCode(HttpStatus.SC_NOT_IMPLEMENTED);
return;
}
@@ -551,7 +551,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/hello"));
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, new MultiLineEntityProducer("0123456789abcd", 2000)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -583,7 +583,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final AsyncServerRequestHandler.ResponseTrigger responseTrigger,
final HttpContext context) throws IOException, HttpException {
responseTrigger.pushPromise(
- new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/stuff")),
+ new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/stuff")),
context,
new BasicPushProducer(new MultiLineEntityProducer("Pushing lots of stuff", 500)));
responseTrigger.submitResponse(
@@ -604,7 +604,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
new HandlerFactory<AsyncPushConsumer>() {
@@ -667,7 +667,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final HttpContext context) throws IOException, HttpException {
responseTrigger.pushPromise(
- new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/stuff")),
+ new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/stuff")),
context, new BasicPushProducer(AsyncEntityProducers.create("Pushing all sorts of stuff")) {
@Override
@@ -678,7 +678,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
});
responseTrigger.pushPromise(
- new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/more-stuff")),
+ new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/more-stuff")),
context, new BasicPushProducer(new MultiLineEntityProducer("Pushing lots of stuff", 500)) {
@Override
@@ -704,7 +704,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result1 = future1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result1);
@@ -744,7 +744,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final Queue<Future<Message<HttpResponse, Void>>> queue = new LinkedList<>();
for (int i = 0; i < 2000; i++) {
- final HttpRequest request1 = new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/"));
final Future<Message<HttpResponse, Void>> future = streamEndpoint.execute(
new BasicRequestProducer(request1, null),
new BasicResponseConsumer<>(new NoopEntityConsumer()), null);
@@ -807,7 +807,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
request1.addHeader("password", "secret");
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, new MultiLineEntityProducer("0123456789abcdef", 5000)),
@@ -819,7 +819,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
Assert.assertEquals(200, response1.getCode());
Assert.assertNotNull("All is well", result1.getBody());
- final HttpRequest request2 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request2 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
final Future<Message<HttpResponse, String>> future2 = streamEndpoint.execute(
new BasicRequestProducer(request2, new MultiLineEntityProducer("0123456789abcdef", 5000)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -901,7 +901,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, new MultiLineEntityProducer("0123456789abcdef", 5000)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -951,7 +951,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/hello"));
final DigestingEntityConsumer<String> entityConsumer = new DigestingEntityConsumer<>("MD5", new StringAsyncEntityConsumer());
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, null),
@@ -997,7 +997,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final AtomicInteger count = new AtomicInteger(0);
for (int i = 0; i < n; i++) {
streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
streamEndpoint.execute(new PingCommand(new BasicPingHandler(new Callback<Boolean>() {
@@ -1034,7 +1034,7 @@ public class H2IntegrationTest extends InternalH2ServerTestBase {
final IOSession session = sessionFuture.get();
final ClientSessionEndpoint streamEndpoint = new ClientSessionEndpoint(session);
- final HttpRequest request = new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request = new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/hello"));
request.addHeader(HttpHeaders.CONNECTION, HeaderElements.CLOSE);
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
new BasicRequestProducer(request, null),
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
index 5110aee..d38e477 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ProtocolNegotiationTest.java
@@ -37,7 +37,7 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
@@ -179,7 +179,7 @@ public class H2ProtocolNegotiationTest {
final AsyncClientEndpoint endpoint = connectFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
final Future<Message<HttpResponse, String>> resultFuture1 = endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -202,7 +202,7 @@ public class H2ProtocolNegotiationTest {
final AsyncClientEndpoint endpoint = connectFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
final Future<Message<HttpResponse, String>> resultFuture1 = endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -225,7 +225,7 @@ public class H2ProtocolNegotiationTest {
final AsyncClientEndpoint endpoint = connectFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
final Future<Message<HttpResponse, String>> resultFuture1 = endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
index 2b1a566..e8ac72d 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndMultiplexingRequesterTest.java
@@ -44,7 +44,7 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler;
@@ -194,7 +194,7 @@ public class H2ServerAndMultiplexingRequesterTest {
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -205,7 +205,7 @@ public class H2ServerAndMultiplexingRequesterTest {
Assert.assertThat(body1, CoreMatchers.equalTo("some stuff"));
final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -216,7 +216,7 @@ public class H2ServerAndMultiplexingRequesterTest {
Assert.assertThat(body2, CoreMatchers.equalTo("some other stuff"));
final Future<Message<HttpResponse, String>> resultFuture3 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -239,15 +239,15 @@ public class H2ServerAndMultiplexingRequesterTest {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
queue.add(requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null));
queue.add(requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null));
queue.add(requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null));
@@ -273,7 +273,7 @@ public class H2ServerAndMultiplexingRequesterTest {
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -286,7 +286,7 @@ public class H2ServerAndMultiplexingRequesterTest {
Thread.sleep(100);
final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -299,7 +299,7 @@ public class H2ServerAndMultiplexingRequesterTest {
Thread.sleep(100);
final Future<Message<HttpResponse, String>> resultFuture3 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -325,7 +325,7 @@ public class H2ServerAndMultiplexingRequesterTest {
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
for (int i = 0; i < reqNo; i++) {
final Cancellable cancellable = requester.execute(
- new BasicClientExchangeHandler<>(new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicClientExchangeHandler<>(new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
new FutureCallback<Message<HttpResponse, String>>() {
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
index ab04205..832c185 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2ServerAndRequesterTest.java
@@ -40,7 +40,7 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
@@ -197,7 +197,7 @@ public class H2ServerAndRequesterTest {
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -208,7 +208,7 @@ public class H2ServerAndRequesterTest {
Assert.assertThat(body1, CoreMatchers.equalTo("some stuff"));
final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -219,7 +219,7 @@ public class H2ServerAndRequesterTest {
Assert.assertThat(body2, CoreMatchers.equalTo("some other stuff"));
final Future<Message<HttpResponse, String>> resultFuture3 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -244,7 +244,7 @@ public class H2ServerAndRequesterTest {
try {
final Future<Message<HttpResponse, String>> resultFuture1 = endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -255,7 +255,7 @@ public class H2ServerAndRequesterTest {
Assert.assertThat(body1, CoreMatchers.equalTo("some stuff"));
final Future<Message<HttpResponse, String>> resultFuture2 = endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -266,7 +266,7 @@ public class H2ServerAndRequesterTest {
Assert.assertThat(body2, CoreMatchers.equalTo("some other stuff"));
final Future<Message<HttpResponse, String>> resultFuture3 = endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -297,15 +297,15 @@ public class H2ServerAndRequesterTest {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
queue.add(endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
queue.add(endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
queue.add(endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2TLSIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2TLSIntegrationTest.java
index 2994f9f..5a0f53f 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2TLSIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/H2TLSIntegrationTest.java
@@ -44,7 +44,7 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.impl.bootstrap.AsyncServerBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
@@ -171,7 +171,7 @@ public class H2TLSIntegrationTest {
final HttpHost target = new HttpHost("https", "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -232,7 +232,7 @@ public class H2TLSIntegrationTest {
final HttpHost target = new HttpHost("https", "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
try {
@@ -298,7 +298,7 @@ public class H2TLSIntegrationTest {
final HttpHost target = new HttpHost("https", "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
try {
@@ -364,7 +364,7 @@ public class H2TLSIntegrationTest {
final HttpHost target = new HttpHost("https", "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
try {
@@ -448,7 +448,7 @@ public class H2TLSIntegrationTest {
final HttpHost target = new HttpHost("https", "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
try {
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
index 741b795..3fec96f 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1AuthenticationTest.java
@@ -44,7 +44,7 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.bootstrap.AsyncRequesterBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.AsyncServerBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
@@ -211,7 +211,7 @@ public class Http1AuthenticationTest {
final HttpHost target = new HttpHost("localhost", address.getPort());
- final HttpRequest request1 = new BasicHttpRequest(Methods.GET, target, "/stuff");
+ final HttpRequest request1 = new BasicHttpRequest(Method.GET, target, "/stuff");
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
new BasicRequestProducer(request1, null),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
@@ -222,7 +222,7 @@ public class Http1AuthenticationTest {
final String body1 = message1.getBody();
Assert.assertThat(body1, CoreMatchers.equalTo("You shall not pass!!!"));
- final HttpRequest request2 = new BasicHttpRequest(Methods.GET, target, "/stuff");
+ final HttpRequest request2 = new BasicHttpRequest(Method.GET, target, "/stuff");
request2.setHeader(HttpHeaders.AUTHORIZATION, "let me pass");
final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
new BasicRequestProducer(request2, null),
@@ -249,7 +249,7 @@ public class Http1AuthenticationTest {
for (int i = 0; i < stuff.length; i++) {
stuff[i] = (byte)('a' + rnd.nextInt(10));
}
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, target, "/stuff");
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, target, "/stuff");
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
new BasicRequestProducer(request1, AsyncEntityProducers.create(stuff, ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
@@ -260,7 +260,7 @@ public class Http1AuthenticationTest {
final String body1 = message1.getBody();
Assert.assertThat(body1, CoreMatchers.equalTo("You shall not pass!!!"));
- final HttpRequest request2 = new BasicHttpRequest(Methods.POST, target, "/stuff");
+ final HttpRequest request2 = new BasicHttpRequest(Method.POST, target, "/stuff");
request2.setHeader(HttpHeaders.AUTHORIZATION, "let me pass");
final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
new BasicRequestProducer(request2, AsyncEntityProducers.create(stuff, ContentType.TEXT_PLAIN)),
@@ -288,7 +288,7 @@ public class Http1AuthenticationTest {
stuff[i] = (byte)('a' + rnd.nextInt(10));
}
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, target, "/stuff");
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, target, "/stuff");
request1.setVersion(HttpVersion.HTTP_1_0);
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
new BasicRequestProducer(request1, AsyncEntityProducers.create(stuff, ContentType.TEXT_PLAIN)),
@@ -300,7 +300,7 @@ public class Http1AuthenticationTest {
final String body1 = message1.getBody();
Assert.assertThat(body1, CoreMatchers.equalTo("You shall not pass!!!"));
- final HttpRequest request2 = new BasicHttpRequest(Methods.POST, target, "/stuff");
+ final HttpRequest request2 = new BasicHttpRequest(Method.POST, target, "/stuff");
request2.setVersion(HttpVersion.HTTP_1_0);
request2.setHeader(HttpHeaders.AUTHORIZATION, "let me pass");
final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
index f9f668f..6132f15 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
@@ -75,7 +75,7 @@ import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.MalformedChunkCodingException;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.config.CharCodingConfig;
@@ -209,7 +209,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
for (int i = 0; i < 5; i++) {
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
@@ -273,7 +273,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
@@ -304,7 +304,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 5; i++) {
queue.add(streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
}
while (!queue.isEmpty()) {
@@ -337,7 +337,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result1 = future1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -353,7 +353,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
}
final Future<Message<HttpResponse, String>> future2 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer(512)), null);
final Message<HttpResponse, String> result2 = future2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -389,7 +389,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 5; i++) {
queue.add(streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
}
while (!queue.isEmpty()) {
@@ -427,7 +427,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
for (int i = 0; i < 5; i++) {
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/hello"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/hello"),
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -460,7 +460,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 5; i++) {
queue.add(streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/hello"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/hello"),
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
}
@@ -494,7 +494,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
for (int i = 0; i < 5; i++) {
- final HttpRequest request = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/hello"));
request.setVersion(HttpVersion.HTTP_1_0);
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
new BasicRequestProducer(request, AsyncEntityProducers.create("Hi there")),
@@ -527,7 +527,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
for (int i = 0; i < 5; i++) {
- final HttpRequest request = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/hello"));
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
new BasicRequestProducer(request, null),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -560,7 +560,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
for (int i = 0; i < 5; i++) {
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/echo"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/echo"),
new MultiLineEntityProducer("0123456789abcdef", 5000)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -597,7 +597,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 2; i++) {
queue.add(streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/"),
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
}
@@ -638,7 +638,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 5; i++) {
queue.add(streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/echo"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/echo"),
new MultiLineEntityProducer("0123456789abcdef", 5000)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
}
@@ -677,7 +677,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
for (int i = 0; i < 5; i++) {
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.HEAD, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.HEAD, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
@@ -741,7 +741,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 5; i++) {
queue.add(streamEndpoint.execute(
- new BasicRequestProducer(Methods.HEAD, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.HEAD, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
}
while (!queue.isEmpty()) {
@@ -802,7 +802,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final IOSession ioSession = sessionFuture.get();
final ClientSessionEndpoint streamEndpoint = new ClientSessionEndpoint(ioSession);
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
request1.addHeader("password", "secret");
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, new MultiLineEntityProducer("0123456789abcdef", 1000)),
@@ -816,7 +816,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
Assert.assertTrue(ioSession.isOpen());
- final HttpRequest request2 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request2 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
final Future<Message<HttpResponse, String>> future2 = streamEndpoint.execute(
new BasicRequestProducer(request2, new MultiLineEntityProducer("0123456789abcdef", 5000)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -829,7 +829,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
Assert.assertTrue(ioSession.isOpen());
- final HttpRequest request3 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request3 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
request3.addHeader("password", "secret");
final Future<Message<HttpResponse, String>> future3 = streamEndpoint.execute(
new BasicRequestProducer(request3, new MultiLineEntityProducer("0123456789abcdef", 1000)),
@@ -843,7 +843,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
Assert.assertTrue(ioSession.isOpen());
- final HttpRequest request4 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request4 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
final Future<Message<HttpResponse, String>> future4 = streamEndpoint.execute(
new BasicRequestProducer(request4, AsyncEntityProducers.create("blah")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -948,7 +948,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 5; i++) {
queue.add(streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/"),
AsyncEntityProducers.create("Some important message")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
}
@@ -1033,7 +1033,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, new MultiLineEntityProducer("0123456789abcdef", 5000)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -1063,7 +1063,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/"));
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, null),
new BasicResponseConsumer<>(new AbstractClassicEntityConsumer<String>(16, Executors.newSingleThreadExecutor()) {
@@ -1123,7 +1123,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/echo"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/echo"));
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, new AbstractClassicEntityProducer(4096, ContentType.TEXT_PLAIN, Executors.newSingleThreadExecutor()) {
@@ -1182,7 +1182,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
response.setCode(HttpStatus.SC_NOT_FOUND);
return;
}
- if (!Methods.POST.name().equalsIgnoreCase(request.getMethod())) {
+ if (!Method.POST.name().equalsIgnoreCase(request.getMethod())) {
response.setCode(HttpStatus.SC_NOT_IMPLEMENTED);
return;
}
@@ -1229,7 +1229,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/hello"));
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, new MultiLineEntityProducer("0123456789abcd", 2000)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -1264,17 +1264,17 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/hello-1"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/hello-1"),
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
- final HttpRequest request2 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/hello-2"));
+ final HttpRequest request2 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/hello-2"));
request2.addHeader(HttpHeaders.CONNECTION, "close");
final Future<Message<HttpResponse, String>> future2 = streamEndpoint.execute(
new BasicRequestProducer(request2,
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Future<Message<HttpResponse, String>> future3 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/hello-3"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/hello-3"),
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -1301,7 +1301,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
}
final Future<Message<HttpResponse, String>> future4 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/hello-3"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/hello-3"),
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
try {
@@ -1331,17 +1331,17 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/hello-1"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/hello-1"),
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
- final HttpRequest request2 = new BasicHttpRequest(Methods.POST, createRequestURI(serverEndpoint, "/hello-2"));
+ final HttpRequest request2 = new BasicHttpRequest(Method.POST, createRequestURI(serverEndpoint, "/hello-2"));
request2.addHeader(HttpHeaders.HOST, "blah:blah");
final Future<Message<HttpResponse, String>> future2 = streamEndpoint.execute(
new BasicRequestProducer(request2,
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Future<Message<HttpResponse, String>> future3 = streamEndpoint.execute(
- new BasicRequestProducer(Methods.POST, createRequestURI(serverEndpoint, "/hello-3"),
+ new BasicRequestProducer(Method.POST, createRequestURI(serverEndpoint, "/hello-3"),
AsyncEntityProducers.create("Hi there")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
@@ -1486,7 +1486,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final AsyncRequestProducer requestProducer = new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello"));
+ final AsyncRequestProducer requestProducer = new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello"));
final StringAsyncEntityConsumer entityConsumer = new StringAsyncEntityConsumer() {
@Override
@@ -1534,7 +1534,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
@@ -1555,7 +1555,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
@@ -1594,7 +1594,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
@@ -1622,7 +1622,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/hello"));
request1.setVersion(HttpVersion.HTTP_1_0);
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, null),
@@ -1634,7 +1634,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
Assert.assertEquals(200, response1.getCode());
Assert.assertEquals("Hi there", result1.getBody());
- final HttpRequest request2 = new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request2 = new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/hello"));
request2.setVersion(HttpVersion.HTTP_1_1);
final Future<Message<HttpResponse, String>> future2 = streamEndpoint.execute(
new BasicRequestProducer(request2, null),
@@ -1685,7 +1685,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
- final HttpRequest request1 = new BasicHttpRequest(Methods.GET, createRequestURI(serverEndpoint, "/hello"));
+ final HttpRequest request1 = new BasicHttpRequest(Method.GET, createRequestURI(serverEndpoint, "/hello"));
final DigestingEntityConsumer<String> entityConsumer = new DigestingEntityConsumer<>("MD5", new StringAsyncEntityConsumer());
final Future<Message<HttpResponse, String>> future1 = streamEndpoint.execute(
new BasicRequestProducer(request1, null),
@@ -1778,7 +1778,7 @@ public class Http1IntegrationTest extends InternalHttp1ServerTestBase {
"localhost", serverEndpoint.getPort(), TIMEOUT);
final ClientSessionEndpoint streamEndpoint = connectFuture.get();
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/boom")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/boom")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
index ee2679d..cee7786 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1ServerAndRequesterTest.java
@@ -46,7 +46,7 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.http.impl.bootstrap.AsyncRequesterBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.AsyncServerBootstrap;
@@ -225,7 +225,7 @@ public class Http1ServerAndRequesterTest {
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -236,7 +236,7 @@ public class Http1ServerAndRequesterTest {
Assert.assertThat(body1, CoreMatchers.equalTo("some stuff"));
final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -247,7 +247,7 @@ public class Http1ServerAndRequesterTest {
Assert.assertThat(body2, CoreMatchers.equalTo("some other stuff"));
final Future<Message<HttpResponse, String>> resultFuture3 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -268,7 +268,7 @@ public class Http1ServerAndRequesterTest {
final HttpHost target = new HttpHost(scheme.id, "localhost", address.getPort());
final Future<Message<HttpResponse, String>> resultFuture1 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/no-keep-alive/stuff",
+ new BasicRequestProducer(Method.POST, target, "/no-keep-alive/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -279,7 +279,7 @@ public class Http1ServerAndRequesterTest {
Assert.assertThat(body1, CoreMatchers.equalTo("some stuff"));
final Future<Message<HttpResponse, String>> resultFuture2 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/no-keep-alive/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/no-keep-alive/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -290,7 +290,7 @@ public class Http1ServerAndRequesterTest {
Assert.assertThat(body2, CoreMatchers.equalTo("some other stuff"));
final Future<Message<HttpResponse, String>> resultFuture3 = requester.execute(
- new BasicRequestProducer(Methods.POST, target, "/no-keep-alive/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/no-keep-alive/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null);
final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -315,7 +315,7 @@ public class Http1ServerAndRequesterTest {
try {
final Future<Message<HttpResponse, String>> resultFuture1 = endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> message1 = resultFuture1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -326,7 +326,7 @@ public class Http1ServerAndRequesterTest {
Assert.assertThat(body1, CoreMatchers.equalTo("some stuff"));
final Future<Message<HttpResponse, String>> resultFuture2 = endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> message2 = resultFuture2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -337,7 +337,7 @@ public class Http1ServerAndRequesterTest {
Assert.assertThat(body2, CoreMatchers.equalTo("some other stuff"));
final Future<Message<HttpResponse, String>> resultFuture3 = endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> message3 = resultFuture3.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
@@ -368,15 +368,15 @@ public class Http1ServerAndRequesterTest {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
queue.add(endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/stuff",
+ new BasicRequestProducer(Method.POST, target, "/stuff",
new StringAsyncEntityProducer("some stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
queue.add(endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/other-stuff",
+ new BasicRequestProducer(Method.POST, target, "/other-stuff",
new StringAsyncEntityProducer("some other stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
queue.add(endpoint.execute(
- new BasicRequestProducer(Methods.POST, target, "/more-stuff",
+ new BasicRequestProducer(Method.POST, target, "/more-stuff",
new StringAsyncEntityProducer("some more stuff", ContentType.TEXT_PLAIN)),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null));
@@ -407,7 +407,7 @@ public class Http1ServerAndRequesterTest {
final Queue<Future<Message<HttpResponse, String>>> queue = new LinkedList<>();
for (int i = 0; i < 20; i++) {
- final HttpRequest head = new BasicHttpRequest(Methods.HEAD, target, "/no-keep-alive/stuff?p=" + i);
+ final HttpRequest head = new BasicHttpRequest(Method.HEAD, target, "/no-keep-alive/stuff?p=" + i);
queue.add(requester.execute(
new BasicRequestProducer(head, null),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), TIMEOUT, null));
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
index 57642e8..6d0c3bd 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/JSSEProviderIntegrationTest.java
@@ -44,7 +44,7 @@ import org.apache.hc.core5.function.Supplier;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.config.Http1Config;
import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler;
import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
@@ -243,7 +243,7 @@ public class JSSEProviderIntegrationTest {
for (int i = 0; i < REQ_NUM; i++) {
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
@@ -309,7 +309,7 @@ public class JSSEProviderIntegrationTest {
"localhost", serverEndpoint.getPort(), TIMEOUT);
try (final ClientSessionEndpoint streamEndpoint = connectFuture.get()) {
final Future<Message<HttpResponse, String>> future = streamEndpoint.execute(
- new BasicRequestProducer(Methods.GET, createRequestURI(serverEndpoint, "/hello")),
+ new BasicRequestProducer(Method.GET, createRequestURI(serverEndpoint, "/hello")),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()), null);
final Message<HttpResponse, String> result = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
Assert.assertNotNull(result);
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java
index 892cc9c..aa26f46 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/reactive/ReactiveClientTest.java
@@ -60,7 +60,7 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStreamResetException;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.BasicEntityDetails;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncServer;
@@ -247,7 +247,7 @@ public class ReactiveClientTest {
}
private BasicRequestProducer getRequestProducer(final InetSocketAddress address, final ReactiveEntityProducer producer) {
- return new BasicRequestProducer(Methods.POST, URI.create("http://localhost:" + address.getPort()), producer);
+ return new BasicRequestProducer(Method.POST, URI.create("http://localhost:" + address.getPort()), producer);
}
@Test
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/Methods.java b/httpcore5/src/main/java/org/apache/hc/core5/http/Method.java
similarity index 96%
rename from httpcore5/src/main/java/org/apache/hc/core5/http/Methods.java
rename to httpcore5/src/main/java/org/apache/hc/core5/http/Method.java
index 345f97a..81bd758 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/Methods.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/Method.java
@@ -34,7 +34,7 @@ import java.util.Locale;
*
* @since 5.0
*/
-public enum Methods {
+public enum Method {
GET(true, true),
HEAD(true, true),
@@ -49,7 +49,7 @@ public enum Methods {
private final boolean safe;
private final boolean idempotent;
- Methods(final boolean safe, final boolean idempotent) {
+ Method(final boolean safe, final boolean idempotent) {
this.safe = safe;
this.idempotent = idempotent;
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
index b9f8146..4083ca9 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamHandler.java
@@ -39,7 +39,7 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.MisdirectedRequestException;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.ProtocolVersion;
@@ -141,7 +141,7 @@ class ServerHttp1StreamHandler implements ResourceHolder {
context.setAttribute(HttpCoreContext.HTTP_RESPONSE, response);
httpProcessor.process(response, responseEntityDetails, context);
- final boolean endStream = responseEntityDetails == null || Methods.HEAD.isSame(method);
+ final boolean endStream = responseEntityDetails == null || Method.HEAD.isSame(method);
if (!connectionReuseStrategy.keepAlive(receivedRequest, response, context)) {
keepAlive = false;
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/io/support/ClassicRequestBuilder.java b/httpcore5/src/main/java/org/apache/hc/core5/http/io/support/ClassicRequestBuilder.java
index 3a185be..fd621ed 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/io/support/ClassicRequestBuilder.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/io/support/ClassicRequestBuilder.java
@@ -40,7 +40,7 @@ import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.NameValuePair;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
@@ -83,7 +83,7 @@ public class ClassicRequestBuilder {
this.method = method;
}
- ClassicRequestBuilder(final Methods method) {
+ ClassicRequestBuilder(final Method method) {
this(method.name());
}
@@ -93,11 +93,11 @@ public class ClassicRequestBuilder {
this.uri = uri;
}
- ClassicRequestBuilder(final Methods method, final URI uri) {
+ ClassicRequestBuilder(final Method method, final URI uri) {
this(method.name(), uri);
}
- ClassicRequestBuilder(final Methods method, final String uri) {
+ ClassicRequestBuilder(final Method method, final String uri) {
this(method.name(), uri != null ? URI.create(uri) : null);
}
@@ -111,99 +111,99 @@ public class ClassicRequestBuilder {
}
public static ClassicRequestBuilder get() {
- return new ClassicRequestBuilder(Methods.GET);
+ return new ClassicRequestBuilder(Method.GET);
}
public static ClassicRequestBuilder get(final URI uri) {
- return new ClassicRequestBuilder(Methods.GET, uri);
+ return new ClassicRequestBuilder(Method.GET, uri);
}
public static ClassicRequestBuilder get(final String uri) {
- return new ClassicRequestBuilder(Methods.GET, uri);
+ return new ClassicRequestBuilder(Method.GET, uri);
}
public static ClassicRequestBuilder head() {
- return new ClassicRequestBuilder(Methods.HEAD);
+ return new ClassicRequestBuilder(Method.HEAD);
}
public static ClassicRequestBuilder head(final URI uri) {
- return new ClassicRequestBuilder(Methods.HEAD, uri);
+ return new ClassicRequestBuilder(Method.HEAD, uri);
}
public static ClassicRequestBuilder head(final String uri) {
- return new ClassicRequestBuilder(Methods.HEAD, uri);
+ return new ClassicRequestBuilder(Method.HEAD, uri);
}
public static ClassicRequestBuilder patch() {
- return new ClassicRequestBuilder(Methods.PATCH);
+ return new ClassicRequestBuilder(Method.PATCH);
}
public static ClassicRequestBuilder patch(final URI uri) {
- return new ClassicRequestBuilder(Methods.PATCH, uri);
+ return new ClassicRequestBuilder(Method.PATCH, uri);
}
public static ClassicRequestBuilder patch(final String uri) {
- return new ClassicRequestBuilder(Methods.PATCH, uri);
+ return new ClassicRequestBuilder(Method.PATCH, uri);
}
public static ClassicRequestBuilder post() {
- return new ClassicRequestBuilder(Methods.POST);
+ return new ClassicRequestBuilder(Method.POST);
}
public static ClassicRequestBuilder post(final URI uri) {
- return new ClassicRequestBuilder(Methods.POST, uri);
+ return new ClassicRequestBuilder(Method.POST, uri);
}
public static ClassicRequestBuilder post(final String uri) {
- return new ClassicRequestBuilder(Methods.POST, uri);
+ return new ClassicRequestBuilder(Method.POST, uri);
}
public static ClassicRequestBuilder put() {
- return new ClassicRequestBuilder(Methods.PUT);
+ return new ClassicRequestBuilder(Method.PUT);
}
public static ClassicRequestBuilder put(final URI uri) {
- return new ClassicRequestBuilder(Methods.PUT, uri);
+ return new ClassicRequestBuilder(Method.PUT, uri);
}
public static ClassicRequestBuilder put(final String uri) {
- return new ClassicRequestBuilder(Methods.PUT, uri);
+ return new ClassicRequestBuilder(Method.PUT, uri);
}
public static ClassicRequestBuilder delete() {
- return new ClassicRequestBuilder(Methods.DELETE);
+ return new ClassicRequestBuilder(Method.DELETE);
}
public static ClassicRequestBuilder delete(final URI uri) {
- return new ClassicRequestBuilder(Methods.DELETE, uri);
+ return new ClassicRequestBuilder(Method.DELETE, uri);
}
public static ClassicRequestBuilder delete(final String uri) {
- return new ClassicRequestBuilder(Methods.DELETE, uri);
+ return new ClassicRequestBuilder(Method.DELETE, uri);
}
public static ClassicRequestBuilder trace() {
- return new ClassicRequestBuilder(Methods.TRACE);
+ return new ClassicRequestBuilder(Method.TRACE);
}
public static ClassicRequestBuilder trace(final URI uri) {
- return new ClassicRequestBuilder(Methods.TRACE, uri);
+ return new ClassicRequestBuilder(Method.TRACE, uri);
}
public static ClassicRequestBuilder trace(final String uri) {
- return new ClassicRequestBuilder(Methods.TRACE, uri);
+ return new ClassicRequestBuilder(Method.TRACE, uri);
}
public static ClassicRequestBuilder options() {
- return new ClassicRequestBuilder(Methods.OPTIONS);
+ return new ClassicRequestBuilder(Method.OPTIONS);
}
public static ClassicRequestBuilder options(final URI uri) {
- return new ClassicRequestBuilder(Methods.OPTIONS, uri);
+ return new ClassicRequestBuilder(Method.OPTIONS, uri);
}
public static ClassicRequestBuilder options(final String uri) {
- return new ClassicRequestBuilder(Methods.OPTIONS, uri);
+ return new ClassicRequestBuilder(Method.OPTIONS, uri);
}
public ClassicRequestBuilder setCharset(final Charset charset) {
@@ -368,7 +368,7 @@ public class ClassicRequestBuilder {
URI uriCopy = this.uri != null ? this.uri : URI.create("/");
HttpEntity entityCopy = this.entity;
if (parameters != null && !parameters.isEmpty()) {
- if (entityCopy == null && (Methods.POST.isSame(method) || Methods.PUT.isSame(method))) {
+ if (entityCopy == null && (Method.POST.isSame(method) || Method.PUT.isSame(method))) {
entityCopy = HttpEntities.createUrlEncoded(parameters, charset);
} else {
try {
@@ -382,8 +382,8 @@ public class ClassicRequestBuilder {
}
}
- if (entityCopy != null && Methods.TRACE.isSame(method)) {
- throw new IllegalStateException(Methods.TRACE + " requests may not include an entity");
+ if (entityCopy != null && Method.TRACE.isSame(method)) {
+ throw new IllegalStateException(Method.TRACE + " requests may not include an entity");
}
final ClassicHttpRequest result = new BasicClassicHttpRequest(method, uriCopy);
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpRequest.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpRequest.java
index d807c09..7038c17 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpRequest.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicClassicHttpRequest.java
@@ -32,7 +32,7 @@ import java.net.URI;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
/**
* Basic implementation of {@link ClassicHttpRequest}.
@@ -82,7 +82,7 @@ public class BasicClassicHttpRequest extends BasicHttpRequest implements Classic
* @param method request method.
* @param path request path.
*/
- public BasicClassicHttpRequest(final Methods method, final String path) {
+ public BasicClassicHttpRequest(final Method method, final String path) {
super(method, path);
}
@@ -93,7 +93,7 @@ public class BasicClassicHttpRequest extends BasicHttpRequest implements Classic
* @param host request host.
* @param path request path.
*/
- public BasicClassicHttpRequest(final Methods method, final HttpHost host, final String path) {
+ public BasicClassicHttpRequest(final Method method, final HttpHost host, final String path) {
super(method, host, path);
}
@@ -103,7 +103,7 @@ public class BasicClassicHttpRequest extends BasicHttpRequest implements Classic
* @param method request method.
* @param requestUri request URI.
*/
- public BasicClassicHttpRequest(final Methods method, final URI requestUri) {
+ public BasicClassicHttpRequest(final Method method, final URI requestUri) {
super(method, requestUri);
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java
index b89a66a..17742de 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/BasicHttpRequest.java
@@ -32,7 +32,7 @@ import java.net.URISyntaxException;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.net.URIAuthority;
@@ -112,7 +112,7 @@ public class BasicHttpRequest extends HeaderGroup implements HttpRequest {
*
* @since 5.0
*/
- public BasicHttpRequest(final Methods method, final String path) {
+ public BasicHttpRequest(final Method method, final String path) {
super();
this.method = Args.notNull(method, "Method").name();
if (path != null) {
@@ -133,7 +133,7 @@ public class BasicHttpRequest extends HeaderGroup implements HttpRequest {
*
* @since 5.0
*/
- public BasicHttpRequest(final Methods method, final HttpHost host, final String path) {
+ public BasicHttpRequest(final Method method, final HttpHost host, final String path) {
super();
this.method = Args.notNull(method, "Method").name();
this.scheme = host != null ? host.getSchemeName() : null;
@@ -149,7 +149,7 @@ public class BasicHttpRequest extends HeaderGroup implements HttpRequest {
*
* @since 5.0
*/
- public BasicHttpRequest(final Methods method, final URI requestUri) {
+ public BasicHttpRequest(final Method method, final URI requestUri) {
super();
this.method = Args.notNull(method, "Method").name();
setUri(Args.notNull(requestUri, "Request URI"));
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java b/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
index 80c0269..b875527 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/message/MessageSupport.java
@@ -41,7 +41,7 @@ import org.apache.hc.core5.http.HttpMessage;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.MessageHeaders;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.CharArrayBuffer;
import org.apache.hc.core5.util.TextUtils;
@@ -173,11 +173,11 @@ public class MessageSupport {
* @since 5.0
*/
public static boolean canResponseHaveBody(final String method, final HttpResponse response) {
- if (Methods.HEAD.isSame(method)) {
+ if (Method.HEAD.isSame(method)) {
return false;
}
final int status = response.getCode();
- if (Methods.CONNECT.isSame(method) && status == HttpStatus.SC_OK) {
+ if (Method.CONNECT.isSame(method) && status == HttpStatus.SC_OK) {
return false;
}
return status >= HttpStatus.SC_SUCCESS
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncRequestBuilder.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncRequestBuilder.java
index b5d59b6..81149b2 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncRequestBuilder.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/AsyncRequestBuilder.java
@@ -38,7 +38,7 @@ import java.util.List;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.NameValuePair;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.message.BasicHeader;
@@ -83,7 +83,7 @@ public class AsyncRequestBuilder {
this.method = method;
}
- AsyncRequestBuilder(final Methods method) {
+ AsyncRequestBuilder(final Method method) {
this(method.name());
}
@@ -93,11 +93,11 @@ public class AsyncRequestBuilder {
this.uri = uri;
}
- AsyncRequestBuilder(final Methods method, final URI uri) {
+ AsyncRequestBuilder(final Method method, final URI uri) {
this(method.name(), uri);
}
- AsyncRequestBuilder(final Methods method, final String uri) {
+ AsyncRequestBuilder(final Method method, final String uri) {
this(method.name(), uri != null ? URI.create(uri) : null);
}
@@ -111,99 +111,99 @@ public class AsyncRequestBuilder {
}
public static AsyncRequestBuilder get() {
- return new AsyncRequestBuilder(Methods.GET);
+ return new AsyncRequestBuilder(Method.GET);
}
public static AsyncRequestBuilder get(final URI uri) {
- return new AsyncRequestBuilder(Methods.GET, uri);
+ return new AsyncRequestBuilder(Method.GET, uri);
}
public static AsyncRequestBuilder get(final String uri) {
- return new AsyncRequestBuilder(Methods.GET, uri);
+ return new AsyncRequestBuilder(Method.GET, uri);
}
public static AsyncRequestBuilder head() {
- return new AsyncRequestBuilder(Methods.HEAD);
+ return new AsyncRequestBuilder(Method.HEAD);
}
public static AsyncRequestBuilder head(final URI uri) {
- return new AsyncRequestBuilder(Methods.HEAD, uri);
+ return new AsyncRequestBuilder(Method.HEAD, uri);
}
public static AsyncRequestBuilder head(final String uri) {
- return new AsyncRequestBuilder(Methods.HEAD, uri);
+ return new AsyncRequestBuilder(Method.HEAD, uri);
}
public static AsyncRequestBuilder patch() {
- return new AsyncRequestBuilder(Methods.PATCH);
+ return new AsyncRequestBuilder(Method.PATCH);
}
public static AsyncRequestBuilder patch(final URI uri) {
- return new AsyncRequestBuilder(Methods.PATCH, uri);
+ return new AsyncRequestBuilder(Method.PATCH, uri);
}
public static AsyncRequestBuilder patch(final String uri) {
- return new AsyncRequestBuilder(Methods.PATCH, uri);
+ return new AsyncRequestBuilder(Method.PATCH, uri);
}
public static AsyncRequestBuilder post() {
- return new AsyncRequestBuilder(Methods.POST);
+ return new AsyncRequestBuilder(Method.POST);
}
public static AsyncRequestBuilder post(final URI uri) {
- return new AsyncRequestBuilder(Methods.POST, uri);
+ return new AsyncRequestBuilder(Method.POST, uri);
}
public static AsyncRequestBuilder post(final String uri) {
- return new AsyncRequestBuilder(Methods.POST, uri);
+ return new AsyncRequestBuilder(Method.POST, uri);
}
public static AsyncRequestBuilder put() {
- return new AsyncRequestBuilder(Methods.PUT);
+ return new AsyncRequestBuilder(Method.PUT);
}
public static AsyncRequestBuilder put(final URI uri) {
- return new AsyncRequestBuilder(Methods.PUT, uri);
+ return new AsyncRequestBuilder(Method.PUT, uri);
}
public static AsyncRequestBuilder put(final String uri) {
- return new AsyncRequestBuilder(Methods.PUT, uri);
+ return new AsyncRequestBuilder(Method.PUT, uri);
}
public static AsyncRequestBuilder delete() {
- return new AsyncRequestBuilder(Methods.DELETE);
+ return new AsyncRequestBuilder(Method.DELETE);
}
public static AsyncRequestBuilder delete(final URI uri) {
- return new AsyncRequestBuilder(Methods.DELETE, uri);
+ return new AsyncRequestBuilder(Method.DELETE, uri);
}
public static AsyncRequestBuilder delete(final String uri) {
- return new AsyncRequestBuilder(Methods.DELETE, uri);
+ return new AsyncRequestBuilder(Method.DELETE, uri);
}
public static AsyncRequestBuilder trace() {
- return new AsyncRequestBuilder(Methods.TRACE);
+ return new AsyncRequestBuilder(Method.TRACE);
}
public static AsyncRequestBuilder trace(final URI uri) {
- return new AsyncRequestBuilder(Methods.TRACE, uri);
+ return new AsyncRequestBuilder(Method.TRACE, uri);
}
public static AsyncRequestBuilder trace(final String uri) {
- return new AsyncRequestBuilder(Methods.TRACE, uri);
+ return new AsyncRequestBuilder(Method.TRACE, uri);
}
public static AsyncRequestBuilder options() {
- return new AsyncRequestBuilder(Methods.OPTIONS);
+ return new AsyncRequestBuilder(Method.OPTIONS);
}
public static AsyncRequestBuilder options(final URI uri) {
- return new AsyncRequestBuilder(Methods.OPTIONS, uri);
+ return new AsyncRequestBuilder(Method.OPTIONS, uri);
}
public static AsyncRequestBuilder options(final String uri) {
- return new AsyncRequestBuilder(Methods.OPTIONS, uri);
+ return new AsyncRequestBuilder(Method.OPTIONS, uri);
}
public AsyncRequestBuilder setCharset(final Charset charset) {
@@ -367,7 +367,7 @@ public class AsyncRequestBuilder {
URI uriCopy = uri != null ? uri : URI.create("/");
AsyncEntityProducer entityProducerCopy = entityProducer;
if (parameters != null && !parameters.isEmpty()) {
- if (entityProducerCopy == null && (Methods.POST.isSame(method) || Methods.PUT.isSame(method))) {
+ if (entityProducerCopy == null && (Method.POST.isSame(method) || Method.PUT.isSame(method))) {
final String content = URLEncodedUtils.format(
parameters,
charset != null ? charset : ContentType.APPLICATION_FORM_URLENCODED.getCharset());
@@ -386,8 +386,8 @@ public class AsyncRequestBuilder {
}
}
- if (entityProducerCopy != null && Methods.TRACE.isSame(method)) {
- throw new IllegalStateException(Methods.TRACE + " requests may not include an entity.");
+ if (entityProducerCopy != null && Method.TRACE.isSame(method)) {
+ throw new IllegalStateException(Method.TRACE + " requests may not include an entity.");
}
final HttpRequest request = new BasicHttpRequest(method, uriCopy);
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicRequestProducer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicRequestProducer.java
index 6435f71..5362bef 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicRequestProducer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/support/BasicRequestProducer.java
@@ -32,7 +32,7 @@ import java.net.URI;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.nio.AsyncEntityProducer;
import org.apache.hc.core5.http.nio.AsyncRequestProducer;
@@ -72,19 +72,19 @@ public class BasicRequestProducer implements AsyncRequestProducer {
this(method, requestUri, null);
}
- public BasicRequestProducer(final Methods method, final HttpHost host, final String path, final AsyncEntityProducer dataProducer) {
+ public BasicRequestProducer(final Method method, final HttpHost host, final String path, final AsyncEntityProducer dataProducer) {
this(new BasicHttpRequest(method, host, path), dataProducer);
}
- public BasicRequestProducer(final Methods method, final HttpHost host, final String path) {
+ public BasicRequestProducer(final Method method, final HttpHost host, final String path) {
this(method, host, path, null);
}
- public BasicRequestProducer(final Methods method, final URI requestUri, final AsyncEntityProducer dataProducer) {
+ public BasicRequestProducer(final Method method, final URI requestUri, final AsyncEntityProducer dataProducer) {
this(new BasicHttpRequest(method, requestUri), dataProducer);
}
- public BasicRequestProducer(final Methods method, final URI requestUri) {
+ public BasicRequestProducer(final Method method, final URI requestUri) {
this(method, requestUri, null);
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java b/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java
index 722caad..511702b 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestConnControl.java
@@ -37,7 +37,7 @@ import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.util.Args;
/**
@@ -61,7 +61,7 @@ public class RequestConnControl implements HttpRequestInterceptor {
Args.notNull(request, "HTTP request");
final String method = request.getMethod();
- if (Methods.CONNECT.isSame(method)) {
+ if (Method.CONNECT.isSame(method)) {
return;
}
if (!request.containsHeader(HttpHeaders.CONNECTION)) {
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java b/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java
index fe033b4..3f3297e 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestContent.java
@@ -38,7 +38,7 @@ import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.message.MessageSupport;
@@ -89,7 +89,7 @@ public class RequestContent implements HttpRequestInterceptor {
throws HttpException, IOException {
Args.notNull(request, "HTTP request");
final String method = request.getMethod();
- if (Methods.TRACE.isSame(method) && entity != null) {
+ if (Method.TRACE.isSame(method) && entity != null) {
throw new ProtocolException("TRACE request may not enclose an entity");
}
if (this.overwrite) {
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java b/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java
index 81bf5b1..69c757a 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/RequestTargetHost.java
@@ -37,7 +37,7 @@ import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.net.URIAuthority;
@@ -64,7 +64,7 @@ public class RequestTargetHost implements HttpRequestInterceptor {
final ProtocolVersion ver = context.getProtocolVersion();
final String method = request.getMethod();
- if (Methods.CONNECT.isSame(method) && ver.lessEquals(HttpVersion.HTTP_1_0)) {
+ if (Method.CONNECT.isSame(method) && ver.lessEquals(HttpVersion.HTTP_1_0)) {
return;
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/ssl/TLS.java b/httpcore5/src/main/java/org/apache/hc/core5/http/ssl/TLS.java
index 1e8d150..c84cb8c 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/ssl/TLS.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/ssl/TLS.java
@@ -46,11 +46,11 @@ public enum TLS {
V_1_2("TLSv1.2", new ProtocolVersion("TLS", 1, 2)),
V_1_3("TLSv1.3", new ProtocolVersion("TLS", 1, 3));
- public final String ident;
+ public final String id;
public final ProtocolVersion version;
- TLS(final String ident, final ProtocolVersion version) {
- this.ident = ident;
+ TLS(final String id, final ProtocolVersion version) {
+ this.id = id;
this.version = version;
}
@@ -84,12 +84,12 @@ public enum TLS {
}
final List<String> enabledProtocols = new ArrayList<>();
for (final String protocol: protocols) {
- if (!protocol.startsWith("SSL") && !protocol.equals(V_1_0.ident) && !protocol.equals(V_1_1.ident)) {
+ if (!protocol.startsWith("SSL") && !protocol.equals(V_1_0.id) && !protocol.equals(V_1_1.id)) {
enabledProtocols.add(protocol);
}
}
if (enabledProtocols.isEmpty()) {
- enabledProtocols.add(V_1_2.ident);
+ enabledProtocols.add(V_1_2.id);
}
return enabledProtocols.toArray(new String[0]);
}
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncPipelinedRequestExecutionExample.java b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncPipelinedRequestExecutionExample.java
index 8afca1c..21fe1a4 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncPipelinedRequestExecutionExample.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncPipelinedRequestExecutionExample.java
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.Http1StreamListener;
import org.apache.hc.core5.http.impl.bootstrap.AsyncRequesterBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
@@ -107,7 +107,7 @@ public class AsyncPipelinedRequestExecutionExample {
final CountDownLatch latch = new CountDownLatch(requestUris.length);
for (final String requestUri: requestUris) {
clientEndpoint.execute(
- new BasicRequestProducer(Methods.GET, target, requestUri),
+ new BasicRequestProducer(Method.GET, target, requestUri),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
new FutureCallback<Message<HttpResponse, String>>() {
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncRequestExecutionExample.java b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncRequestExecutionExample.java
index 5564432..f044afd 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncRequestExecutionExample.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/AsyncRequestExecutionExample.java
@@ -35,7 +35,7 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.Message;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.Http1StreamListener;
import org.apache.hc.core5.http.impl.bootstrap.AsyncRequesterBootstrap;
import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
@@ -101,7 +101,7 @@ public class AsyncRequestExecutionExample {
final CountDownLatch latch = new CountDownLatch(requestUris.length);
for (final String requestUri: requestUris) {
requester.execute(
- new BasicRequestProducer(Methods.GET, target, requestUri),
+ new BasicRequestProducer(Method.GET, target, requestUri),
new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
Timeout.ofSeconds(5),
new FutureCallback<Message<HttpResponse, String>>() {
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicFileServerExample.java b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicFileServerExample.java
index d0f3ed5..a8fc9fd 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicFileServerExample.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicFileServerExample.java
@@ -48,7 +48,7 @@ import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.MethodNotSupportedException;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.HttpRequestHandler;
@@ -152,7 +152,7 @@ public class ClassicFileServerExample {
final HttpContext context) throws HttpException, IOException {
final String method = request.getMethod();
- if (!Methods.GET.isSame(method) && !Methods.HEAD.isSame(method) && !Methods.POST.isSame(method)) {
+ if (!Method.GET.isSame(method) && !Method.HEAD.isSame(method) && !Method.POST.isSame(method)) {
throw new MethodNotSupportedException(method + " method not supported");
}
final String path = request.getPath();
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicGetExecutionExample.java b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicGetExecutionExample.java
index a4e8f43..8870642 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicGetExecutionExample.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicGetExecutionExample.java
@@ -35,7 +35,7 @@ import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.Http1StreamListener;
import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
import org.apache.hc.core5.http.impl.bootstrap.RequesterBootstrap;
@@ -88,7 +88,7 @@ public class ClassicGetExecutionExample {
for (int i = 0; i < requestUris.length; i++) {
final String requestUri = requestUris[i];
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, target, requestUri);
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, target, requestUri);
try (ClassicHttpResponse response = httpRequester.execute(target, request, Timeout.ofSeconds(5), coreContext)) {
System.out.println(requestUri + "->" + response.getCode());
System.out.println(EntityUtils.toString(response.getEntity()));
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicPostExecutionExample.java b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicPostExecutionExample.java
index d36d06e..843e05c 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicPostExecutionExample.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/examples/ClassicPostExecutionExample.java
@@ -40,7 +40,7 @@ import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.impl.Http1StreamListener;
import org.apache.hc.core5.http.impl.bootstrap.HttpRequester;
import org.apache.hc.core5.http.impl.bootstrap.RequesterBootstrap;
@@ -117,7 +117,7 @@ public class ClassicPostExecutionExample {
final String requestUri = "/post";
for (int i = 0; i < requestBodies.length; i++) {
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, target, requestUri);
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, target, requestUri);
request.setEntity(requestBodies[i]);
try (ClassicHttpResponse response = httpRequester.execute(target, request, Timeout.ofSeconds(5), coreContext)) {
System.out.println(requestUri + "->" + response.getCode());
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultConnectionReuseStrategy.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultConnectionReuseStrategy.java
index 54325d1..0f5c3f6 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultConnectionReuseStrategy.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/TestDefaultConnectionReuseStrategy.java
@@ -32,7 +32,7 @@ import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
@@ -232,7 +232,7 @@ public class TestDefaultConnectionReuseStrategy {
@Test
public void testRequestExplicitClose() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, "/");
+ final HttpRequest request = new BasicHttpRequest(Method.GET, "/");
request.addHeader("Connection", "close");
final HttpResponse response = new BasicHttpResponse(200, "OK");
@@ -243,7 +243,7 @@ public class TestDefaultConnectionReuseStrategy {
@Test
public void testRequestNoExplicitClose() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, "/");
+ final HttpRequest request = new BasicHttpRequest(Method.GET, "/");
request.addHeader("Connection", "blah, blah, blah");
final HttpResponse response = new BasicHttpResponse(200, "OK");
@@ -254,7 +254,7 @@ public class TestDefaultConnectionReuseStrategy {
@Test
public void testRequestExplicitCloseMultipleTokens() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, "/");
+ final HttpRequest request = new BasicHttpRequest(Method.GET, "/");
request.addHeader("Connection", "blah, blah, blah");
request.addHeader("Connection", "keep-alive");
request.addHeader("Connection", "close");
@@ -267,7 +267,7 @@ public class TestDefaultConnectionReuseStrategy {
@Test
public void testRequestClose() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, "/");
+ final HttpRequest request = new BasicHttpRequest(Method.GET, "/");
request.addHeader("Connection", "close");
final HttpResponse response = new BasicHttpResponse(200, "OK");
@@ -279,7 +279,7 @@ public class TestDefaultConnectionReuseStrategy {
@Test
public void testHeadRequestWithout() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.HEAD, "/");
+ final HttpRequest request = new BasicHttpRequest(Method.HEAD, "/");
final HttpResponse response = new BasicHttpResponse(200, "OK");
Assert.assertTrue(reuseStrategy.keepAlive(request, response, context));
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java
index ad718ae..286f949 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java
@@ -37,7 +37,7 @@ import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.LengthRequiredException;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.NotImplementedException;
import org.apache.hc.core5.http.config.Http1Config;
import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
@@ -237,7 +237,7 @@ public class TestDefaultBHttpClientConnection {
Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/stuff");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/stuff");
request.addHeader("User-Agent", "test");
conn.sendRequestHeader(request);
@@ -257,7 +257,7 @@ public class TestDefaultBHttpClientConnection {
Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/stuff");
request.addHeader("User-Agent", "test");
request.addHeader("Content-Length", "3");
request.setEntity(new StringEntity("123", ContentType.TEXT_PLAIN));
@@ -280,7 +280,7 @@ public class TestDefaultBHttpClientConnection {
Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/stuff");
request.addHeader("User-Agent", "test");
request.addHeader("Transfer-Encoding", "chunked");
request.setEntity(new StringEntity("123", ContentType.TEXT_PLAIN));
@@ -304,7 +304,7 @@ public class TestDefaultBHttpClientConnection {
Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/stuff");
request.addHeader("User-Agent", "test");
request.setEntity(new StringEntity("123", ContentType.TEXT_PLAIN));
@@ -321,7 +321,7 @@ public class TestDefaultBHttpClientConnection {
Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/stuff");
request.addHeader("User-Agent", "test");
conn.sendRequestHeader(request);
@@ -342,7 +342,7 @@ public class TestDefaultBHttpClientConnection {
Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/stuff");
request.addHeader("User-Agent", "test");
request.addHeader("Transfer-Encoding", "chunked");
final StringEntity entity = new StringEntity("123", ContentType.TEXT_PLAIN, true);
@@ -369,7 +369,7 @@ public class TestDefaultBHttpClientConnection {
Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/stuff");
request.addHeader("User-Agent", "test");
request.addHeader("Content-Length", "3");
final StringEntity entity = new StringEntity("123", ContentType.TEXT_PLAIN, true);
@@ -395,7 +395,7 @@ public class TestDefaultBHttpClientConnection {
Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/stuff");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/stuff");
request.addHeader("User-Agent", "test");
request.addHeader("Content-Length", "3000");
final ByteArrayEntity entity = new ByteArrayEntity(new byte[3000], ContentType.TEXT_PLAIN, true);
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java
index dc0bcea..45ddbee 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.NotImplementedException;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.config.Http1Config;
@@ -87,7 +87,7 @@ public class TestDefaultBHttpServerConnection {
final ClassicHttpRequest request = conn.receiveRequestHeader();
Assert.assertNotNull(request);
Assert.assertEquals("/", request.getPath());
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
}
@@ -106,7 +106,7 @@ public class TestDefaultBHttpServerConnection {
Assert.assertNotNull(request);
Assert.assertEquals("/", request.getPath());
- Assert.assertEquals(Methods.POST.name(), request.getMethod());
+ Assert.assertEquals(Method.POST.name(), request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
Assert.assertNull(request.getEntity());
Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
@@ -137,7 +137,7 @@ public class TestDefaultBHttpServerConnection {
Assert.assertNotNull(request);
Assert.assertEquals("/stuff", request.getPath());
- Assert.assertEquals(Methods.POST.name(), request.getMethod());
+ Assert.assertEquals(Method.POST.name(), request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
Assert.assertNull(request.getEntity());
Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
@@ -169,7 +169,7 @@ public class TestDefaultBHttpServerConnection {
Assert.assertNotNull(request);
Assert.assertEquals("/stuff", request.getPath());
- Assert.assertEquals(Methods.POST.name(), request.getMethod());
+ Assert.assertEquals(Method.POST.name(), request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
Assert.assertNull(request.getEntity());
Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
@@ -191,7 +191,7 @@ public class TestDefaultBHttpServerConnection {
Assert.assertNotNull(request);
Assert.assertEquals("/stuff", request.getPath());
- Assert.assertEquals(Methods.POST.name(), request.getMethod());
+ Assert.assertEquals(Method.POST.name(), request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
Assert.assertNull(request.getEntity());
Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
index e5e0348..2f4b098 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.HeaderElements;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpResponse;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.io.HttpClientConnection;
import org.apache.hc.core5.http.io.HttpResponseInformationCallback;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
@@ -54,7 +54,7 @@ public class TestHttpRequestExecutor {
@Test
public void testInvalidInput() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
final HttpClientConnection conn = Mockito.mock(HttpClientConnection.class);
final HttpProcessor httprocessor = Mockito.mock(HttpProcessor.class);
@@ -123,7 +123,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
executor.preProcess(request, httprocessor, context);
Mockito.verify(httprocessor).process(request, request.getEntity(), context);
@@ -151,7 +151,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
executor.preProcess(request, httprocessor, context);
Mockito.verify(httprocessor).process(request, request.getEntity(), context);
@@ -196,7 +196,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
executor.preProcess(request, httprocessor, context);
Mockito.verify(httprocessor).process(request, request.getEntity(), context);
@@ -221,7 +221,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.HEAD, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.HEAD, "/");
executor.preProcess(request, httprocessor, context);
Mockito.verify(httprocessor).process(request, request.getEntity(), context);
@@ -246,7 +246,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
final HttpEntity entity = Mockito.mock(HttpEntity.class);
request.setEntity(entity);
@@ -274,7 +274,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.addHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final HttpEntity entity = Mockito.mock(HttpEntity.class);
request.setEntity(entity);
@@ -306,7 +306,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.addHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final HttpEntity entity = Mockito.mock(HttpEntity.class);
request.setEntity(entity);
@@ -338,7 +338,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.addHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final HttpEntity entity = Mockito.mock(HttpEntity.class);
request.setEntity(entity);
@@ -386,7 +386,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.addHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final HttpEntity entity = Mockito.mock(HttpEntity.class);
request.setEntity(entity);
@@ -416,7 +416,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
Mockito.doThrow(new IOException("Oopsie")).when(conn).sendRequestHeader(request);
try {
@@ -433,7 +433,7 @@ public class TestHttpRequestExecutor {
final HttpRequestExecutor executor = new HttpRequestExecutor();
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
Mockito.doThrow(new RuntimeException("Oopsie")).when(conn).receiveResponseHeader();
try {
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
index 6e48a54..b3e50df 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
@@ -42,7 +42,7 @@ import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpResponseFactory;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.MethodNotSupportedException;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.UnsupportedHttpVersionException;
import org.apache.hc.core5.http.io.HttpRequestHandler;
@@ -109,7 +109,7 @@ public class TestHttpService {
@Test
public void testBasicExecution() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
Mockito.when(connReuseStrategy.keepAlive(request, response, context)).thenReturn(Boolean.FALSE);
@@ -133,7 +133,7 @@ public class TestHttpService {
@Test
public void testExecutionEntityEnclosingRequest() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
final InputStream inStream = Mockito.mock(InputStream.class);
final InputStreamEntity entity = new InputStreamEntity(inStream, -1, null);
request.setEntity(entity);
@@ -172,7 +172,7 @@ public class TestHttpService {
@Test
public void testExecutionEntityEnclosingRequestWithExpectContinue() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.addHeader(HttpHeaders.EXPECT, HeaderElements.CONTINUE);
final InputStream inStream = Mockito.mock(InputStream.class);
final InputStreamEntity entity = new InputStreamEntity(inStream, -1, null);
@@ -297,7 +297,7 @@ public class TestHttpService {
@Test
public void testConnectionKeepAlive() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
Mockito.when(handlerResolver.resolve(request, context)).thenReturn(requestHandler);
@@ -322,7 +322,7 @@ public class TestHttpService {
@Test
public void testNoContentResponse() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
@@ -354,7 +354,7 @@ public class TestHttpService {
@Test
public void testResponseToHead() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final ClassicHttpRequest request = new BasicClassicHttpRequest(Methods.HEAD, "/");
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.HEAD, "/");
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
Mockito.when(responseFactory.newHttpResponse(200)).thenReturn(response);
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 25f6db0..918f7dd 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
@@ -34,7 +34,7 @@ import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.MessageConstraintException;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.config.Http1Config;
import org.apache.hc.core5.http.io.SessionInputBuffer;
import org.junit.Assert;
@@ -59,7 +59,7 @@ public class TestRequestParser {
final DefaultHttpRequestParser parser = new DefaultHttpRequestParser();
final ClassicHttpRequest httprequest = parser.parse(inBuffer, inputStream);
- Assert.assertEquals(Methods.GET.name(), httprequest.getMethod());
+ Assert.assertEquals(Method.GET.name(), httprequest.getMethod());
Assert.assertEquals("/", httprequest.getPath());
final Header[] headers = httprequest.getHeaders();
Assert.assertEquals(3, headers.length);
@@ -89,7 +89,7 @@ public class TestRequestParser {
Http1Config.custom().setMaxEmptyLineCount(3).build());
final ClassicHttpRequest httprequest = parser.parse(inBuffer, inputStream);
- Assert.assertEquals(Methods.GET.name(), httprequest.getMethod());
+ Assert.assertEquals(Method.GET.name(), httprequest.getMethod());
Assert.assertEquals("/", httprequest.getPath());
final Header[] headers = httprequest.getHeaders();
Assert.assertEquals(1, headers.length);
@@ -140,7 +140,7 @@ public class TestRequestParser {
Assert.assertNotNull(httprequest);
Assert.assertEquals(5, timeoutCount);
- Assert.assertEquals(Methods.GET.name(), httprequest.getMethod());
+ Assert.assertEquals(Method.GET.name(), httprequest.getMethod());
Assert.assertEquals("/", httprequest.getPath());
final Header[] headers = httprequest.getHeaders();
Assert.assertEquals(3, headers.length);
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineFormatter.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineFormatter.java
index ccadccf..105dd6c 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineFormatter.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineFormatter.java
@@ -30,7 +30,7 @@ package org.apache.hc.core5.http.message;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.util.CharArrayBuffer;
import org.junit.Assert;
import org.junit.Before;
@@ -57,7 +57,7 @@ public class TestBasicLineFormatter {
@Test
public void testRLFormatting() throws Exception {
- final RequestLine requestline = new RequestLine(Methods.GET.name(), "/stuff", HttpVersion.HTTP_1_1);
+ final RequestLine requestline = new RequestLine(Method.GET.name(), "/stuff", HttpVersion.HTTP_1_1);
final CharArrayBuffer buf = new CharArrayBuffer(64);
this.formatter.formatRequestLine(buf, requestline);
Assert.assertEquals("GET /stuff HTTP/1.1", buf.toString());
@@ -66,7 +66,7 @@ public class TestBasicLineFormatter {
@Test
public void testRLFormattingInvalidInput() throws Exception {
final CharArrayBuffer buf = new CharArrayBuffer(64);
- final RequestLine requestline = new RequestLine(Methods.GET.name(), "/stuff", HttpVersion.HTTP_1_1);
+ final RequestLine requestline = new RequestLine(Method.GET.name(), "/stuff", HttpVersion.HTTP_1_1);
try {
this.formatter.formatRequestLine(null, requestline);
Assert.fail("IllegalArgumentException should habe been thrown");
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java
index 44ab2d8..52f679f 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicLineParser.java
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.message;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ParseException;
import org.apache.hc.core5.util.CharArrayBuffer;
import org.junit.Assert;
@@ -57,7 +57,7 @@ public class TestBasicLineParser {
buf.append("GET /stuff HTTP/1.1");
RequestLine requestline = this.parser.parseRequestLine(buf);
Assert.assertEquals("GET /stuff HTTP/1.1", requestline.toString());
- Assert.assertEquals(Methods.GET.name(), requestline.getMethod());
+ Assert.assertEquals(Method.GET.name(), requestline.getMethod());
Assert.assertEquals("/stuff", requestline.getUri());
Assert.assertEquals(HttpVersion.HTTP_1_1, requestline.getProtocolVersion());
@@ -66,7 +66,7 @@ public class TestBasicLineParser {
buf.append(" GET /stuff HTTP/1.1 ");
requestline = this.parser.parseRequestLine(buf);
Assert.assertEquals("GET /stuff HTTP/1.1", requestline.toString());
- Assert.assertEquals(Methods.GET.name(), requestline.getMethod());
+ Assert.assertEquals(Method.GET.name(), requestline.getMethod());
Assert.assertEquals("/stuff", requestline.getUri());
Assert.assertEquals(HttpVersion.HTTP_1_1, requestline.getProtocolVersion());
@@ -74,7 +74,7 @@ public class TestBasicLineParser {
buf.clear();
buf.append("\rGET /stuff HTTP/1.1");
requestline = this.parser.parseRequestLine(buf);
- Assert.assertEquals(Methods.GET.name(), requestline.getMethod());
+ Assert.assertEquals(Method.GET.name(), requestline.getMethod());
Assert.assertEquals("/stuff", requestline.getUri());
Assert.assertEquals(HttpVersion.HTTP_1_1, requestline.getProtocolVersion());
}
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicMessages.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicMessages.java
index def89ef..96c0cc1 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicMessages.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBasicMessages.java
@@ -33,7 +33,7 @@ import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.net.URIAuthority;
import org.junit.Assert;
import org.junit.Test;
@@ -82,12 +82,12 @@ public class TestBasicMessages {
Assert.assertEquals("WHATEVER", request.getMethod());
Assert.assertEquals("/", request.getPath());
- request = new BasicHttpRequest(Methods.GET, "/");
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ request = new BasicHttpRequest(Method.GET, "/");
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertEquals("/", request.getPath());
try {
- new BasicHttpRequest(Methods.GET, (URI) null);
+ new BasicHttpRequest(Method.GET, (URI) null);
Assert.fail("IllegalArgumentException should have been thrown");
} catch (final IllegalArgumentException ex) {
// expected
@@ -131,8 +131,8 @@ public class TestBasicMessages {
@Test
public void testRequestBasics() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, "/stuff");
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ final HttpRequest request = new BasicHttpRequest(Method.GET, "/stuff");
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertEquals("/stuff", request.getPath());
Assert.assertEquals(null, request.getAuthority());
Assert.assertEquals(new URI("/stuff"), request.getUri());
@@ -140,8 +140,8 @@ public class TestBasicMessages {
@Test
public void testRequestWithRelativeURI() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, new URI("/stuff"));
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ final HttpRequest request = new BasicHttpRequest(Method.GET, new URI("/stuff"));
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertEquals("/stuff", request.getPath());
Assert.assertEquals(null, request.getAuthority());
Assert.assertEquals(new URI("/stuff"), request.getUri());
@@ -149,8 +149,8 @@ public class TestBasicMessages {
@Test
public void testRequestWithAbsoluteURI() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, new URI("https://host:9443/stuff?param=value"));
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ final HttpRequest request = new BasicHttpRequest(Method.GET, new URI("https://host:9443/stuff?param=value"));
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertEquals("/stuff?param=value", request.getPath());
Assert.assertEquals(new URIAuthority("host", 9443), request.getAuthority());
Assert.assertEquals("https", request.getScheme());
@@ -159,8 +159,8 @@ public class TestBasicMessages {
@Test
public void testRequestWithAbsoluteURIAsPath() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, "https://host:9443/stuff?param=value");
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ final HttpRequest request = new BasicHttpRequest(Method.GET, "https://host:9443/stuff?param=value");
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertEquals("/stuff?param=value", request.getPath());
Assert.assertEquals(new URIAuthority("host", 9443), request.getAuthority());
Assert.assertEquals("https", request.getScheme());
@@ -169,8 +169,8 @@ public class TestBasicMessages {
@Test
public void testRequestWithNoPath() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, new URI("http://host"));
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ final HttpRequest request = new BasicHttpRequest(Method.GET, new URI("http://host"));
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertEquals("/", request.getPath());
Assert.assertEquals(new URIAuthority("host"), request.getAuthority());
Assert.assertEquals("http", request.getScheme());
@@ -179,8 +179,8 @@ public class TestBasicMessages {
@Test
public void testRequestWithUserInfo() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, new URI("https://user:pwd@host:9443/stuff?param=value"));
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ final HttpRequest request = new BasicHttpRequest(Method.GET, new URI("https://user:pwd@host:9443/stuff?param=value"));
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertEquals("/stuff?param=value", request.getPath());
Assert.assertEquals(new URIAuthority("user:pwd", "host", 9443), request.getAuthority());
Assert.assertEquals("https", request.getScheme());
@@ -189,8 +189,8 @@ public class TestBasicMessages {
@Test
public void testRequestWithAuthority() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, new HttpHost("http", "somehost", -1), "/stuff");
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ final HttpRequest request = new BasicHttpRequest(Method.GET, new HttpHost("http", "somehost", -1), "/stuff");
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertEquals("/stuff", request.getPath());
Assert.assertEquals(new URIAuthority("somehost"), request.getAuthority());
Assert.assertEquals(new URI("http://somehost/stuff"), request.getUri());
@@ -198,8 +198,8 @@ public class TestBasicMessages {
@Test
public void testRequestWithAuthorityRelativePath() throws Exception {
- final HttpRequest request = new BasicHttpRequest(Methods.GET, new HttpHost("http", "somehost", -1), "stuff");
- Assert.assertEquals(Methods.GET.name(), request.getMethod());
+ final HttpRequest request = new BasicHttpRequest(Method.GET, new HttpHost("http", "somehost", -1), "stuff");
+ Assert.assertEquals(Method.GET.name(), request.getMethod());
Assert.assertEquals("stuff", request.getPath());
Assert.assertEquals(new URIAuthority("somehost"), request.getAuthority());
Assert.assertEquals(new URI("http://somehost/stuff"), request.getUri());
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestRequestHandlerRegistry.java b/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestRequestHandlerRegistry.java
index b603da9..35e43ba 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestRequestHandlerRegistry.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestRequestHandlerRegistry.java
@@ -29,7 +29,7 @@ package org.apache.hc.core5.http.protocol;
import org.apache.hc.core5.function.Supplier;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.MisdirectedRequestException;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.junit.Assert;
@@ -57,37 +57,37 @@ public class TestRequestHandlerRegistry {
@Test
public void testResolveByRequestUri() throws Exception {
handlerRegistry.register(null, "/test*", "stuff");
- Assert.assertNotEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, "/"), context));
- Assert.assertNotEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, "/abc"), context));
- Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, "/test"), context));
- Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, "/testabc"), context));
+ Assert.assertNotEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, "/"), context));
+ Assert.assertNotEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, "/abc"), context));
+ Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, "/test"), context));
+ Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, "/testabc"), context));
}
@Test
public void testByRequestUriWithQuery() throws Exception {
handlerRegistry.register(null, "/test*", "stuff");
- Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, "/test?test=a"), context));
- Assert.assertNotEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, "/tes?test=a"), context));
+ Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, "/test?test=a"), context));
+ Assert.assertNotEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, "/tes?test=a"), context));
}
@Test
public void testResolveByHostnameAndRequestUri() throws Exception {
handlerRegistry.register("myhost", "/test*", "stuff");
- Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, new HttpHost("myhost"), "/test"), context));
- Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, new HttpHost("MyHost"), "/testabc"), context));
+ Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, new HttpHost("myhost"), "/test"), context));
+ Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, new HttpHost("MyHost"), "/testabc"), context));
}
@Test
public void testResolveByLocalhostAndRequestUri() throws Exception {
handlerRegistry.register("myhost", "/test*", "stuff");
- Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, new HttpHost("localhost"), "/test"), context));
- Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, new HttpHost("LocalHost"), "/testabc"), context));
+ Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, new HttpHost("localhost"), "/test"), context));
+ Assert.assertEquals("stuff", handlerRegistry.resolve(new BasicHttpRequest(Method.GET, new HttpHost("LocalHost"), "/testabc"), context));
}
@Test(expected = MisdirectedRequestException.class)
public void testResolveByUnknownHostname() throws Exception {
handlerRegistry.register("myhost", "/test*", "stuff");
- handlerRegistry.resolve(new BasicHttpRequest(Methods.GET, new HttpHost("otherhost"), "/test"), context);
+ handlerRegistry.resolve(new BasicHttpRequest(Method.GET, new HttpHost("otherhost"), "/test"), context);
}
}
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 c4d24d2..fa4332e 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
@@ -36,7 +36,7 @@ import org.apache.hc.core5.http.HeaderElements;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.Methods;
+import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.impl.io.EmptyInputStream;
import org.apache.hc.core5.http.io.entity.BasicHttpEntity;
@@ -54,7 +54,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestConnControlGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
final RequestConnControl interceptor = new RequestConnControl();
interceptor.process(request, request.getEntity(), context);
final Header header = request.getFirstHeader(HttpHeaders.CONNECTION);
@@ -65,7 +65,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestConnControlConnectMethod() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.CONNECT, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.CONNECT, "/");
final RequestConnControl interceptor = new RequestConnControl();
interceptor.process(request, request.getEntity(), context);
final Header header = request.getFirstHeader(HttpHeaders.CONNECTION);
@@ -75,7 +75,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestConnControlCustom() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
final Header myheader = new BasicHeader(HttpHeaders.CONNECTION, "close");
request.addHeader(myheader);
final RequestConnControl interceptor = new RequestConnControl();
@@ -89,7 +89,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestConnControlUpgrade() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.addHeader(HttpHeaders.UPGRADE, "HTTP/2");
final RequestConnControl interceptor = new RequestConnControl();
interceptor.process(request, request.getEntity(), context);
@@ -112,9 +112,9 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentProtocolException() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request1 = new BasicClassicHttpRequest(Method.POST, "/");
request1.addHeader(new BasicHeader(HttpHeaders.TRANSFER_ENCODING, "chunked"));
- final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request2 = new BasicClassicHttpRequest(Method.POST, "/");
request2.addHeader(new BasicHeader(HttpHeaders.CONTENT_LENGTH, "12"));
final RequestContent interceptor = new RequestContent();
@@ -135,7 +135,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentNullEntity() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
final RequestContent interceptor = new RequestContent();
interceptor.process(request, request.getEntity(), context);
@@ -147,7 +147,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentEntityContentLengthDelimitedHTTP11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new StringEntity("whatever", StandardCharsets.US_ASCII));
final RequestContent interceptor = new RequestContent();
@@ -161,7 +161,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentEntityChunkedHTTP11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new StringEntity("whatever", StandardCharsets.US_ASCII, true));
final RequestContent interceptor = new RequestContent();
@@ -175,7 +175,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentEntityUnknownLengthHTTP11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new BasicHttpEntity(EmptyInputStream.INSTANCE, -1, null));
final RequestContent interceptor = new RequestContent();
@@ -190,7 +190,7 @@ public class TestStandardInterceptors {
public void testRequestContentEntityChunkedHTTP10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new StringEntity("whatever", StandardCharsets.US_ASCII, true));
final RequestContent interceptor = new RequestContent();
@@ -205,7 +205,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentTypeAndEncoding() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new BasicHttpEntity(EmptyInputStream.INSTANCE,
ContentType.parseLenient("whatever"), "whatever"));
@@ -222,7 +222,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentNullTypeAndEncoding() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new BasicHttpEntity(EmptyInputStream.INSTANCE, null, null));
final RequestContent interceptor = new RequestContent();
@@ -235,7 +235,7 @@ public class TestStandardInterceptors {
public void testRequestContentEntityUnknownLengthHTTP10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new BasicHttpEntity(EmptyInputStream.INSTANCE, -1, null));
final RequestContent interceptor = new RequestContent();
@@ -261,7 +261,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentIgnoreNonenclosingRequests() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
final RequestContent interceptor = new RequestContent();
interceptor.process(request, request.getEntity(), context);
Assert.assertEquals(0, request.getHeaders().length);
@@ -271,7 +271,7 @@ public class TestStandardInterceptors {
public void testRequestContentOverwriteHeaders() throws Exception {
final RequestContent interceptor = new RequestContent(true);
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.addHeader(new BasicHeader(HttpHeaders.CONTENT_LENGTH, "10"));
request.addHeader(new BasicHeader(HttpHeaders.TRANSFER_ENCODING, "whatever"));
request.setEntity(new StringEntity(""));
@@ -285,7 +285,7 @@ public class TestStandardInterceptors {
public void testRequestContentAddHeaders() throws Exception {
final RequestContent interceptor = new RequestContent(true);
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new StringEntity(""));
interceptor.process(request, request.getEntity(), context);
final Header h1 = request.getFirstHeader(HttpHeaders.CONTENT_LENGTH);
@@ -298,7 +298,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestContentEntityWithTrailers() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(HttpEntities.create("whatever", StandardCharsets.US_ASCII,
new BasicHeader("h1", "this"), new BasicHeader("h1", "that"), new BasicHeader("h2", "this and that")));
@@ -314,7 +314,7 @@ public class TestStandardInterceptors {
@Test(expected = ProtocolException.class)
public void testRequestContentTraceWithEntity() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.TRACE, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.TRACE, "/");
request.setEntity(new StringEntity("stuff"));
final RequestContent interceptor = new RequestContent();
interceptor.process(request, request.getEntity(), context);
@@ -323,7 +323,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestExpectContinueGenerated() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new StringEntity("whatever", StandardCharsets.US_ASCII));
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, request.getEntity(), context);
@@ -336,7 +336,7 @@ public class TestStandardInterceptors {
public void testRequestExpectContinueHTTP10() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new StringEntity("whatever", StandardCharsets.US_ASCII));
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, request.getEntity(), context);
@@ -347,7 +347,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestExpectContinueZeroContent() throws Exception {
final HttpCoreContext context = HttpCoreContext.create();
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new StringEntity("", StandardCharsets.US_ASCII));
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, request.getEntity(), context);
@@ -369,7 +369,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestExpectContinueIgnoreNonenclosingRequests() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, request.getEntity(), context);
Assert.assertEquals(0, request.getHeaders().length);
@@ -378,7 +378,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestTargetHostGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.setAuthority(new URIAuthority("somehost", 8080));
final RequestTargetHost interceptor = new RequestTargetHost();
interceptor.process(request, request.getEntity(), context);
@@ -390,7 +390,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestTargetHostNotGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.setAuthority(new URIAuthority("somehost", 8080));
request.addHeader(new BasicHeader(HttpHeaders.HOST, "whatever"));
final RequestTargetHost interceptor = new RequestTargetHost();
@@ -404,7 +404,7 @@ public class TestStandardInterceptors {
public void testRequestTargetHostMissingHostHTTP10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
final RequestTargetHost interceptor = new RequestTargetHost();
interceptor.process(request, request.getEntity(), context);
final Header header = request.getFirstHeader(HttpHeaders.HOST);
@@ -414,7 +414,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestTargetHostMissingHostHTTP11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
final RequestTargetHost interceptor = new RequestTargetHost();
try {
interceptor.process(request, request.getEntity(), context);
@@ -434,7 +434,7 @@ public class TestStandardInterceptors {
// expected
}
try {
- interceptor.process(new BasicClassicHttpRequest(Methods.GET, "/"), null, null);
+ interceptor.process(new BasicClassicHttpRequest(Method.GET, "/"), null, null);
Assert.fail("IllegalArgumentException should have been thrown");
} catch (final IllegalArgumentException ex) {
// expected
@@ -444,7 +444,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestTargetHostConnectHttp11() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.CONNECT, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.CONNECT, "/");
request.setAuthority(new URIAuthority("somehost", 8080));
final RequestTargetHost interceptor = new RequestTargetHost();
interceptor.process(request, request.getEntity(), context);
@@ -457,7 +457,7 @@ public class TestStandardInterceptors {
public void testRequestTargetHostConnectHttp10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.CONNECT, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.CONNECT, "/");
request.setAuthority(new URIAuthority("somehost", 8080));
final RequestTargetHost interceptor = new RequestTargetHost();
interceptor.process(request, request.getEntity(), context);
@@ -468,7 +468,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestUserAgentGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
final RequestUserAgent interceptor = new RequestUserAgent("some agent");
interceptor.process(request, request.getEntity(), context);
final Header header = request.getFirstHeader(HttpHeaders.USER_AGENT);
@@ -479,7 +479,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestUserAgentNotGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.addHeader(new BasicHeader(HttpHeaders.USER_AGENT, "whatever"));
final RequestUserAgent interceptor = new RequestUserAgent("some agent");
interceptor.process(request, request.getEntity(), context);
@@ -491,7 +491,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestUserAgentMissingUserAgent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
final RequestUserAgent interceptor = new RequestUserAgent();
interceptor.process(request, request.getEntity(), context);
final Header header = request.getFirstHeader(HttpHeaders.USER_AGENT);
@@ -533,7 +533,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlEntityUnknownContentLengthExplicitKeepAlive() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
@@ -560,7 +560,7 @@ public class TestStandardInterceptors {
public void testResponseConnControlEntityUnknownContentLengthHTTP10() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
@@ -576,7 +576,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlClientRequest() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
@@ -592,7 +592,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlClientRequest2() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
@@ -607,7 +607,7 @@ public class TestStandardInterceptors {
public void testResponseConnControl10Client11Response() throws Exception {
final HttpContext context = new BasicHttpContext(null);
context.setProtocolVersion(HttpVersion.HTTP_1_0);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
final ClassicHttpResponse response = new BasicClassicHttpResponse(HttpStatus.SC_OK, "OK");
@@ -622,7 +622,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlStatusCode() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
@@ -650,7 +650,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlExplicitClose() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "keep-alive"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
@@ -667,7 +667,7 @@ public class TestStandardInterceptors {
@Test
public void testResponseConnControlClientRequestMixUp() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.addHeader(new BasicHeader(HttpHeaders.CONNECTION, "blah, keep-alive, close"));
context.setAttribute(HttpCoreContext.HTTP_REQUEST, request);
@@ -938,7 +938,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestDateGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.POST, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.POST, "/");
request.setEntity(new StringEntity("stuff"));
final RequestDate interceptor = new RequestDate();
@@ -953,7 +953,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestDateNotGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
final RequestDate interceptor = new RequestDate();
interceptor.process(request, request.getEntity(), context);
@@ -1019,7 +1019,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestHttp10HostHeaderAbsent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.setVersion(HttpVersion.HTTP_1_0);
final RequestValidateHost interceptor = new RequestValidateHost();
interceptor.process(request, request.getEntity(), context);
@@ -1028,7 +1028,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestHttpHostHeader() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.setVersion(HttpVersion.HTTP_1_1);
request.setHeader(HttpHeaders.HOST, "host:8888");
final RequestValidateHost interceptor = new RequestValidateHost();
@@ -1039,7 +1039,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestHttpHostHeaderNoPort() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.setVersion(HttpVersion.HTTP_1_1);
request.setHeader(HttpHeaders.HOST, "host");
final RequestValidateHost interceptor = new RequestValidateHost();
@@ -1050,7 +1050,7 @@ public class TestStandardInterceptors {
@Test
public void testRequestHttp11HostHeaderPresent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.setHeader(HttpHeaders.HOST, "blah");
final RequestValidateHost interceptor = new RequestValidateHost();
interceptor.process(request, request.getEntity(), context);
@@ -1059,7 +1059,7 @@ public class TestStandardInterceptors {
@Test(expected = ProtocolException.class)
public void testRequestHttp11HostHeaderAbsent() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
final RequestValidateHost interceptor = new RequestValidateHost();
interceptor.process(request, request.getEntity(), context);
}
@@ -1067,7 +1067,7 @@ public class TestStandardInterceptors {
@Test(expected = ProtocolException.class)
public void testRequestHttp11MultipleHostHeaders() throws Exception {
final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Methods.GET, "/");
+ final BasicClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
request.addHeader(HttpHeaders.HOST, "blah");
request.addHeader(HttpHeaders.HOST, "blah");
final RequestValidateHost interceptor = new RequestValidateHost();