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 224ce5352 Test modernization, clean up utility classes.
224ce5352 is described below
commit 224ce5352b75746e30863a6b14bd35a6c52b0d60
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 14:32:04 2025 -0400
Test modernization, clean up utility classes.
---
.../org/apache/juneau/bean/swagger/HeaderInfo.java | 2 +-
.../java/org/apache/juneau/bean/swagger/Items.java | 2 +-
.../org/apache/juneau/bean/swagger/Operation.java | 8 +--
.../apache/juneau/bean/swagger/ParameterInfo.java | 2 +-
.../org/apache/juneau/bean/swagger/SchemaInfo.java | 6 +--
.../org/apache/juneau/bean/swagger/Swagger.java | 8 +--
.../apache/juneau/bean/swagger/ui/SwaggerUI.java | 3 +-
.../assertions/FluentThrowableAssertion.java | 5 +-
.../org/apache/juneau/common/internal/Utils.java | 54 ++++++++++++++++++++
.../apache/juneau/config/internal/ConfigMap.java | 2 +-
.../java/org/apache/juneau/jena/RdfClassMeta.java | 4 +-
.../org/apache/juneau/jena/RdfParserSession.java | 4 +-
.../apache/juneau/jena/RdfSerializerSession.java | 4 +-
.../main/java/org/apache/juneau/BeanFilter.java | 2 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 4 +-
.../java/org/apache/juneau/BeanPropertyMeta.java | 10 ++--
.../src/main/java/org/apache/juneau/ClassMeta.java | 4 +-
.../main/java/org/apache/juneau/MediaRange.java | 5 +-
.../main/java/org/apache/juneau/cp/BeanStore.java | 2 +-
.../org/apache/juneau/cp/DefaultClassList.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 29 +++++------
.../org/apache/juneau/html/HtmlParserSession.java | 6 +--
.../apache/juneau/internal/CollectionUtils.java | 57 +---------------------
.../org/apache/juneau/json/JsonParserSession.java | 4 +-
.../jsonschema/JsonSchemaGeneratorSession.java | 2 +-
.../org/apache/juneau/jsonschema/TypeCategory.java | 2 +-
.../juneau/msgpack/MsgPackSerializerSession.java | 5 +-
.../apache/juneau/objecttools/ObjectSearcher.java | 4 +-
.../apache/juneau/objecttools/ObjectSorter.java | 6 +--
.../apache/juneau/objecttools/ObjectViewer.java | 5 +-
.../java/org/apache/juneau/parser/ParserSet.java | 24 ++++-----
.../java/org/apache/juneau/parser/Position.java | 2 +-
.../java/org/apache/juneau/reflect/ClassInfo.java | 46 ++++++++---------
.../org/apache/juneau/reflect/ExecutableInfo.java | 13 ++---
.../java/org/apache/juneau/reflect/MethodInfo.java | 2 +-
.../apache/juneau/serializer/SerializerSet.java | 20 ++++----
.../java/org/apache/juneau/swap/AutoListSwap.java | 5 +-
.../java/org/apache/juneau/swap/AutoMapSwap.java | 5 +-
.../org/apache/juneau/swap/AutoNumberSwap.java | 5 +-
.../org/apache/juneau/swap/AutoObjectSwap.java | 5 +-
.../org/apache/juneau/swaps/MatchResultSwap.java | 3 +-
.../org/apache/juneau/uon/UonParserSession.java | 4 +-
.../org/apache/juneau/utils/ReflectionMap.java | 12 ++---
.../juneau/utils/StringExpressionMatcher.java | 4 +-
.../java/org/apache/juneau/xml/XmlClassMeta.java | 4 +-
.../org/apache/juneau/xml/XmlParserSession.java | 4 +-
.../apache/juneau/microservice/Microservice.java | 4 +-
.../microservice/resources/DirectoryResource.java | 2 +-
.../org/apache/juneau/rest/client/RestRequest.java | 12 ++---
.../apache/juneau/http/header/BasicCsvHeader.java | 6 +--
.../org/apache/juneau/http/header/EntityTags.java | 3 +-
.../apache/juneau/http/part/BasicCsvArrayPart.java | 4 +-
.../org/apache/juneau/rest/mock/MockLogger.java | 2 +-
.../juneau/rest/mock/MockServletResponse.java | 3 +-
.../java/org/apache/juneau/rest/RestContext.java | 4 +-
.../org/apache/juneau/rest/RestOperations.java | 5 +-
.../org/apache/juneau/rest/arg/FormDataArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/HeaderArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/QueryArg.java | 2 +-
.../org/apache/juneau/rest/arg/RestOpArgList.java | 2 +-
.../juneau/rest/converter/RestConverterList.java | 2 +-
.../apache/juneau/rest/guard/RestGuardList.java | 2 +-
.../org/apache/juneau/rest/guard/RoleMatcher.java | 4 +-
.../juneau/rest/matcher/RestMatcherList.java | 2 +-
.../rest/processor/ResponseProcessorList.java | 2 +-
.../org/apache/juneau/rest/remote/RrpcServlet.java | 2 +-
.../apache/juneau/rest/staticfile/StaticFiles.java | 2 +-
.../rest/swagger/BasicSwaggerProviderSession.java | 12 ++---
.../org/apache/juneau/rest/util/RestUtils.java | 10 ++--
.../juneau/rest/util/UrlPathMatcherList.java | 3 +-
.../org/apache/juneau/rest/widget/Tooltip.java | 3 +-
71 files changed, 261 insertions(+), 247 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
index 31cc01281..a36e2dab7 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
@@ -262,7 +262,7 @@ public class HeaderInfo extends SwaggerElement {
* @return This object.
*/
public HeaderInfo setEnum(Collection<Object> value) {
- _enum = toSet(value);
+ _enum = setFrom(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
index cbb0c8a37..2a0e593a4 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
@@ -236,7 +236,7 @@ public class Items extends SwaggerElement {
* @return This object.
*/
public Items setEnum(Collection<Object> value) {
- _enum = toSet(value);
+ _enum = setFrom(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Operation.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Operation.java
index d9d119579..d6542fccc 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Operation.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Operation.java
@@ -236,7 +236,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setConsumes(Collection<MediaType> value) {
- consumes = toSet(value);
+ consumes = setFrom(value);
return this;
}
@@ -512,7 +512,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setProduces(Collection<MediaType> value) {
- produces = toSet(value);
+ produces = setFrom(value);
return this;
}
@@ -639,7 +639,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setSchemes(Collection<String> value) {
- schemes = toSet(value);
+ schemes = setFrom(value);
return this;
}
@@ -758,7 +758,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setTags(Collection<String> value) {
- tags = toSet(value);
+ tags = setFrom(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
index 07f57e66e..04cc21418 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
@@ -410,7 +410,7 @@ public class ParameterInfo extends SwaggerElement {
* @return This object.
*/
public ParameterInfo setEnum(Collection<Object> value) {
- _enum = toSet(value);
+ _enum = setFrom(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
index f105508c5..02f17fb44 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
@@ -200,7 +200,7 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setAllOf(Collection<Object> value) {
- allOf = toSet(value);
+ allOf = setFrom(value);
return this;
}
@@ -322,7 +322,7 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setEnum(Collection<Object> value) {
- _enum = toSet(value);
+ _enum = setFrom(value);
return this;
}
@@ -850,7 +850,7 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setRequiredProperties(Collection<String> value) {
- requiredProperties = toSet(value);
+ requiredProperties = setFrom(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
index 5717de176..9f10e7957 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
@@ -175,7 +175,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setConsumes(Collection<MediaType> value) {
- consumes = toSet(value);
+ consumes = setFrom(value);
return this;
}
@@ -456,7 +456,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setProduces(Collection<MediaType> value) {
- produces = toSet(value);
+ produces = setFrom(value);
return this;
}
@@ -566,7 +566,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setSchemes(Collection<String> value) {
- schemes = toSet(value);
+ schemes = setFrom(value);
return this;
}
@@ -754,7 +754,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setTags(Collection<Tag> value) {
- tags = toSet(value);
+ tags = setFrom(value);
return this;
}
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 6c47d6b51..d07a706b7 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
@@ -15,7 +15,6 @@ package org.apache.juneau.bean.swagger.ui;
import static java.util.Collections.*;
import static org.apache.juneau.bean.html5.HtmlBuilder.*;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.CollectionUtils.list;
import java.util.*;
@@ -389,7 +388,7 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
return null; // NOSONAR - Intentionally returning null.
if (s.indexOf(',') == -1)
return singletonList(s);
- var l = list();
+ var l = list2();
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 712f35e9f..cdeb4164c 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,7 +15,6 @@ 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.internal.CollectionUtils.list;
import java.io.*;
import java.util.*;
@@ -200,7 +199,7 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
if (t.getCause() == null)
l = singletonList(t.getMessage());
else {
- l = list();
+ l = CollectionUtils.list2();
while (t != null) {
l.add(t.getMessage());
t = t.getCause();
@@ -249,7 +248,7 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
if (t.getCause() == null)
l = singletonList(t.getMessage());
else {
- l = list();
+ l = CollectionUtils.list2();
while (t != null) {
l.add(t.getLocalizedMessage());
t = t.getCause();
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
index b9a8fd093..5cfd863a1 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/Utils.java
@@ -26,6 +26,7 @@ import java.util.concurrent.*;
import java.util.function.*;
import java.util.stream.*;
+
public class Utils {
/** Constructor */
@@ -647,4 +648,57 @@ public class Utils {
public static <K,V> boolean isNotEmpty2(Map<K,V> value) {
return value != null && ! value.isEmpty();
}
+
+ /**
+ * Converts the specified collection to an array.
+ *
+ * @param <E> The element type.
+ * @param value The collection to convert.
+ * @param componentType The component type of the array.
+ * @return A new array.
+ */
+ @SuppressWarnings("unchecked")
+ public static <E> E[] array(Collection<E> value, Class<E>
componentType) {
+ if (value == null)
+ return null;
+ E[] array = (E[])Array.newInstance(componentType, value.size());
+ return value.toArray(array);
+ }
+
+ /**
+ * Convenience method for creating an unmodifiable list.
+ *
+ * @param <E> The element type.
+ * @param values The values to initialize the list with.
+ * @return A new unmodifiable list, or <jk>null</jk> if the array was
<jk>null</jk>.
+ */
+ @SafeVarargs
+ public static <E> List<E> ulist2(E...values) {
+ if (values == null)
+ return null;
+ return u(alist(values));
+ }
+
+ /**
+ * Convenience method for creating an unmodifiable {@link
LinkedHashSet}.
+ *
+ * @param <E> The element type.
+ * @param values The values to initialize the set with.
+ * @return A new unmodifiable set.
+ */
+ @SafeVarargs
+ public static <E> Set<E> uset2(E...values) {
+ return u(set(values));
+ }
+
+ /**
+ * Convenience method for creating an {@link ArrayList} of the
specified size.
+ *
+ * @param <E> The element type.
+ * @param size The initial size of the list.
+ * @return A new modifiable list.
+ */
+ public static <E> ArrayList<E> listOfSize(int size) {
+ return new ArrayList<>(size);
+ }
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index 67d968f07..ad189b63a 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -120,7 +120,7 @@ public class ConfigMap implements ConfigStoreListener {
}
}
- List<Import> irl = list(imports2.size());
+ List<Import> irl = Utils.listOfSize(imports2.size());
forEachReverse(listFrom(imports2.values()), x -> irl.add(new
Import(x).register(listeners)));
this.imports.addAll(irl);
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 8e39642fa..a35a603ad 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
@@ -41,8 +41,8 @@ public class RdfClassMeta extends ExtendedClassMeta {
*/
public RdfClassMeta(ClassMeta<?> cm, RdfMetaProvider mp) {
super(cm);
- List<Rdf> rdfs = list();
- List<RdfSchema> schemas = list();
+ List<Rdf> rdfs = list2();
+ List<RdfSchema> schemas = list2();
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 a19b5e12a..841a2522e 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
@@ -240,7 +240,7 @@ public class RdfParserSession extends ReaderParserSession {
if (isLooseCollections() && type.isCollectionOrArray()) {
Collection c = null;
if (type.isArray() || type.isArgs())
- c = list();
+ c = list2();
else
c = (
type.canCreateNewInstance(getOuter())
@@ -464,7 +464,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 = list();
+ o = list2();
else
o = (sType.canCreateNewInstance(outer) ?
(Collection<?>)sType.newInstance(outer) : new JsonList(this));
Resource r = n.asResource();
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index cd8d4a603..c14712f03 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -24,7 +24,7 @@ import java.util.function.*;
import com.hp.hpl.jena.rdf.model.*;
import org.apache.juneau.*;
-import org.apache.juneau.common.internal.StringUtils;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.jena.annotation.*;
@@ -534,7 +534,7 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
private RDFList serializeToList(Collection c, ClassMeta<?> type) throws
SerializeException {
ClassMeta<?> elementType = type.getElementType();
- List<RDFNode> l = list(c.size());
+ List<RDFNode> l = Utils.listOfSize(c.size());
c.forEach(x -> l.add(serializeAnything(x, false, elementType,
null, null, null)));
return model.createList(l.iterator());
}
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 587046a29..9f784e65f 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
@@ -629,7 +629,7 @@ public final class BeanFilter {
*/
public Builder dictionary(Class<?>...values) {
if (dictionary == null)
- dictionary = list(values);
+ dictionary = list2(values);
else for (Class<?> cc : values)
dictionary.add(cc);
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index d09b40bd9..6e0b01f7f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -128,7 +128,7 @@ public class BeanMeta<T> {
this.beanFilter = beanFilter;
this.dictionaryName = b.dictionaryName;
this.properties = u(b.properties);
- this.propertyArray = properties == null ? EMPTY_PROPERTIES :
CollectionUtils.array(properties.values(), BeanPropertyMeta.class);
+ this.propertyArray = properties == null ? EMPTY_PROPERTIES :
Utils.array(properties.values(), BeanPropertyMeta.class);
this.hiddenProperties = u(b.hiddenProperties);
this.getterProps = u(b.getterProps);
this.setterProps = u(b.setterProps);
@@ -806,7 +806,7 @@ public class BeanMeta<T> {
* @return Metadata on all properties associated with this bean.
*/
public Collection<BeanPropertyMeta> getPropertyMetas() {
- return CollectionUtils.ulist(propertyArray);
+ return Utils.ulist2(propertyArray);
}
/**
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 f64503af5..f6e8802be 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
@@ -168,7 +168,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 = list();
+ List<Class<?>> bdClasses = list2();
if (field == null && getter == null && setter == null)
return false;
@@ -180,7 +180,7 @@ public final class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
canWrite |= (field != null || setter != null);
if (innerField != null) {
- List<Beanp> lp = list();
+ List<Beanp> lp = list2();
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 +202,7 @@ public final class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
}
if (getter != null) {
- List<Beanp> lp = list();
+ List<Beanp> lp = list2();
bc.forEachAnnotation(Beanp.class, getter, x ->
true, x -> lp.add(x));
if (rawTypeMeta == null)
rawTypeMeta =
bc.resolveClassMeta(last(lp), getter.getGenericReturnType(), typeVarImpls);
@@ -220,7 +220,7 @@ public final class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
}
if (setter != null) {
- List<Beanp> lp = list();
+ List<Beanp> lp = list2();
bc.forEachAnnotation(Beanp.class, setter, x ->
true, x -> lp.add(x));
if (rawTypeMeta == null)
rawTypeMeta =
bc.resolveClassMeta(last(lp), setter.getGenericParameterTypes()[0],
typeVarImpls);
@@ -626,7 +626,7 @@ public final class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
return l;
} else if (rawTypeMeta.isCollection()) {
Collection c = (Collection)o;
- List l = list(c.size());
+ List l = Utils.listOfSize(c.size());
ClassMeta childType =
rawTypeMeta.getElementType();
c.forEach(x ->
l.add(applyChildPropertiesFilter(session, childType, x)));
return l;
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 114f18643..a1127925e 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
@@ -337,7 +337,7 @@ public final class ClassMeta<T> implements Type {
dictionaryName = null;
Throwable initException = null;
BeanMeta beanMeta = null;
- List<ObjectSwap> swaps = list();
+ List<ObjectSwap> swaps = list2();
BuilderSwap builderSwap;
InvocationHandler invocationHandler = null;
BeanRegistry beanRegistry = null;
@@ -2164,7 +2164,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 = list();
+ List<A> l = list2();
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 b792be272..1da3e70b9 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
@@ -19,6 +19,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.http.message.*;
+import org.apache.juneau.common.internal.*;
/**
@@ -48,7 +49,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 = list();
+ List<NameValuePair> extensions = list2();
boolean foundQ = false;
for (NameValuePair p : e.getParameters()) {
if (p.getName().equals("q")) {
@@ -102,7 +103,7 @@ public class MediaRange extends MediaType {
* @return The optional list of extensions, never <jk>null</jk>.
*/
public List<NameValuePair> getExtensions() {
- return ulist(extensions);
+ return Utils.ulist2(extensions);
}
/**
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 9840b2acf..108721740 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
@@ -588,7 +588,7 @@ public class BeanStore {
*/
public String getMissingParams(ExecutableInfo executable) {
List<ParamInfo> params = executable.getParams();
- List<String> l = list();
+ List<String> l = list2();
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 7c4dfd756..1360ff7e5 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
@@ -64,7 +64,7 @@ public class DefaultClassList {
* Constructor.
*/
protected DefaultClassList() {
- entries = list();
+ entries = list2();
}
/**
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 1b797db42..f31679d79 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
@@ -24,6 +24,7 @@ import java.util.regex.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.svl.*;
import org.apache.juneau.utils.*;
@@ -275,7 +276,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> aside() {
if (aside == null)
- aside = list();
+ aside = list2();
return aside;
}
@@ -353,7 +354,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> footer() {
if (footer == null)
- footer = list();
+ footer = list2();
return footer;
}
@@ -394,7 +395,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> head() {
if (head == null)
- head = list();
+ head = list2();
return head;
}
@@ -436,7 +437,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> header() {
if (header == null)
- header = list();
+ header = list2();
return header;
}
@@ -481,7 +482,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> nav() {
if (nav == null)
- nav = list();
+ nav = list2();
return nav;
}
@@ -543,7 +544,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> navlinks() {
if (navlinks == null)
- navlinks = list();
+ navlinks = list2();
return navlinks;
}
@@ -658,7 +659,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> script() {
if (script == null)
- script = list();
+ script = list2();
return script;
}
@@ -696,7 +697,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> style() {
if (style == null)
- style = list();
+ style = list2();
return style;
}
@@ -727,7 +728,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<String> stylesheet() {
if (stylesheet == null)
- stylesheet = list();
+ stylesheet = list2();
return stylesheet;
}
@@ -826,7 +827,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
*/
public List<Class<? extends HtmlWidget>> widgets() {
if (widgets == null)
- widgets = list();
+ widgets = list2();
return widgets;
}
@@ -1611,11 +1612,11 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
}
private static <T> List<T> copy(T[] s) {
- return s.length == 0 ? null : list(s);
+ return s.length == 0 ? null : list2(s);
}
private List<String> merge(List<String> old, String[]
newValues) {
- List<String> x = list(newValues.length);
+ List<String> x = Utils.listOfSize(newValues.length);
for (String s : newValues) {
if ("NONE".equals(s)) {
if (old != null)
@@ -1631,7 +1632,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
}
private List<String> mergeNavLinks(List<String> old, String[]
newValues) {
- List<String> x = list(newValues.length);
+ List<String> x = Utils.listOfSize(newValues.length);
for (String s : newValues) {
if ("NONE".equals(s)) {
if (old != null)
@@ -1699,7 +1700,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
templateBean = newInstance(template);
widgetMap = new HtmlWidgetMap();
widgets.stream().map(this::newInstance).forEach(x ->
widgetMap.append(x));
- widgetArray = array(widgetMap.values(), HtmlWidget.class);
+ widgetArray = Utils.array(widgetMap.values(), HtmlWidget.class);
}
@Override /* Context */
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 f8d15840c..841e550c5 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
@@ -397,7 +397,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, list(), sType, pMeta);
+ ArrayList l =
(ArrayList)parseTableIntoCollection(r, list2(), sType, pMeta);
o = toArray(sType, l);
}
else
@@ -420,7 +420,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,
list(), sType, pMeta));
+ o = toArray(sType, parseIntoCollection(r,
list2(), sType, pMeta));
else
isValid = false;
skipTag(r, xUL);
@@ -554,7 +554,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 = list();
+ List<String> keys = list2();
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 77ab19d79..933d16c38 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
@@ -38,7 +38,7 @@ public final class CollectionUtils {
* @param val The value to copy from.
* @return A new {@link LinkedHashSet}, or <jk>null</jk> if the input
was null.
*/
- public static <E> Set<E> toSet(Collection<E> val) {
+ public static <E> Set<E> setFrom(Collection<E> val) {
return val == null ? null : new LinkedHashSet<>(val);
}
@@ -156,7 +156,7 @@ public final class CollectionUtils {
* @return A new modifiable list.
*/
@SafeVarargs
- public static <E> List<E> list(E...values) {
+ public static <E> List<E> list2(E...values) {
ArrayList<E> l = new ArrayList<>(values.length);
for (E v : values)
l.add(v);
@@ -176,17 +176,6 @@ public final class CollectionUtils {
return list(values);
}
- /**
- * Convenience method for creating an {@link ArrayList} of the
specified size.
- *
- * @param <E> The element type.
- * @param size The initial size of the list.
- * @return A new modifiable list.
- */
- public static <E> ArrayList<E> list(int size) {
- return new ArrayList<>(size);
- }
-
/**
* Convenience method for creating a {@link LinkedList}.
*
@@ -271,32 +260,6 @@ public final class CollectionUtils {
return set(values);
}
- /**
- * Convenience method for creating an unmodifiable {@link
LinkedHashSet}.
- *
- * @param <E> The element type.
- * @param values The values to initialize the set with.
- * @return A new unmodifiable set.
- */
- @SafeVarargs
- public static <E> Set<E> uset(E...values) {
- return u(set(values));
- }
-
- /**
- * Convenience method for creating an unmodifiable list.
- *
- * @param <E> The element type.
- * @param values The values to initialize the list with.
- * @return A new unmodifiable list, or <jk>null</jk> if the array was
<jk>null</jk>.
- */
- @SafeVarargs
- public static <E> List<E> ulist(E...values) {
- if (values == null)
- return null;
- return u(alist(values));
- }
-
/**
* Convenience method for creating a {@link TreeSet}.
*
@@ -555,22 +518,6 @@ public final class CollectionUtils {
return value == null ? null: Collections.synchronizedMap(value);
}
- /**
- * Converts the specified collection to an array.
- *
- * @param <E> The element type.
- * @param value The collection to convert.
- * @param componentType The component type of the array.
- * @return A new array.
- */
- @SuppressWarnings("unchecked")
- public static <E> E[] array(Collection<E> value, Class<E>
componentType) {
- if (value == null)
- return null;
- E[] array = (E[])Array.newInstance(componentType, value.size());
- return value.toArray(array);
- }
-
/**
* Iterates the specified list in reverse order.
*
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 b8975a748..e5b3a29a7 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
@@ -360,7 +360,7 @@ public final class JsonParserSession extends
ReaderParserSession {
parseIntoMap2(r, m, string(), object(), pMeta);
o = cast(m, pMeta, eType);
} else {
- ArrayList l =
(ArrayList)parseIntoCollection2(r, list(), sType, pMeta);
+ ArrayList l =
(ArrayList)parseIntoCollection2(r, list2(), sType, pMeta);
o = toArray(sType, l);
}
} else if (c == '{') {
@@ -847,7 +847,7 @@ public final class JsonParserSession extends
ReaderParserSession {
*/
private void skipWrapperAttrStart(ParserReader r, String wrapperAttr)
throws IOException, ParseException {
- final int
+ final int
S0=0, // Looking for outer '{'
S1=1, // Looking for attrName start.
S3=3, // Found attrName end, looking for :.
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 c5869d58c..3578c39c6 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
@@ -376,7 +376,7 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
@SuppressWarnings("unchecked")
private List<String> getEnums(ClassMeta<?> cm) {
- List<String> l = list();
+ List<String> l = list2();
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 a40e05286..9a17a5b2a 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
@@ -83,7 +83,7 @@ public enum TypeCategory {
public static TypeCategory[] parseArray(String s) {
if (s == null || s.isEmpty())
return new TypeCategory[0];
- List<TypeCategory> list = list();
+ List<TypeCategory> list = list2();
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/msgpack/MsgPackSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index 827fa5fe9..0f55ea929 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -21,6 +21,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.serializer.*;
@@ -309,7 +310,7 @@ public final class MsgPackSerializerSession extends
OutputStreamSerializerSessio
// The map size may change as we're iterating over it, so
// grab a snapshot of the entries in a separate list.
- List<SimpleMapEntry> entries = list(m.size());
+ List<SimpleMapEntry> entries = Utils.listOfSize(m.size());
m.forEach((k,v) -> entries.add(new SimpleMapEntry(k, v)));
out.startMap(entries.size());
@@ -381,7 +382,7 @@ public final class MsgPackSerializerSession extends
OutputStreamSerializerSessio
@SuppressWarnings({"rawtypes", "unchecked"})
private void serializeCollection(MsgPackOutputStream out, Collection c,
ClassMeta<?> type) throws SerializeException {
ClassMeta<?> elementType = type.getElementType();
- List<Object> l = list(c.size());
+ List<Object> l = Utils.listOfSize(c.size());
c = sort(c);
l.addAll(c);
out.startArray(l.size());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
index 7879b5387..a24f51cbf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
@@ -181,7 +181,7 @@ public final class ObjectSearcher implements
ObjectTool<SearchArgs> {
if (type.isCollection()) {
Collection<?> c = (Collection)input;
- l = list(c.size());
+ l = Utils.listOfSize(c.size());
List<Object> l2 = l;
c.forEach(x -> {
if (rowMatcher.matches(x))
@@ -190,7 +190,7 @@ public final class ObjectSearcher implements
ObjectTool<SearchArgs> {
} else /* isArray */ {
int size = Array.getLength(input);
- l = list(size);
+ l = Utils.listOfSize(size);
for (int i = 0; i < size; i++) {
Object o = Array.get(input, i);
if (rowMatcher.matches(o))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
index 0329a2b1c..705855727 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSorter.java
@@ -115,12 +115,12 @@ public final class ObjectSorter implements
ObjectTool<SortArgs> {
if (type.isArray()) {
int size = Array.getLength(input);
- l = list(size);
+ l = Utils.listOfSize(size);
for (int i = 0; i < size; i++)
l.add(new SortEntry(session, Array.get(input,
i)));
} else /* isCollection() */ {
Collection c = (Collection)input;
- l = list(c.size());
+ l = Utils.listOfSize(c.size());
List<SortEntry> l2 = l;
c.forEach(x -> l2.add(new SortEntry(session, x)));
}
@@ -136,7 +136,7 @@ public final class ObjectSorter implements
ObjectTool<SortArgs> {
Collections.sort(l3);
});
- List<Object> l2 = list(l.size());
+ List<Object> l2 = Utils.listOfSize(l.size());
l.forEach(x -> l2.add(x.o));
return l2;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
index 59b628a80..9dac3949d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
@@ -18,6 +18,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -114,12 +115,12 @@ public final class ObjectViewer implements
ObjectTool<ViewArgs> {
if (type.isArray()) {
int size = Array.getLength(input);
- l = list(size);
+ l = Utils.listOfSize(size);
for (int i = 0; i < size; i++)
l.add(Array.get(input, i));
} else if (type.isCollection()) {
Collection c = (Collection)input;
- l = list(c.size());
+ l = Utils.listOfSize(c.size());
List<Object> l2 = l;
c.forEach(x -> l2.add(x));
} else {
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 b4f1b3c5c..293c2df66 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
@@ -149,7 +149,7 @@ public final class ParserSet {
*/
protected Builder(BeanStore beanStore) {
super(ParserSet.class, beanStore);
- this.entries = list();
+ this.entries = list2();
}
/**
@@ -159,7 +159,7 @@ public final class ParserSet {
*/
protected Builder(ParserSet copyFrom) {
super(copyFrom.getClass(), BeanStore.INSTANCE);
- this.entries = list((Object[])copyFrom.entries);
+ this.entries = list2((Object[])copyFrom.entries);
}
/**
@@ -173,7 +173,7 @@ public final class ParserSet {
protected Builder(Builder copyFrom) {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null :
copyFrom.bcBuilder.copy();
- entries = list();
+ entries = list2();
copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
}
@@ -258,7 +258,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 = list();
+ List<Object> l = list2();
for (Class<?> v : values)
if (v.getSimpleName().equals("NoInherit"))
clear();
@@ -298,7 +298,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 = list();
+ List<Object> l = list2();
for (Class<?> v : values) {
if (v.getSimpleName().equals("Inherit")) {
l.addAll(entries);
@@ -494,8 +494,8 @@ public final class ParserSet {
this.entries =
builder.entries.stream().map(this::build).toArray(Parser[]::new);
- List<MediaType> lmt = list();
- List<Parser> l = list();
+ List<MediaType> lmt = list2();
+ List<Parser> l = list2();
for (Parser e : entries) {
e.getMediaTypes().forEach(x -> {
lmt.add(x);
@@ -503,8 +503,8 @@ public final class ParserSet {
});
}
- this.mediaTypes = array(lmt, MediaType.class);
- this.mediaTypeParsers = array(l, Parser.class);
+ this.mediaTypes = Utils.array(lmt, MediaType.class);
+ this.mediaTypeParsers = Utils.array(l, Parser.class);
}
private Parser build(Object o) {
@@ -537,7 +537,7 @@ public final class ParserSet {
return pm;
MediaType ct = MediaType.of(contentTypeHeader);
- int match = ct.match(ulist(mediaTypes));
+ int match = ct.match(Utils.ulist2(mediaTypes));
if (match >= 0) {
pm = new ParserMatch(mediaTypes[match],
mediaTypeParsers[match]);
@@ -588,7 +588,7 @@ public final class ParserSet {
* @return An unmodifiable list of media types.
*/
public List<MediaType> getSupportedMediaTypes() {
- return ulist(mediaTypes);
+ return Utils.ulist2(mediaTypes);
}
/**
@@ -597,7 +597,7 @@ public final class ParserSet {
* @return An unmodifiable list of parsers in this group.
*/
public List<Parser> getParsers() {
- return ulist(entries);
+ return Utils.ulist2(entries);
}
/**
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 8cf65d990..215b89eba 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
@@ -56,7 +56,7 @@ public class Position {
@Override /* Object */
public String toString() {
- List<String> l = list();
+ List<String> l = list2();
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 2118714f2..3f4fc1911 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
@@ -298,7 +298,7 @@ public final class ClassInfo {
* <br>Results are in the same order as {@link
Class#getInterfaces()}.
*/
public List<ClassInfo> getDeclaredInterfaces() {
- return ulist(_getDeclaredInterfaces());
+ return Utils.ulist2(_getDeclaredInterfaces());
}
/**
@@ -312,7 +312,7 @@ public final class ClassInfo {
* <br>Results are in child-to-parent order.
*/
public List<ClassInfo> getInterfaces() {
- return ulist(_getInterfaces());
+ return Utils.ulist2(_getInterfaces());
}
/**
@@ -328,7 +328,7 @@ public final class ClassInfo {
* <br>Results are in child-to-parent order.
*/
public List<ClassInfo> getParents() {
- return ulist(_getParents());
+ return Utils.ulist2(_getParents());
}
/**
@@ -341,7 +341,7 @@ public final class ClassInfo {
* <br>Results are ordered child-to-parent order with classes
listed before interfaces.
*/
public List<ClassInfo> getAllParents() {
- return ulist(_getAllParents());
+ return Utils.ulist2(_getAllParents());
}
/**
@@ -395,7 +395,7 @@ public final class ClassInfo {
ClassInfo[] _getParents() {
if (parents == null) {
synchronized(this) {
- List<ClassInfo> l = list();
+ List<ClassInfo> l = list2();
Class<?> pc = c;
while (pc != null && pc != Object.class) {
l.add(of(pc));
@@ -438,7 +438,7 @@ public final class ClassInfo {
* <br>Results are ordered alphabetically.
*/
public List<MethodInfo> getPublicMethods() {
- return ulist(_getPublicMethods());
+ return Utils.ulist2(_getPublicMethods());
}
/**
@@ -476,7 +476,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<MethodInfo> getDeclaredMethods() {
- return ulist(_getDeclaredMethods());
+ return Utils.ulist2(_getDeclaredMethods());
}
/**
@@ -514,7 +514,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<MethodInfo> getMethods() {
- return ulist(_getAllMethods());
+ return Utils.ulist2(_getAllMethods());
}
/**
@@ -552,7 +552,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<MethodInfo> getAllMethodsParentFirst() {
- return ulist(_getAllMethodsParentFirst());
+ return Utils.ulist2(_getAllMethodsParentFirst());
}
/**
@@ -572,7 +572,7 @@ public final class ClassInfo {
if (publicMethods == null) {
synchronized(this) {
Method[] mm = c == null ? new Method[0] :
c.getMethods();
- List<MethodInfo> l = list(mm.length);
+ List<MethodInfo> l =
Utils.listOfSize(mm.length);
for (Method m : mm)
if (m.getDeclaringClass() !=
Object.class)
l.add(getMethodInfo(m));
@@ -587,7 +587,7 @@ public final class ClassInfo {
if (declaredMethods == null) {
synchronized(this) {
Method[] mm = c == null ? new Method[0] :
c.getDeclaredMethods();
- List<MethodInfo> l = list(mm.length);
+ List<MethodInfo> l =
Utils.listOfSize(mm.length);
for (Method m : mm)
if (!
"$jacocoInit".equals(m.getName())) // Jacoco adds its own simulated methods.
l.add(getMethodInfo(m));
@@ -601,7 +601,7 @@ public final class ClassInfo {
MethodInfo[] _getAllMethods() {
if (allMethods == null) {
synchronized(this) {
- List<MethodInfo> l = list();
+ List<MethodInfo> l = list2();
for (ClassInfo c : _getAllParents())
c._appendDeclaredMethods(l);
allMethods = l.toArray(new
MethodInfo[l.size()]);
@@ -613,7 +613,7 @@ public final class ClassInfo {
MethodInfo[] _getAllMethodsParentFirst() {
if (allMethodsParentFirst == null) {
synchronized(this) {
- List<MethodInfo> l = list();
+ List<MethodInfo> l = list2();
ClassInfo[] parents = _getAllParents();
for (int i = parents.length-1; i >=0; i--)
parents[i]._appendDeclaredMethods(l);
@@ -639,7 +639,7 @@ public final class ClassInfo {
* @return All public constructors defined on this class.
*/
public List<ConstructorInfo> getPublicConstructors() {
- return ulist(_getPublicConstructors());
+ return Utils.ulist2(_getPublicConstructors());
}
/**
@@ -676,7 +676,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<ConstructorInfo> getDeclaredConstructors() {
- return ulist(_getDeclaredConstructors());
+ return Utils.ulist2(_getDeclaredConstructors());
}
/**
@@ -709,7 +709,7 @@ public final class ClassInfo {
if (publicConstructors == null) {
synchronized(this) {
Constructor<?>[] cc = c == null ? new
Constructor[0] : c.getConstructors();
- List<ConstructorInfo> l = list(cc.length);
+ List<ConstructorInfo> l =
Utils.listOfSize(cc.length);
for (Constructor<?> ccc : cc)
l.add(getConstructorInfo(ccc));
l.sort(null);
@@ -723,7 +723,7 @@ public final class ClassInfo {
if (declaredConstructors == null) {
synchronized(this) {
Constructor<?>[] cc = c == null ? new
Constructor[0] : c.getDeclaredConstructors();
- List<ConstructorInfo> l = list(cc.length);
+ List<ConstructorInfo> l =
Utils.listOfSize(cc.length);
for (Constructor<?> ccc : cc)
l.add(getConstructorInfo(ccc));
l.sort(null);
@@ -774,7 +774,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<FieldInfo> getPublicFields() {
- return ulist(_getPublicFields());
+ return Utils.ulist2(_getPublicFields());
}
/**
@@ -812,7 +812,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<FieldInfo> getDeclaredFields() {
- return ulist(_getDeclaredFields());
+ return Utils.ulist2(_getDeclaredFields());
}
/**
@@ -852,7 +852,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<FieldInfo> getAllFields() {
- return ulist(_getAllFields());
+ return Utils.ulist2(_getAllFields());
}
/**
@@ -894,7 +894,7 @@ public final class ClassInfo {
if (declaredFields == null) {
synchronized(this) {
Field[] ff = c == null ? new Field[0] :
c.getDeclaredFields();
- List<FieldInfo> l = list(ff.length);
+ List<FieldInfo> l = Utils.listOfSize(ff.length);
for (Field f : ff)
if (! "$jacocoData".equals(f.getName()))
l.add(getFieldInfo(f));
@@ -908,7 +908,7 @@ public final class ClassInfo {
FieldInfo[] _getAllFields() {
if (allFields == null) {
synchronized(this) {
- List<FieldInfo> l = list();
+ List<FieldInfo> l = list2();
ClassInfo[] parents = _getAllParents();
for (int i = parents.length-1; i >=0; i--)
for (FieldInfo f :
parents[i]._getDeclaredFields())
@@ -946,7 +946,7 @@ public final class ClassInfo {
* @return The matching annotations.
*/
public <A extends Annotation> List<A> getAnnotations(AnnotationProvider
annotationProvider, Class<A> type) {
- List<A> l = list();
+ List<A> l = list2();
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/ExecutableInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
index 39907e282..75f2a6754 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
@@ -22,6 +22,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -139,7 +140,7 @@ public abstract class ExecutableInfo {
* @return An array of parameter information, never <jk>null</jk>.
*/
public final List<ParamInfo> getParams() {
- return ulist(_getParams());
+ return Utils.ulist2(_getParams());
}
/**
@@ -173,7 +174,7 @@ public abstract class ExecutableInfo {
* @return The parameter types on this executable.
*/
public final List<ClassInfo> getParamTypes() {
- return ulist(_getParameterTypes());
+ return Utils.ulist2(_getParameterTypes());
}
/**
@@ -193,7 +194,7 @@ public abstract class ExecutableInfo {
* @return The raw parameter types on this executable.
*/
public final List<Class<?>> getRawParamTypes() {
- return ulist(_getRawParamTypes());
+ return Utils.ulist2(_getRawParamTypes());
}
/**
@@ -213,7 +214,7 @@ public abstract class ExecutableInfo {
* @return The raw generic parameter types on this executable.
*/
public final List<Type> getRawGenericParamTypes() {
- return ulist(_getRawGenericParamTypes());
+ return Utils.ulist2(_getRawGenericParamTypes());
}
/**
@@ -234,7 +235,7 @@ public abstract class ExecutableInfo {
* @see Executable#getParameters()
*/
public final List<Parameter> getRawParameters() {
- return ulist(_getRawParameters());
+ return Utils.ulist2(_getRawParameters());
}
/**
@@ -392,7 +393,7 @@ public abstract class ExecutableInfo {
* @return The exception types on this executable.
*/
public final List<ClassInfo> getExceptionTypes() {
- return ulist(_getExceptionTypes());
+ return Utils.ulist2(_getExceptionTypes());
}
final ClassInfo[] _getExceptionTypes() {
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 86db9ae88..84f1a5e0f 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
@@ -198,7 +198,7 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
MethodInfo[] _getMatching() {
if (matching == null) {
synchronized(this) {
- List<MethodInfo> l = findMatching(list(), this,
getDeclaringClass());
+ List<MethodInfo> l = findMatching(list2(),
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 88af8e5ac..e21dbb2d4 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
@@ -147,7 +147,7 @@ public final class SerializerSet {
*/
protected Builder(BeanStore beanStore) {
super(SerializerSet.class, beanStore);
- this.entries = list();
+ this.entries = list2();
}
/**
@@ -157,7 +157,7 @@ public final class SerializerSet {
*/
protected Builder(SerializerSet copyFrom) {
super(copyFrom.getClass());
- this.entries = list((Object[])copyFrom.entries);
+ this.entries = list2((Object[])copyFrom.entries);
}
/**
@@ -171,7 +171,7 @@ public final class SerializerSet {
protected Builder(Builder copyFrom) {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null :
copyFrom.bcBuilder.copy();
- entries = list();
+ entries = list2();
copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
}
@@ -256,7 +256,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 = list();
+ List<Object> l = list2();
for (Class<?> e : values) {
if (Serializer.class.isAssignableFrom(e)) {
l.add(createBuilder(e));
@@ -293,7 +293,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 = list();
+ List<Object> l = list2();
for (Class<?> e : values) {
if (e.getSimpleName().equals("Inherit")) {
l.addAll(entries);
@@ -496,11 +496,11 @@ public final class SerializerSet {
protected SerializerSet(Builder builder) {
this.entries =
builder.entries.stream().map(this::build).toArray(Serializer[]::new);
- this.entriesList = ulist(entries);
+ this.entriesList = Utils.ulist2(entries);
- List<MediaRange> lmtr = list();
+ List<MediaRange> lmtr = list2();
Set<MediaType> lmt = set();
- List<Serializer> l = list();
+ List<Serializer> l = list2();
for (Serializer e : entries) {
e.getMediaTypeRanges().forEachRange(x -> {
lmtr.add(x);
@@ -510,9 +510,9 @@ public final class SerializerSet {
}
this.mediaRanges = lmtr.toArray(new MediaRange[lmtr.size()]);
- this.mediaRangesList = ulist(mediaRanges);
+ this.mediaRangesList = Utils.ulist2(mediaRanges);
this.mediaTypes = lmt.toArray(new MediaType[lmt.size()]);
- this.mediaTypesList = ulist(mediaTypes);
+ this.mediaTypesList = Utils.ulist2(mediaTypes);
this.mediaTypeRangeSerializers = l.toArray(new
Serializer[l.size()]);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
index 75dac48cb..77eee68d3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoListSwap.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
@@ -80,8 +81,8 @@ import org.apache.juneau.serializer.*;
public class AutoListSwap<T> extends ObjectSwap<T,List<?>> {
private static final Set<String>
- SWAP_METHOD_NAMES = uset("toList", "toJsonList"),
- UNSWAP_METHOD_NAMES = uset("fromList", "fromJsonList",
"create", "valueOf");
+ SWAP_METHOD_NAMES = Utils.uset2("toList", "toJsonList"),
+ UNSWAP_METHOD_NAMES = Utils.uset2("fromList", "fromJsonList",
"create", "valueOf");
/**
* Look for constructors and methods on this class and construct a
dynamic swap if it's possible to do so.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
index aedcf840d..ac3182914 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoMapSwap.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
@@ -80,8 +81,8 @@ import org.apache.juneau.serializer.*;
public class AutoMapSwap<T> extends ObjectSwap<T,Map<?,?>> {
private static final Set<String>
- SWAP_METHOD_NAMES = uset("toMap", "toJsonMap"),
- UNSWAP_METHOD_NAMES = uset("fromMap", "fromJsonMap", "create",
"valueOf");
+ SWAP_METHOD_NAMES = Utils.uset2("toMap", "toJsonMap"),
+ UNSWAP_METHOD_NAMES = Utils.uset2("fromMap", "fromJsonMap",
"create", "valueOf");
/**
* Look for constructors and methods on this class and construct a
dynamic swap if it's possible to do so.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
index 3bd8d121c..d62dedaba 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
@@ -103,8 +104,8 @@ import org.apache.juneau.serializer.*;
public class AutoNumberSwap<T> extends ObjectSwap<T,Number> {
private static final Set<String>
- SWAP_METHOD_NAMES = uset("toNumber", "toInteger", "toInt",
"toLong", "toFloat", "toDouble", "toShort", "toByte"),
- UNSWAP_METHOD_NAMES = uset("fromInteger", "fromInt",
"fromLong", "fromFloat", "fromDouble", "fromShort", "fromByte", "create",
"valueOf");
+ SWAP_METHOD_NAMES = Utils.uset2("toNumber", "toInteger",
"toInt", "toLong", "toFloat", "toDouble", "toShort", "toByte"),
+ UNSWAP_METHOD_NAMES = Utils.uset2("fromInteger", "fromInt",
"fromLong", "fromFloat", "fromDouble", "fromShort", "fromByte", "create",
"valueOf");
/**
* Look for constructors and methods on this class and construct a
dynamic swap if it's possible to do so.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
index 1442caa28..4ceb9d356 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoObjectSwap.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
@@ -82,8 +83,8 @@ import org.apache.juneau.serializer.*;
public class AutoObjectSwap<T> extends ObjectSwap<T,Object> {
private static final Set<String>
- SWAP_METHOD_NAMES = uset("swap", "toObject"),
- UNSWAP_METHOD_NAMES = uset("unswap", "create", "fromObject",
"of");
+ SWAP_METHOD_NAMES = Utils.uset2("swap", "toObject"),
+ UNSWAP_METHOD_NAMES = Utils.uset2("unswap", "create",
"fromObject", "of");
/**
* Inspects the specified class and returns a swap of this type if
possible.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
index cd487e506..eeb028d0c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swaps/MatchResultSwap.java
@@ -18,6 +18,7 @@ import java.util.*;
import java.util.regex.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.swap.*;
/**
@@ -37,7 +38,7 @@ public class MatchResultSwap extends
ObjectSwap<MatchResult,List<String>> {
*/
@Override /* ObjectSwap */
public List<String> swap(BeanSession session, MatchResult o) {
- List<String> l = list(o.groupCount());
+ List<String> l = Utils.listOfSize(o.groupCount());
for (int i = 0; i <= o.groupCount(); i++)
l.add(o.group(i));
return l;
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 e63b09f53..40ff8fd27 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
@@ -413,12 +413,12 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
o = cast(m, pMeta, eType);
// Handle case where it's an array, but only a
single value was specified.
else {
- ArrayList l = list(1);
+ ArrayList l = Utils.listOfSize(1);
l.add(m.cast(sType.getElementType()));
o = toArray(sType, l);
}
} else {
- ArrayList l = (ArrayList)parseIntoCollection(r,
list(), sType, isUrlParamValue, pMeta);
+ ArrayList l = (ArrayList)parseIntoCollection(r,
list2(), 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 dda4cf2de..e7cc5f461 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
@@ -161,10 +161,10 @@ public class ReflectionMap<V> {
* Constructor.
*/
protected Builder() {
- classEntries = list();
- methodEntries = list();
- fieldEntries = list();
- constructorEntries = list();
+ classEntries = list2();
+ methodEntries = list2();
+ fieldEntries = list2();
+ constructorEntries = list2();
}
/**
@@ -363,7 +363,7 @@ public class ReflectionMap<V> {
private static <V> List<V> lazyAdd(List<V> list, V v) {
if (list == null)
- list = list();
+ list = list2();
list.add(v);
return list;
}
@@ -803,7 +803,7 @@ public class ReflectionMap<V> {
private static <V> List<V> lazyAdd(V[] array, List<V> list, V v) {
if (list == null)
- list = list(array);
+ list = list2(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 5a0bc23f0..4cbc36709 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
@@ -99,8 +99,8 @@ public class StringExpressionMatcher {
expression = expression.trim();
- List<Exp> ors = list();
- List<Exp> ands = list();
+ List<Exp> ors = list2();
+ List<Exp> ands = list2();
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 dd486bfd0..c5dd9a4b3 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
@@ -41,8 +41,8 @@ public class XmlClassMeta extends ExtendedClassMeta {
*/
public XmlClassMeta(ClassMeta<?> cm, XmlMetaProvider mp) {
super(cm);
- List<Xml> xmls = list();
- List<XmlSchema> schemas = list();
+ List<Xml> xmls = list2();
+ List<XmlSchema> schemas = list2();
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 b3daaae7c..522a09163 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
@@ -539,7 +539,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, list(),
sType, pMeta);
+ ArrayList l = (ArrayList)parseIntoCollection(r,
list2(), sType, pMeta);
o = toArray(sType, l);
} else if (sType.canCreateNewInstanceFromString(outer)) {
o = sType.newInstanceFromString(outer,
getElementText(r));
@@ -793,7 +793,7 @@ public class XmlParserSession extends ReaderParserSession {
else if (cpcm.isCollectionOrArray()) {
Object o = cp.get(m, null);
if (o == null)
- cp.set(m, cp.getName(), list());
+ cp.set(m, cp.getName(), list2());
}
}
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 82d1c644b..a0c555737 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
@@ -148,7 +148,7 @@ public class Microservice implements ConfigEventListener {
ConfigStore configStore;
Config.Builder configBuilder = Config.create();
Boolean consoleEnabled;
- List<ConsoleCommand> consoleCommands = list();
+ List<ConsoleCommand> consoleCommands = list2();
VarResolver.Builder varResolver =
VarResolver.create().defaultVars().vars(ConfigVar.class);
Scanner consoleReader;
PrintWriter consoleWriter;
@@ -1074,7 +1074,7 @@ public class Microservice implements ConfigEventListener {
*/
public String executeCommand(String command, String input,
Object...args) {
StringWriter sw = new StringWriter();
- List<String> l = list();
+ List<String> l = list2();
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 2405a4a22..60affce50 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
@@ -258,7 +258,7 @@ public class DirectoryResource extends BasicRestServlet {
@Html(format=HtmlFormat.HTML_CDC)
public List<Action> getActions() throws Exception {
- List<Action> l = list();
+ List<Action> l = list2();
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 f2a5a2f96..0d46fa613 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
@@ -87,7 +87,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 = list(); // Used for
intercepting and altering requests.
+ List<RestCallInterceptor> interceptors = list2(); // Used for
intercepting and altering requests.
private HeaderList headerData;
private PartList queryData, formData, pathData;
@@ -687,7 +687,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
@FluentSetter
public RestRequest rethrow(Class<?>...values) {
if (rethrow == null)
- rethrow = list();
+ rethrow = list2();
for (Class<?> v : values) {
if (v != null && Throwable.class.isAssignableFrom(v))
rethrow.add((Class<? extends Throwable>)v);
@@ -1499,7 +1499,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
return this;
}
- List<Header> l = list();
+ List<Header> l = list2();
if (HttpHeaders.canCast(value)) {
l.add(HttpHeaders.cast(value));
@@ -1535,7 +1535,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
return this;
}
- List<NameValuePair> l = list();
+ List<NameValuePair> l = list2();
if (HttpParts.canCast(value)) {
l.add(HttpParts.cast(value));
@@ -1572,7 +1572,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
return this;
}
- List<NameValuePair> l = list();
+ List<NameValuePair> l = list2();
if (HttpParts.canCast(value)) {
l.add(HttpParts.cast(value));
@@ -1606,7 +1606,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
if (! isMulti)
return pathData(createPart(name, value, PATH,
serializer, schema, false));
- List<NameValuePair> l = list();
+ List<NameValuePair> l = list2();
if (HttpParts.canCast(value)) {
l.add(HttpParts.cast(value));
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
index 1b9c34b9d..72acd6b43 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
@@ -186,7 +186,7 @@ public class BasicCsvHeader extends BasicHeader {
* @return The header value as a list wrapped in an {@link Optional}.
Never <jk>null</jk>.
*/
public Optional<List<String>> asList() {
- return Utils.opt(ulist(value()));
+ return Utils.opt(Utils.ulist2(value()));
}
/**
@@ -198,7 +198,7 @@ public class BasicCsvHeader extends BasicHeader {
* @return The header value as a list. Can be <jk>null</jk>.
*/
public List<String> toList() {
- return ulist(value());
+ return Utils.ulist2(value());
}
/**
@@ -251,7 +251,7 @@ public class BasicCsvHeader extends BasicHeader {
* @throws AssertionError If assertion failed.
*/
public FluentListAssertion<String,BasicCsvHeader> assertList() {
- return new FluentListAssertion<>(ulist(value()), this);
+ return new FluentListAssertion<>(Utils.ulist2(value()), this);
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTags.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTags.java
index 094bc68f9..1e3e0bd45 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTags.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTags.java
@@ -18,6 +18,7 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -100,7 +101,7 @@ public class EntityTags {
* @return The entity tags in this object as a list. Can be
<jk>null</jk>.
*/
public List<EntityTag> toList() {
- return ulist(value);
+ return Utils.ulist2(value);
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
index f78d90632..b1ffc90b9 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
@@ -162,7 +162,7 @@ public class BasicCsvArrayPart extends BasicPart {
* @throws AssertionError If assertion failed.
*/
public FluentListAssertion<String,BasicCsvArrayPart> assertList() {
- return new FluentListAssertion<>(ulist(value()), this);
+ return new FluentListAssertion<>(Utils.ulist2(value()), this);
}
/**
@@ -174,7 +174,7 @@ public class BasicCsvArrayPart extends BasicPart {
* @return The part value as a {@link List}, or <jk>null</jk> if the
value <jk>null</jk>.
*/
public List<String> toList() {
- return ulist(value());
+ return Utils.ulist2(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 b45901587..98bf4fb05 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
@@ -71,7 +71,7 @@ public class MockLogger extends Logger {
private static final String FORMAT_PROPERTY =
"java.util.logging.SimpleFormatter.format";
- private final List<LogRecord> logRecords = list();
+ private final List<LogRecord> logRecords = list2();
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-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 8991e24df..57655480a 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
@@ -20,6 +20,7 @@ import java.util.*;
import jakarta.servlet.*;
import jakarta.servlet.http.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.rest.util.*;
@@ -263,7 +264,7 @@ public class MockServletResponse implements
HttpServletResponse {
@Override /* HttpServletResponse */
public Collection<String> getHeaders(String name) {
String[] s = headerMap.get(name);
- return s == null ? Collections.emptyList() : ulist(s);
+ return s == null ? Collections.emptyList() : Utils.ulist2(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 6277f8f2d..68bf53d1c 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
@@ -5533,14 +5533,14 @@ public class RestContext extends Context {
produces = builder.produces().orElseGet(
()->{
- Set<MediaType> s = opContexts.isEmpty()
? emptySet() :
toSet(opContexts.get(0).getSerializers().getSupportedMediaTypes());
+ Set<MediaType> s = opContexts.isEmpty()
? emptySet() :
setFrom(opContexts.get(0).getSerializers().getSupportedMediaTypes());
opContexts.forEach(x ->
s.retainAll(x.getSerializers().getSupportedMediaTypes()));
return u(listFrom(s));
}
);
consumes = builder.consumes().orElseGet(
()->{
- Set<MediaType> s = opContexts.isEmpty()
? emptySet() : toSet(opContexts.get(0).getParsers().getSupportedMediaTypes());
+ Set<MediaType> s = opContexts.isEmpty()
? emptySet() : setFrom(opContexts.get(0).getParsers().getSupportedMediaTypes());
opContexts.forEach(x ->
s.retainAll(x.getParsers().getSupportedMediaTypes()));
return u(listFrom(s));
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
index dd092b2cf..956466402 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
@@ -18,6 +18,7 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.internal.*;
@@ -148,7 +149,7 @@ public class RestOperations {
for (Map.Entry<String,TreeSet<RestOpContext>> e :
builder.map.entrySet())
m.put(e.getKey(), listFrom(e.getValue()));
this.map = m;
- this.list = array(builder.set, RestOpContext.class);
+ this.list = Utils.array(builder.set, RestOpContext.class);
}
/**
@@ -207,6 +208,6 @@ public class RestOperations {
* @return An unmodifiable list of method contexts in this object.
*/
public List<RestOpContext> getOpContexts() {
- return ulist(list);
+ return Utils.ulist2(list);
}
}
\ No newline at end of file
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 2c6d9a6a5..50c5fd0e9 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
@@ -101,7 +101,7 @@ public class FormDataArg implements RestOpArg {
ClassMeta<?> cm = bs.getClassMeta(type.innerType());
if (multi) {
- Collection c = cm.isArray() ? list() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
+ Collection c = cm.isArray() ? list2() :
(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 fae6bc51d..e3ef00a9d 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
@@ -142,7 +142,7 @@ public class HeaderArg implements RestOpArg {
ClassMeta<?> cm = bs.getClassMeta(type.innerType());
if (multi) {
- Collection c = cm.isArray() ? list() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
+ Collection c = cm.isArray() ? list2() :
(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 a8a11b6bc..21540e91b 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
@@ -101,7 +101,7 @@ public class QueryArg implements RestOpArg {
ClassMeta<?> cm = bs.getClassMeta(type.innerType());
if (multi) {
- Collection c = cm.isArray() ? list() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
+ Collection c = cm.isArray() ? list2() :
(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 6c58a6d7d..219fe0b6f 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
@@ -63,7 +63,7 @@ public class RestOpArgList {
*/
protected Builder(BeanStore beanStore) {
super(RestOpArgList.class, beanStore);
- entries = list();
+ entries = list2();
}
@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 419e4c9b4..cb8090bb2 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
@@ -62,7 +62,7 @@ public class RestConverterList {
*/
protected Builder(BeanStore beanStore) {
super(RestConverterList.class, beanStore);
- this.entries = list();
+ this.entries = list2();
}
@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 eb7946c94..a00a6bede 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
@@ -62,7 +62,7 @@ public class RestGuardList {
*/
protected Builder(BeanStore beanStore) {
super(RestGuardList.class, beanStore);
- entries = list();
+ entries = list2();
}
@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 3cf8401fb..87ff59e8d 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
@@ -100,8 +100,8 @@ public class RoleMatcher {
expression = expression.trim();
- List<Exp> ors = list();
- List<Exp> ands = list();
+ List<Exp> ors = list2();
+ List<Exp> ands = list2();
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 ec44955ed..4b0f12f7f 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
@@ -63,7 +63,7 @@ public class RestMatcherList {
*/
protected Builder(BeanStore beanStore) {
super(RestMatcherList.class, beanStore);
- entries = list();
+ entries = list2();
}
@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 850084728..8f0673d57 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
@@ -63,7 +63,7 @@ public class ResponseProcessorList {
*/
protected Builder(BeanStore beanStore) {
super(ResponseProcessorList.class, beanStore);
- this.entries = list();
+ this.entries = list2();
}
@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 be8b5cd7c..72606db46 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
@@ -98,7 +98,7 @@ public abstract class RrpcServlet extends BasicRestServlet {
@Path("javaInterface") @Schema(description="Java
interface name") String javaInterface
) throws Exception {
- List<LinkString> l = list();
+ List<LinkString> l = list2();
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 5cdc859c1..1ce991602 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
@@ -73,7 +73,7 @@ public interface StaticFiles extends FileFinder {
*/
protected Builder(BeanStore beanStore) {
super(BasicStaticFiles.class, beanStore);
- headers = list();
+ headers = list2();
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 e5f5867e6..c1891e476 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
@@ -416,9 +416,9 @@ public class BasicSwaggerProviderSession {
}
if (mi.hasAnnotation(Response.class) ||
mi.getReturnType().unwrap(Value.class,Optional.class).hasAnnotation(Response.class))
{
- List<Response> la = list();
+ List<Response> la = list2();
mi.forEachAnnotation(context, Response.class, x
-> true, x -> la.add(x));
- List<StatusCode> la2 = list();
+ List<StatusCode> la2 = list2();
mi.forEachAnnotation(context, StatusCode.class,
x -> true, x -> la2.add(x));
Set<Integer> codes = getCodes(la2, 200);
for (Response a : la) {
@@ -467,10 +467,10 @@ public class BasicSwaggerProviderSession {
ClassInfo pt = mpi.getParameterType();
if (pt.is(Value.class) &&
(mpi.hasAnnotation(Header.class) || pt.hasAnnotation(Header.class))) {
- List<Header> la = list();
+ List<Header> la = list2();
mpi.forEachAnnotation(Header.class, x
-> true, x -> la.add(x));
pt.forEachAnnotation(Header.class, x ->
true, x -> la.add(x));
- List<StatusCode> la2 = list();
+ List<StatusCode> la2 = list2();
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);
@@ -488,10 +488,10 @@ public class BasicSwaggerProviderSession {
}
} else if (mpi.hasAnnotation(Response.class) ||
pt.hasAnnotation(Response.class)) {
- List<Response> la = list();
+ List<Response> la = list2();
mpi.forEachAnnotation(Response.class, x
-> true, x -> la.add(x));
pt.forEachAnnotation(Response.class, x
-> true, x -> la.add(x));
- List<StatusCode> la2 = list();
+ List<StatusCode> la2 = list2();
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 d8c9fe87f..ad9d11e7c 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
@@ -217,7 +217,7 @@ public final class RestUtils {
if (value.length == 0)
return fromParent;
- List<String> l = list();
+ List<String> l = list2();
for (String v : value) {
if (! "INHERIT".equals(v))
l.add(v);
@@ -233,7 +233,7 @@ public final class RestUtils {
if (links.length == 0)
return parentLinks;
- List<String> list = list();
+ List<String> list = list2();
for (String l : links) {
if ("INHERIT".equals(l))
addAll(list, parentLinks);
@@ -248,14 +248,14 @@ public final class RestUtils {
list.add(l);
}
}
- return array(list, String.class);
+ return Utils.array(list, String.class);
}
static String[] resolveContent(String[] content, String[]
parentContent) {
if (content.length == 0)
return parentContent;
- List<String> list = list();
+ List<String> list = list2();
for (String l : content) {
if ("INHERIT".equals(l)) {
addAll(list, parentContent);
@@ -265,7 +265,7 @@ public final class RestUtils {
list.add(l);
}
}
- return array(list, String.class);
+ return Utils.array(list, String.class);
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcherList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcherList.java
index f675bb81e..6a5c50bfa 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcherList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/UrlPathMatcherList.java
@@ -14,6 +14,7 @@ package org.apache.juneau.rest.util;
import java.util.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -43,6 +44,6 @@ public class UrlPathMatcherList extends
ArrayList<UrlPathMatcher> {
* @return The contents of this list as a {@link UrlPathMatcher} array.
*/
public UrlPathMatcher[] asArray() {
- return CollectionUtils.array(this, UrlPathMatcher.class);
+ return Utils.array(this, UrlPathMatcher.class);
}
}
\ No newline at end of file
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 b6661f080..49e4b1a87 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
@@ -19,6 +19,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.bean.html5.*;
+import org.apache.juneau.common.internal.*;
/**
* Simple template for adding tooltips to HTML5 bean constructs, typically in
menu item widgets.
@@ -47,7 +48,7 @@ public class Tooltip {
*/
public Tooltip(String display, Object... content) {
this.display = new HtmlText(display);
- this.content = ulist(content);
+ this.content = Utils.ulist2(content);
}
/**
