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 061daf5bf Test modernization, clean up utility classes.
061daf5bf is described below
commit 061daf5bfa0f62ecdf64600fd65fc7d3e856bf7a
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 15:12:33 2025 -0400
Test modernization, clean up utility classes.
---
.../apache/juneau/bean/swagger/ui/SwaggerUI.java | 2 +-
.../assertions/FluentThrowableAssertion.java | 5 ++--
.../java/org/apache/juneau/jena/RdfClassMeta.java | 5 ++--
.../org/apache/juneau/jena/RdfParserSession.java | 5 ++--
.../main/java/org/apache/juneau/BeanFilter.java | 2 +-
.../java/org/apache/juneau/BeanPropertyMeta.java | 9 +++----
.../src/main/java/org/apache/juneau/ClassMeta.java | 5 ++--
.../main/java/org/apache/juneau/MediaRange.java | 3 ++-
.../main/java/org/apache/juneau/cp/BeanStore.java | 3 ++-
.../org/apache/juneau/cp/DefaultClassList.java | 3 ++-
.../org/apache/juneau/html/HtmlDocSerializer.java | 23 +++++++++---------
.../org/apache/juneau/html/HtmlParserSession.java | 6 ++---
.../apache/juneau/internal/CollectionUtils.java | 28 +++++++++++-----------
.../org/apache/juneau/json/JsonParserSession.java | 3 ++-
.../jsonschema/JsonSchemaGeneratorSession.java | 3 ++-
.../org/apache/juneau/jsonschema/TypeCategory.java | 2 +-
.../java/org/apache/juneau/parser/ParserSet.java | 15 ++++++------
.../java/org/apache/juneau/parser/Position.java | 3 ++-
.../java/org/apache/juneau/reflect/ClassInfo.java | 10 ++++----
.../java/org/apache/juneau/reflect/MethodInfo.java | 3 ++-
.../apache/juneau/serializer/SerializerSet.java | 14 +++++------
.../org/apache/juneau/uon/UonParserSession.java | 3 ++-
.../org/apache/juneau/utils/ReflectionMap.java | 13 +++++-----
.../juneau/utils/StringExpressionMatcher.java | 5 ++--
.../java/org/apache/juneau/xml/XmlClassMeta.java | 5 ++--
.../org/apache/juneau/xml/XmlParserSession.java | 5 ++--
.../apache/juneau/microservice/Microservice.java | 5 ++--
.../microservice/resources/DirectoryResource.java | 3 ++-
.../org/apache/juneau/rest/client/RestRequest.java | 13 +++++-----
.../org/apache/juneau/rest/mock/MockLogger.java | 3 ++-
.../org/apache/juneau/rest/arg/FormDataArg.java | 3 ++-
.../java/org/apache/juneau/rest/arg/HeaderArg.java | 3 ++-
.../java/org/apache/juneau/rest/arg/QueryArg.java | 3 ++-
.../org/apache/juneau/rest/arg/RestOpArgList.java | 3 ++-
.../juneau/rest/converter/RestConverterList.java | 3 ++-
.../apache/juneau/rest/guard/RestGuardList.java | 3 ++-
.../org/apache/juneau/rest/guard/RoleMatcher.java | 5 ++--
.../juneau/rest/matcher/RestMatcherList.java | 3 ++-
.../rest/processor/ResponseProcessorList.java | 3 ++-
.../org/apache/juneau/rest/remote/RrpcServlet.java | 3 ++-
.../apache/juneau/rest/staticfile/StaticFiles.java | 3 ++-
.../rest/swagger/BasicSwaggerProviderSession.java | 12 +++++-----
.../org/apache/juneau/rest/util/RestUtils.java | 7 +++---
43 files changed, 148 insertions(+), 113 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
index a0e1e3541..21ec94179 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
@@ -389,7 +389,7 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
return null; // NOSONAR - Intentionally returning null.
if (s.indexOf(',') == -1)
return singletonList(s);
- var l = list2();
+ var l = Utils.list();
var sa = s.split("\n");
for (var i = 0; i < sa.length; i++) {
if (i > 0)
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index cdeb4164c..bb0db546a 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -15,6 +15,7 @@ package org.apache.juneau.assertions;
import static java.util.Collections.*;
import static org.apache.juneau.common.internal.ArgUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
+import static org.apache.juneau.common.internal.Utils.list;
import java.io.*;
import java.util.*;
@@ -199,7 +200,7 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
if (t.getCause() == null)
l = singletonList(t.getMessage());
else {
- l = CollectionUtils.list2();
+ l = list();
while (t != null) {
l.add(t.getMessage());
t = t.getCause();
@@ -248,7 +249,7 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
if (t.getCause() == null)
l = singletonList(t.getMessage());
else {
- l = CollectionUtils.list2();
+ l = list();
while (t != null) {
l.add(t.getLocalizedMessage());
t = t.getCause();
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
index a35a603ad..9f38fa0be 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfClassMeta.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.jena;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -41,8 +42,8 @@ public class RdfClassMeta extends ExtendedClassMeta {
*/
public RdfClassMeta(ClassMeta<?> cm, RdfMetaProvider mp) {
super(cm);
- List<Rdf> rdfs = list2();
- List<RdfSchema> schemas = list2();
+ List<Rdf> rdfs = list();
+ List<RdfSchema> schemas = list();
cm.forEachAnnotation(Rdf.class, x -> true, x -> rdfs.add(x));
cm.forEachAnnotation(RdfSchema.class, x -> true, x ->
schemas.add(x));
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index 841a2522e..c2449823b 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -14,6 +14,7 @@ package org.apache.juneau.jena;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.jena.Constants.*;
import java.io.*;
@@ -240,7 +241,7 @@ public class RdfParserSession extends ReaderParserSession {
if (isLooseCollections() && type.isCollectionOrArray()) {
Collection c = null;
if (type.isArray() || type.isArgs())
- c = list2();
+ c = list();
else
c = (
type.canCreateNewInstance(getOuter())
@@ -464,7 +465,7 @@ public class RdfParserSession extends ReaderParserSession {
o = parseIntoMap(r, m, eType.getKeyType(),
eType.getValueType(), pMeta);
} else if (sType.isCollectionOrArray() || sType.isArgs()) {
if (sType.isArray() || sType.isArgs())
- o = list2();
+ o = list();
else
o = (sType.canCreateNewInstance(outer) ?
(Collection<?>)sType.newInstance(outer) : new JsonList(this));
Resource r = n.asResource();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
index 4cab4b446..acc3807d2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
@@ -631,7 +631,7 @@ public final class BeanFilter {
*/
public Builder dictionary(Class<?>...values) {
if (dictionary == null)
- dictionary = list2(values);
+ dictionary = list(values);
else for (Class<?> cc : values)
dictionary.add(cc);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index f6e8802be..9575c100f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -14,6 +14,7 @@ package org.apache.juneau;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -168,7 +169,7 @@ public final class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
boolean validate(BeanContext bc, BeanRegistry
parentBeanRegistry, Map<Class<?>,Class<?>[]> typeVarImpls, Set<String> bpro,
Set<String> bpwo) throws Exception {
- List<Class<?>> bdClasses = list2();
+ List<Class<?>> bdClasses = list();
if (field == null && getter == null && setter == null)
return false;
@@ -180,7 +181,7 @@ public final class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
canWrite |= (field != null || setter != null);
if (innerField != null) {
- List<Beanp> lp = list2();
+ List<Beanp> lp = list();
bc.forEachAnnotation(Beanp.class, innerField, x
-> true, x -> lp.add(x));
if (field != null || Utils.isNotEmpty2(lp)) {
// Only use field type if it's a bean
property or has @Beanp annotation.
@@ -202,7 +203,7 @@ public final class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
}
if (getter != null) {
- List<Beanp> lp = list2();
+ List<Beanp> lp = list();
bc.forEachAnnotation(Beanp.class, getter, x ->
true, x -> lp.add(x));
if (rawTypeMeta == null)
rawTypeMeta =
bc.resolveClassMeta(last(lp), getter.getGenericReturnType(), typeVarImpls);
@@ -220,7 +221,7 @@ public final class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
}
if (setter != null) {
- List<Beanp> lp = list2();
+ List<Beanp> lp = list ();
bc.forEachAnnotation(Beanp.class, setter, x ->
true, x -> lp.add(x));
if (rawTypeMeta == null)
rawTypeMeta =
bc.resolveClassMeta(last(lp), setter.getGenericParameterTypes()[0],
typeVarImpls);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index a1127925e..b3f885a42 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -14,6 +14,7 @@ package org.apache.juneau;
import static org.apache.juneau.ClassMeta.ClassCategory.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
import static java.util.Arrays.*;
@@ -337,7 +338,7 @@ public final class ClassMeta<T> implements Type {
dictionaryName = null;
Throwable initException = null;
BeanMeta beanMeta = null;
- List<ObjectSwap> swaps = list2();
+ List<ObjectSwap> swaps = list();
BuilderSwap builderSwap;
InvocationHandler invocationHandler = null;
BeanRegistry beanRegistry = null;
@@ -2164,7 +2165,7 @@ public final class ClassMeta<T> implements Type {
private <A extends Annotation> A[] annotationArray(Class<A> type) {
A[] array = (A[])annotationArrayMap.get(type);
if (array == null && beanContext != null) {
- List<A> l = list2();
+ List<A> l = list();
info.forEachAnnotation(beanContext, type, x-> true, x
-> l.add(x));
array = (A[])Array.newInstance(type, l.size());
for (int i = 0; i < l.size(); i++)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
index 1da3e70b9..977d82bb3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaRange.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -49,7 +50,7 @@ public class MediaRange extends MediaType {
// The media type consists of everything up to the q parameter.
// The q parameter and stuff after is part of the range.
- List<NameValuePair> extensions = list2();
+ List<NameValuePair> extensions = list();
boolean foundQ = false;
for (NameValuePair p : e.getParameters()) {
if (p.getName().equals("q")) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
index 9fdb2614d..9146208ec 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
@@ -14,6 +14,7 @@ package org.apache.juneau.cp;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static java.util.stream.Collectors.*;
@@ -588,7 +589,7 @@ public class BeanStore {
*/
public String getMissingParams(ExecutableInfo executable) {
List<ParamInfo> params = executable.getParams();
- List<String> l = list2();
+ List<String> l = list();
loop: for (int i = 0; i < params.size(); i++) {
ParamInfo pi = params.get(i);
ClassInfo pt = pi.getParameterType();
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 1360ff7e5..ca9d0d65b 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
@@ -13,6 +13,7 @@
package org.apache.juneau.cp;
import static org.apache.juneau.common.internal.ArgUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -64,7 +65,7 @@ public class DefaultClassList {
* Constructor.
*/
protected DefaultClassList() {
- entries = list2();
+ entries = list();
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index f31679d79..830d3046a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -14,6 +14,7 @@ package org.apache.juneau.html;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.lang.annotation.*;
@@ -276,7 +277,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> aside() {
if (aside == null)
- aside = list2();
+ aside = list();
return aside;
}
@@ -354,7 +355,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> footer() {
if (footer == null)
- footer = list2();
+ footer = list();
return footer;
}
@@ -395,7 +396,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> head() {
if (head == null)
- head = list2();
+ head = list();
return head;
}
@@ -437,7 +438,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> header() {
if (header == null)
- header = list2();
+ header = list();
return header;
}
@@ -482,7 +483,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> nav() {
if (nav == null)
- nav = list2();
+ nav = list();
return nav;
}
@@ -544,7 +545,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> navlinks() {
if (navlinks == null)
- navlinks = list2();
+ navlinks = list();
return navlinks;
}
@@ -659,7 +660,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> script() {
if (script == null)
- script = list2();
+ script = list();
return script;
}
@@ -697,7 +698,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> style() {
if (style == null)
- style = list2();
+ style = list();
return style;
}
@@ -728,7 +729,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> stylesheet() {
if (stylesheet == null)
- stylesheet = list2();
+ stylesheet = list();
return stylesheet;
}
@@ -827,7 +828,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<Class<? extends HtmlWidget>> widgets() {
if (widgets == null)
- widgets = list2();
+ widgets = list();
return widgets;
}
@@ -1612,7 +1613,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
}
private static <T> List<T> copy(T[] s) {
- return s.length == 0 ? null : list2(s);
+ return s.length == 0 ? null : list(s);
}
private List<String> merge(List<String> old, String[]
newValues) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index 51df6939b..a776e21a1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -398,7 +398,7 @@ public final class HtmlParserSession extends
XmlParserSession {
o = parseTableIntoCollection(r,
(Collection)(sType.canCreateNewInstance(outer)
? sType.newInstance(outer) :
new JsonList(this)), sType, pMeta);
else if (sType.isArray() || sType.isArgs()) {
- ArrayList l =
(ArrayList)parseTableIntoCollection(r, list2(), sType, pMeta);
+ ArrayList l =
(ArrayList)parseTableIntoCollection(r, list(), sType, pMeta);
o = toArray(sType, l);
}
else
@@ -421,7 +421,7 @@ public final class HtmlParserSession extends
XmlParserSession {
o = parseIntoCollection(r,
(Collection)(sType.canCreateNewInstance(outer)
? sType.newInstance(outer) : new
JsonList(this)), sType, pMeta);
else if (sType.isArray() || sType.isArgs())
- o = toArray(sType, parseIntoCollection(r,
list2(), sType, pMeta));
+ o = toArray(sType, parseIntoCollection(r,
list(), sType, pMeta));
else
isValid = false;
skipTag(r, xUL);
@@ -555,7 +555,7 @@ public final class HtmlParserSession extends
XmlParserSession {
ClassMeta<E> type, BeanPropertyMeta pMeta) throws
IOException, ParseException, ExecutableException, XMLStreamException {
HtmlTag tag = nextTag(r, TR);
- List<String> keys = list2();
+ List<String> keys = list();
while (true) {
tag = nextTag(r, TH, xTR);
if (tag == xTR)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
index df7c9e284..ad4aa91c4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/CollectionUtils.java
@@ -148,20 +148,20 @@ public final class CollectionUtils {
return new SetBuilder<>(elementType, elementTypeArgs);
}
- /**
- * Convenience method for creating an {@link ArrayList}.
- *
- * @param <E> The element type.
- * @param values The values to initialize the list with.
- * @return A new modifiable list.
- */
- @SafeVarargs
- public static <E> List<E> list2(E...values) {
- ArrayList<E> l = new ArrayList<>(values.length);
- for (E v : values)
- l.add(v);
- return l;
- }
+// /**
+// * Convenience method for creating an {@link ArrayList}.
+// *
+// * @param <E> The element type.
+// * @param values The values to initialize the list with.
+// * @return A new modifiable list.
+// */
+// @SafeVarargs
+// public static <E> List<E> list2(E...values) {
+// ArrayList<E> l = new ArrayList<>(values.length);
+// for (E v : values)
+// l.add(v);
+// return l;
+// }
/**
* Convenience method for creating an {@link ArrayList}.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index e5b3a29a7..17f994790 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -13,6 +13,7 @@
package org.apache.juneau.json;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.io.*;
@@ -360,7 +361,7 @@ public final class JsonParserSession extends
ReaderParserSession {
parseIntoMap2(r, m, string(), object(), pMeta);
o = cast(m, pMeta, eType);
} else {
- ArrayList l =
(ArrayList)parseIntoCollection2(r, list2(), sType, pMeta);
+ ArrayList l =
(ArrayList)parseIntoCollection2(r, list(), sType, pMeta);
o = toArray(sType, l);
}
} else if (c == '{') {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index 3578c39c6..fbebfcfe7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.jsonschema;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.jsonschema.TypeCategory.*;
@@ -376,7 +377,7 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
@SuppressWarnings("unchecked")
private List<String> getEnums(ClassMeta<?> cm) {
- List<String> l = list2();
+ List<String> l = list();
for (Enum<?> e :
((Class<Enum<?>>)cm.getInnerClass()).getEnumConstants())
l.add(cm.toString(e));
return l;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
index edc184151..52ffd8d2c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/TypeCategory.java
@@ -85,7 +85,7 @@ public enum TypeCategory {
public static TypeCategory[] parseArray(String s) {
if (s == null || s.isEmpty())
return new TypeCategory[0];
- List<TypeCategory> list = list2();
+ List<TypeCategory> list = list();
split3(s, x -> list.add(valueOf(x.toUpperCase())));
return list.toArray(new TypeCategory[list.size()]);
}
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 293c2df66..5039c009e 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
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.parser;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static java.util.stream.Collectors.*;
@@ -149,7 +150,7 @@ public final class ParserSet {
*/
protected Builder(BeanStore beanStore) {
super(ParserSet.class, beanStore);
- this.entries = list2();
+ this.entries = list();
}
/**
@@ -159,7 +160,7 @@ public final class ParserSet {
*/
protected Builder(ParserSet copyFrom) {
super(copyFrom.getClass(), BeanStore.INSTANCE);
- this.entries = list2((Object[])copyFrom.entries);
+ this.entries = list((Object[])copyFrom.entries);
}
/**
@@ -173,7 +174,7 @@ public final class ParserSet {
protected Builder(Builder copyFrom) {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null :
copyFrom.bcBuilder.copy();
- entries = list2();
+ entries = list();
copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
}
@@ -258,7 +259,7 @@ public final class ParserSet {
* @throws IllegalArgumentException If one or more values do
not extend from {@link Parser}.
*/
public Builder add(Class<?>...values) {
- List<Object> l = list2();
+ List<Object> l = list();
for (Class<?> v : values)
if (v.getSimpleName().equals("NoInherit"))
clear();
@@ -298,7 +299,7 @@ public final class ParserSet {
* @throws IllegalArgumentException If one or more values do
not extend from {@link Parser} or named <js>"Inherit"</js>.
*/
public Builder set(Class<?>...values) {
- List<Object> l = list2();
+ List<Object> l = list();
for (Class<?> v : values) {
if (v.getSimpleName().equals("Inherit")) {
l.addAll(entries);
@@ -494,8 +495,8 @@ public final class ParserSet {
this.entries =
builder.entries.stream().map(this::build).toArray(Parser[]::new);
- List<MediaType> lmt = list2();
- List<Parser> l = list2();
+ List<MediaType> lmt = list();
+ List<Parser> l = list();
for (Parser e : entries) {
e.getMediaTypes().forEach(x -> {
lmt.add(x);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
index 215b89eba..7f9973fdf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Position.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.parser;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -56,7 +57,7 @@ public class Position {
@Override /* Object */
public String toString() {
- List<String> l = list2();
+ List<String> l = list();
if (line != -1)
l.add("line " + line);
if (column != -1)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index 82a197f2f..ade942cfc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -396,7 +396,7 @@ public final class ClassInfo {
ClassInfo[] _getParents() {
if (parents == null) {
synchronized(this) {
- List<ClassInfo> l = list2();
+ List<ClassInfo> l = list();
Class<?> pc = c;
while (pc != null && pc != Object.class) {
l.add(of(pc));
@@ -602,7 +602,7 @@ public final class ClassInfo {
MethodInfo[] _getAllMethods() {
if (allMethods == null) {
synchronized(this) {
- List<MethodInfo> l = list2();
+ List<MethodInfo> l = list();
for (ClassInfo c : _getAllParents())
c._appendDeclaredMethods(l);
allMethods = l.toArray(new
MethodInfo[l.size()]);
@@ -614,7 +614,7 @@ public final class ClassInfo {
MethodInfo[] _getAllMethodsParentFirst() {
if (allMethodsParentFirst == null) {
synchronized(this) {
- List<MethodInfo> l = list2();
+ List<MethodInfo> l = list();
ClassInfo[] parents = _getAllParents();
for (int i = parents.length-1; i >=0; i--)
parents[i]._appendDeclaredMethods(l);
@@ -909,7 +909,7 @@ public final class ClassInfo {
FieldInfo[] _getAllFields() {
if (allFields == null) {
synchronized(this) {
- List<FieldInfo> l = list2();
+ List<FieldInfo> l = list();
ClassInfo[] parents = _getAllParents();
for (int i = parents.length-1; i >=0; i--)
for (FieldInfo f :
parents[i]._getDeclaredFields())
@@ -947,7 +947,7 @@ public final class ClassInfo {
* @return The matching annotations.
*/
public <A extends Annotation> List<A> getAnnotations(AnnotationProvider
annotationProvider, Class<A> type) {
- List<A> l = list2();
+ List<A> l = list();
forEachAnnotation(annotationProvider, type, x-> true, x ->
l.add(x));
return l;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index 84f1a5e0f..fa38fc1c8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.reflect;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
@@ -198,7 +199,7 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
MethodInfo[] _getMatching() {
if (matching == null) {
synchronized(this) {
- List<MethodInfo> l = findMatching(list2(),
this, getDeclaringClass());
+ List<MethodInfo> l = findMatching(list(), this,
getDeclaringClass());
matching = l.toArray(new MethodInfo[l.size()]);
}
}
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 6e155adff..1245a2d44 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
@@ -149,7 +149,7 @@ public final class SerializerSet {
*/
protected Builder(BeanStore beanStore) {
super(SerializerSet.class, beanStore);
- this.entries = list2();
+ this.entries = list();
}
/**
@@ -159,7 +159,7 @@ public final class SerializerSet {
*/
protected Builder(SerializerSet copyFrom) {
super(copyFrom.getClass());
- this.entries = list2((Object[])copyFrom.entries);
+ this.entries = list((Object[])copyFrom.entries);
}
/**
@@ -173,7 +173,7 @@ public final class SerializerSet {
protected Builder(Builder copyFrom) {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null :
copyFrom.bcBuilder.copy();
- entries = list2();
+ entries = list();
copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
}
@@ -258,7 +258,7 @@ public final class SerializerSet {
* @throws IllegalArgumentException If one or more values do
not extend from {@link Serializer}.
*/
public Builder add(Class<?>...values) {
- List<Object> l = list2();
+ List<Object> l = list();
for (Class<?> e : values) {
if (Serializer.class.isAssignableFrom(e)) {
l.add(createBuilder(e));
@@ -295,7 +295,7 @@ public final class SerializerSet {
* @throws IllegalArgumentException If one or more values do
not extend from {@link Serializer} or named <js>"Inherit"</js>.
*/
public Builder set(Class<?>...values) {
- List<Object> l = list2();
+ List<Object> l = list();
for (Class<?> e : values) {
if (e.getSimpleName().equals("Inherit")) {
l.addAll(entries);
@@ -500,9 +500,9 @@ public final class SerializerSet {
this.entries =
builder.entries.stream().map(this::build).toArray(Serializer[]::new);
this.entriesList = Utils.ulist2(entries);
- List<MediaRange> lmtr = list2();
+ List<MediaRange> lmtr = list();
Set<MediaType> lmt = set();
- List<Serializer> l = list2();
+ List<Serializer> l = list();
for (Serializer e : entries) {
e.getMediaTypeRanges().forEachRange(x -> {
lmtr.add(x);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index 40ff8fd27..3eb34b152 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -14,6 +14,7 @@ package org.apache.juneau.uon;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.io.*;
@@ -418,7 +419,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
o = toArray(sType, l);
}
} else {
- ArrayList l = (ArrayList)parseIntoCollection(r,
list2(), sType, isUrlParamValue, pMeta);
+ ArrayList l = (ArrayList)parseIntoCollection(r,
list(), sType, isUrlParamValue, pMeta);
o = toArray(sType, l);
}
} else if (c == '(') {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
index e7cc5f461..d521b8701 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
@@ -15,6 +15,7 @@ package org.apache.juneau.utils;
import static java.lang.Character.*;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.lang.reflect.*;
@@ -161,10 +162,10 @@ public class ReflectionMap<V> {
* Constructor.
*/
protected Builder() {
- classEntries = list2();
- methodEntries = list2();
- fieldEntries = list2();
- constructorEntries = list2();
+ classEntries = list();
+ methodEntries = list();
+ fieldEntries = list();
+ constructorEntries = list();
}
/**
@@ -363,7 +364,7 @@ public class ReflectionMap<V> {
private static <V> List<V> lazyAdd(List<V> list, V v) {
if (list == null)
- list = list2();
+ list = list();
list.add(v);
return list;
}
@@ -803,7 +804,7 @@ public class ReflectionMap<V> {
private static <V> List<V> lazyAdd(V[] array, List<V> list, V v) {
if (list == null)
- list = list2(array);
+ list = list(array);
list.add(v);
return list;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
index 4cbc36709..26e5fa361 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/StringExpressionMatcher.java
@@ -19,6 +19,7 @@ import java.util.regex.*;
import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StateMachineState.*;
@@ -99,8 +100,8 @@ public class StringExpressionMatcher {
expression = expression.trim();
- List<Exp> ors = list2();
- List<Exp> ands = list2();
+ List<Exp> ors = list();
+ List<Exp> ands = list();
StateMachineState state = S01;
int i = 0, mark = -1;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
index c5dd9a4b3..732008487 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.xml;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -41,8 +42,8 @@ public class XmlClassMeta extends ExtendedClassMeta {
*/
public XmlClassMeta(ClassMeta<?> cm, XmlMetaProvider mp) {
super(cm);
- List<Xml> xmls = list2();
- List<XmlSchema> schemas = list2();
+ List<Xml> xmls = list();
+ List<XmlSchema> schemas = list();
if (cm != null) {
cm.forEachAnnotation(Xml.class, x -> true, x ->
xmls.add(x));
cm.forEachAnnotation(XmlSchema.class, x -> true, x ->
schemas.add(x));
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
index 522a09163..e54596957 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
@@ -14,6 +14,7 @@ package org.apache.juneau.xml;
import static javax.xml.stream.XMLStreamConstants.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.xml.annotation.XmlFormat.*;
@@ -539,7 +540,7 @@ public class XmlParserSession extends ReaderParserSession {
o = builder != null ? builder.build(this,
m.getBean(), eType) : m.getBean();
}
} else if (sType.isArray() || sType.isArgs()) {
- ArrayList l = (ArrayList)parseIntoCollection(r,
list2(), sType, pMeta);
+ ArrayList l = (ArrayList)parseIntoCollection(r, list(),
sType, pMeta);
o = toArray(sType, l);
} else if (sType.canCreateNewInstanceFromString(outer)) {
o = sType.newInstanceFromString(outer,
getElementText(r));
@@ -793,7 +794,7 @@ public class XmlParserSession extends ReaderParserSession {
else if (cpcm.isCollectionOrArray()) {
Object o = cp.get(m, null);
if (o == null)
- cp.set(m, cp.getName(), list2());
+ cp.set(m, cp.getName(), list());
}
}
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index a0c555737..1b0386140 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -14,6 +14,7 @@ package org.apache.juneau.microservice;
import static org.apache.juneau.common.internal.IOUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.FileUtils.*;
@@ -148,7 +149,7 @@ public class Microservice implements ConfigEventListener {
ConfigStore configStore;
Config.Builder configBuilder = Config.create();
Boolean consoleEnabled;
- List<ConsoleCommand> consoleCommands = list2();
+ List<ConsoleCommand> consoleCommands = list();
VarResolver.Builder varResolver =
VarResolver.create().defaultVars().vars(ConfigVar.class);
Scanner consoleReader;
PrintWriter consoleWriter;
@@ -1074,7 +1075,7 @@ public class Microservice implements ConfigEventListener {
*/
public String executeCommand(String command, String input,
Object...args) {
StringWriter sw = new StringWriter();
- List<String> l = list2();
+ List<String> l = list();
l.add(command);
for (Object a : args)
l.add(Utils.s(a));
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
index 60affce50..f3d11c5ea 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/DirectoryResource.java
@@ -14,6 +14,7 @@ package org.apache.juneau.microservice.resources;
import static org.apache.juneau.common.internal.IOUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.io.*;
@@ -258,7 +259,7 @@ public class DirectoryResource extends BasicRestServlet {
@Html(format=HtmlFormat.HTML_CDC)
public List<Action> getActions() throws Exception {
- List<Action> l = list2();
+ List<Action> l = list();
if (allowViews && f.canRead() && ! f.isDirectory()) {
l.add(new Action("view", uri + "?method=VIEW"));
l.add(new Action("download", uri +
"?method=DOWNLOAD"));
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 0d46fa613..e61255d8d 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
@@ -18,6 +18,7 @@ import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.common.internal.IOUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.http.HttpEntities.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.rest.client.RestOperation.*;
@@ -87,7 +88,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
final RestClient client; // The client
that created this call.
private final HttpRequestBase request; // The request.
private RestResponse response; // The response.
- List<RestCallInterceptor> interceptors = list2(); // Used for
intercepting and altering requests.
+ List<RestCallInterceptor> interceptors = list(); // Used for
intercepting and altering requests.
private HeaderList headerData;
private PartList queryData, formData, pathData;
@@ -687,7 +688,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
@FluentSetter
public RestRequest rethrow(Class<?>...values) {
if (rethrow == null)
- rethrow = list2();
+ rethrow = list();
for (Class<?> v : values) {
if (v != null && Throwable.class.isAssignableFrom(v))
rethrow.add((Class<? extends Throwable>)v);
@@ -1499,7 +1500,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
return this;
}
- List<Header> l = list2();
+ List<Header> l = list();
if (HttpHeaders.canCast(value)) {
l.add(HttpHeaders.cast(value));
@@ -1535,7 +1536,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
return this;
}
- List<NameValuePair> l = list2();
+ List<NameValuePair> l = list();
if (HttpParts.canCast(value)) {
l.add(HttpParts.cast(value));
@@ -1572,7 +1573,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
return this;
}
- List<NameValuePair> l = list2();
+ List<NameValuePair> l = list();
if (HttpParts.canCast(value)) {
l.add(HttpParts.cast(value));
@@ -1606,7 +1607,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
if (! isMulti)
return pathData(createPart(name, value, PATH,
serializer, schema, false));
- List<NameValuePair> l = list2();
+ List<NameValuePair> l = list();
if (HttpParts.canCast(value)) {
l.add(HttpParts.cast(value));
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockLogger.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockLogger.java
index 98bf4fb05..e2561f153 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockLogger.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockLogger.java
@@ -13,6 +13,7 @@
package org.apache.juneau.rest.mock;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.io.*;
@@ -71,7 +72,7 @@ public class MockLogger extends Logger {
private static final String FORMAT_PROPERTY =
"java.util.logging.SimpleFormatter.format";
- private final List<LogRecord> logRecords = list2();
+ private final List<LogRecord> logRecords = list();
private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
private volatile Formatter formatter;
private volatile String format = "%4$s: %5$s%6$s%n";
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
index 50c5fd0e9..121ca5de5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
@@ -14,6 +14,7 @@ package org.apache.juneau.rest.arg;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.http.annotation.FormDataAnnotation.*;
import java.util.*;
@@ -101,7 +102,7 @@ public class FormDataArg implements RestOpArg {
ClassMeta<?> cm = bs.getClassMeta(type.innerType());
if (multi) {
- Collection c = cm.isArray() ? list2() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
+ 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));
return cm.isArray() ? ArrayUtils.toArray(c,
cm.getElementType().getInnerClass()) : c;
}
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 e3ef00a9d..90e86885f 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
@@ -14,6 +14,7 @@ package org.apache.juneau.rest.arg;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.http.annotation.HeaderAnnotation.*;
import java.util.*;
@@ -142,7 +143,7 @@ public class HeaderArg implements RestOpArg {
ClassMeta<?> cm = bs.getClassMeta(type.innerType());
if (multi) {
- Collection c = cm.isArray() ? list2() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
+ Collection c = cm.isArray() ? list() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
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;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
index 21540e91b..c2f90c8e2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
@@ -14,6 +14,7 @@ package org.apache.juneau.rest.arg;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.http.annotation.QueryAnnotation.*;
import java.util.*;
@@ -101,7 +102,7 @@ public class QueryArg implements RestOpArg {
ClassMeta<?> cm = bs.getClassMeta(type.innerType());
if (multi) {
- Collection c = cm.isArray() ? list2() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
+ 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));
return cm.isArray() ? ArrayUtils.toArray(c,
cm.getElementType().getInnerClass()) : c;
}
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 219fe0b6f..4d7fc8c64 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
@@ -13,6 +13,7 @@
package org.apache.juneau.rest.arg;
import static org.apache.juneau.common.internal.ArgUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -63,7 +64,7 @@ public class RestOpArgList {
*/
protected Builder(BeanStore beanStore) {
super(RestOpArgList.class, beanStore);
- entries = list2();
+ entries = list();
}
@Override /* BeanBuilder */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
index cb8090bb2..93ecebf0c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.converter;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -62,7 +63,7 @@ public class RestConverterList {
*/
protected Builder(BeanStore beanStore) {
super(RestConverterList.class, beanStore);
- this.entries = list2();
+ this.entries = list();
}
@Override /* BeanBuilder */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
index a00a6bede..a68bca099 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.guard;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -62,7 +63,7 @@ public class RestGuardList {
*/
protected Builder(BeanStore beanStore) {
super(RestGuardList.class, beanStore);
- entries = list2();
+ entries = list();
}
@Override /* BeanBuilder */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
index 87ff59e8d..e1be2bf4e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleMatcher.java
@@ -19,6 +19,7 @@ import java.util.regex.*;
import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StateMachineState.*;
@@ -100,8 +101,8 @@ public class RoleMatcher {
expression = expression.trim();
- List<Exp> ors = list2();
- List<Exp> ands = list2();
+ List<Exp> ors = list();
+ List<Exp> ands = list();
StateMachineState state = S01;
int i = 0, mark = -1;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
index 4b0f12f7f..0810ce14c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
@@ -13,6 +13,7 @@
package org.apache.juneau.rest.matcher;
import static java.util.stream.Collectors.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -63,7 +64,7 @@ public class RestMatcherList {
*/
protected Builder(BeanStore beanStore) {
super(RestMatcherList.class, beanStore);
- entries = list2();
+ entries = list();
}
@Override /* BeanBuilder */
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 8f0673d57..3d480dc79 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
@@ -13,6 +13,7 @@
package org.apache.juneau.rest.processor;
import static org.apache.juneau.common.internal.ArgUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
@@ -63,7 +64,7 @@ public class ResponseProcessorList {
*/
protected Builder(BeanStore beanStore) {
super(ResponseProcessorList.class, beanStore);
- this.entries = list2();
+ this.entries = list();
}
@Override /* BeanBuilder */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
index 72606db46..f83f68e44 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/remote/RrpcServlet.java
@@ -14,6 +14,7 @@ package org.apache.juneau.rest.remote;
import static org.apache.juneau.bean.html5.HtmlBuilder.*;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -98,7 +99,7 @@ public abstract class RrpcServlet extends BasicRestServlet {
@Path("javaInterface") @Schema(description="Java
interface name") String javaInterface
) throws Exception {
- List<LinkString> l = list2();
+ List<LinkString> l = list();
for (String s : getMethods(javaInterface).keySet())
l.add(new LinkString(s, "servlet:/{0}/{1}",
urlEncode(javaInterface), urlEncode(s)));
return l;
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 1ce991602..767f2abe7 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
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.staticfile;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.nio.file.*;
@@ -73,7 +74,7 @@ public interface StaticFiles extends FileFinder {
*/
protected Builder(BeanStore beanStore) {
super(BasicStaticFiles.class, beanStore);
- headers = list2();
+ headers = list();
fileFinder = FileFinder.create(beanStore);
mimeTypes = new ExtendedMimetypesFileTypeMap();
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
index dc8ab836e..6bd56abf7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
@@ -417,9 +417,9 @@ public class BasicSwaggerProviderSession {
}
if (mi.hasAnnotation(Response.class) ||
mi.getReturnType().unwrap(Value.class,Optional.class).hasAnnotation(Response.class))
{
- List<Response> la = list2();
+ List<Response> la = list();
mi.forEachAnnotation(context, Response.class, x
-> true, x -> la.add(x));
- List<StatusCode> la2 = list2();
+ List<StatusCode> la2 = list();
mi.forEachAnnotation(context, StatusCode.class,
x -> true, x -> la2.add(x));
Set<Integer> codes = getCodes(la2, 200);
for (Response a : la) {
@@ -468,10 +468,10 @@ public class BasicSwaggerProviderSession {
ClassInfo pt = mpi.getParameterType();
if (pt.is(Value.class) &&
(mpi.hasAnnotation(Header.class) || pt.hasAnnotation(Header.class))) {
- List<Header> la = list2();
+ List<Header> la = list();
mpi.forEachAnnotation(Header.class, x
-> true, x -> la.add(x));
pt.forEachAnnotation(Header.class, x ->
true, x -> la.add(x));
- List<StatusCode> la2 = list2();
+ List<StatusCode> la2 = list();
mpi.forEachAnnotation(StatusCode.class,
x -> true, x -> la2.add(x));
pt.forEachAnnotation(StatusCode.class,
x -> true, x -> la2.add(x));
Set<Integer> codes = getCodes(la2, 200);
@@ -489,10 +489,10 @@ public class BasicSwaggerProviderSession {
}
} else if (mpi.hasAnnotation(Response.class) ||
pt.hasAnnotation(Response.class)) {
- List<Response> la = list2();
+ List<Response> la = list();
mpi.forEachAnnotation(Response.class, x
-> true, x -> la.add(x));
pt.forEachAnnotation(Response.class, x
-> true, x -> la.add(x));
- List<StatusCode> la2 = list2();
+ List<StatusCode> la2 = list();
mpi.forEachAnnotation(StatusCode.class,
x -> true, x -> la2.add(x));
pt.forEachAnnotation(StatusCode.class,
x -> true, x -> la2.add(x));
Set<Integer> codes = getCodes(la2, 200);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
index ad9d11e7c..6e2b4ddb1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
@@ -14,6 +14,7 @@ package org.apache.juneau.rest.util;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -217,7 +218,7 @@ public final class RestUtils {
if (value.length == 0)
return fromParent;
- List<String> l = list2();
+ List<String> l = list();
for (String v : value) {
if (! "INHERIT".equals(v))
l.add(v);
@@ -233,7 +234,7 @@ public final class RestUtils {
if (links.length == 0)
return parentLinks;
- List<String> list = list2();
+ List<String> list = list();
for (String l : links) {
if ("INHERIT".equals(l))
addAll(list, parentLinks);
@@ -255,7 +256,7 @@ public final class RestUtils {
if (content.length == 0)
return parentContent;
- List<String> list = list2();
+ List<String> list = list();
for (String l : content) {
if ("INHERIT".equals(l)) {
addAll(list, parentContent);
