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 523bb2a Collections usage optimizations.
523bb2a is described below
commit 523bb2ad99054832d8706905be197b4c8b0bda5c
Author: JamesBognar <[email protected]>
AuthorDate: Sat Feb 19 12:44:20 2022 -0500
Collections usage optimizations.
---
.../main/ConfigurablePropertyCodeGenerator.java | 4 +-
juneau-all/src/java/main/FieldSorter.java | 5 ++-
.../org/apache/juneau/dto/swagger/Operation.java | 2 +-
.../main/java/org/apache/juneau/BeanContext.java | 14 +++----
.../main/java/org/apache/juneau/BeanSession.java | 2 +-
.../juneau/annotation/BeanConfigAnnotation.java | 4 +-
.../java/org/apache/juneau/collections/Args.java | 3 +-
.../java/org/apache/juneau/collections/OMap.java | 2 +-
.../java/org/apache/juneau/cp/BasicFileFinder.java | 5 +--
.../org/apache/juneau/cp/DefaultClassList.java | 3 +-
.../main/java/org/apache/juneau/cp/FileFinder.java | 4 +-
.../apache/juneau/csv/CsvSerializerSession.java | 4 +-
.../org/apache/juneau/encoders/EncoderSet.java | 3 +-
.../juneau/http/header/BasicCsvArrayHeader.java | 2 +-
.../org/apache/juneau/http/header/HeaderList.java | 10 ++---
.../java/org/apache/juneau/http/header/Thrown.java | 2 +-
.../java/org/apache/juneau/http/part/PartList.java | 8 ++--
.../apache/juneau/internal/AnnotationUtils.java | 3 +-
.../java/org/apache/juneau/parser/ParserSet.java | 6 +--
.../org/apache/juneau/pojotools/SearchArgs.java | 2 +-
.../java/org/apache/juneau/pojotools/SortArgs.java | 2 +-
.../java/org/apache/juneau/pojotools/ViewArgs.java | 2 +-
.../juneau/serializer/SerializerSession.java | 3 +-
.../apache/juneau/serializer/SerializerSet.java | 3 +-
.../main/java/org/apache/juneau/svl/VarList.java | 6 +--
.../java/org/apache/juneau/utils/PojoQuery.java | 2 +-
.../java/org/apache/juneau/utils/SearchArgs.java | 2 +-
.../juneau/examples/rest/RootContentTest.java | 4 +-
.../rest/test/client/ThirdPartyProxyResource.java | 17 ++++----
.../rest/test/client/ThirdPartyProxyTest.java | 46 +++++++++++-----------
.../org/apache/juneau/rest/client/RestClient.java | 4 +-
.../juneau/rest/mock/MockServletRequest.java | 4 +-
.../juneau/rest/mock/MockServletResponse.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 7 ++--
.../java/org/apache/juneau/rest/RestOpContext.java | 12 +++---
.../org/apache/juneau/rest/arg/CookieList.java | 4 +-
.../org/apache/juneau/rest/arg/RestOpArgList.java | 2 +-
.../juneau/rest/httppart/RequestAttributes.java | 2 +-
.../juneau/rest/httppart/RequestHeaders.java | 5 +--
.../juneau/rest/httppart/RequestPathParams.java | 2 +-
.../juneau/rest/httppart/RequestQueryParams.java | 2 +-
.../rest/processor/ResponseBeanProcessor.java | 3 +-
.../rest/processor/ResponseProcessorList.java | 6 +--
.../apache/juneau/rest/staticfile/StaticFiles.java | 2 +-
.../org/apache/juneau/rest/stats/ThrownStore.java | 2 +-
.../org/apache/juneau/rest/widget/Tooltip.java | 3 +-
46 files changed, 117 insertions(+), 120 deletions(-)
diff --git a/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
b/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
index 3b58119..014ef12 100644
--- a/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
+++ b/juneau-all/src/java/main/ConfigurablePropertyCodeGenerator.java
@@ -135,10 +135,10 @@ public class ConfigurablePropertyCodeGenerator {
StringBuilder sigLine =
new StringBuilder();
sigLine.append("\n").append(indent).append("public ");
if
(m.getTypeParameters().length > 0)
-
sigLine.append("<").append(Arrays.asList(m.getTypeParameters()).stream().map(x
-> x.getName()).collect(Collectors.joining(", "))).append("> ");
+
sigLine.append("<").append(alist(m.getTypeParameters()).stream().map(x ->
x.getName()).collect(Collectors.joining(", "))).append("> ");
sigLine.append(cName).append(" ").append(mSig).append(" ");
if (
m.getExceptionTypes().length > 0)
-
sigLine.append("throws
").append(Arrays.asList(m.getExceptionTypes()).stream().map(x ->
x.getSimpleName()).collect(Collectors.joining(", ")));
+
sigLine.append("throws ").append(alist(m.getExceptionTypes()).stream().map(x ->
x.getSimpleName()).collect(Collectors.joining(", ")));
sigLine.append("{");
String sigLine2 =
sigLine.toString();
diff --git a/juneau-all/src/java/main/FieldSorter.java
b/juneau-all/src/java/main/FieldSorter.java
index 81896ff..dda7c1e 100644
--- a/juneau-all/src/java/main/FieldSorter.java
+++ b/juneau-all/src/java/main/FieldSorter.java
@@ -10,13 +10,14 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
// * specific language governing permissions and limitations under the
License. *
//
***************************************************************************************************************************
-import java.util.*;
+import static org.apache.juneau.internal.CollectionUtils.*;
+
import java.util.stream.*;
public class FieldSorter {
public static void main(String[] args) {
String in = "properties, p, excludeProperties, x,
readOnlyProperties, ro, writeOnlyProperties, wo, example, typeName,
typePropertyName";
-
System.err.println(Arrays.asList(in.split("[\\s\\,]+")).stream().sorted().collect(Collectors.joining(",
")));
+
System.err.println(alist(in.split("[\\s\\,]+")).stream().sorted().collect(Collectors.joining(",
")));
}
}
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
index dbe84cb..1634ae7 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
@@ -1133,7 +1133,7 @@ public class Operation extends SwaggerElement {
*/
public Operation security(String scheme, String...alternatives) {
Map<String,List<String>> m = map();
- m.put(scheme, Arrays.asList(alternatives));
+ m.put(scheme, alist(alternatives));
addSecurity(Collections.singletonList(m));
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 376ff50..d8c5bdf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -18,8 +18,6 @@ import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
-import static java.util.Arrays.*;
-
import java.beans.*;
import java.io.*;
import java.lang.annotation.*;
@@ -1724,7 +1722,7 @@ public class BeanContext extends Context {
*/
@FluentSetter
public Builder beanDictionary(Class<?>...values) {
- return beanDictionary(asList(values));
+ return beanDictionary(alist(values));
}
/**
@@ -2611,7 +2609,7 @@ public class BeanContext extends Context {
*/
@FluentSetter
public Builder notBeanClasses(Class<?>...values) {
- return notBeanClasses(asList(values));
+ return notBeanClasses(alist(values));
}
/**
@@ -2681,7 +2679,7 @@ public class BeanContext extends Context {
*/
@FluentSetter
public Builder notBeanPackages(String...values) {
- return notBeanPackages(asList(values));
+ return notBeanPackages(alist(values));
}
/**
@@ -3021,7 +3019,7 @@ public class BeanContext extends Context {
*/
@FluentSetter
public Builder swaps(Class<?>...values) {
- return swaps(asList(values));
+ return swaps(alist(values));
}
/**
@@ -3571,9 +3569,9 @@ public class BeanContext extends Context {
notBeanPackages =
optional(builder.notBeanPackages).map(ArrayList::new).map(Collections::unmodifiableList).orElse(emptyList());
propertyNamer = builder.propertyNamer != null ?
builder.propertyNamer : BasicPropertyNamer.class;
- notBeanClassesArray = notBeanClasses.isEmpty() ?
DEFAULT_NOTBEAN_CLASSES : Stream.of(notBeanClasses,
asList(DEFAULT_NOTBEAN_CLASSES)).flatMap(Collection::stream).toArray(Class[]::new);
+ notBeanClassesArray = notBeanClasses.isEmpty() ?
DEFAULT_NOTBEAN_CLASSES : Stream.of(notBeanClasses,
alist(DEFAULT_NOTBEAN_CLASSES)).flatMap(Collection::stream).toArray(Class[]::new);
- String[] _notBeanPackages = notBeanPackages.isEmpty() ?
DEFAULT_NOTBEAN_PACKAGES : Stream.of(notBeanPackages,
asList(DEFAULT_NOTBEAN_PACKAGES)).flatMap(Collection::stream).toArray(String[]::new);
+ String[] _notBeanPackages = notBeanPackages.isEmpty() ?
DEFAULT_NOTBEAN_PACKAGES : Stream.of(notBeanPackages,
alist(DEFAULT_NOTBEAN_PACKAGES)).flatMap(Collection::stream).toArray(String[]::new);
notBeanPackageNames = Stream.of(_notBeanPackages).filter(x -> !
x.endsWith(".*")).toArray(String[]::new);
notBeanPackagePrefixes = Stream.of(_notBeanPackages).filter(x
-> x.endsWith(".*")).map(x -> x.substring(0,
x.length()-2)).toArray(String[]::new);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 1e6a789..6c3e410 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -712,7 +712,7 @@ public class BeanSession extends ContextSession {
if (from.isCollection())
return (T)toArray(to,
(Collection)value);
else if (from.isArray())
- return (T)toArray(to,
Arrays.asList((Object[])value));
+ return (T)toArray(to,
alist((Object[])value));
else if (startsWith(value.toString(), '['))
return (T)toArray(to,
OList.ofJson(value.toString()).setBeanSession(this));
else if (to.hasMutaterFrom(from))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
index 993bc7e..99e9e7f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static java.util.Arrays.*;
+import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -80,7 +80,7 @@ public class BeanConfigAnnotation {
classes(a.notBeanClasses()).ifPresent(x ->
b.notBeanClasses(x));
classes(a.notBeanClasses_replace()).ifPresent(x -> {
b.notBeanClasses().clear(); b.notBeanClasses(x);});
type(a.propertyNamer()).ifPresent(x ->
b.propertyNamer(x));
- asList(a.interfaces()).stream().map(x ->
BeanAnnotation.create(x).interfaceClass(x).build()).forEach(x ->
b.annotations(x));
+ alist(a.interfaces()).stream().map(x ->
BeanAnnotation.create(x).interfaceClass(x).build()).forEach(x ->
b.annotations(x));
strings(a.notBeanPackages()).ifPresent(x ->
b.notBeanPackages(x));
strings(a.notBeanPackages_replace()).ifPresent(x ->
{b.notBeanPackages().clear(); b.notBeanPackages(x);});
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
index 230ac66..e1e24cb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
@@ -13,6 +13,7 @@
package org.apache.juneau.collections;
import static org.apache.juneau.internal.ThrowableUtils.*;
+import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.util.*;
@@ -120,7 +121,7 @@ public final class Args extends OMap {
* @param args Arguments passed in through a <c>main(String[] args)</c>
method.
*/
public Args(String[] args) {
- List<String> argList = new LinkedList<>(Arrays.asList(args));
+ List<String> argList = linkedList(args);
// Capture the main arguments.
Integer i = 0;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OMap.java
index 6464eaf..8d7d282 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/OMap.java
@@ -911,7 +911,7 @@ public class OMap extends LinkedHashMap<String,Object> {
else if (s instanceof String[])
r = (String[])s;
else if (s instanceof Object[])
- r =
ArrayUtils.toStringArray(Arrays.asList((Object[])s));
+ r = ArrayUtils.toStringArray(alist((Object[])s));
else
r = split(stringify(s));
return (r.length == 0 ? def : r);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
index 886ac83..e5d2ee4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
@@ -18,7 +18,6 @@ import static org.apache.juneau.internal.FileUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
-import static java.util.Arrays.*;
import static java.util.stream.Collectors.*;
import java.io.*;
@@ -268,11 +267,11 @@ public class BasicFileFinder implements FileFinder {
}
private List<String> getIncludePatterns() {
- return
asList(include).stream().map(x->x.pattern()).collect(toList());
+ return
alist(include).stream().map(x->x.pattern()).collect(toList());
}
private List<String> getExcludePatterns() {
- return
asList(include).stream().map(x->x.pattern()).collect(toList());
+ return
alist(include).stream().map(x->x.pattern()).collect(toList());
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
index d1a4d08..6a2682e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.cp;
-import static java.util.Arrays.*;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -83,7 +82,7 @@ public class DefaultClassList {
* @return This object.
*/
public DefaultClassList add(Class<?>...values) {
- entries.addAll(0, asList(values));
+ entries.addAll(0, alist(values));
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
index 024f08d..d40d720 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -214,7 +214,7 @@ public interface FileFinder {
*/
@FluentSetter
public Builder include(String...patterns) {
- this.include =
Arrays.asList(patterns).stream().map(x->Pattern.compile(x)).collect(Collectors.toList());
+ this.include =
alist(patterns).stream().map(x->Pattern.compile(x)).collect(Collectors.toList());
return this;
}
@@ -228,7 +228,7 @@ public interface FileFinder {
*/
@FluentSetter
public Builder exclude(String...patterns) {
- this.exclude =
Arrays.asList(patterns).stream().map(x->Pattern.compile(x)).collect(Collectors.toList());
+ this.exclude =
alist(patterns).stream().map(x->Pattern.compile(x)).collect(Collectors.toList());
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index 6b171da..db61784 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -12,6 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.csv;
+import static org.apache.juneau.internal.CollectionUtils.*;
+
import java.io.*;
import java.lang.reflect.*;
import java.nio.charset.*;
@@ -218,7 +220,7 @@ public final class CsvSerializerSession extends
WriterSerializerSession {
ClassMeta<?> cm = getClassMetaForObject(o);
Collection<?> l = null;
if (cm.isArray()) {
- l = Arrays.asList((Object[])o);
+ l = alist((Object[])o);
} else {
l = (Collection<?>)o;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
index f4bf027..472b431 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.encoders;
-import static java.util.Arrays.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
@@ -226,7 +225,7 @@ public final class EncoderSet {
* @return This object.
*/
public Builder add(Encoder...values) {
- entries.addAll(0, asList(values));
+ entries.addAll(0, alist(values));
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvArrayHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvArrayHeader.java
index dc2f570..4cba3df 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvArrayHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/BasicCsvArrayHeader.java
@@ -209,6 +209,6 @@ public class BasicCsvArrayHeader extends BasicHeader {
}
private List<String> parse(String value) {
- return value == null ? null :
unmodifiable(Arrays.asList(split(value)));
+ return value == null ? null : unmodifiable(alist(split(value)));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
index eb6db7e..f5f2687 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -478,7 +478,7 @@ public class HeaderList {
@FluentSetter
public Builder prepend(HeaderList value) {
if (value != null)
- entries.addAll(0, Arrays.asList(value.entries));
+ entries.addAll(0, alist(value.entries));
return this;
}
@@ -535,7 +535,7 @@ public class HeaderList {
@FluentSetter
public Builder prepend(Header...values) {
if (values != null)
- prepend(Arrays.asList(values));
+ prepend(alist(values));
return this;
}
@@ -678,7 +678,7 @@ public class HeaderList {
@FluentSetter
public Builder set(Header...values) {
if (values != null)
- set(Arrays.asList(values));
+ set(alist(values));
return this;
}
@@ -803,7 +803,7 @@ public class HeaderList {
@FluentSetter
public Builder setDefault(Header...values) {
if (values != null)
- setDefault(Arrays.asList(values));
+ setDefault(alist(values));
return this;
}
@@ -1640,6 +1640,6 @@ public class HeaderList {
@Override /* Object */
public String toString() {
- return Arrays.asList(entries).toString();
+ return alist(entries).toString();
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Thrown.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Thrown.java
index bd8027f..e506f77 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Thrown.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/header/Thrown.java
@@ -92,7 +92,7 @@ public class Thrown extends BasicCsvArrayHeader {
* @return A new header bean, or <jk>null</jk> if the value is
<jk>null</jk>.
*/
public static Thrown of(Throwable...values) {
- return new
Thrown(Arrays.asList(values).stream().map(Part::new).collect(toList()));
+ return new
Thrown(alist(values).stream().map(Part::new).collect(toList()));
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
index 4bd7c95..ea8b1cd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/part/PartList.java
@@ -465,7 +465,7 @@ public class PartList {
@FluentSetter
public Builder prepend(PartList value) {
if (value != null)
- entries.addAll(0, Arrays.asList(value.entries));
+ entries.addAll(0, alist(value.entries));
return this;
}
@@ -522,7 +522,7 @@ public class PartList {
@FluentSetter
public Builder prepend(NameValuePair...values) {
if (values != null)
- prepend(Arrays.asList(values));
+ prepend(alist(values));
return this;
}
@@ -665,7 +665,7 @@ public class PartList {
@FluentSetter
public Builder set(NameValuePair...values) {
if (values != null)
- set(Arrays.asList(values));
+ set(alist(values));
return this;
}
@@ -790,7 +790,7 @@ public class PartList {
@FluentSetter
public Builder setDefault(NameValuePair...values) {
if (values != null)
- setDefault(Arrays.asList(values));
+ setDefault(alist(values));
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/AnnotationUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/AnnotationUtils.java
index acc3896..2165ba2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/AnnotationUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/AnnotationUtils.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
+import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import java.lang.annotation.*;
@@ -70,7 +71,7 @@ public class AnnotationUtils {
}
private static Stream<Method> getAnnotationMethods(Class<? extends
Annotation> type) {
- return Arrays.asList(type.getDeclaredMethods())
+ return alist(type.getDeclaredMethods())
.stream()
.filter(x -> x.getParameterCount() == 0 &&
x.getDeclaringClass().isAnnotation())
;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
index 48bb5eb..49c6db6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
@@ -16,8 +16,6 @@ import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
-import static java.util.Arrays.*;
-import static java.util.Collections.*;
import static java.util.stream.Collectors.*;
import java.util.*;
@@ -347,7 +345,7 @@ public final class ParserSet {
* @return This object.
*/
public Builder add(Parser...s) {
- entries.addAll(0, asList(s));
+ entries.addAll(0, alist(s));
return this;
}
@@ -602,7 +600,7 @@ public final class ParserSet {
* @return An unmodifiable list of parsers in this group.
*/
public List<Parser> getParsers() {
- return unmodifiableList(asList(entries));
+ return ulist(entries);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/SearchArgs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/SearchArgs.java
index 80540bb..f833745 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/SearchArgs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/SearchArgs.java
@@ -39,7 +39,7 @@ public class SearchArgs {
* @param searchArgs Search arguments.
*/
public SearchArgs(String searchArgs) {
- this(Arrays.asList(split(searchArgs)));
+ this(alist(split(searchArgs)));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/SortArgs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/SortArgs.java
index 25816df..cd68462 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/SortArgs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/SortArgs.java
@@ -43,7 +43,7 @@ public class SortArgs {
* </ul>
*/
public SortArgs(String...sortArgs) {
- this(Arrays.asList(sortArgs));
+ this(alist(sortArgs));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/ViewArgs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/ViewArgs.java
index 2aeaedf..268814d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/ViewArgs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/ViewArgs.java
@@ -37,7 +37,7 @@ public class ViewArgs {
* <br>Values are column names.
*/
public ViewArgs(String...viewArgs) {
- this(Arrays.asList(viewArgs));
+ this(alist(viewArgs));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 608fb89..3771aa9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -13,6 +13,7 @@
package org.apache.juneau.serializer;
import static org.apache.juneau.collections.OMap.*;
+import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.io.*;
@@ -659,7 +660,7 @@ public class SerializerSession extends BeanTraverseSession {
list.add(Array.get(array, i));
return list;
}
- return Arrays.asList((Object[])array);
+ return alist((Object[])array);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
index 5f4b90c..0ae459f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
@@ -14,7 +14,6 @@ package org.apache.juneau.serializer;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
-import static java.util.Arrays.*;
import static java.util.stream.Collectors.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
@@ -342,7 +341,7 @@ public final class SerializerSet {
* @return This object.
*/
public Builder add(Serializer...s) {
- entries.addAll(0, asList(s));
+ entries.addAll(0, alist(s));
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
index ff8e165..ae16105 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarList.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl;
-import static java.util.Arrays.*;
+import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -85,7 +85,7 @@ public class VarList extends ArrayList<Object> {
* @return This object.
*/
public VarList append(Var...vars) {
- addAll(asList(vars));
+ addAll(alist(vars));
return this;
}
@@ -108,7 +108,7 @@ public class VarList extends ArrayList<Object> {
*/
@SafeVarargs
public final VarList append(Class<? extends Var>...vars) {
- addAll(asList(vars));
+ addAll(alist(vars));
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoQuery.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoQuery.java
index 0f6f88c..1eb58e0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoQuery.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/PojoQuery.java
@@ -302,7 +302,7 @@ public final class PojoQuery {
return dm;
}
if (cm.isArray()) {
- return replaceWithMutables(Arrays.asList((Object[])o));
+ return replaceWithMutables(alist((Object[])o));
}
return o;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
index 48c60cc..c7d560d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/SearchArgs.java
@@ -188,7 +188,7 @@ public class SearchArgs {
*/
public Builder sort(String sortArgs) {
if (sortArgs != null)
-
sort(Arrays.asList(StringUtils.split(sortArgs)));
+ sort(alist(StringUtils.split(sortArgs)));
return this;
}
diff --git
a/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
index 6daf159..9dcd876 100644
---
a/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
+++
b/juneau-examples/juneau-examples-rest-jetty-ftest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
@@ -12,6 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.examples.rest;
+import static org.apache.juneau.internal.CollectionUtils.*;
+
import java.util.*;
import org.apache.juneau.http.header.*;
@@ -23,7 +25,7 @@ public class RootContentTest extends ContentComboTestBase {
@Parameterized.Parameters
public static Collection<Object[]> getParameters() {
- return Arrays.asList(new Object[][] {
+ return alist(new Object[][] {
{ /* 0 */
new ComboInput("HTML-stylesheet", "/",
MediaType.HTML,
"@import '/htdocs/themes/devops.css';",
diff --git
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
index 24441a3..e32eac2 100644
---
a/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
+++
b/juneau-microservice/juneau-microservice-ftest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyResource.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.test.client;
-import static java.util.Arrays.*;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.testutils.Constants.*;
@@ -1248,7 +1247,7 @@ public class ThirdPartyProxyResource extends
BasicRestServlet implements BasicUn
@RestGet(path="/returnIntegerList")
public List<Integer> returnIntegerList() {
- return asList(new Integer[]{1,null});
+ return alist(new Integer[]{1,null});
}
@RestGet(path="/returnInteger3dList")
@@ -1268,7 +1267,7 @@ public class ThirdPartyProxyResource extends
BasicRestServlet implements BasicUn
@RestGet(path="/returnStringList")
public List<String> returnStringList() {
- return asList(new String[]{"foo","bar",null});
+ return alist(new String[]{"foo","bar",null});
}
// Beans
@@ -1285,7 +1284,7 @@ public class ThirdPartyProxyResource extends
BasicRestServlet implements BasicUn
@RestGet(path="/returnBeanList")
public List<ABean> returnBeanList() {
- return asList(ABean.get());
+ return alist(ABean.get());
}
@RestGet(path="/returnBean1d3dList")
@@ -1300,7 +1299,7 @@ public class ThirdPartyProxyResource extends
BasicRestServlet implements BasicUn
@RestGet(path="/returnBeanListMap")
public Map<String,List<ABean>> returnBeanListMap() {
- return map("foo",asList(ABean.get()));
+ return map("foo",alist(ABean.get()));
}
@RestGet(path="/returnBean1d3dListMap")
@@ -1310,7 +1309,7 @@ public class ThirdPartyProxyResource extends
BasicRestServlet implements BasicUn
@RestGet(path="/returnBeanListMapIntegerKeys")
public Map<Integer,List<ABean>> returnBeanListMapIntegerKeys() {
- return map(1,asList(ABean.get()));
+ return map(1,alist(ABean.get()));
}
// Typed beans
@@ -1327,7 +1326,7 @@ public class ThirdPartyProxyResource extends
BasicRestServlet implements BasicUn
@RestGet(path="/returnTypedBeanList")
public List<TypedBean> returnTypedBeanList() {
- return asList((TypedBean)TypedBeanImpl.get());
+ return alist((TypedBean)TypedBeanImpl.get());
}
@RestGet(path="/returnTypedBean1d3dList")
@@ -1342,7 +1341,7 @@ public class ThirdPartyProxyResource extends
BasicRestServlet implements BasicUn
@RestGet(path="/returnTypedBeanListMap")
public Map<String,List<TypedBean>> returnTypedBeanListMap() {
- return map("foo",asList((TypedBean)TypedBeanImpl.get()));
+ return map("foo",alist((TypedBean)TypedBeanImpl.get()));
}
@RestGet(path="/returnTypedBean1d3dListMap")
@@ -1352,7 +1351,7 @@ public class ThirdPartyProxyResource extends
BasicRestServlet implements BasicUn
@RestGet(path="/returnTypedBeanListMapIntegerKeys")
public Map<Integer,List<TypedBean>> returnTypedBeanListMapIntegerKeys()
{
- return map(1,asList((TypedBean)TypedBeanImpl.get()));
+ return map(1,alist((TypedBean)TypedBeanImpl.get()));
}
// Swapped POJOs
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 24e467b..ecde29b 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
@@ -52,7 +52,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Parameterized.Parameters
public static Collection<Object[]> getParameters() {
- return Arrays.asList(new Object[][] {
+ return alist(new Object[][] {
{ /* 0 */ "Json",
JsonSerializer.DEFAULT.copy().addBeanTypes().addRootType().build(),
JsonParser.DEFAULT },
{ /* 1 */ "Xml",
XmlSerializer.DEFAULT.copy().addBeanTypes().addRootType().build(),
XmlParser.DEFAULT },
{ /* 2 */ "Mixed",
JsonSerializer.DEFAULT.copy().addBeanTypes().addRootType().build(),
XmlParser.DEFAULT },
@@ -141,7 +141,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
alist(alist(alist(1,null),null),null),
alist(new Integer[][][]{{{1,null},null},null},null),
alist(new int[][][]{{{1,2},null},null},null),
- Arrays.asList("foo","bar",null)
+ alist("foo","bar",null)
);
assertEquals("OK", r);
}
@@ -155,9 +155,9 @@ public class ThirdPartyProxyTest extends RestTestcase {
alist(ABean.get(),null),
alist(new
ABean[][][]{{{ABean.get(),null},null},null},null),
map("foo",ABean.get()),
- map("foo",Arrays.asList(ABean.get())),
+ map("foo",alist(ABean.get())),
map("foo",alist(new
ABean[][][]{{{ABean.get(),null},null},null},null)),
- map(1,Arrays.asList(ABean.get()))
+ map(1,alist(ABean.get()))
);
assertEquals("OK", r);
}
@@ -172,9 +172,9 @@ public class ThirdPartyProxyTest extends RestTestcase {
alist(TypedBeanImpl.get(),null),
alist(new
TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null),
map("foo",TypedBeanImpl.get()),
-
map("foo",Arrays.asList((TypedBean)TypedBeanImpl.get())),
+ map("foo",alist((TypedBean)TypedBeanImpl.get())),
map("foo",alist(new
TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null)),
- map(1,Arrays.asList((TypedBean)TypedBeanImpl.get()))
+ map(1,alist((TypedBean)TypedBeanImpl.get()))
);
assertEquals("OK", r);
}
@@ -270,7 +270,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
alist(alist(alist(1,null),null),null),
alist(new Integer[][][]{{{1,null},null},null},null),
alist(new int[][][]{{{1,2},null},null},null),
- Arrays.asList("foo","bar",null)
+ alist("foo","bar",null)
);
assertEquals("OK", r);
}
@@ -284,9 +284,9 @@ public class ThirdPartyProxyTest extends RestTestcase {
alist(ABean.get(),null),
alist(new
ABean[][][]{{{ABean.get(),null},null},null},null),
map("foo",ABean.get()),
- map("foo",Arrays.asList(ABean.get())),
+ map("foo",alist(ABean.get())),
map("foo",alist(new
ABean[][][]{{{ABean.get(),null},null},null},null)),
- map(1,Arrays.asList(ABean.get()))
+ map(1,alist(ABean.get()))
);
assertEquals("OK", r);
}
@@ -301,9 +301,9 @@ public class ThirdPartyProxyTest extends RestTestcase {
alist(TypedBeanImpl.get(),null),
alist(new
TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null),
map("foo",TypedBeanImpl.get()),
-
map("foo",Arrays.asList((TypedBean)TypedBeanImpl.get())),
+ map("foo",alist((TypedBean)TypedBeanImpl.get())),
map("foo",alist(new
TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null)),
- map(1,Arrays.asList((TypedBean)TypedBeanImpl.get()))
+ map(1,alist((TypedBean)TypedBeanImpl.get()))
);
assertEquals("OK", r);
}
@@ -411,7 +411,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
alist(alist(alist(1,null),null),null),
alist(new Integer[][][]{{{1,null},null},null},null),
alist(new int[][][]{{{1,2},null},null},null),
- Arrays.asList("foo","bar",null)
+ alist("foo","bar",null)
);
assertEquals("OK", r);
}
@@ -425,9 +425,9 @@ public class ThirdPartyProxyTest extends RestTestcase {
alist(ABean.get(),null),
alist(new
ABean[][][]{{{ABean.get(),null},null},null},null),
map("foo",ABean.get()),
- map("foo",Arrays.asList(ABean.get())),
+ map("foo",alist(ABean.get())),
map("foo",alist(new
ABean[][][]{{{ABean.get(),null},null},null},null)),
- map(1,Arrays.asList(ABean.get()))
+ map(1,alist(ABean.get()))
);
assertEquals("OK", r);
}
@@ -442,9 +442,9 @@ public class ThirdPartyProxyTest extends RestTestcase {
alist(TypedBeanImpl.get(),null),
alist(new
TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null),
map("foo",TypedBeanImpl.get()),
-
map("foo",Arrays.asList((TypedBean)TypedBeanImpl.get())),
+ map("foo",alist((TypedBean)TypedBeanImpl.get())),
map("foo",alist(new
TypedBean[][][]{{{TypedBeanImpl.get(),null},null},null},null)),
- map(1,Arrays.asList((TypedBean)TypedBeanImpl.get()))
+ map(1,alist((TypedBean)TypedBeanImpl.get()))
);
assertEquals("OK", r);
}
@@ -939,7 +939,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Test
public void ea17_setStringList() {
- proxy.setStringList(Arrays.asList("foo","bar",null));
+ proxy.setStringList(alist("foo","bar",null));
}
// Beans
@@ -955,7 +955,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Test
public void eb03_setBeanList() {
- proxy.setBeanList(Arrays.asList(ABean.get()));
+ proxy.setBeanList(alist(ABean.get()));
}
@Test
@@ -970,7 +970,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Test
public void eb06_setBeanListMap() {
- proxy.setBeanListMap(map("foo",Arrays.asList(ABean.get())));
+ proxy.setBeanListMap(map("foo",alist(ABean.get())));
}
@Test
@@ -980,7 +980,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Test
public void eb08_setBeanListMapIntegerKeys() {
-
proxy.setBeanListMapIntegerKeys(map(1,Arrays.asList(ABean.get())));
+ proxy.setBeanListMapIntegerKeys(map(1,alist(ABean.get())));
}
// Typed beans
@@ -997,7 +997,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Test
public void ec03_setTypedBeanList() {
-
proxy.setTypedBeanList(Arrays.asList((TypedBean)TypedBeanImpl.get()));
+ proxy.setTypedBeanList(alist((TypedBean)TypedBeanImpl.get()));
}
@Test
@@ -1012,7 +1012,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Test
public void ec06_setTypedBeanListMap() {
-
proxy.setTypedBeanListMap(map("foo",Arrays.asList((TypedBean)TypedBeanImpl.get())));
+
proxy.setTypedBeanListMap(map("foo",alist((TypedBean)TypedBeanImpl.get())));
}
@Test
@@ -1022,7 +1022,7 @@ public class ThirdPartyProxyTest extends RestTestcase {
@Test
public void ec08_setTypedBeanListMapIntegerKeys() {
-
proxy.setTypedBeanListMapIntegerKeys(map(1,Arrays.asList((TypedBean)TypedBeanImpl.get())));
+
proxy.setTypedBeanListMapIntegerKeys(map(1,alist((TypedBean)TypedBeanImpl.get())));
}
// Swapped POJOs
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 566e710..8ae5fa6 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
@@ -7195,9 +7195,9 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
if (body instanceof Supplier)
body = ((Supplier<?>)body).get();
if (body instanceof NameValuePair)
- return req.body(new
UrlEncodedFormEntity(Arrays.asList((NameValuePair)body)));
+ return req.body(new
UrlEncodedFormEntity(alist((NameValuePair)body)));
if (body instanceof NameValuePair[])
- return req.body(new
UrlEncodedFormEntity(Arrays.asList((NameValuePair[])body)));
+ return req.body(new
UrlEncodedFormEntity(alist((NameValuePair[])body)));
if (body instanceof PartList)
return req.body(new
UrlEncodedFormEntity(((PartList)body).asNameValuePairs()));
if (body instanceof HttpResource)
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index f1486bf..f389517 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -616,7 +616,7 @@ public class MockServletRequest implements
HttpServletRequest {
@Override /* HttpServletRequest */
public Enumeration<Locale> getLocales() {
- return Collections.enumeration(Arrays.asList(locale));
+ return Collections.enumeration(alist(locale));
}
@Override /* HttpServletRequest */
@@ -714,7 +714,7 @@ public class MockServletRequest implements
HttpServletRequest {
@Override /* HttpServletRequest */
public Enumeration<String> getHeaders(String name) {
String[] s = headerMap.get(name);
- return Collections.enumeration(Arrays.asList(s == null ? new
String[0] : s));
+ return Collections.enumeration(alist(s == null ? new String[0]
: s));
}
@Override /* HttpServletRequest */
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
index 5829188..3e06336 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
@@ -274,7 +274,7 @@ public class MockServletResponse implements
HttpServletResponse {
@Override /* HttpServletResponse */
public Collection<String> getHeaders(String name) {
String[] s = headerMap.get(name);
- return s == null ? Collections.emptyList() : Arrays.asList(s);
+ return s == null ? emptyList() : alist(s);
}
@Override /* HttpServletResponse */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index f51d56b..814d084 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -24,7 +24,6 @@ import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.rest.HttpRuntimeException.*;
import static org.apache.juneau.rest.logging.RestLoggingDetail.*;
import static org.apache.juneau.rest.processor.ResponseProcessor.*;
-import static java.util.Arrays.*;
import static java.util.Collections.*;
import static java.util.logging.Level.*;
import static org.apache.juneau.rest.annotation.RestOpAnnotation.*;
@@ -5210,7 +5209,7 @@ public class RestContext extends Context {
*/
@FluentSetter
public Builder children(Object...values) {
- children.addAll(asList(values));
+ children.addAll(alist(values));
return this;
}
@@ -5566,7 +5565,7 @@ public class RestContext extends Context {
if (produces == null)
produces = list(values);
else
- produces.addAll(Arrays.asList(values));
+ produces.addAll(alist(values));
return this;
}
@@ -5629,7 +5628,7 @@ public class RestContext extends Context {
if (consumes == null)
consumes = list(values);
else
- consumes.addAll(Arrays.asList(values));
+ consumes.addAll(alist(values));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index fc1f35c..e45525d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -23,12 +23,10 @@ import static org.apache.juneau.http.HttpParts.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.rest.HttpRuntimeException.*;
import static org.apache.juneau.rest.util.RestUtils.*;
-import static java.util.Arrays.*;
import java.lang.annotation.*;
import java.lang.reflect.Method;
import java.nio.charset.*;
import java.util.*;
-import java.util.ArrayList;
import java.util.concurrent.*;
import java.util.function.*;
@@ -1962,7 +1960,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
if (path == null)
path = list(values);
else
- path.addAll(0, Arrays.asList(values));
+ path.addAll(0, alist(values));
return this;
}
@@ -1997,7 +1995,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
if (produces == null)
produces = list(values);
else
- produces.addAll(Arrays.asList(values));
+ produces.addAll(alist(values));
return this;
}
@@ -2033,7 +2031,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
if (rolesDeclared == null)
rolesDeclared = set(values);
else
- rolesDeclared.addAll(asList(values));
+ rolesDeclared.addAll(alist(values));
return this;
}
@@ -2119,9 +2117,9 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
@FluentSetter
public Builder consumes(MediaType...values) {
if (consumes == null)
- consumes = new
ArrayList<>(Arrays.asList(values));
+ consumes = list(values);
else
- consumes.addAll(Arrays.asList(values));
+ consumes.addAll(alist(values));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/CookieList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/CookieList.java
index d2d0a8f..5903abe 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/CookieList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/CookieList.java
@@ -12,6 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.arg;
+import static org.apache.juneau.internal.CollectionUtils.*;
+
import java.util.*;
import javax.servlet.http.*;
@@ -46,6 +48,6 @@ public class CookieList extends ArrayList<Cookie> {
* @param values The values to set in the cookie list.
*/
public CookieList(Cookie[] values) {
- super(Arrays.asList(values));
+ super(alist(values));
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
index 6f1b19f..51b745f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
@@ -84,7 +84,7 @@ public class RestOpArgList {
* @throws IllegalArgumentException if any class does not
extend from {@link RestOpArg}.
*/
public Builder add(Class<?>...values) {
- entries.addAll(0,
Arrays.asList(assertClassArrayArgIsType("values", RestOpArg.class, values)));
+ entries.addAll(0,
alist(assertClassArrayArgIsType("values", RestOpArg.class, values)));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
index 54dc90d..066431e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
@@ -151,7 +151,7 @@ public class RequestAttributes {
* @return This object.
*/
public RequestAttributes addDefault(NamedAttribute...pairs) {
- return addDefault(Arrays.asList(pairs));
+ return addDefault(alist(pairs));
}
/**
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 8c70f56..9916dab 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
@@ -233,7 +233,7 @@ public class RequestHeaders {
* @return This object.
*/
public RequestHeaders addDefault(Header...pairs) {
- return addDefault(Arrays.asList(pairs));
+ return addDefault(alist(pairs));
}
/**
@@ -426,8 +426,7 @@ public class RequestHeaders {
* @return A new list object.
*/
public RequestHeaders subset(String...headers) {
- Map<String,List<RequestHeader>> m = Arrays
- .asList(headers)
+ Map<String,List<RequestHeader>> m = alist(headers)
.stream()
.map(x -> key(x))
.filter(map::containsKey)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
index 9ca03e0..0d29782 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
@@ -213,7 +213,7 @@ public class RequestPathParams {
* @return This object.
*/
public RequestPathParams addDefault(NameValuePair...pairs) {
- return addDefault(Arrays.asList(pairs));
+ return addDefault(alist(pairs));
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
index 54c0087..6ac36d1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
@@ -229,7 +229,7 @@ public class RequestQueryParams {
* @return This object.
*/
public RequestQueryParams addDefault(NameValuePair...pairs) {
- return addDefault(Arrays.asList(pairs));
+ return addDefault(alist(pairs));
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
index fa240bca..4b6ced4 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
@@ -13,6 +13,7 @@
package org.apache.juneau.rest.processor;
import static org.apache.juneau.internal.ClassUtils.*;
+import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.io.*;
@@ -134,7 +135,7 @@ public final class ResponseBeanProcessor implements
ResponseProcessor {
if (o instanceof Map)
return ((Map<?,?>)o).entrySet();
if (o.getClass().isArray())
- return Arrays.asList((Object[])o);
+ return alist((Object[])o);
if (o instanceof Collection)
return (Collection<?>)o;
throw new InternalServerError("Could not iterate over Headers
of type ''{0}''", className(o));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
index b33c4a6..26b8539 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
@@ -17,8 +17,6 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
-import static java.util.Arrays.*;
-
import org.apache.juneau.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
@@ -86,7 +84,7 @@ public class ResponseProcessorList {
* @throws IllegalArgumentException if any class does not
extend from {@link ResponseProcessor}.
*/
public Builder add(Class<?>...values) {
-
entries.addAll(asList(assertClassArrayArgIsType("values",
ResponseProcessor.class, values)));
+
entries.addAll(alist(assertClassArrayArgIsType("values",
ResponseProcessor.class, values)));
return this;
}
@@ -97,7 +95,7 @@ public class ResponseProcessorList {
* @return This object.
*/
public Builder add(ResponseProcessor...values) {
- entries.addAll(asList(values));
+ entries.addAll(alist(values));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
index 19c007c..ff4d7f2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
@@ -99,7 +99,7 @@ public interface StaticFiles extends FileFinder {
*/
@FluentSetter
public Builder headers(Header...headers) {
- this.headers.addAll(Arrays.asList(headers));
+ this.headers.addAll(alist(headers));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
index fbd98bb..05c6eb6 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
@@ -272,7 +272,7 @@ public class ThrownStore {
* @return A modifiable list of strings.
*/
protected List<String> createStackTrace(Throwable t) {
- return Arrays.asList(t.getStackTrace()).stream().filter(x ->
include(x)).map(x -> normalize(x)).collect(toList());
+ return alist(t.getStackTrace()).stream().filter(x ->
include(x)).map(x -> normalize(x)).collect(toList());
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
index f98190a..9594e7f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
@@ -13,6 +13,7 @@
package org.apache.juneau.rest.widget;
import static org.apache.juneau.dto.html5.HtmlBuilder.*;
+import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -50,7 +51,7 @@ public class Tooltip {
*/
public Tooltip(String display, Object...content) {
this.display = new HtmlText(display);
- this.content = Arrays.asList(content);
+ this.content = alist(content);
}
/**
