This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 1e78771 org.apache.juneau.http tests.
1e78771 is described below
commit 1e78771dc250d0480bd2024fba4a644f8e0d41e9
Author: JamesBognar <[email protected]>
AuthorDate: Sat Jul 11 10:31:39 2020 -0400
org.apache.juneau.http tests.
---
.../java/org/apache/juneau/http/HttpMethod.java | 78 ++++++++--------------
.../org/apache/juneau/http/HttpMethodName.java | 3 +
.../juneau/examples/rest/HelloWorldResource.java | 2 +-
.../microservice/resources/ConfigResource.java | 2 +-
.../microservice/resources/DirectoryResource.java | 2 +-
.../microservice/resources/LogsResource.java | 2 +-
.../microservice/resources/ShutdownResource.java | 2 +-
.../apache/juneau/rest/test/ConfigResource.java | 2 +-
.../juneau/rest/test/LargePojosResource.java | 2 +-
.../java/org/apache/juneau/rest/test/Root.java | 2 +-
.../rest/test/client/ThirdPartyProxyResource.java | 2 +-
.../jetty/resources/DebugResource.java | 2 +-
.../jetty/template/HelloWorldResource.java | 2 +-
.../springboot/template/HelloWorldResource.java | 2 +-
.../apache/juneau/rest/client2/Remote_Test.java | 6 +-
.../rest/client2/RestClient_BasicCalls_Test.java | 14 ++--
.../client2/RestClient_CallbackStrings_Test.java | 2 +-
.../juneau/rest/client2/RestClient_Test.java | 13 +---
.../juneau/rest/client2/RrpcInterfaceTest.java | 2 +-
.../org/apache/juneau/rest/client/HttpMethod.java | 2 -
.../org/apache/juneau/rest/client2/RestClient.java | 32 +++------
.../apache/juneau/rest/client2/RestRequest.java | 9 ---
.../apache/juneau/rest/mock2/MockRestClient.java | 5 +-
.../juneau/rest/BasicRestInfoProviderTest.java | 2 +-
.../juneau/rest/BeanContextPropertiesTest.java | 2 +-
.../java/org/apache/juneau/rest/PathsTest.java | 2 +-
.../org/apache/juneau/rest/RestParamsTest.java | 7 +-
.../org/apache/juneau/rest/StatusCodesTest.java | 2 +-
.../rest/annotation/RestMethodMatchersTest.java | 2 +-
.../juneau/rest/annotation/RestMethodPathTest.java | 2 +-
.../rest/annotation/RestResourcePathTest.java | 2 +-
.../annotation/RestResourcePropertiesTest.java | 2 +-
.../juneau/rest/annotation/RestResourceTest.java | 33 +++++----
.../annotation2/AnnotationInheritanceTest.java | 2 +-
.../rest/annotation2/BodyAnnotationTest.java | 2 +-
.../rest/annotation2/FormDataAnnotationTest.java | 2 +-
.../rest/annotation2/HasQueryAnnotationTest.java | 2 +-
.../rest/annotation2/HeaderAnnotationTest.java | 2 +-
.../rest/annotation2/PathAnnotationTest.java | 2 +-
.../annotation2/PathRemainderAnnotationTest.java | 2 +-
.../rest/annotation2/QueryAnnotationTest.java | 2 +-
.../juneau/rest/annotation2/RestHookTest.java | 2 +-
.../rest/annotation2/RestResourceParsersTest.java | 2 +-
.../annotation2/RestResourcePojoSwapsTest.java | 2 +-
.../juneau/rest/headers/AcceptCharsetTest.java | 2 +-
.../org/apache/juneau/rest/headers/AcceptTest.java | 2 +-
.../juneau/rest/headers/ClientVersionTest.java | 2 +-
.../juneau/rest/headers/ContentEncodingTest.java | 2 +-
.../juneau/rest/headers/ContentTypeTest.java | 2 +-
.../org/apache/juneau/rest/BasicRestGroup.java | 2 +-
.../org/apache/juneau/rest/BasicRestMethods.java | 2 +-
.../apache/juneau/rest/BasicRestServletGroup.java | 2 +-
.../org/apache/juneau/rest/RestMethodContext.java | 2 +-
.../org/apache/juneau/rest/RestMethodParam.java | 2 -
.../org/apache/juneau/rest/RestParamDefaults.java | 14 ----
.../java/org/apache/juneau/rest/RestRequest.java | 12 ----
.../apache/juneau/rest/annotation/HookEvent.java | 2 -
.../apache/juneau/rest/annotation/RestMethod.java | 2 +-
.../org/apache/juneau/rest/remote/RrpcServlet.java | 2 +-
.../server/config/rest/LoadConfigResource.java | 2 +-
60 files changed, 120 insertions(+), 202 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
index b4708cb..91698ab 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethod.java
@@ -12,88 +12,68 @@
//
***************************************************************************************************************************
package org.apache.juneau.http;
+import static org.apache.juneau.internal.StringUtils.*;
+
import java.util.*;
+import org.apache.juneau.collections.*;
+
/**
- * Represents valid HTTP 1.1 method names per the RFC 2616 spec.
+ * Represents valid HTTP 1.1 method name static strings per the RFC 2616 spec.
*
* <ul class='seealso'>
* <li class='extlink'>{@doc RFC2616}
* </ul>
*/
-public enum HttpMethod {
+public class HttpMethod {
/** {@doc RFC2616.section9#sec9.2 OPTIONS} */
- OPTIONS(false),
+ public static final String OPTIONS = "OPTIONS";
/** {@doc RFC2616.section9#sec9.3 GET} */
- GET(false),
+ public static final String GET = "GET";
/** {@doc RFC2616.section9#sec9.4 HEAD} */
- HEAD(false),
+ public static final String HEAD = "HEAD";
/** {@doc RFC2616.section9#sec9.5 POST} */
- POST(true),
+ public static final String POST = "POST";
/** {@doc RFC2616.section9#sec9.6 PUT} */
- PUT(true),
-
- /** PATH */
- PATCH(true),
+ public static final String PUT = "PUT";
/** {@doc RFC2616.section9#sec9.7 DELETE} */
- DELETE(false),
+ public static final String DELETE = "DELETE";
/** {@doc RFC2616.section9#sec9.8 TRACE} */
- TRACE(false),
+ public static final String TRACE = "TRACE";
/** {@doc RFC2616.section9#sec9.9 CONNECT} */
- CONNECT(false),
+ public static final String CONNECT = "CONNECT";
- /** HTTP MOVE */
- MOVE(false),
+ /** {@doc https://tools.ietf.org/html/rfc5789 PATCH} */
+ public static final String PATCH = "PATCH";
- /** A non-standard value. */
- OTHER(true);
+ /** Special case for a REST method that implements a REST-RPC
interface. */
+ public static final String RRPC = "RRPC";
- private boolean hasContent;
+ /** A non-standard value. */
+ public static final String OTHER = "OTHER";
- HttpMethod(boolean hasContent) {
- this.hasContent = hasContent;
- }
+ /** Represents any HTTP method. */
+ public static final String ANY = "*";
- private static final Map<String,HttpMethod> cache = new
TreeMap<>(String.CASE_INSENSITIVE_ORDER);
- static {
- cache.put("OPTIONS", OPTIONS);
- cache.put("GET", GET);
- cache.put("HEAD", HEAD);
- cache.put("POST", POST);
- cache.put("PUT", PUT);
- cache.put("DELETE", DELETE);
- cache.put("TRACE", TRACE);
- cache.put("CONNECT", CONNECT);
- }
+ private static final Set<String> NO_BODY_METHODS =
ASet.unmodifiable("GET","HEAD","DELETE","CONNECT","OPTIONS","TRACE");
/**
- * Returns whether this HTTP method normally has content.
- *
- * @return <jk>true</jk> if this HTTP method normally has content.
- */
- public boolean hasContent() {
- return hasContent;
- }
-
- /**
- * Returns the enum for the specified key.
- *
+ * Returns <jk>true</jk> if specified http method has content.
* <p>
- * Case is ignored.
+ * By default, anything not in this list can have content: <c>GET,
HEAD, DELETE, CONNECT, OPTIONS, TRACE</c>.
*
- * @param key The HTTP method name.
- * @return The HttpMethod enum, or {@link #OTHER} if it's not a
standard method name.
+ * @param name The HTTP method.
+ * @return <jk>true</jk> if specified http method has content.
*/
- public static HttpMethod of(String key) {
- HttpMethod m = cache.get(key);
- return m == null ? OTHER : m;
+ public static boolean hasContent(String name) {
+ return !
NO_BODY_METHODS.contains(emptyIfNull(name).toUpperCase());
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
index eba6885..f563e5a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpMethodName.java
@@ -18,7 +18,10 @@ package org.apache.juneau.http;
* <ul class='seealso'>
* <li class='extlink'>{@doc RFC2616}
* </ul>
+ *
+ * @deprecated Use {@link HttpMethod}.
*/
+@Deprecated
public class HttpMethodName {
/** {@doc RFC2616.section9#sec9.2 OPTIONS} */
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
index 7d373f0..17d6841 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.examples.rest;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
index 639c534..9faf566 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigResource.java
@@ -13,7 +13,7 @@
package org.apache.juneau.microservice.resources;
import static org.apache.juneau.dto.html5.HtmlBuilder.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import java.io.*;
import java.util.Map;
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index a334590..49b6cf3 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.microservice.resources;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.rest.annotation.HookEvent.*;
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index f054bfd..86978dc 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -13,7 +13,7 @@
package org.apache.juneau.microservice.resources;
import static org.apache.juneau.rest.annotation.HookEvent.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.io.*;
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
index 03007b3..d5619ad 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ShutdownResource.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.microservice.resources;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
index 7a1e23c..7d2d059 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/ConfigResource.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.test;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.http.annotation.Path;
import org.apache.juneau.rest.*;
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
index 56e56e0..9ac1805 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/LargePojosResource.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.test;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.http.annotation.Body;
import org.apache.juneau.rest.*;
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
index ee2e5e2..55fe04b 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/Root.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.test;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.microservice.jetty.resources.*;
import org.apache.juneau.microservice.resources.*;
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
index a3212b4..2e6d9ad 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
@@ -15,7 +15,7 @@ package org.apache.juneau.rest.test.client;
import static java.util.Arrays.*;
import static org.junit.Assert.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.testutils.Constants.*;
import java.io.*;
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
index 9a260a3..f87240d 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/resources/DebugResource.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.microservice.jetty.resources;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import java.io.*;
diff --git
a/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java
b/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java
index 6f61759..0d88615 100755
---
a/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java
+++
b/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/HelloWorldResource.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.microservice.jetty.template;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
index 6b04d92..6b2b6cf 100755
---
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
+++
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.microservice.springboot.template;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/Remote_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/Remote_Test.java
index c63de55..33e9031 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/Remote_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/Remote_Test.java
@@ -404,7 +404,7 @@ public class Remote_Test {
@Rest
public static class E implements BasicSimpleJsonRest {
- @RestMethod(name=HttpMethodName.RRPC)
+ @RestMethod(name=HttpMethod.RRPC)
public E1 getProxy() {
return new E1() {
@Override
@@ -456,7 +456,7 @@ public class Remote_Test {
@Rest
public static class E5 implements BasicSimpleJsonRest {
- @RestMethod(name=HttpMethodName.RRPC)
+ @RestMethod(name=HttpMethod.RRPC)
public E5b getProxy() {
return new E5b() {
@Override
@@ -486,7 +486,7 @@ public class Remote_Test {
@Rest
public static class E6 implements BasicSimpleJsonRest {
- @RestMethod(name=HttpMethodName.RRPC)
+ @RestMethod(name=HttpMethod.RRPC)
public E5b getProxy() {
return new E5b() {
@Override
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_BasicCalls_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_BasicCalls_Test.java
index ed336f5..b1ac6bc 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_BasicCalls_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_BasicCalls_Test.java
@@ -381,8 +381,8 @@ public class RestClient_BasicCalls_Test {
@Test
public void a26_request_PATCH() throws Exception {
-
client().build().request(HttpMethod.PATCH,"/bean",bean).run().assertBody().is("{f:1}");
-
client().build().request(HttpMethod.PATCH,"/bean").body(bean).run().assertBody().is("{f:1}");
+
client().build().request("patch","/bean",bean).run().assertBody().is("{f:1}");
+
client().build().request("patch","/bean").body(bean).run().assertBody().is("{f:1}");
}
@Test
@@ -398,7 +398,7 @@ public class RestClient_BasicCalls_Test {
);
RestClient x = client().build();
for (Object body : bodies) {
-
x.request(HttpMethod.PATCH,"/bean",body).contentType(body instanceof
NameValuePairSupplier ? "application/x-www-form-urlencoded" :
"application/json").run().assertBody().is("{f:1}");
+ x.request("patch","/bean",body).contentType(body
instanceof NameValuePairSupplier ? "application/x-www-form-urlencoded" :
"application/json").run().assertBody().is("{f:1}");
}
}
@@ -413,14 +413,14 @@ public class RestClient_BasicCalls_Test {
);
RestClient x = client().build();
for (Object url : urls) {
-
x.request(HttpMethod.PATCH,url,bean).accept("application/json+simple").run().assertBody().is("{f:1}");
+
x.request("patch",url,bean).accept("application/json+simple").run().assertBody().is("{f:1}");
}
}
@Test
public void a29_request_GET() throws Exception {
-
client().build().request(HttpMethod.GET,"/bean",null).run().assertBody().is("{f:1}");
-
client().build().request(HttpMethod.GET,"/bean").run().assertBody().is("{f:1}");
+
client().build().request("get","/bean",null).run().assertBody().is("{f:1}");
+
client().build().request("get","/bean").run().assertBody().is("{f:1}");
}
@Test
@@ -434,7 +434,7 @@ public class RestClient_BasicCalls_Test {
);
RestClient x = client().build();
for (Object url : urls) {
-
x.request(HttpMethod.GET,url).accept("application/json+simple").run().assertBody().is("{f:1}");
+
x.request("get",url).accept("application/json+simple").run().assertBody().is("{f:1}");
}
}
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_CallbackStrings_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_CallbackStrings_Test.java
index 1107469..62be201 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_CallbackStrings_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_CallbackStrings_Test.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.client2;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Test.java
index 1c4ecd1..b5cced3 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Test.java
@@ -34,7 +34,6 @@ import org.apache.http.params.*;
import org.apache.http.protocol.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.exception.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
@@ -114,14 +113,14 @@ public class RestClient_Test {
public void a04_request_whenClosed() throws Exception {
RestClient rc = client().build();
rc.closeQuietly();
-
assertThrown(()->rc.request(HttpMethod.GET,"/bean",null)).contains("RestClient.close()
has already been called");
+
assertThrown(()->rc.request("get","/bean",null)).contains("RestClient.close()
has already been called");
}
@Test
public void a05_request_whenClosed_withStackCreation() throws Exception
{
RestClient rc = client().debug().build();
rc.closeQuietly();
-
assertThrown(()->rc.request(HttpMethod.GET,"/bean",null)).contains("RestClient.close()
has already been called");
+
assertThrown(()->rc.request("get","/bean",null)).contains("RestClient.close()
has already been called");
}
@Test
@@ -476,14 +475,6 @@ public class RestClient_Test {
assertNotNull(client().build().get("/bean").toString());
}
- @Test
- public void e17_getHttpMethod() throws Exception {
- RestClient x = client().build();
- assertString(x.get().getHttpMethod()).is("GET");
-
assertString(x.request("FOO",null,false).getHttpMethod()).is("OTHER");
-
assertString(x.request(null,null,false).getHttpMethod()).is("GET");
- }
-
//------------------------------------------------------------------------------------------------------------------
// Helper methods.
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RrpcInterfaceTest.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RrpcInterfaceTest.java
index c1a46c1..786fc98 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RrpcInterfaceTest.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RrpcInterfaceTest.java
@@ -14,7 +14,7 @@ package org.apache.juneau.rest.client2;
import static java.util.Arrays.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.testutils.Constants.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/HttpMethod.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/HttpMethod.java
index 659954c..9dcff9b 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/HttpMethod.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/HttpMethod.java
@@ -14,8 +14,6 @@ package org.apache.juneau.rest.client;
/**
* Enumeration of HTTP methods.
- *
- * @deprecated Use {@link org.apache.juneau.http.HttpMethod}
*/
@Deprecated
public enum HttpMethod {
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
index 26b84fc..954408e 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClient.java
@@ -15,6 +15,7 @@ package org.apache.juneau.rest.client2;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.AddFlag.*;
import static org.apache.juneau.httppart.HttpPartType.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static java.util.logging.Level.*;
import static org.apache.juneau.internal.StateMachineState.*;
import static java.lang.Character.*;
@@ -168,7 +169,7 @@ import org.apache.juneau.utils.*;
* <li class='jm'>{@link RestClient#options(Object) options(uri)}
* <li class='jm'>{@link RestClient#formPost(Object,Object)
formPost(uri,body)} / {@link RestClient#formPost(Object) formPost(uri)}
* <li class='jm'>{@link
RestClient#formPostPairs(Object,Object...) formPostPairs(uri,parameters...)}
- * <li class='jm'>{@link
RestClient#request(HttpMethod,Object,Object) request(method,uri,body)}
+ * <li class='jm'>{@link RestClient#request(String,Object,Object)
request(method,uri,body)}
* </ul>
* </ul>
*
@@ -1950,8 +1951,6 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
static final String RESTCLIENT_httpClient = PREFIX + "httpClient.o";
static final String RESTCLIENT_httpClientBuilder= PREFIX +
"httpClientBuilder.o";
- private static final Set<String> NO_BODY_METHODS =
ASet.unmodifiable("GET","HEAD","DELETE","CONNECT","OPTIONS","TRACE");
-
private final HeaderSupplier headers;
private final NameValuePairSupplier query, formData;
final CloseableHttpClient httpClient;
@@ -2106,18 +2105,6 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
}
/**
- * Returns <jk>true</jk> if specified http method has content.
- * <p>
- * By default, anything not in this list can have content: <c>GET,
HEAD, DELETE, CONNECT, OPTIONS, TRACE</c>.
- *
- * @param httpMethod The HTTP method. Must be upper-case.
- * @return <jk>true</jk> if specified http method has content.
- */
- protected boolean hasContent(String httpMethod) {
- return ! NO_BODY_METHODS.contains(httpMethod);
- }
-
- /**
* Calls {@link CloseableHttpClient#close()} on the underlying {@link
CloseableHttpClient}.
*
* <p>
@@ -2805,15 +2792,16 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* <li>
* {@link Supplier} - A supplier of anything on
this list.
* </ul>
- * This parameter is IGNORED if {@link HttpMethod#hasContent()} is
<jk>false</jk>.
+ * This parameter is IGNORED if the method type normally does not
have content.
* @return
* A {@link RestRequest} object that can be further tailored
before executing the request and getting the response
* as a parsed object.
* @throws RestCallException If any authentication errors occurred.
*/
- public RestRequest request(HttpMethod method, Object uri, Object body)
throws RestCallException {
- RestRequest rc = request(method.name(), uri,
method.hasContent());
- if (method.hasContent())
+ public RestRequest request(String method, Object uri, Object body)
throws RestCallException {
+ boolean b = hasContent(method);
+ RestRequest rc = request(method, uri, b);
+ if (b)
rc.body(body);
return rc;
}
@@ -2837,8 +2825,8 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* as a parsed object.
* @throws RestCallException If any authentication errors occurred.
*/
- public RestRequest request(HttpMethod method, Object uri) throws
RestCallException {
- RestRequest rc = request(method.name(), uri,
method.hasContent());
+ public RestRequest request(String method, Object uri) throws
RestCallException {
+ RestRequest rc = request(method, uri, hasContent(method));
return rc;
}
@@ -2846,7 +2834,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* Perform a generic REST call.
*
* <p>
- * Typically you're going to use {@link #request(HttpMethod, Object)}
or {@link #request(HttpMethod, Object, Object)},
+ * Typically you're going to use {@link #request(String, Object)} or
{@link #request(String, Object, Object)},
* but this method is provided to allow you to perform non-standard
HTTP methods (e.g. HTTP FOO).
*
* @param method The method name (e.g. <js>"GET"</js>,
<js>"OPTIONS"</js>).
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestRequest.java
index c176d68..43f5e51 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestRequest.java
@@ -3108,15 +3108,6 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
}
/**
- * Returns the HTTP method this request uses, such as GET, PUT, POST,
or other.
- *
- * @return The HTTP method this request uses, such as GET, PUT, POST,
or other.
- */
- public HttpMethod getHttpMethod() {
- return HttpMethod.of(request.getMethod());
- }
-
- /**
* Returns the original request URI.
*
* <ul class='notes'>
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
index 6f05db4..9765c17 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClient.java
@@ -28,7 +28,6 @@ import org.apache.http.client.methods.*;
import org.apache.http.entity.*;
import org.apache.http.message.*;
import org.apache.juneau.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.remote.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
@@ -546,12 +545,12 @@ public class MockRestClient extends RestClient implements
HttpClientConnection {
}
@Override /* RestClient */
- public MockRestRequest request(HttpMethod method, Object url, Object
body) throws RestCallException {
+ public MockRestRequest request(String method, Object url, Object body)
throws RestCallException {
return (MockRestRequest)super.request(method, url, body);
}
@Override /* RestClient */
- public MockRestRequest request(HttpMethod method, Object url) throws
RestCallException {
+ public MockRestRequest request(String method, Object url) throws
RestCallException {
return (MockRestRequest)super.request(method, url);
}
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
index ac25b8c..2a0673a 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
@@ -16,7 +16,7 @@ import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import java.io.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BeanContextPropertiesTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BeanContextPropertiesTest.java
index 9e8156e..4768b11 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BeanContextPropertiesTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/BeanContextPropertiesTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/PathsTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/PathsTest.java
index 5e63a48..235c48f 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/PathsTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/PathsTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.collections.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
index 19792b9..a1fe7bd 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/RestParamsTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.internal.IOUtils.*;
import static org.junit.runners.MethodSorters.*;
@@ -23,7 +23,6 @@ import javax.servlet.*;
import org.apache.juneau.config.*;
import org.apache.juneau.dto.swagger.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.annotation.*;
@@ -85,8 +84,8 @@ public class RestParamsTest {
return t != null;
}
@RestMethod
- public String a12(HttpMethod t) {
- return t.toString();
+ public String a12(@Method String t) {
+ return t;
}
@SuppressWarnings("deprecation")
@RestMethod
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/StatusCodesTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/StatusCodesTest.java
index 2250505..c8caa5e 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/StatusCodesTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/StatusCodesTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodMatchersTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodMatchersTest.java
index 41d25be..f2583aa 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodMatchersTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodMatchersTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodPathTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodPathTest.java
index ce5dd36..af71da4 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodPathTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestMethodPathTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.mock2.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
index d1b5dc4..ee1ec18 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePathTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePropertiesTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePropertiesTest.java
index 0a3fc9d..88bb227 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePropertiesTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourcePropertiesTest.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.annotation;
import static java.lang.String.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import java.io.IOException;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceTest.java
index 50b0304..ea18b9f 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation/RestResourceTest.java
@@ -13,7 +13,6 @@
package org.apache.juneau.rest.annotation;
import static org.junit.runners.MethodSorters.*;
-import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.http.annotation.*;
@@ -235,7 +234,7 @@ public class RestResourceTest {
c1.put("/", "").run().assertBody().is("PUT");
c1.get("/").header("X-Method",
"PUT").run().assertBody().is("GET");
c1.put("/", "").header("X-Method",
"GET").run().assertBody().is("PUT");
-
c1.request(GET,"/").header("X-Method","FOO").run().assertBody().is("GET");
+
c1.request("get","/").header("X-Method","FOO").run().assertBody().is("GET");
}
@Test
@@ -244,7 +243,7 @@ public class RestResourceTest {
c2.put("/", "").run().assertBody().is("PUT");
c2.get("/").header("X-Method",
"PUT").run().assertBody().is("GET");
c2.put("/", "").header("X-Method",
"GET").run().assertBody().is("GET");
-
c2.request(GET,"/").header("X-Method","FOO").run().assertBody().is("GET");
+
c2.request("get","/").header("X-Method","FOO").run().assertBody().is("GET");
}
@Test
@@ -253,7 +252,7 @@ public class RestResourceTest {
c3.put("/", "").run().assertBody().is("PUT");
c3.get("/").header("X-Method",
"PUT").run().assertBody().is("GET");
c3.put("/", "").header("X-Method",
"GET").run().assertBody().is("GET");
-
c3.request(GET,"/").header("X-Method","FOO").run().assertBody().is("GET");
+
c3.request("get","/").header("X-Method","FOO").run().assertBody().is("GET");
}
@Test
@@ -262,7 +261,7 @@ public class RestResourceTest {
c4.put("/", "").run().assertBody().is("PUT");
c4.get("/").header("X-Method",
"PUT").run().assertBody().is("GET");
c4.put("/", "").header("X-Method",
"GET").run().assertBody().is("PUT");
-
c4.request(GET,"/").header("X-Method","FOO").run().assertBody().is("FOO");
+
c4.request("get","/").header("X-Method","FOO").run().assertBody().is("FOO");
}
@Test
@@ -271,7 +270,7 @@ public class RestResourceTest {
c5.put("/", "").run().assertBody().is("PUT");
c5.get("/").header("X-Method",
"PUT").run().assertBody().is("PUT");
c5.put("/", "").header("X-Method",
"GET").run().assertBody().is("GET");
-
c5.request(GET,"/").header("X-Method","FOO").run().assertBody().is("FOO");
+
c5.request("get","/").header("X-Method","FOO").run().assertBody().is("FOO");
}
@Test
@@ -280,7 +279,7 @@ public class RestResourceTest {
c6.put("/", "").run().assertBody().is("PUT");
c6.get("/").header("X-Method",
"PUT").run().assertBody().is("GET");
c6.put("/", "").header("X-Method",
"GET").run().assertBody().is("PUT");
-
c6.request(GET,"/").header("X-Method","FOO").run().assertBody().is("GET");
+
c6.request("get","/").header("X-Method","FOO").run().assertBody().is("GET");
}
@Test
@@ -289,7 +288,7 @@ public class RestResourceTest {
c7.put("/", "").run().assertBody().is("PUT");
c7.get("/").header("X-Method",
"PUT").run().assertBody().is("GET");
c7.put("/", "").header("X-Method",
"GET").run().assertBody().is("PUT");
-
c7.request(GET,"/").header("X-Method","FOO").run().assertBody().is("GET");
+
c7.request("get","/").header("X-Method","FOO").run().assertBody().is("GET");
}
@Test
@@ -298,7 +297,7 @@ public class RestResourceTest {
c8.put("/", "").run().assertBody().is("PUT");
c8.get("/").header("X-Method",
"PUT").run().assertBody().is("GET");
c8.put("/", "").header("X-Method",
"GET").run().assertBody().is("PUT");
-
c8.request(GET,"/").header("X-Method","FOO").run().assertBody().is("GET");
+
c8.request("get","/").header("X-Method","FOO").run().assertBody().is("GET");
}
@Test
@@ -384,7 +383,7 @@ public class RestResourceTest {
d1.put("/?method=GET", "").run().assertBody().is("PUT");
d1.get("/?method=HEAD").run().assertBody().is("HEAD");
d1.get("/?method=OPTIONS").run().assertBody().is("OPTIONS");
- d1.request(GET,"/?method=FOO").run().assertBody().is("GET");
+ d1.request("get","/?method=FOO").run().assertBody().is("GET");
}
@Test
@@ -397,7 +396,7 @@ public class RestResourceTest {
d2.put("/?method=GET", "").run().assertBody().is("GET");
d2.get("/?method=HEAD").run().assertBody().is("GET");
d2.get("/?method=OPTIONS").run().assertBody().is("GET");
- d2.request(GET,"/?method=FOO").run().assertBody().is("GET");
+ d2.request("get","/?method=FOO").run().assertBody().is("GET");
}
@Test
@@ -410,7 +409,7 @@ public class RestResourceTest {
d3.put("/?method=GET", "").run().assertBody().is("GET");
d3.get("/?method=HEAD").run().assertBody().is("GET");
d3.get("/?method=OPTIONS").run().assertBody().is("GET");
- d3.request(GET,"/?method=FOO").run().assertBody().is("GET");
+ d3.request("get","/?method=FOO").run().assertBody().is("GET");
}
@Test
@@ -423,7 +422,7 @@ public class RestResourceTest {
d4.put("/?method=GET", "").run().assertBody().is("PUT");
d4.get("/?method=HEAD").run().assertBody().is("GET");
d4.get("/?method=OPTIONS").run().assertBody().is("GET");
- d4.request(GET,"/?method=FOO").run().assertBody().is("FOO");
+ d4.request("get","/?method=FOO").run().assertBody().is("FOO");
}
@Test
@@ -436,7 +435,7 @@ public class RestResourceTest {
d5.put("/?method=GET", "").run().assertBody().is("GET");
d5.get("/?method=HEAD").run().assertBody().is("HEAD");
d5.get("/?method=OPTIONS").run().assertBody().is("OPTIONS");
- d5.request(GET,"/?method=FOO").run().assertBody().is("FOO");
+ d5.request("get","/?method=FOO").run().assertBody().is("FOO");
}
@Test
@@ -449,7 +448,7 @@ public class RestResourceTest {
d6.put("/?method=GET", "").run().assertBody().is("PUT");
d6.get("/?method=HEAD").run().assertBody().is("GET");
d6.get("/?method=OPTIONS").run().assertBody().is("GET");
- d6.request(GET,"/?method=FOO").run().assertBody().is("GET");
+ d6.request("get","/?method=FOO").run().assertBody().is("GET");
}
@Test
@@ -462,7 +461,7 @@ public class RestResourceTest {
d7.put("/?method=GET", "").run().assertBody().is("PUT");
d7.get("/?method=HEAD").run().assertBody().is("GET");
d7.get("/?method=OPTIONS").run().assertBody().is("GET");
- d7.request(GET,"/?method=FOO").run().assertBody().is("GET");
+ d7.request("get","/?method=FOO").run().assertBody().is("GET");
}
@Test
@@ -475,7 +474,7 @@ public class RestResourceTest {
d8.put("/?method=GET", "").run().assertBody().is("PUT");
d8.get("/?method=HEAD").run().assertBody().is("GET");
d8.get("/?method=OPTIONS").run().assertBody().is("GET");
- d8.request(GET,"/?method=FOO").run().assertBody().is("GET");
+ d8.request("get","/?method=FOO").run().assertBody().is("GET");
}
@Test
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/AnnotationInheritanceTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/AnnotationInheritanceTest.java
index b18c5d2..99bb538 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/AnnotationInheritanceTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/AnnotationInheritanceTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation2;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.http.annotation.Body;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
index f055ac5..bd8e88e 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/BodyAnnotationTest.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.annotation2;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.rest.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
index 4bfd282..f367410 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/FormDataAnnotationTest.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.annotation2;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.rest.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
index 1defb76..5db8449 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HasQueryAnnotationTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation2;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.http.annotation.HasQuery;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HeaderAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HeaderAnnotationTest.java
index e1e6d10..3f4b5cf 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HeaderAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/HeaderAnnotationTest.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.annotation2;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.rest.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathAnnotationTest.java
index ce84138..c280a14 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathAnnotationTest.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.annotation2;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.rest.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathRemainderAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathRemainderAnnotationTest.java
index 13aa04e..3b92c08 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathRemainderAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/PathRemainderAnnotationTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation2;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
index 8830cb0..23dd016 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/QueryAnnotationTest.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.annotation2;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.rest.testutils.TestUtils.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
index c8a672f..5529bc1 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestHookTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation2;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.rest.annotation.HookEvent.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourceParsersTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourceParsersTest.java
index 79ce8be..a471b99 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourceParsersTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourceParsersTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation2;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.internal.IOUtils.*;
import static org.junit.runners.MethodSorters.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
index 1c681bf..ebd2700 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/annotation2/RestResourcePojoSwapsTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation2;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptCharsetTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptCharsetTest.java
index e271b36..5966da8 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptCharsetTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptCharsetTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.headers;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptTest.java
index 1b2b154..f32dd99 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/AcceptTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.headers;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import java.io.IOException;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ClientVersionTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ClientVersionTest.java
index c44eb43..174ced7 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ClientVersionTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ClientVersionTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.headers;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.rest.annotation.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentEncodingTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentEncodingTest.java
index 87e028f..7c7e012 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentEncodingTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentEncodingTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.headers;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.encoders.*;
diff --git
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentTypeTest.java
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentTypeTest.java
index b420677..55551d0 100644
---
a/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentTypeTest.java
+++
b/juneau-rest/juneau-rest-server-utest/src/test/java/org/apache/juneau/rest/headers/ContentTypeTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.headers;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.junit.runners.MethodSorters.*;
import java.io.IOException;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestGroup.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestGroup.java
index 311cd81..5cd293e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestGroup.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestGroup.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import javax.servlet.http.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestMethods.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestMethods.java
index 7548047..745ec27 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestMethods.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestMethods.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.dto.swagger.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
index bbd9c1d..da68511 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestServletGroup.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.helper.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
index 09d2e42..bf6ffed 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContext.java
@@ -296,7 +296,7 @@ public class RestMethodContext extends BeanContext
implements Comparable<RestMet
* Method names are case-insensitive (always folded to upper-case).
*
* <p>
- * Note that you can use {@link org.apache.juneau.http.HttpMethodName}
for constant values.
+ * Note that you can use {@link org.apache.juneau.http.HttpMethod} for
constant values.
*
* <p>
* Besides the standard HTTP method names, the following can also be
specified:
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
index 6b066fe..729e78a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodParam.java
@@ -22,7 +22,6 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.config.*;
import org.apache.juneau.dto.swagger.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.header.Date;
import org.apache.juneau.parser.*;
@@ -82,7 +81,6 @@ import org.apache.juneau.utils.*;
* <li><b>Other objects</b>
* <ul>
* <li class='jc'>{@link Config}
- * <li class='jc'>{@link HttpMethod}
* <li class='jc'>{@link InputStream}
* <li class='jc'>{@link Locale}
* <li class='jc'>{@link MessageBundle}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
index 027ae17..8937e34 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
@@ -26,7 +26,6 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.config.*;
import org.apache.juneau.dto.swagger.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.annotation.Body;
import org.apache.juneau.http.annotation.FormData;
@@ -91,7 +90,6 @@ class RestParamDefaults {
RequestAttributesObject.class,
RequestQueryObject.class,
RequestFormDataObject.class,
- HttpMethodObject.class,
RestLoggerObject.class,
RestContextObject.class,
ParserObject.class,
@@ -720,18 +718,6 @@ class RestParamDefaults {
}
}
- static final class HttpMethodObject extends RestMethodParam {
-
- protected HttpMethodObject() {
- super(OTHER, HttpMethod.class);
- }
-
- @Override /* RestMethodParam */
- public Object resolve(RestRequest req, RestResponse res) throws
Exception {
- return req.getHttpMethod();
- }
- }
-
@SuppressWarnings("deprecation")
static final class RestLoggerObject extends RestMethodParam {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index f5f4f93..a3c8d16 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -1184,18 +1184,6 @@ public final class RestRequest extends
HttpServletRequestWrapper {
return method;
}
- /**
- * Returns the HTTP 1.1 method name of the request as an enum.
- *
- * <p>
- * Note that non-RFC2616 method names resolve as {@link
HttpMethod#OTHER}.
- *
- * @return The HTTP method.
- */
- public HttpMethod getHttpMethod() {
- return HttpMethod.of(method);
- }
-
@Override /* ServletRequest */
public int getContentLength() {
return getBody().getContentLength();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
index b71a62f..86fd502 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/HookEvent.java
@@ -22,7 +22,6 @@ import javax.servlet.http.*;
import org.apache.juneau.*;
import org.apache.juneau.config.*;
import org.apache.juneau.dto.swagger.*;
-import org.apache.juneau.http.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.exception.*;
import org.apache.juneau.rest.*;
@@ -156,7 +155,6 @@ public enum HookEvent {
* <li>{@link RequestHeaders}
* <li>{@link RequestQuery}
* <li>{@link RequestFormData}
- * <li>{@link HttpMethod}
* <li>{@link Logger}
* <li>{@link RestContext}
* <li>{@link org.apache.juneau.parser.Parser}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
index ab3d479..091a721 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestMethod.java
@@ -448,7 +448,7 @@ public @interface RestMethod {
* Method names are case-insensitive (always folded to upper-case).
*
* <p>
- * Note that you can use {@link org.apache.juneau.http.HttpMethodName}
for constant values.
+ * Note that you can use {@link org.apache.juneau.http.HttpMethod} for
constant values.
*
* <p>
* Besides the standard HTTP method names, the following can also be
specified:
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
index 548be81..d6a08b0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
@@ -13,7 +13,7 @@
package org.apache.juneau.rest.remote;
import static org.apache.juneau.dto.html5.HtmlBuilder.*;
-import static org.apache.juneau.http.HttpMethodName.*;
+import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.io.*;
diff --git
a/juneau-sc/juneau-sc-server/src/main/java/org/apache/juneau/server/config/rest/LoadConfigResource.java
b/juneau-sc/juneau-sc-server/src/main/java/org/apache/juneau/server/config/rest/LoadConfigResource.java
index 8420eff..518f5ed 100644
---
a/juneau-sc/juneau-sc-server/src/main/java/org/apache/juneau/server/config/rest/LoadConfigResource.java
+++
b/juneau-sc/juneau-sc-server/src/main/java/org/apache/juneau/server/config/rest/LoadConfigResource.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.server.config.rest;
-import static org.apache.juneau.http.HttpMethodName.GET;
+import static org.apache.juneau.http.HttpMethod.GET;
import org.apache.juneau.http.annotation.Path;
import org.apache.juneau.json.JsonSerializer;
