This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch jbFixRestNpe
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/jbFixRestNpe by this push:
new a4d051e10 RequestHeaders should be a list.
a4d051e10 is described below
commit a4d051e1075c299c03623dc8b2c3a9edf09c5504
Author: JamesBognar <[email protected]>
AuthorDate: Tue Aug 16 09:30:09 2022 -0400
RequestHeaders should be a list.
---
.../java/org/apache/juneau/rest/RestRequest.java | 4 +-
.../java/org/apache/juneau/rest/arg/HeaderArg.java | 5 +-
.../juneau/rest/httppart/RequestHeaders.java | 233 +++++++++------------
.../http/remote/Remote_HeaderAnnotation_Test.java | 2 +-
.../annotation/Rest_AllowedHeaderParams_Test.java | 50 ++---
.../juneau/rest/client/RestClient_Body_Test.java | 2 +-
.../client/RestClient_CallbackStrings_Test.java | 2 +-
7 files changed, 132 insertions(+), 166 deletions(-)
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 130c69ac5..320a15ba9 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
@@ -1616,9 +1616,7 @@ public final class RestRequest extends
HttpServletRequestWrapper {
public String toString() {
StringBuilder sb = new
StringBuilder("\n").append(getRequestLine()).append("\n");
sb.append("---Headers---\n");
- for (RequestHeader h : getHeaders().getAll()) {
- sb.append("\t").append(h).append("\n");
- }
+ getHeaders().forEach(x ->
sb.append("\t").append(x).append("\n"));
String m = getMethod();
if (m.equals("PUT") || m.equals("POST")) {
try {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
index 4a1f211ad..5ea5c1f53 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
@@ -144,14 +144,13 @@ public class HeaderArg implements RestOpArg {
if (multi) {
Collection c = cm.isArray() ? list() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
- rh.getAll(name).stream().map(x ->
x.parser(ps).schema(schema).as(cm.getElementType()).orElse(null)).forEach(x ->
c.add(x));
+ rh.stream(name).map(x ->
x.parser(ps).schema(schema).as(cm.getElementType()).orElse(null)).forEach(x ->
c.add(x));
return cm.isArray() ? ArrayUtils.toArray(c,
cm.getElementType().getInnerClass()) : c;
}
if (cm.isMapOrBean() && isOneOf(name, "*", "")) {
JsonMap m = new JsonMap();
- for (RequestHeader e : rh.getAll())
- m.put(e.getName(), e.parser(ps).schema(schema
== null ? null :
schema.getProperty(e.getName())).as(cm.getValueType()).orElse(null));
+ rh.forEach(x -> m.put(x.getName(),
x.parser(ps).schema(schema == null ? null :
schema.getProperty(x.getName())).as(cm.getValueType()).orElse(null)));
return req.getBeanSession().convertToType(m, cm);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
index 1e62aebd1..4da341413 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
@@ -20,7 +20,7 @@ import static java.util.stream.Collectors.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import java.util.*;
-import java.util.function.*;
+import java.util.stream.*;
import org.apache.http.*;
import org.apache.juneau.httppart.*;
@@ -68,11 +68,10 @@ import org.apache.juneau.http.header.*;
* <ul class='spaced-list'>
* <li>Methods for retrieving headers:
* <ul class='javatreec'>
- * <li class='jm'>{@link
RequestHeaders#contains(String...) contains(String...)}
+ * <li class='jm'>{@link RequestHeaders#contains(String)
contains(String)}
* <li class='jm'>{@link
RequestHeaders#containsAny(String...) containsAny(String...)}
* <li class='jm'>{@link RequestHeaders#get(Class)
get(Class)}
* <li class='jm'>{@link RequestHeaders#get(String)
get(String)}
- * <li class='jm'>{@link RequestHeaders#getAll() getAll()}
* <li class='jm'>{@link RequestHeaders#getAll(String)
getAll(String)}
* <li class='jm'>{@link RequestHeaders#getFirst(String)
getFirst(String)}
* <li class='jm'>{@link RequestHeaders#getLast(String)
getLast(String)}
@@ -84,7 +83,6 @@ import org.apache.juneau.http.header.*;
* <li class='jm'>{@link
RequestHeaders#addDefault(Header...) addDefault(Header...)}
* <li class='jm'>{@link RequestHeaders#addDefault(List)
addDefault(List)}
* <li class='jm'>{@link
RequestHeaders#addDefault(String,String) addDefault(String,String)}
- * <li class='jm'>{@link RequestHeaders#remove(Header...)
remove(Header...)}
* <li class='jm'>{@link RequestHeaders#remove(String...)
remove(String...)}
* <li class='jm'>{@link RequestHeaders#set(Header...)
set(Header...)}
* <li class='jm'>{@link RequestHeaders#set(String,Object)
set(String,Object)}
@@ -108,19 +106,18 @@ import org.apache.juneau.http.header.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class RequestHeaders {
+public class RequestHeaders extends ArrayList<RequestHeader> {
+
+ private static final long serialVersionUID = 1L;
private final RestRequest req;
- private final boolean caseSensitive;
- private final VarResolverSession vs ;
+ private boolean caseSensitive;
+ private final VarResolverSession vs;
private HttpPartParserSession parser;
- private List<RequestHeader> list = new LinkedList<>();
- private Map<String,List<RequestHeader>> map = new TreeMap<>();
-
/**
- * TODO
+ * Constructor.
*
* @param req The request creating this bean.
* @param query The query parameters on the request (used for
overloaded header values).
@@ -133,14 +130,9 @@ public class RequestHeaders {
for (Enumeration<String> e =
req.getHttpServletRequest().getHeaderNames(); e.hasMoreElements();) {
String name = e.nextElement();
- String key = key(name);
- List<RequestHeader> l = list();
for (Enumeration<String> ve =
req.getHttpServletRequest().getHeaders(name); ve.hasMoreElements();) {
- RequestHeader h = new RequestHeader(req, name,
ve.nextElement());
- list.add(h);
- l.add(h);
+ add(new RequestHeader(req, name,
ve.nextElement()));
}
- map.put(key, l);
}
// Parameters defined on the request URL overwrite existing
headers.
@@ -161,21 +153,22 @@ public class RequestHeaders {
req = copyFrom.req;
caseSensitive = copyFrom.caseSensitive;
parser = copyFrom.parser;
- list.addAll(copyFrom.list);
- map.putAll(copyFrom.map);
+ addAll(copyFrom);
vs = copyFrom.vs;
}
/**
* Subset constructor.
*/
- private RequestHeaders(RequestHeaders copyFrom,
Map<String,List<RequestHeader>> headerMap) {
+ private RequestHeaders(RequestHeaders copyFrom, String...names) {
this.req = copyFrom.req;
- map.putAll(headerMap);
- list =
headerMap.values().stream().flatMap(List::stream).collect(toList());
- parser = copyFrom.parser;
caseSensitive = copyFrom.caseSensitive;
+ parser = copyFrom.parser;
vs = copyFrom.vs;
+ for (String n : names)
+ for (RequestHeader h : copyFrom)
+ if (eq(h.getName(), n))
+ add(h);
}
/**
@@ -186,11 +179,21 @@ public class RequestHeaders {
*/
public RequestHeaders parser(HttpPartParserSession value) {
this.parser = value;
- for (RequestHeader h : list)
+ for (RequestHeader h : this)
h.parser(parser);
return this;
}
+ /**
+ * Sets case sensitivity to <jk>true</jk> for names in this set.
+ *
+ * @return This object (for method chaining).
+ */
+ public RequestHeaders caseSensitive() {
+ this.caseSensitive = true;
+ return this;
+ }
+
//-----------------------------------------------------------------------------------------------------------------
// Basic operations.
//-----------------------------------------------------------------------------------------------------------------
@@ -208,15 +211,12 @@ public class RequestHeaders {
assertArgNotNull("pairs", pairs);
for (Header p : pairs) {
String name = p.getName();
- String key = key(name);
- List<RequestHeader> l = map.get(key);
- boolean hasAllBlanks = l != null &&
l.stream().allMatch(x -> StringUtils.isEmpty(x.getValue()));
- if (l == null || hasAllBlanks) {
- if (hasAllBlanks)
- list.removeAll(l);
+ Stream<RequestHeader> l = stream(name);
+ boolean hasAllBlanks = l.allMatch(x ->
StringUtils.isEmpty(x.getValue()));
+ if (hasAllBlanks) {
+ removeAll(getAll(name));
RequestHeader x = new RequestHeader(req, name,
vs.resolve(p.getValue()));
- list.add(x);
- map.put(key, list(x));
+ add(x);
}
}
return this;
@@ -247,38 +247,13 @@ public class RequestHeaders {
}
/**
- * Returns all the headers with the specified name.
+ * Returns <jk>true</jk> if the header with the specified name is
present.
*
* @param name The header name. Must not be <jk>null</jk>.
- * @return The list of all headers with the specified name, or an empty
list if none are found.
- */
- public List<RequestHeader> getAll(String name) {
- assertArgNotNull("name", name);
- List<RequestHeader> l = map.get(key(name));
- return l == null ? emptyList() : unmodifiable(l);
- }
-
- /**
- * Returns all the headers in this request.
- *
- * @return All the headers in this request.
+ * @return <jk>true</jk> if the headers with the specified name is
present.
*/
- public List<RequestHeader> getAll() {
- return unmodifiable(list);
- }
-
- /**
- * Returns <jk>true</jk> if the headers with the specified names are
present.
- *
- * @param names The header names. Must not be <jk>null</jk>.
- * @return <jk>true</jk> if the headers with the specified names are
present.
- */
- public boolean contains(String...names) {
- assertArgNotNull("names", names);
- for (String n : names)
- if (! map.containsKey(key(n)))
- return false;
- return true;
+ public boolean contains(String name) {
+ return stream(name).findAny().isPresent();
}
/**
@@ -290,20 +265,11 @@ public class RequestHeaders {
public boolean containsAny(String...names) {
assertArgNotNull("names", names);
for (String n : names)
- if (map.containsKey(key(n)))
+ if (stream(n).findAny().isPresent())
return true;
return false;
}
- /**
- * Returns <jk>true</jk> if these headers are empty.
- *
- * @return <jk>true</jk> if these headers are empty.
- */
- public boolean isEmpty() {
- return list.isEmpty();
- }
-
/**
* Adds a request header value.
*
@@ -317,13 +283,7 @@ public class RequestHeaders {
*/
public RequestHeaders add(String name, Object value) {
assertArgNotNull("name", name);
- String key = key(name);
- RequestHeader h = new RequestHeader(req, name,
stringify(value)).parser(parser);
- if (map.containsKey(key))
- map.get(key).add(h);
- else
- map.put(key, list(h));
- list.add(h);
+ add(new RequestHeader(req, name,
stringify(value)).parser(parser));
return this;
}
@@ -362,11 +322,7 @@ public class RequestHeaders {
*/
public RequestHeaders set(String name, Object value) {
assertArgNotNull("name", name);
- String key = key(name);
- remove(key);
- RequestHeader h = new RequestHeader(req, name,
stringify(value)).parser(parser);
- map.put(key, list(h));
- list.add(h);
+ add(new RequestHeader(req, name,
stringify(value)).parser(parser));
return this;
}
@@ -397,24 +353,8 @@ public class RequestHeaders {
*/
public RequestHeaders remove(String...name) {
assertArgNotNull("name", name);
- for (String n : name) {
- String key = key(n);
- if (map.containsKey(key))
- list.removeAll(map.get(key));
- map.remove(key);
- }
- return this;
- }
-
- /**
- * Remove headers.
- *
- * @param headers The headers to remove. Must not be <jk>null</jk>.
- * @return This object.
- */
- public RequestHeaders remove(Header...headers) {
- for (Header h : headers)
- remove(h.getName());
+ for (String n : name)
+ stream(n).forEach(x -> remove(x));
return this;
}
@@ -425,19 +365,55 @@ public class RequestHeaders {
* @return A new list object.
*/
public RequestHeaders subset(String...headers) {
- Map<String,List<RequestHeader>> m = alist(headers)
- .stream()
- .map(x -> key(x))
- .filter(map::containsKey)
- .collect(toMap(Function.identity(),map::get));
-
- return new RequestHeaders(this, m);
+ return new RequestHeaders(this, headers);
}
//-----------------------------------------------------------------------------------------------------------------
// Convenience getters.
//-----------------------------------------------------------------------------------------------------------------
+ /**
+ * Returns all headers with the specified name.
+ *
+ * @param name The header name.
+ * @return The list of all headers with matching names. Never
<jk>null</jk>.
+ */
+ public List<RequestHeader> getAll(String name) {
+ return stream(name).collect(toList());
+ }
+
+ /**
+ * Returns all headers with the specified name.
+ *
+ * @param name The header name.
+ * @return The stream of all headers with matching names. Never
<jk>null</jk>.
+ */
+ public Stream<RequestHeader> stream(String name) {
+ return stream().filter(x -> eq(x.getName(), name));
+ }
+
+ /**
+ * Returns all headers in sorted order.
+ *
+ * @return The stream of all headers in sorted order.
+ */
+ public Stream<RequestHeader> sorted() {
+ Comparator<RequestHeader> x;
+ if (caseSensitive)
+ x = (x1,x2) -> x1.getName().compareTo(x2.getName());
+ else
+ x = (x1,x2) ->
String.CASE_INSENSITIVE_ORDER.compare(x1.getName(), x2.getName());
+ return stream().sorted(x);
+ }
+
+ /**
+ * Returns all the unique header names in this list.
+ * @return The list of all unique header names in this list.
+ */
+ public List<String> getNames() {
+ return stream().map(x -> x.getName()).map(x -> caseSensitive ?
x : x.toLowerCase()).distinct().collect(toList());
+ }
+
/**
* Returns the first header with the specified name.
*
@@ -450,8 +426,7 @@ public class RequestHeaders {
*/
public RequestHeader getFirst(String name) {
assertArgNotNull("name", name);
- List<RequestHeader> l = map.get(key(name));
- return (l == null || l.isEmpty() ? new RequestHeader(req, name,
null).parser(parser) : l.get(0));
+ return stream(name).findFirst().orElseGet(()->new
RequestHeader(req, name, null).parser(parser));
}
/**
@@ -466,13 +441,17 @@ public class RequestHeaders {
*/
public RequestHeader getLast(String name) {
assertArgNotNull("name", name);
- List<RequestHeader> l = map.get(key(name));
- return (l == null || l.isEmpty() ? new RequestHeader(req, name,
null).parser(parser) : l.get(l.size()-1));
+ Value<RequestHeader> v = Value.empty();
+ stream(name).forEach(x -> v.set(x));
+ return v.orElseGet(() -> new RequestHeader(req, name,
null).parser(parser));
}
/**
* Returns the condensed header with the specified name.
*
+ * <p>
+ * If multiple headers are present, they will be combined into a single
comma-delimited list.
+ *
* @param name The header name.
* @return The header, never <jk>null</jk>.
*/
@@ -521,31 +500,21 @@ public class RequestHeaders {
return new RequestHeaders(this);
}
- /**
- * Converts the headers to a readable string.
- *
- * @param sorted Sort the headers by name.
- * @return A JSON string containing the contents of the headers.
- */
- public String toString(boolean sorted) {
- JsonMap m = JsonMap.create();
- if (sorted) {
- for (List<RequestHeader> h1 : map.values())
- for (RequestHeader h2 : h1)
- m.append(h2.getName(), h2.getValue());
- } else {
- for (RequestHeader h : list)
- m.append(h.getName(), h.getValue());
- }
- return m.toString();
- }
-
private String key(String name) {
return caseSensitive ? name : name.toLowerCase();
}
+ private boolean eq(String s1, String s2) {
+ if (caseSensitive)
+ return StringUtils.eq(s1, s2);
+ return StringUtils.eqic(s1, s2);
+ }
+
@Override /* Object */
public String toString() {
- return toString(false);
+ JsonMap m = new JsonMap();
+ for (String n : getNames())
+ m.put(n, get(n).asString().orElse(null));
+ return m.asJson();
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
index 5c41e162f..1f5c6a521 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_HeaderAnnotation_Test.java
@@ -679,7 +679,7 @@ public class Remote_HeaderAnnotation_Test {
public static class K {
@RestOp
public String get(RestRequest req) throws Exception {
- return
req.getHeaders().subset("a,b,c,d,e,f,g,h,i,i1,i2,i3,a1,a2,a3,a4,b1,b2,b3,b4,c1,c2,c3,c4,e1,e2,e3,e4,f1,f2,f3,f4".split("\\,")).toString(true);
+ return
req.getHeaders().subset("a,b,c,d,e,f,g,h,i,i1,i2,i3,a1,a2,a3,a4,b1,b2,b3,b4,c1,c2,c3,c4,e1,e2,e3,e4,f1,f2,f3,f4".split("\\,")).toString();
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
index a1676cc89..5871d969f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_AllowedHeaderParams_Test.java
@@ -32,7 +32,7 @@ public class Rest_AllowedHeaderParams_Test {
public String put(RequestHeaders h) {
Accept accept =
h.get("Accept").as(Accept.class).orElse(Accept.NULL);
ContentType contentType =
h.get("Content-Type").as(ContentType.class).orElse(ContentType.NULL);
- return "Accept="+(accept.isPresent() ? accept.get() :
null)+",Content-Type=" + (contentType.isPresent() ? contentType.get() : null) +
",Custom=" + h.get("Custom").orElse(null);
+ return "Accept="+(accept.isPresent() ? accept.get() :
null)+"; Content-Type=" + (contentType.isPresent() ? contentType.get() : null)
+ "; Custom=" + h.get("Custom").orElse(null);
}
}
@@ -64,43 +64,43 @@ public class Rest_AllowedHeaderParams_Test {
@Test
public void a01_basic() throws Exception {
RestClient a1 = MockRestClient.build(A1.class);
- a1.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a1.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+bar1,Content-Type=text/plain+bar2,Custom=foo3");
-
a1.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+bar1,Content-Type=text/plain+bar2,Custom=foo3");
+ a1.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a1.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1, text/plain+bar1;
Content-Type=text/plain+foo2, text/plain+bar2; Custom=foo3");
+
a1.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1, text/plain+bar1;
Content-Type=text/plain+foo2, text/plain+bar2; Custom=foo3");
RestClient a2 = MockRestClient.build(A2.class);
- a2.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a2.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+bar1,Content-Type=text/plain+bar2,Custom=foo3");
-
a2.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+bar1,Content-Type=text/plain+bar2,Custom=foo3");
+ a2.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a2.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1, text/plain+bar1;
Content-Type=text/plain+foo2, text/plain+bar2; Custom=foo3");
+
a2.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1, text/plain+bar1;
Content-Type=text/plain+foo2, text/plain+bar2; Custom=foo3");
RestClient a3 = MockRestClient.build(A3.class);
- a3.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a3.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+bar1,Content-Type=text/plain+bar2,Custom=foo3");
-
a3.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+bar1,Content-Type=text/plain+bar2,Custom=foo3");
+ a3.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a3.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1, text/plain+bar1;
Content-Type=text/plain+foo2, text/plain+bar2; Custom=foo3");
+
a3.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1, text/plain+bar1;
Content-Type=text/plain+foo2, text/plain+bar2; Custom=foo3");
RestClient a4 = MockRestClient.build(A4.class);
- a4.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a4.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=bar3");
-
a4.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=bar3");
+ a4.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a4.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3, bar3");
+
a4.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3, bar3");
RestClient a5 = MockRestClient.build(A5.class);
- a5.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a5.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+bar1,Content-Type=text/plain+bar2,Custom=bar3");
-
a5.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+bar1,Content-Type=text/plain+bar2,Custom=bar3");
+ a5.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a5.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1, text/plain+bar1;
Content-Type=text/plain+foo2, text/plain+bar2; Custom=foo3, bar3");
+
a5.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1, text/plain+bar1;
Content-Type=text/plain+foo2, text/plain+bar2; Custom=foo3, bar3");
RestClient a6 = MockRestClient.build(A6.class);
- a6.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a6.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a6.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
+ a6.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a6.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a6.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
RestClient a7 = MockRestClient.build(A7.class);
- a7.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a7.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a7.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
+ a7.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a7.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a7.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
RestClient a8 = MockRestClient.build(A8.class);
- a8.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a8.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
-
a8.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1,Content-Type=text/plain+foo2,Custom=foo3");
+ a8.put("/",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a8.put("/?Accept=text/plain%2Bbar1&Content-Type=text/plain%2Bbar2&Custom=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
+
a8.put("/?ACCEPT=text/plain%2Bbar1&CONTENT-TYPE=text/plain%2Bbar2&CUSTOM=bar3",
"").accept("text/plain+foo1").contentType("text/plain+foo2").header("Custom",
"foo3").run().assertContent("Accept=text/plain+foo1;
Content-Type=text/plain+foo2; Custom=foo3");
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
index 9e5914a15..aaa7427a5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
@@ -40,7 +40,7 @@ public class RestClient_Body_Test {
public static class A extends BasicRestObject {
@RestPost
public Reader post(org.apache.juneau.rest.RestRequest req,
org.apache.juneau.rest.RestResponse res) throws IOException {
- for (RequestHeader e : req.getHeaders().getAll())
+ for (RequestHeader e : req.getHeaders())
res.addHeader("X-" + e.getName(), e.getValue());
return req.getReader();
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
index 6cdc6248a..6012e56c1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_CallbackStrings_Test.java
@@ -43,7 +43,7 @@ public class RestClient_CallbackStrings_Test {
}
private Map<String,Object> getFooHeaders(RestRequest req) {
Map<String,Object> m = new TreeMap<>();
- req.getHeaders().getAll().stream().filter(x ->
x.getName().startsWith("Foo-")).forEach(x -> m.put(x.getName(), x.getValue()));
+ req.getHeaders().stream().filter(x ->
x.getName().startsWith("Foo-")).forEach(x -> m.put(x.getName(), x.getValue()));
return m;
}
}
