[juneau] branch master updated: RestClient API improvements.

[jamesbognar]

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 3fc6185  RestClient API improvements.
3fc6185 is described below

commit 3fc61859869cf4116e8944007270b9cf555e4f54
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Mon Jun 7 12:36:53 2021 -0400

    RestClient API improvements.
---
 .../src/main/java/org/apache/juneau/rest/client/RestRequest.java | 9 +++++++++
 .../main/java/org/apache/juneau/rest/mock/MockRestClient.java    | 4 ++--
 .../java/org/apache/juneau/rest/mock/MockRestClientBuilder.java  | 2 +-
 .../java/org/apache/juneau/rest/mock/MockServletRequest.java     | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git 
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
 
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index 3b7c32a..c38902a 100644
--- 
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++ 
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -3583,6 +3583,15 @@ public class RestRequest extends BeanSession implements 
HttpUriRequest, Configur
                return getPartSerializerSession(client.getPartSerializer());
        }
 
+       /**
+        * TEMP
+        *
+        * @return TEMP
+        */
+       public HttpRequest getHttpRequest() {
+               return this;
+       }
+
        
//-----------------------------------------------------------------------------------------------------------------
        // Other methods
        
//-----------------------------------------------------------------------------------------------------------------
diff --git 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index f178b70..80ca44c 100644
--- 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++ 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -38,8 +38,8 @@ import org.apache.juneau.rest.*;
 import org.apache.juneau.rest.annotation.*;
 import org.apache.juneau.rest.client.*;
 import org.apache.juneau.rest.client.RestRequest;
-import org.apache.juneau.rest.logging.*;
 import org.apache.juneau.http.header.ContentType;
+import org.apache.juneau.rest.logging.*;
 
 /**
  * Mocked {@link RestClient}.
@@ -724,7 +724,7 @@ public class MockRestClient extends RestClient implements 
HttpClientConnection {
         */
        private HttpRequest findRestRequest(HttpRequest req) {
                if (req instanceof RestRequestCreated)
-                       return ((RestRequestCreated)req).getRestRequest();
+                       return 
((RestRequestCreated)req).getRestRequest().getHttpRequest();
                if (req instanceof HttpRequestWrapper)
                        return findRestRequest(((HttpRequestWrapper) 
req).getOriginal());
                return req;
diff --git 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
index 34a00dc..4493513 100644
--- 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
+++ 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
@@ -212,7 +212,7 @@ public class MockRestClientBuilder extends 
RestClientBuilder {
 
        @Override /* ContextBuilder */
        public MockRestClientBuilder debug() {
-               header("Debug", true);
+               header("Debug", "true");
                super.debug();
                return this;
        }
diff --git 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index 4d0ca3a..b56da69 100644
--- 
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++ 
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -958,7 +958,7 @@ public class MockServletRequest implements 
HttpServletRequest {
         */
        protected MockServletRequest debug(boolean value) {
                if (value)
-                       header("Debug", true);
+                       header("Debug", "true");
                return this;
        }
 
@@ -973,7 +973,7 @@ public class MockServletRequest implements 
HttpServletRequest {
         */
        public MockServletRequest noTrace(boolean value) {
                if (value)
-                       header("No-Trace", true);
+                       header("No-Trace", "true");
                return this;
        }