Request factory classes to re-use `Method#normalizedValueOf`
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/BasicHttpRequests.java b/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/BasicHttpRequests.java
index 02e2366..340e9cf 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/BasicHttpRequests.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/BasicHttpRequests.java
@@ -28,12 +28,10 @@
package org.apache.hc.client5.http.async.methods;
import java.net.URI;
-import java.util.Locale;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.util.Args;
/**
* Common HTTP methods using {@link BasicHttpRequest} as a HTTP request message representation.
@@ -42,12 +40,6 @@
*/
public final class BasicHttpRequests {
- // TODO Next version of HttpCore:
- // Method.normalizedValueOf(method)
- private static Method normalizedValueOf(final String method) {
- return Method.valueOf(Args.notNull(method, "method").toUpperCase(Locale.ROOT));
- }
-
/**
* Creates a new BasicHttpRequest for the given {@code method} and {@code String} URI.
*
@@ -56,9 +48,7 @@
* @return A new BasicHttpRequest.
*/
public static BasicHttpRequest create(final String method, final String uri) {
- // TODO Next version of HttpCore:
- // return create(Method.normalizedValueOf(method), uri);
- return create(normalizedValueOf(method), uri);
+ return create(Method.normalizedValueOf(method), uri);
}
/**
@@ -69,9 +59,7 @@
* @return A new BasicHttpRequest.
*/
public static BasicHttpRequest create(final String method, final URI uri) {
- // TODO Next version of HttpCore:
- // return create(Method.normalizedValueOf(method), uri);
- return create(normalizedValueOf(method), uri);
+ return create(Method.normalizedValueOf(method), uri);
}
public static BasicHttpRequest delete(final String uri) {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/SimpleHttpRequests.java b/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/SimpleHttpRequests.java
index eb44815..d89b45f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/SimpleHttpRequests.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/SimpleHttpRequests.java
@@ -28,11 +28,9 @@
package org.apache.hc.client5.http.async.methods;
import java.net.URI;
-import java.util.Locale;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.Method;
-import org.apache.hc.core5.util.Args;
/**
* Common HTTP methods using {@link SimpleHttpRequest} as a HTTP request message representation.
@@ -41,12 +39,6 @@
*/
public final class SimpleHttpRequests {
- // TODO Next version of HttpCore:
- // Method.normalizedValueOf(method)
- private static Method normalizedValueOf(final String method) {
- return Method.valueOf(Args.notNull(method, "method").toUpperCase(Locale.ROOT));
- }
-
/**
* Creates a new BasicHttpRequest for the given {@code method} and {@code String} URI.
*
@@ -55,9 +47,7 @@
* @return A new BasicHttpRequest.
*/
public static SimpleHttpRequest create(final String method, final String uri) {
- // TODO Next version of HttpCore:
- // return create(Method.normalizedValueOf(method), uri);
- return create(normalizedValueOf(method), uri);
+ return create(Method.normalizedValueOf(method), uri);
}
/**
@@ -68,9 +58,7 @@
* @return A new BasicHttpRequest.
*/
public static SimpleHttpRequest create(final String method, final URI uri) {
- // TODO Next version of HttpCore:
- // return create(Method.normalizedValueOf(method), uri);
- return create(normalizedValueOf(method), uri);
+ return create(Method.normalizedValueOf(method), uri);
}
public static SimpleHttpRequest delete(final String uri) {
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/ClassicHttpRequests.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/ClassicHttpRequests.java
index 02287c2..d7efc28 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/ClassicHttpRequests.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/ClassicHttpRequests.java
@@ -28,12 +28,10 @@
package org.apache.hc.client5.http.classic.methods;
import java.net.URI;
-import java.util.Locale;
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.util.Args;
-
/**
* Common HTTP methods using {@link HttpUriRequest} as a HTTP request message representation.
* <p>
@@ -44,12 +42,6 @@
*/
public final class ClassicHttpRequests {
- private static Method normalizedValueOf(final String method) {
- // TODO Next version of HttpCore:
- // Method.normalizedValueOf(method)
- return Method.valueOf(Args.notNull(method, "method").toUpperCase(Locale.ROOT));
- }
-
/**
* Creates a new HttpUriRequest for the given {@code Method} and {@code String} URI.
*
@@ -101,7 +93,7 @@
* @return A new HttpUriRequest.
*/
public static HttpUriRequest create(final String method, final String uri) {
- return create(normalizedValueOf(method), uri);
+ return create(Method.normalizedValueOf(method), uri);
}
/**
@@ -114,7 +106,7 @@
* @return A new HttpUriRequest.
*/
public static HttpUriRequest create(final String method, final URI uri) {
- return create(normalizedValueOf(method), uri);
+ return create(Method.normalizedValueOf(method), uri);
}
public static HttpUriRequest delete(final String uri) {
