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 e68fae5 REST refactoring.
e68fae5 is described below
commit e68fae5500ca5acc9356b3f37fb27a019b589671
Author: JamesBognar <[email protected]>
AuthorDate: Thu Mar 4 14:38:43 2021 -0500
REST refactoring.
---
.../java/org/apache/juneau/http/HttpParts.java | 42 ++++++++++++++++++++++
.../rest/test/client/ThirdPartyProxyTest.java | 5 +--
.../org/apache/juneau/rest/client/RestClient.java | 3 +-
.../java/org/apache/juneau/http/PartList_Test.java | 8 ++---
.../http/remote/Remote_BodyAnnotation_Test.java | 7 ++--
.../remote/Remote_FormDataAnnotation_Test.java | 2 +-
.../http/remote/Remote_PathAnnotation_Test.java | 2 +-
.../http/remote/Remote_QueryAnnotation_Test.java | 2 +-
.../rest/client/RestClient_BasicCalls_Test.java | 2 +-
.../rest/client/RestClient_FormData_Test.java | 2 +-
.../juneau/rest/client/RestClient_Paths_Test.java | 2 +-
.../juneau/rest/client/RestClient_Query_Test.java | 2 +-
12 files changed, 62 insertions(+), 17 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
index 09cd078..d9e61a6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/HttpParts.java
@@ -358,4 +358,46 @@ public class HttpParts {
public static final SerializedPart serializedPart(String name,
Supplier<?> value) {
return SerializedPart.of(name, value);
}
+
+ /**
+ * Instantiates a new {@link PartListBuilder}.
+ *
+ * @return A new empty builder.
+ */
+ public static final PartListBuilder partListBuilder() {
+ return PartList.create();
+ }
+
+ /**
+ * Creates a new {@link PartList} initialized with the specified parts.
+ *
+ * @param parts The parts to add to the list. Can be <jk>null</jk>.
<jk>null</jk> entries are ignored.
+ * @return A new unmodifiable instance, never <jk>null</jk>.
+ */
+ public static final PartList partList(List<Part> parts) {
+ return PartList.of(parts);
+ }
+
+ /**
+ * Creates a new {@link PartList} initialized with the specified parts.
+ *
+ * @param parts The parts to add to the list. <jk>null</jk> entries
are ignored.
+ * @return A new unmodifiable instance, never <jk>null</jk>.
+ */
+ public static final PartList partList(Part...parts) {
+ return PartList.of(parts);
+ }
+
+ /**
+ * Creates a new {@link PartList} initialized with the specified
name/value pairs.
+ *
+ * @param pairs
+ * Initial list of pairs.
+ * <br>Must be an even number of parameters representing key/value
pairs.
+ * @throws RuntimeException If odd number of parameters were specified.
+ * @return A new instance.
+ */
+ public static PartList partList(Object...pairs) {
+ return PartList.ofPairs(pairs);
+ }
}
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index 9cd8096..f412d33 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.runners.MethodSorters.*;
import static org.apache.juneau.http.HttpHeaders.*;
+import static org.apache.juneau.http.HttpParts.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -376,7 +377,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Test
public void b12_partListQuery() throws Exception {
String r = proxy.partListQuery(
- PartList.ofPairs("a","foo","b","","c",null)
+ partList("a","foo","b","","c",null)
);
assertEquals("OK", r);
}
@@ -505,7 +506,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Test
public void c10_partListFormData() throws Exception {
String r = proxy.partListFormData(
- PartList.ofPairs("a","foo","b","","c",null)
+ partList("a","foo","b","","c",null)
);
assertEquals("OK", r);
}
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 10b7a14..540831a 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.AddFlag.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.http.HttpHeaders.*;
+import static org.apache.juneau.http.HttpParts.*;
import static java.util.logging.Level.*;
import static org.apache.juneau.internal.StateMachineState.*;
import static java.lang.Character.*;
@@ -2597,7 +2598,7 @@ public class RestClient extends BeanContext implements
HttpClient, Closeable, Re
* @throws RestCallException If any authentication errors occurred.
*/
public RestRequest formPostPairs(Object uri, Object...parameters)
throws RestCallException {
- return formPost(uri, PartList.ofPairs(parameters));
+ return formPost(uri, partList(parameters));
}
/**
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/PartList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/PartList_Test.java
index a1cedb3..6de157c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/PartList_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/PartList_Test.java
@@ -52,16 +52,16 @@ public class PartList_Test {
public void a02_creators() {
PartList x;
- x = PartList.of(part("Foo","bar"), part("Foo","baz"), null);
+ x = partList(part("Foo","bar"), part("Foo","baz"), null);
assertObject(x.iterator()).asJson().is("['Foo=bar','Foo=baz']");
- x = PartList.of(AList.of(part("Foo","bar"), part("Foo","baz"),
null));
+ x = partList(AList.of(part("Foo","bar"), part("Foo","baz"),
null));
assertObject(x.iterator()).asJson().is("['Foo=bar','Foo=baz']");
- x = PartList.ofPairs("Foo","bar","Foo","baz");
+ x = partList("Foo","bar","Foo","baz");
assertObject(x.iterator()).asJson().is("['Foo=bar','Foo=baz']");
- assertThrown(()->PartList.ofPairs("Foo")).is("Odd number of
parameters passed into PartList.ofPairs()");
+ assertThrown(()->partList("Foo")).is("Odd number of parameters
passed into PartList.ofPairs()");
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_BodyAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_BodyAnnotation_Test.java
index 114e157..06a028a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_BodyAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_BodyAnnotation_Test.java
@@ -14,6 +14,7 @@ package org.apache.juneau.http.remote;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
+import static org.apache.juneau.http.HttpParts.*;
import java.io.*;
import java.util.*;
@@ -147,7 +148,7 @@ public class Remote_BodyAnnotation_Test {
assertEquals("xxx",x.postX7(new StringReader("xxx")));
assertEquals("xxx",x.postX8(new StringInputStream("xxx")));
assertEquals("xxx",x.postX9(new StringEntity("xxx")));
-
assertEquals("foo=bar",x.postX10(PartList.ofPairs("foo","bar")));
+ assertEquals("foo=bar",x.postX10(partList("foo","bar")));
}
//-----------------------------------------------------------------------------------------------------------------
@@ -242,7 +243,7 @@ public class Remote_BodyAnnotation_Test {
assertEquals("xxx",x.postX7(new StringReader("xxx")));
assertEquals("xxx",x.postX8(new StringInputStream("xxx")));
assertEquals("xxx",x.postX9(new
StringEntity("xxx",org.apache.http.entity.ContentType.create("text/plain"))));
-
assertEquals("foo=bar",x.postX10(PartList.ofPairs("foo","bar")));
+ assertEquals("foo=bar",x.postX10(partList("foo","bar")));
}
//-----------------------------------------------------------------------------------------------------------------
@@ -322,6 +323,6 @@ public class Remote_BodyAnnotation_Test {
assertEquals("xxx",x.postX7(new StringReader("xxx")));
assertEquals("xxx",x.postX8(new StringInputStream("xxx")));
assertEquals("xxx",x.postX9(new
StringEntity("xxx",org.apache.http.entity.ContentType.create("text/plain"))));
-
assertEquals("foo=bar",x.postX10(PartList.ofPairs("foo","bar")));
+ assertEquals("foo=bar",x.postX10(partList("foo","bar")));
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
index 93e7d1a..d3ea94d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_FormDataAnnotation_Test.java
@@ -976,7 +976,7 @@ public class Remote_FormDataAnnotation_Test {
}
private static PartList parts(Object...pairs) {
- return PartList.ofPairs(pairs);
+ return partList(pairs);
}
private static RestClientBuilder client(Class<?> c) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
index 198fde1..993b945 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_PathAnnotation_Test.java
@@ -776,7 +776,7 @@ public class Remote_PathAnnotation_Test {
//------------------------------------------------------------------------------------------------------------------
private static PartList parts(Object...pairs) {
- return PartList.ofPairs(pairs);
+ return partList(pairs);
}
private static NameValuePair part(String key, Object val) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
index df3b933..fed8c1b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_QueryAnnotation_Test.java
@@ -939,7 +939,7 @@ public class Remote_QueryAnnotation_Test {
//------------------------------------------------------------------------------------------------------------------
private static PartList parts(Object...pairs) {
- return PartList.ofPairs(pairs);
+ return partList(pairs);
}
private static NameValuePair part(String key,Object val) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
index b1dd3f4..8471b4a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
@@ -441,7 +441,7 @@ public class RestClient_BasicCalls_Test {
}
private static PartList parts(Object...pairs) {
- return PartList.ofPairs(pairs);
+ return partList(pairs);
}
private static RestClientBuilder client() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
index b7d3473..1f81a33 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
@@ -226,7 +226,7 @@ public class RestClient_FormData_Test {
}
private static PartList parts(Object...pairs) {
- return PartList.ofPairs(pairs);
+ return partList(pairs);
}
private static RestClientBuilder client() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
index 03451f7..1fcf6a3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
@@ -97,7 +97,7 @@ public class RestClient_Paths_Test {
}
private static PartList pairs(Object...pairs) {
- return PartList.ofPairs(pairs);
+ return partList(pairs);
}
private static RestClientBuilder client() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
index 3d4f151..f513f8d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Query_Test.java
@@ -198,7 +198,7 @@ public class RestClient_Query_Test {
}
private static PartList parts(Object...pairs) {
- return PartList.ofPairs(pairs);
+ return partList(pairs);
}
private static RestClientBuilder client() {
