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 89952f6 org.apache.juneau.http tests.
89952f6 is described below
commit 89952f692053957d611682f63ddd8c0467eb3446
Author: JamesBognar <[email protected]>
AuthorDate: Fri Jul 10 17:12:31 2020 -0400
org.apache.juneau.http tests.
---
.../src/main/java/org/apache/juneau/http/HttpMethod.java | 2 +-
.../java/org/apache/juneau/rest/client2/RestClient_Test.java | 8 ++++++++
.../src/main/java/org/apache/juneau/rest/client2/RestClient.java | 2 ++
.../main/java/org/apache/juneau/rest/client2/RestRequest.java | 9 +++++++++
.../src/main/java/org/apache/juneau/rest/RestRequest.java | 2 +-
5 files changed, 21 insertions(+), 2 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 beb6771..b4708cb 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
@@ -92,7 +92,7 @@ public enum HttpMethod {
* @param key The HTTP method name.
* @return The HttpMethod enum, or {@link #OTHER} if it's not a
standard method name.
*/
- public static HttpMethod forString(String key) {
+ public static HttpMethod of(String key) {
HttpMethod m = cache.get(key);
return m == null ? OTHER : m;
}
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 1f2018a..1c4ecd1 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
@@ -476,6 +476,14 @@ 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/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 ad4a25d..26b84fc 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
@@ -2867,6 +2867,8 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* @throws RestCallException If any authentication errors occurred.
*/
public RestRequest request(String method, Object uri, boolean hasBody)
throws RestCallException {
+ if (method == null)
+ method = "GET";
if (isClosed) {
Exception e2 = null;
if (closedStack != null) {
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 43f5e51..c176d68 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,6 +3108,15 @@ 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-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 db76172..f5f4f93 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
@@ -1193,7 +1193,7 @@ public final class RestRequest extends
HttpServletRequestWrapper {
* @return The HTTP method.
*/
public HttpMethod getHttpMethod() {
- return HttpMethod.forString(method);
+ return HttpMethod.of(method);
}
@Override /* ServletRequest */
