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 1e279cd45 Fix build failure
1e279cd45 is described below
commit 1e279cd4556e7b0b02da0188f56f3e223976789a
Author: JamesBognar <[email protected]>
AuthorDate: Tue Aug 16 10:30:13 2022 -0400
Fix build failure
---
.../org/apache/juneau/rest/client/RestRequest.java | 2 +
.../rest/filefinder/BasicRestFileFinder.java | 2 +-
.../juneau/rest/httppart/RequestHeaders.java | 74 ++++++++++------------
3 files changed, 37 insertions(+), 41 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 3a8853baa..692fe1f98 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
@@ -2188,6 +2188,8 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
/**
* A shortcut for calling
<c>run().getContent().as(<js>type</js>,<js>args</js>)</c>.
*
+ * @param <T>
+ * The object type to create.
* @param type
* The object type to create.
* <br>Can be any of the following: {@link ClassMeta}, {@link
Class}, {@link ParameterizedType}, {@link GenericArrayType}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/filefinder/BasicRestFileFinder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/filefinder/BasicRestFileFinder.java
index 3ffb2a502..f79ca5ffc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/filefinder/BasicRestFileFinder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/filefinder/BasicRestFileFinder.java
@@ -29,7 +29,7 @@ import org.apache.juneau.rest.*;
*
* <ul class='notes'>
* <li>Files up to 1MB are cached in memory.
- * <li>Files with {@link "class"} and {@link "properties"} are excluded
for security purposes.
+ * <li>Files with {@code "class"} and {@code "properties"} are excluded
for security purposes.
* </ul>
*/
public class BasicRestFileFinder extends BasicFileFinder {
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 4da341413..adb7ba30b 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
@@ -83,7 +83,7 @@ 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(String...)
remove(String...)}
+ * <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)}
* </ul>
@@ -166,9 +166,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
parser = copyFrom.parser;
vs = copyFrom.vs;
for (String n : names)
- for (RequestHeader h : copyFrom)
- if (eq(h.getName(), n))
- add(h);
+ copyFrom.stream().filter(x -> eq(x.getName(),
n)).forEach(x -> add(x));
}
/**
@@ -179,8 +177,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
*/
public RequestHeaders parser(HttpPartParserSession value) {
this.parser = value;
- for (RequestHeader h : this)
- h.parser(parser);
+ forEach(x -> x.parser(parser));
return this;
}
@@ -215,8 +212,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
boolean hasAllBlanks = l.allMatch(x ->
StringUtils.isEmpty(x.getValue()));
if (hasAllBlanks) {
removeAll(getAll(name));
- RequestHeader x = new RequestHeader(req, name,
vs.resolve(p.getValue()));
- add(x);
+ add(new RequestHeader(req, name,
vs.resolve(p.getValue())));
}
}
return this;
@@ -246,30 +242,6 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
return addDefault(BasicStringHeader.of(name, value));
}
- /**
- * 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 <jk>true</jk> if the headers with the specified name is
present.
- */
- public boolean contains(String name) {
- return stream(name).findAny().isPresent();
- }
-
- /**
- * Returns <jk>true</jk> if the header with any of the specified names
are present.
- *
- * @param names The header names. Must not be <jk>null</jk>.
- * @return <jk>true</jk> if the header with any of the specified names
are present.
- */
- public boolean containsAny(String...names) {
- assertArgNotNull("names", names);
- for (String n : names)
- if (stream(n).findAny().isPresent())
- return true;
- return false;
- }
-
/**
* Adds a request header value.
*
@@ -299,10 +271,9 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
*/
public RequestHeaders add(Header...headers) {
assertArgNotNull("headers", headers);
- for (Header h : headers) {
+ for (Header h : headers)
if (h != null)
add(h.getName(), h.getValue());
- }
return this;
}
@@ -322,7 +293,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
*/
public RequestHeaders set(String name, Object value) {
assertArgNotNull("name", name);
- add(new RequestHeader(req, name,
stringify(value)).parser(parser));
+ set(new RequestHeader(req, name,
stringify(value)).parser(parser));
return this;
}
@@ -346,15 +317,14 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
}
/**
- * Remove headers.
+ * Remove header by name.
*
* @param name The header names. Must not be <jk>null</jk>.
* @return This object.
*/
- public RequestHeaders remove(String...name) {
+ public RequestHeaders remove(String name) {
assertArgNotNull("name", name);
- for (String n : name)
- stream(n).forEach(x -> remove(x));
+ stream(name).forEach(x -> remove(x));
return this;
}
@@ -372,6 +342,30 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
// Convenience getters.
//-----------------------------------------------------------------------------------------------------------------
+ /**
+ * 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 <jk>true</jk> if the header with the specified name is
present.
+ */
+ public boolean contains(String name) {
+ return stream(name).findAny().isPresent();
+ }
+
+ /**
+ * Returns <jk>true</jk> if the header with any of the specified names
are present.
+ *
+ * @param names The header names. Must not be <jk>null</jk>.
+ * @return <jk>true</jk> if the header with any of the specified names
are present.
+ */
+ public boolean containsAny(String...names) {
+ assertArgNotNull("names", names);
+ for (String n : names)
+ if (stream(n).findAny().isPresent())
+ return true;
+ return false;
+ }
+
/**
* Returns all headers with the specified name.
*
@@ -397,7 +391,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
*
* @return The stream of all headers in sorted order.
*/
- public Stream<RequestHeader> sorted() {
+ public Stream<RequestHeader> getSorted() {
Comparator<RequestHeader> x;
if (caseSensitive)
x = (x1,x2) -> x1.getName().compareTo(x2.getName());
