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 b0881d3 RestClient tests.
b0881d3 is described below
commit b0881d39e7758284201f2272ba2032ebd563a5df
Author: JamesBognar <[email protected]>
AuthorDate: Wed Jul 1 10:58:25 2020 -0400
RestClient tests.
---
.../rest/client2/RestClient_Logging_Test.java | 24 +++++++++++++---------
.../org/apache/juneau/rest/client2/RestClient.java | 8 ++++----
.../juneau/rest/client2/RestClientBuilder.java | 5 ++++-
.../juneau/rest/mock2/MockRestClientBuilder.java | 4 ++--
4 files changed, 24 insertions(+), 17 deletions(-)
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Logging_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Logging_Test.java
index 644f455..2bb20ef 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Logging_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Logging_Test.java
@@ -61,15 +61,15 @@ public class RestClient_Logging_Test {
MockConsole c = MockConsole.create();
MockLogger l = MockLogger.create();
-
client().logRequests(DetailLevel.NONE,Level.SEVERE).logToConsole().logger(l).console(c).build().post("/bean",bean).complete();
+
client().logRequests(DetailLevel.NONE,Level.SEVERE,null).logToConsole().logger(l).console(c).build().post("/bean",bean).complete();
c.assertContents().is("");
c.reset();
-
client().logRequests(DetailLevel.SIMPLE,Level.SEVERE).logToConsole().logger(l).console(c).build().post("/bean",bean).complete();
+
client().logRequests(DetailLevel.SIMPLE,Level.SEVERE,null).logToConsole().logger(l).console(c).build().post("/bean",bean).complete();
c.assertContents().is("HTTP POST http://localhost/bean,
HTTP/1.1 200 \n");
c.reset();
-
client().logRequests(DetailLevel.FULL,Level.SEVERE).logToConsole().logger(l).console(c).build().post("/bean",bean).complete();
+
client().logRequests(DetailLevel.FULL,Level.SEVERE,null).logToConsole().logger(l).console(c).build().post("/bean",bean).complete();
c.assertContents().is(
"",
"=== HTTP Call (outgoing)
======================================================",
@@ -92,7 +92,7 @@ public class RestClient_Logging_Test {
);
c.reset();
-
client().logRequests(DetailLevel.FULL,Level.SEVERE).logToConsole().logger(l).console(c).build().get("/bean").complete();
+
client().logRequests(DetailLevel.FULL,Level.SEVERE,null).logToConsole().logger(l).console(c).build().get("/bean").complete();
c.assertContents().is(
"",
"=== HTTP Call (outgoing)
======================================================",
@@ -111,7 +111,7 @@ public class RestClient_Logging_Test {
);
c.reset();
-
clientPlain().logRequests(DetailLevel.FULL,Level.SEVERE).logToConsole().logger(l).console(c).build().post("/stream",new
InputStreamEntity(new ByteArrayInputStream("foo".getBytes()))).complete();
+
clientPlain().logRequests(DetailLevel.FULL,Level.SEVERE,null).logToConsole().logger(l).console(c).build().post("/stream",new
InputStreamEntity(new ByteArrayInputStream("foo".getBytes()))).complete();
c.assertContents().is(
"",
"=== HTTP Call (outgoing)
======================================================",
@@ -130,25 +130,29 @@ public class RestClient_Logging_Test {
);
c.reset();
-
client().logRequests(DetailLevel.NONE,Level.SEVERE).logToConsole().logger(l).console(MockConsole.class).build().post("/bean",bean).complete();
+
clientPlain().logRequests(DetailLevel.FULL,Level.SEVERE,(req,res)->false).logToConsole().logger(l).console(c).build().post("/stream",new
InputStreamEntity(new ByteArrayInputStream("foo".getBytes()))).complete();
+ c.assertContents().isEmpty();
+ c.reset();
+
+
client().logRequests(DetailLevel.NONE,Level.SEVERE,null).logToConsole().logger(l).console(MockConsole.class).build().post("/bean",bean).complete();
}
@Test
public void a02_logTo() throws Exception {
MockLogger l = MockLogger.create();
-
client().logRequests(DetailLevel.NONE,Level.SEVERE).logToConsole().logger(l).build().post("/bean",bean).complete();
+
client().logRequests(DetailLevel.NONE,Level.SEVERE,null).logToConsole().logger(l).build().post("/bean",bean).complete();
l.assertContents().is("");
l.assertRecordCount().is(0);
l.reset();
-
client().logger(l).logRequests(DetailLevel.SIMPLE,Level.WARNING).build().post("/bean",bean).complete();
+
client().logger(l).logRequests(DetailLevel.SIMPLE,Level.WARNING,null).build().post("/bean",bean).complete();
l.assertLastLevel(Level.WARNING);
l.assertLastMessage().stderr().is("HTTP POST
http://localhost/bean, HTTP/1.1 200 ");
l.assertContents().is("WARNING: HTTP POST
http://localhost/bean, HTTP/1.1 200 \n");
l.reset();
-
client().logger(l).logRequests(DetailLevel.FULL,Level.WARNING).build().post("/bean",bean).complete();
+
client().logger(l).logRequests(DetailLevel.FULL,Level.WARNING,null).build().post("/bean",bean).complete();
l.assertLastLevel(Level.WARNING);
l.assertLastMessage().is(
"",
@@ -204,7 +208,7 @@ public class RestClient_Logging_Test {
}
@Test
- public void a03_other() throws Exception {
+ public void a04_other() throws Exception {
MockLogger ml = MockLogger.create();
MockConsole mc = MockConsole.create();
client().logger(ml).interceptors(A1.class).build().post("/bean",bean).complete();
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 ed2fc24..92fdba2 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
@@ -828,7 +828,7 @@ import org.apache.http.client.CookieStore;
* <ul>
* <li class='jm'>{@link RestClientBuilder#logger(Logger)
logger(Logger)}
* <li class='jm'>{@link RestClientBuilder#logToConsole()
logToConsole()}
- * <li class='jm'>{@link
RestClientBuilder#logRequests(DetailLevel,Level) logRequests(DetailLevel,Level)}
+ * <li class='jm'>{@link
RestClientBuilder#logRequests(DetailLevel,Level,BiPredicate)
logRequests(DetailLevel,Level,BiPredicate)}
* </ul>
* </ul>
*
@@ -1528,7 +1528,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* <li><b>Default:</b> {@link org.apache.juneau.DetailLevel#NONE}
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#logRequests(DetailLevel,Level)}
+ * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#logRequests(DetailLevel,Level,BiPredicate)}
* </ul>
* </ul>
*
@@ -1590,7 +1590,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* <li><b>Default:</b> {@link java.util.logging.Level#INFO}
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#logRequests(DetailLevel,Level)}
+ * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#logRequests(DetailLevel,Level,BiPredicate)}
* </ul>
* </ul>
*
@@ -1615,7 +1615,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* <li><b>Default:</b> <c>(req,res) -> true</c>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#logRequests(DetailLevel,Level)}
+ * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#logRequests(DetailLevel,Level,BiPredicate)}
* </ul>
* </ul>
*
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
index 708f8c6..1c177f0 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client2/RestClientBuilder.java
@@ -952,16 +952,19 @@ public class RestClientBuilder extends BeanContextBuilder
{
* <ul class='seealso'>
* <li class='jf'>{@link RestClient#RESTCLIENT_logRequests}
* <li class='jf'>{@link RestClient#RESTCLIENT_logRequestsLevel}
+ * <li class='jf'>{@link
RestClient#RESTCLIENT_logRequestsPredicate}
* </ul>
*
* @param detail The detail level of logging.
* @param level The log level.
+ * @param test A predicate to use per-request to see if the request
should be logged. If <jk>null</jk>, always logs.
* @return This object (for method chaining).
*/
@FluentSetter
- public RestClientBuilder logRequests(DetailLevel detail, Level level) {
+ public RestClientBuilder logRequests(DetailLevel detail, Level level,
BiPredicate<RestRequest,RestResponse> test) {
set(RESTCLIENT_logRequests, detail);
set(RESTCLIENT_logRequestsLevel, level);
+ set(RESTCLIENT_logRequestsPredicate, test);
return this;
}
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClientBuilder.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClientBuilder.java
index 2ca29ee..2983a6c 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClientBuilder.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock2/MockRestClientBuilder.java
@@ -1132,8 +1132,8 @@ public class MockRestClientBuilder extends
RestClientBuilder {
}
@Override /* GENERATED - RestClientBuilder */
- public MockRestClientBuilder logRequests(DetailLevel detail, Level
level) {
- super.logRequests(detail, level);
+ public MockRestClientBuilder logRequests(DetailLevel detail, Level
level, BiPredicate<RestRequest,RestResponse> test) {
+ super.logRequests(detail, level, test);
return this;
}
