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 caa51f8 RestClient tests.
caa51f8 is described below
commit caa51f849714419e5165e10e801a90fc11122d0c
Author: JamesBognar <[email protected]>
AuthorDate: Wed Jul 1 14:13:34 2020 -0400
RestClient tests.
---
.../org/apache/juneau/assertions/Assertion.java | 6 +-----
.../org/apache/juneau/internal/ClassUtils.java | 11 ++++++++++
.../rest/client2/RestClient_FormData_Test.java | 2 ++
.../rest/client2/RestClient_Headers_Test.java | 1 +
.../juneau/rest/client2/RestClient_Paths_Test.java | 1 +
.../juneau/rest/client2/RestClient_Query_Test.java | 2 ++
.../org/apache/juneau/rest/client2/RestClient.java | 2 --
.../juneau/rest/client2/RestClientBuilder.java | 24 +---------------------
.../apache/juneau/rest/client2/RestRequest.java | 5 +----
.../juneau/rest/mock2/MockRestClientBuilder.java | 6 ------
10 files changed, 20 insertions(+), 40 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
index f52c701..ba425e6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertion.java
@@ -90,11 +90,7 @@ public class Assertion {
* @return The class name for an object.
*/
protected static String className(Object o) {
- if (o == null)
- return null;
- if (o instanceof Class)
- return ((Class<?>)o).getName();
- return className(o.getClass());
+ return ClassUtils.className(o);
}
// <FluentSetters>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
index 1792849..42bb9e6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
@@ -321,4 +321,15 @@ public final class ClassUtils {
}
return null;
}
+
+
+ /**
+ * Returns the class name for the specified object.
+ *
+ * @param value The object to get the class name for.
+ * @return The name of the class or <jk>null</jk> if the value was null.
+ */
+ public static String className(Object value) {
+ return value == null ? null : value instanceof Class<?> ?
((Class<?>)value).getName() : value.getClass().getName();
+ }
}
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_FormData_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_FormData_Test.java
index 3acccf0..8546ab4 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_FormData_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_FormData_Test.java
@@ -78,6 +78,7 @@ public class RestClient_FormData_Test {
client().formDatas(AMap.of("foo","bar")).build().post("/formData").run().assertBody().is("foo=bar");
client().formDatas(pairs("foo","bar","foo","baz")).build().post("/formData").run().assertBody().is("foo=bar&foo=baz");
client().formDatas(pair("foo","bar"),pair("foo","baz")).build().post("/formData").run().assertBody().is("foo=bar&foo=baz");
+
client().formDatas(AList.of(pair("foo","bar"),pair("foo","baz"))).build().post("/formData").run().assertBody().is("foo=bar&foo=baz");
client().formDatas((Object)new
NameValuePair[]{pair("foo","bar")}).build().post("/formData").run().assertBody().is("foo=bar");
client().build().post("/formData").formDatas(pair("foo","bar")).run().assertBody().is("foo=bar");
@@ -85,6 +86,7 @@ public class RestClient_FormData_Test {
client().build().post("/formData").formDatas(AMap.of("foo","bar")).run().assertBody().is("foo=bar");
client().build().post("/formData").formDatas(pairs("foo","bar","foo","baz")).run().assertBody().is("foo=bar&foo=baz");
client().build().post("/formData").formDatas(pair("foo","bar"),pair("foo","baz")).run().assertBody().is("foo=bar&foo=baz");
+
client().build().post("/formData").formDatas(AList.of(pair("foo","bar"),pair("foo","baz"))).run().assertBody().is("foo=bar&foo=baz");
client().build().post("/formData").formDatas((Object)new
NameValuePair[]{pair("foo","bar")}).run().assertBody().is("foo=bar");
client().build().post("/formData").formDatas(ABean.get()).run().assertBody().is("f=1");
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
index ba7e5e5..7da1316 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Headers_Test.java
@@ -114,6 +114,7 @@ public class RestClient_Headers_Test {
checkFooClient().headers(SerializedHeader.create().name("Foo").value("Bar").serializer(OpenApiSerializer.DEFAULT)).build().get("/headers").headers(SerializedHeader.create().name("Foo").value("Baz").serializer(OpenApiSerializer.DEFAULT)).debug().run().assertBody().is("['Bar','Baz']");
checkFooClient().headers((Object)new
Header[]{header("Foo","bar")}).build().get("/headers").headers((Object)new
Header[]{header("Foo","baz")}).debug().run().assertBody().is("['bar','baz']");
checkFooClient().headers(HeaderSupplier.of(header("Foo","bar"))).build().get("/headers").headers(HeaderSupplier.of(header("Foo","baz"))).run().assertBody().is("['bar','baz']");
+
checkFooClient().headers(AList.of(header("Foo","bar"))).build().get("/headers").headers(AList.of(header("Foo","baz"))).run().assertBody().is("['bar','baz']");
checkClient("f").build().get("/headers").headers(bean).debug().run().assertBody().is("['1']");
checkClient("f").build().get("/headers").headers((Object)null).debug().run().assertBody().is("null");
assertThrown(()->client().headers("Foo")).contains("Invalid
type");
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Paths_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Paths_Test.java
index db996c2..7a8cde8 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Paths_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Paths_Test.java
@@ -66,6 +66,7 @@ public class RestClient_Paths_Test {
@Test
public void a03_paths_Object() throws Exception {
client().build().get("/echo/{x}").paths(pair("x","foo")).run().assertBody().contains("HTTP
GET /echo/foo");
+
client().build().get("/echo/{x}").paths(AList.of(pair("x","foo"))).run().assertBody().contains("HTTP
GET /echo/foo");
client().build().get("/echo/{x}").paths(pairs("x","foo")).run().assertBody().contains("HTTP
GET /echo/foo");
client().build().get("/echo/{x}").paths(OMap.of("x","foo")).run().assertBody().contains("HTTP
GET /echo/foo");
client().build().get("/echo/{x}").paths((Object)new
NameValuePair[]{pair("x","foo")}).run().assertBody().contains("HTTP GET
/echo/foo");
diff --git
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Query_Test.java
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Query_Test.java
index 2e9202a..0305db5 100644
---
a/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Query_Test.java
+++
b/juneau-rest/juneau-rest-client-utest/src/test/java/org/apache/juneau/rest/client2/RestClient_Query_Test.java
@@ -142,6 +142,7 @@ public class RestClient_Query_Test {
client().queries(AMap.of("foo","bar")).build().get("/query").run().assertBody().is("foo=bar");
client().queries(pairs("foo","bar","foo","baz")).build().get("/query").run().assertBody().is("foo=bar&foo=baz");
client().queries(pair("foo","bar"),pair("foo","baz")).build().get("/query").run().assertBody().is("foo=bar&foo=baz");
+
client().queries(AList.of(pair("foo","bar"),pair("foo","baz"))).build().get("/query").run().assertBody().is("foo=bar&foo=baz");
client().queries((Object)new
NameValuePair[]{pair("foo","bar")}).build().get("/query").run().assertBody().is("foo=bar");
@@ -150,6 +151,7 @@ public class RestClient_Query_Test {
client().build().get("/query").queries(AMap.of("foo","bar")).run().assertBody().is("foo=bar");
client().build().get("/query").queries(pairs("foo","bar","foo","baz")).run().assertBody().is("foo=bar&foo=baz");
client().build().get("/query").queries(pair("foo","bar"),pair("foo","baz")).run().assertBody().is("foo=bar&foo=baz");
+
client().build().get("/query").queries(AList.of(pair("foo","bar"),pair("foo","baz"))).run().assertBody().is("foo=bar&foo=baz");
client().build().get("/query").queries((Object)new
NameValuePair[]{pair("foo","bar")}).run().assertBody().is("foo=bar");
client().build().get("/query").queries(new
A10()).run().assertBody().is("foo=bar");
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 3caf7eb..31b7abe 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
@@ -281,7 +281,6 @@ import org.apache.http.client.CookieStore;
* <li class='jm'>{@link RestClientBuilder#header(String,Object)
header(String,Object)}
* <li class='jm'>{@link
RestClientBuilder#header(String,Object,HttpPartSchema,HttpPartSerializer)
header(String,Object,HttpPartSerializer,HttpPartSchema)}
* <li class='jm'>{@link RestClientBuilder#header(Header)
header(Header)}
- * <li class='jm'>{@link RestClientBuilder#header(NameValuePair)
header(NameValuePair)}
* <li class='jm'>{@link RestClientBuilder#headers(Object...)
headers(Object...)}
* <li class='jm'>{@link RestClientBuilder#headerPairs(Object...)
headerPairs(Object...)}
* <li class='jm'>{@link RestClientBuilder#accept(Object)
accept(Object)}
@@ -1194,7 +1193,6 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#header(String,Object)
header(String,Object)}
* <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#header(String,Object,HttpPartSchema,HttpPartSerializer)
header(String,Object,HttpPartSerializer,HttpPartSchema)}
* <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#header(Header) header(Header)}
- * <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#header(NameValuePair)
header(NameValuePair)}
* <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#headers(Object...)
headers(Object...)}
* <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#headerPairs(Object...)
headerPairs(Object...)}
* <li class='jm'>{@link
org.apache.juneau.rest.client2.RestClientBuilder#accept(Object) accept(Object)}
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 0c9aff8..6304a21 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
@@ -17,6 +17,7 @@ import static org.apache.juneau.rest.client2.RestClient.*;
import static org.apache.juneau.BeanTraverseContext.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.serializer.OutputStreamSerializer.*;
import static org.apache.juneau.serializer.WriterSerializer.*;
import static org.apache.juneau.oapi.OpenApiCommon.*;
@@ -1270,25 +1271,6 @@ public class RestClientBuilder extends
BeanContextBuilder {
}
/**
- * Sets a header on all requests.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * RestClient c = RestClient
- * .<jsm>create</jsm>()
- *
.header(BasicNameValuePair.<jsm>of</jsm>(<js>"Foo"</js>, <js>"bar"</js>))
- * .build();
- * </p>
- *
- * @param pair The header to set.
- * @return This object (for method chaining).
- */
- @FluentSetter
- public RestClientBuilder header(NameValuePair pair) {
- return headers(pair);
- }
-
- /**
* Sets multiple headers on all requests.
*
* <h5 class='section'>Example:</h5>
@@ -5822,8 +5804,4 @@ public class RestClientBuilder extends BeanContextBuilder
{
private static SerializedHeaderBuilder serializedHeader(Object key,
Object value, HttpPartSerializer serializer, HttpPartSchema schema) {
return key == null ? null :
SerializedHeader.create().name(stringify(key)).value(value).serializer(serializer).schema(schema);
}
-
- private static String className(Object value) {
- return value == null ? null : value.getClass().getName();
- }
}
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 b05e1f8..034bf1e 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
@@ -13,6 +13,7 @@
package org.apache.juneau.rest.client2;
import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.AddFlag.*;
import static org.apache.juneau.httppart.HttpPartType.*;
@@ -3387,10 +3388,6 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
return key == null ? null : new
SerializedHeader(stringify(key), value, serializer, schema, flags == null ?
false : flags.contains(SKIP_IF_EMPTY));
}
- private static String className(Object value) {
- return value.getClass().getName();
- }
-
private static boolean isNameValuePairArray(Object o) {
if (o == null || ! o.getClass().isArray())
return false;
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 2983a6c..9e71e12 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
@@ -940,12 +940,6 @@ public class MockRestClientBuilder extends
RestClientBuilder {
}
@Override /* GENERATED - RestClientBuilder */
- public MockRestClientBuilder header(NameValuePair pair) {
- super.header(pair);
- return this;
- }
-
- @Override /* GENERATED - RestClientBuilder */
public MockRestClientBuilder header(String name, Object value) {
super.header(name, value);
return this;
