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 af891ad90b Utility class cleanup
af891ad90b is described below
commit af891ad90b279f58366417b99a3dc89606ef64a5
Author: James Bognar <[email protected]>
AuthorDate: Mon Oct 27 14:07:35 2025 -0400
Utility class cleanup
---
.../org/apache/juneau/bean/openapi3/Items.java | 2 +-
.../apache/juneau/bean/openapi3/SchemaInfo.java | 10 ++--
.../juneau/bean/openapi3/ServerVariable.java | 2 +-
.../org/apache/juneau/bean/swagger/HeaderInfo.java | 2 +-
.../java/org/apache/juneau/bean/swagger/Items.java | 2 +-
.../org/apache/juneau/bean/swagger/Operation.java | 12 ++---
.../apache/juneau/bean/swagger/ParameterInfo.java | 2 +-
.../org/apache/juneau/bean/swagger/SchemaInfo.java | 6 +--
.../org/apache/juneau/bean/swagger/Swagger.java | 10 ++--
.../juneau/common/collections/SimpleMap.java | 4 +-
.../juneau/common/utils/CollectionUtils.java | 54 ++++++----------------
.../apache/juneau/config/internal/ConfigMap.java | 2 +-
.../apache/juneau/jena/RdfSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/BeanContext.java | 8 ++--
.../java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../src/main/java/org/apache/juneau/Context.java | 4 +-
.../annotation/TargetedAnnotationBuilder.java | 2 +-
.../annotation/TargetedAnnotationTBuilder.java | 4 +-
.../apache/juneau/objecttools/ObjectSorter.java | 2 +-
.../org/apache/juneau/objecttools/ViewArgs.java | 2 +-
.../java/org/apache/juneau/reflect/ClassInfo.java | 2 +-
.../apache/juneau/xml/XmlSerializerSession.java | 2 +-
.../microservice/resources/LogEntryFormatter.java | 3 +-
.../juneau/rest/mock/MockServletRequest.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 8 ++--
.../org/apache/juneau/rest/RestOperations.java | 2 +-
.../org/apache/juneau/rest/util/RestUtils.java | 2 +-
.../apache/juneau/common/utils/ArrayUtilsTest.java | 14 +++---
.../juneau/common/utils/CollectionUtils_Test.java | 14 +++---
.../org/apache/juneau/utils/ArrayUtilsTest.java | 14 +++---
30 files changed, 86 insertions(+), 111 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
index 63aa8434b6..2f620b7745 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
@@ -470,7 +470,7 @@ public class Items extends OpenApiElement {
* @return This object
*/
public Items setEnum(Collection<Object> value) {
- _enum = CollectionUtils.listFrom(value);
+ _enum = CollectionUtils.toList(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
index a5409b1545..aa467c5aba 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
@@ -769,7 +769,7 @@ public class SchemaInfo extends OpenApiElement {
* @return This object
*/
public SchemaInfo setAllOf(Collection<Object> value) {
- allOf = CollectionUtils.listFrom(value);
+ allOf = CollectionUtils.toList(value);
return this;
}
@@ -782,7 +782,7 @@ public class SchemaInfo extends OpenApiElement {
* @return This object
*/
public SchemaInfo setAnyOf(Collection<Object> value) {
- anyOf = CollectionUtils.listFrom(value);
+ anyOf = CollectionUtils.toList(value);
return this;
}
@@ -850,7 +850,7 @@ public class SchemaInfo extends OpenApiElement {
* @return This object
*/
public SchemaInfo setEnum(Collection<Object> value) {
- _enum = CollectionUtils.listFrom(value);
+ _enum = CollectionUtils.toList(value);
return this;
}
@@ -1096,7 +1096,7 @@ public class SchemaInfo extends OpenApiElement {
* @return This object
*/
public SchemaInfo setOneOf(Collection<Object> value) {
- oneOf = CollectionUtils.listFrom(value);
+ oneOf = CollectionUtils.toList(value);
return this;
}
@@ -1175,7 +1175,7 @@ public class SchemaInfo extends OpenApiElement {
* @return This object
*/
public SchemaInfo setRequired(Collection<String> value) {
- required = CollectionUtils.listFrom(value);
+ required = CollectionUtils.toList(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
index 824369e0eb..eac1b23923 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
@@ -268,7 +268,7 @@ public class ServerVariable extends OpenApiElement {
* @return This object
*/
public ServerVariable setEnum(Collection<Object> value) {
- _enum = CollectionUtils.listFrom(value);
+ _enum = CollectionUtils.toList(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
index a501e243e6..26f9f8705a 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
@@ -507,7 +507,7 @@ public class HeaderInfo extends SwaggerElement {
* @return This object.
*/
public HeaderInfo setEnum(Collection<Object> value) {
- _enum = CollectionUtils.setFrom(value);
+ _enum = CollectionUtils.toSet(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
index 7d8de2e029..c4c4282c4c 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
@@ -464,7 +464,7 @@ public class Items extends SwaggerElement {
* @return This object.
*/
public Items setEnum(Collection<Object> value) {
- _enum = CollectionUtils.setFrom(value);
+ _enum = CollectionUtils.toSet(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Operation.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Operation.java
index d93310cdb7..d57edb3dcf 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Operation.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Operation.java
@@ -701,7 +701,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setConsumes(Collection<MediaType> value) {
- consumes = CollectionUtils.setFrom(value);
+ consumes = CollectionUtils.toSet(value);
return this;
}
@@ -800,7 +800,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setParameters(Collection<ParameterInfo> value) {
- parameters = CollectionUtils.listFrom(value);
+ parameters = CollectionUtils.toList(value);
return this;
}
@@ -832,7 +832,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setProduces(Collection<MediaType> value) {
- produces = CollectionUtils.setFrom(value);
+ produces = CollectionUtils.toSet(value);
return this;
}
@@ -888,7 +888,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setSchemes(Collection<String> value) {
- schemes = CollectionUtils.setFrom(value);
+ schemes = CollectionUtils.toSet(value);
return this;
}
@@ -920,7 +920,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setSecurity(Collection<Map<String,List<String>>>
value) {
- security = CollectionUtils.listFrom(value);
+ security = CollectionUtils.toList(value);
return this;
}
@@ -970,7 +970,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setTags(Collection<String> value) {
- tags = CollectionUtils.setFrom(value);
+ tags = CollectionUtils.toSet(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
index b09fa5b402..e9c7d8d965 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
@@ -715,7 +715,7 @@ public class ParameterInfo extends SwaggerElement {
* @return This object.
*/
public ParameterInfo setEnum(Collection<Object> value) {
- _enum = CollectionUtils.setFrom(value);
+ _enum = CollectionUtils.toSet(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
index 4e6f67e0f6..bac1ee76e5 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
@@ -677,7 +677,7 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setAllOf(Collection<SchemaInfo> value) {
- allOf = CollectionUtils.setFrom(value);
+ allOf = CollectionUtils.toSet(value);
return this;
}
@@ -747,7 +747,7 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setEnum(Collection<Object> value) {
- _enum = CollectionUtils.setFrom(value);
+ _enum = CollectionUtils.toSet(value);
return this;
}
@@ -1057,7 +1057,7 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setRequiredProperties(Collection<String> value) {
- requiredProperties = CollectionUtils.setFrom(value);
+ requiredProperties = CollectionUtils.toSet(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
index 4efe5c70ab..a3b585d7be 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
@@ -791,7 +791,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setConsumes(Collection<MediaType> value) {
- consumes = CollectionUtils.setFrom(value);
+ consumes = CollectionUtils.toSet(value);
return this;
}
@@ -925,7 +925,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setProduces(Collection<MediaType> value) {
- produces = CollectionUtils.setFrom(value);
+ produces = CollectionUtils.toSet(value);
return this;
}
@@ -979,7 +979,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setSchemes(Collection<String> value) {
- schemes = CollectionUtils.setFrom(value);
+ schemes = CollectionUtils.toSet(value);
return this;
}
@@ -1011,7 +1011,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setSecurity(Collection<Map<String,List<String>>> value) {
- security = CollectionUtils.listFrom(value);
+ security = CollectionUtils.toList(value);
return this;
}
@@ -1064,7 +1064,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setTags(Collection<Tag> value) {
- tags = CollectionUtils.setFrom(value);
+ tags = CollectionUtils.toSet(value);
return this;
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
index 79b1f17f01..4ccf9a257c 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
@@ -221,7 +221,7 @@ public class SimpleMap<K,V> extends AbstractMap<K,V> {
*/
@Override /* Map */
public Set<Map.Entry<K,V>> entrySet() {
- return asSet(entries);
+ return toSet(entries);
}
/**
@@ -276,7 +276,7 @@ public class SimpleMap<K,V> extends AbstractMap<K,V> {
*/
@Override /* Map */
public Set<K> keySet() {
- return asSet(keys);
+ return toSet(keys);
}
/**
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
index ca191f6457..ecb8530180 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
@@ -305,8 +305,8 @@ public class CollectionUtils {
* @param value The collection to copy from.
* @return A new modifiable list.
*/
- public static <E> ArrayList<E> listFrom(Collection<E> value) {
- return listFrom(value, false);
+ public static <E> ArrayList<E> toList(Collection<E> value) {
+ return toList(value, false);
}
/**
@@ -317,7 +317,7 @@ public class CollectionUtils {
* @param nullIfEmpty If <jk>true</jk> will return <jk>null</jk> if the
collection is empty.
* @return A new modifiable list.
*/
- public static <E> ArrayList<E> listFrom(Collection<E> value, boolean
nullIfEmpty) {
+ public static <E> ArrayList<E> toList(Collection<E> value, boolean
nullIfEmpty) {
if (value == null || (nullIfEmpty && value.isEmpty()))
return null;
ArrayList<E> l = new ArrayList<>();
@@ -404,20 +404,6 @@ public class CollectionUtils {
return m;
}
- /**
- * Creates an {@link ArrayList} copy from a collection.
- *
- * @param <K> The key type.
- * @param <V> The value type.
- * @param value The collection to copy from.
- * @return A new modifiable list.
- */
- public static <K,V> LinkedHashMap<K,V> mapFrom(Map<K,V> value) {
- if (value == null)
- return null;
- return new LinkedHashMap<>(value);
- }
-
/**
* Convenience method for creating a {@link LinkedHashMap}.
*
@@ -458,7 +444,7 @@ public 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> setFrom(Collection<E> val) {
+ public static <E> Set<E> toSet(Collection<E> val) {
return val == null ? null : new LinkedHashSet<>(val);
}
@@ -484,7 +470,7 @@ public class CollectionUtils {
* @return A new modifiable list.
*/
public static <E> ArrayList<E> sortedList(Comparator<E> comparator,
Collection<E> value) {
- ArrayList<E> l = listFrom(value);
+ ArrayList<E> l = toList(value);
Collections.sort(l, comparator);
return l;
}
@@ -551,7 +537,7 @@ public class CollectionUtils {
* @param value The value to copy from.
* @return A new {@link TreeSet}, or <jk>null</jk> if the input was
null.
*/
- public static <E> TreeSet<E> sortedSetFrom(Collection<E> value) {
+ public static <E> TreeSet<E> toSortedSet(Collection<E> value) {
if (value == null)
return null;
TreeSet<E> l = new TreeSet<>();
@@ -567,7 +553,7 @@ public class CollectionUtils {
* @param nullIfEmpty If <jk>true</jk> returns <jk>null</jk> if the
collection is empty.
* @return A new {@link TreeSet}, or <jk>null</jk> if the input was
null.
*/
- public static <E> TreeSet<E> sortedSetFrom(Collection<E> value, boolean
nullIfEmpty) {
+ public static <E> TreeSet<E> toSortedSet(Collection<E> value, boolean
nullIfEmpty) {
if (value == null || (nullIfEmpty && value.isEmpty()))
return null;
TreeSet<E> l = new TreeSet<>();
@@ -654,22 +640,10 @@ public class CollectionUtils {
* @param copyFrom The set to copy from.
* @return A new {@link TreeSet}, or <jk>null</jk> if the set was
<jk>null</jk>.
*/
- public static <T> TreeSet<T> treeSet(Set<T> copyFrom) {
+ public static <T> TreeSet<T> toSortedSet(Set<T> copyFrom) {
return copyFrom == null ? null : new TreeSet<>(copyFrom);
}
- /**
- * Creates a new {@link TreeSet} containing the specified values.
- *
- * @param <T> The element type.
- * @param values The values to add to the set.
- * @return A new {@link TreeSet}, never <jk>null</jk>.
- */
- @SafeVarargs
- public static <T> TreeSet<T> treeSet(T...values) {
- return new TreeSet<>(Arrays.asList(values));
- }
-
//-----------------------------------------------------------------------------------------------------------------
// Array utilities
//-----------------------------------------------------------------------------------------------------------------
@@ -683,7 +657,7 @@ public class CollectionUtils {
* @return A new array with the specified elements appended.
*/
@SuppressWarnings("unchecked")
- public static <T> T[] append(T[] array, T...newElements) {
+ public static <T> T[] addAll(T[] array, T...newElements) {
if (array == null)
return newElements;
if (newElements.length == 0)
@@ -706,7 +680,7 @@ public class CollectionUtils {
* @param array The array being wrapped in a <c>Set</c> interface.
* @return The new set.
*/
- public static <T> Set<T> asSet(final T[] array) {
+ public static <T> Set<T> toSet(final T[] array) {
AssertionUtils.assertArgNotNull("array", array);
return new AbstractSet<>() {
@@ -780,11 +754,11 @@ public class CollectionUtils {
* The index position of the element in the specified array, or
* <c>-1</c> if the array doesn't contain the element, or the
array or element is <jk>null</jk>.
*/
- public static int indexOf(String element, String[] array) {
+ public static <T> int indexOf(T element, T[] array) {
if (element == null || array == null)
return -1;
for (int i = 0; i < array.length; i++)
- if (element.equals(array[i]))
+ if (eq(element, array[i]))
return i;
return -1;
}
@@ -890,7 +864,7 @@ public class CollectionUtils {
* @return The same list passed in.
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static List copyToList(Object array, List list) {
+ public static List copyArrayToList(Object array, List list) {
if (nn(array)) {
int length = Array.getLength(array);
for (int i = 0; i < length; i++)
@@ -955,7 +929,7 @@ public class CollectionUtils {
* <jk>true</jk> if the specified array contains the specified
element,
* <jk>false</jk> if the array or element is <jk>null</jk>.
*/
- public static boolean contains(String element, String[] array) {
+ public static <T> boolean contains(T element, T[] array) {
return indexOf(element, array) != -1;
}
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 5a93df54d6..96578a6626 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
@@ -834,7 +834,7 @@ public class ConfigMap implements ConfigStoreListener {
}
List<Import> irl = listOfSize(imports2.size());
-
CollectionUtils.forEachReverse(CollectionUtils.listFrom(imports2.values()), x
-> irl.add(new Import(x).register(listeners)));
+
CollectionUtils.forEachReverse(CollectionUtils.toList(imports2.values()), x ->
irl.add(new Import(x).register(listeners)));
this.imports.addAll(irl);
// Add [blank] section.
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 ecd3026e4a..72aa3a4a5e 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
@@ -493,7 +493,7 @@ public class RdfSerializerSession extends
WriterSerializerSession {
ClassMeta<?> keyType = type.getKeyType(), valueType =
type.getValueType();
- ArrayList<Map.Entry<Object,Object>> l =
CollectionUtils.listFrom(m.entrySet());
+ ArrayList<Map.Entry<Object,Object>> l =
CollectionUtils.toList(m.entrySet());
Collections.reverse(l);
l.forEach(x -> {
Object value = x.getValue();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 7777fb61cf..f0706d154a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -252,10 +252,10 @@ public class BeanContext extends Context {
beanConstructorVisibility =
copyFrom.beanConstructorVisibility;
beanMethodVisibility = copyFrom.beanMethodVisibility;
beanFieldVisibility = copyFrom.beanFieldVisibility;
- beanDictionary =
CollectionUtils.listFrom(copyFrom.beanDictionary, true);
- swaps = CollectionUtils.listFrom(copyFrom.swaps, true);
+ beanDictionary =
CollectionUtils.toList(copyFrom.beanDictionary, true);
+ swaps = CollectionUtils.toList(copyFrom.swaps, true);
notBeanClasses = classSet(copyFrom.notBeanClasses,
true);
- notBeanPackages =
CollectionUtils.sortedSetFrom(copyFrom.notBeanPackages, true);
+ notBeanPackages =
CollectionUtils.toSortedSet(copyFrom.notBeanPackages, true);
disableBeansRequireSomeProperties = !
copyFrom.beansRequireSomeProperties;
beanMapPutReturnsOldValue =
copyFrom.beanMapPutReturnsOldValue;
beansRequireDefaultConstructor =
copyFrom.beansRequireDefaultConstructor;
@@ -294,7 +294,7 @@ public class BeanContext extends Context {
beanDictionary =
CollectionUtils.copyOf(copyFrom.beanDictionary);
swaps = CollectionUtils.copyOf(copyFrom.swaps);
notBeanClasses = classSet(copyFrom.notBeanClasses);
- notBeanPackages =
CollectionUtils.sortedSetFrom(copyFrom.notBeanPackages);
+ notBeanPackages =
CollectionUtils.toSortedSet(copyFrom.notBeanPackages);
disableBeansRequireSomeProperties =
copyFrom.disableBeansRequireSomeProperties;
beanMapPutReturnsOldValue =
copyFrom.beanMapPutReturnsOldValue;
beansRequireDefaultConstructor =
copyFrom.beansRequireDefaultConstructor;
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 ba36e7d2e9..ef8c1d0553 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
@@ -492,7 +492,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
// Copy any existing array values into
the temporary list.
Object oldArray = invokeGetter(bean,
pName);
- copyToList(oldArray, l);
+ copyArrayToList(oldArray, l);
}
// Add new entry to our array.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index 1acb675cb9..3420bfa143 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -116,7 +116,7 @@ public abstract class Context implements AnnotationProvider
{
protected Builder(Builder copyFrom) {
debug = copyFrom.debug;
type = copyFrom.type;
- annotations =
CollectionUtils.listFrom(copyFrom.annotations, true);
+ annotations =
CollectionUtils.toList(copyFrom.annotations, true);
registerBuilders(this);
}
@@ -128,7 +128,7 @@ public abstract class Context implements AnnotationProvider
{
protected Builder(Context copyFrom) {
debug = copyFrom.debug;
type = copyFrom.getClass();
- annotations =
CollectionUtils.listFrom(copyFrom.annotations, true);
+ annotations =
CollectionUtils.toList(copyFrom.annotations, true);
registerBuilders(this);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
index 2dfadedbd2..06eaf7d678 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationBuilder.java
@@ -49,7 +49,7 @@ public class TargetedAnnotationBuilder<B extends
TargetedAnnotationBuilder<B>> e
*/
public B on(String...values) {
for (String v : values)
- on = append(on, v);
+ on = addAll(on, v);
return asThis();
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
index c7aec92848..56aa171fc2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/TargetedAnnotationTBuilder.java
@@ -49,7 +49,7 @@ public class TargetedAnnotationTBuilder<B extends
TargetedAnnotationTBuilder<B>>
*/
public B on(Class<?>...value) {
for (Class<?> v : value)
- on = append(on, v.getName());
+ on = addAll(on, v.getName());
return asThis();
}
@@ -62,7 +62,7 @@ public class TargetedAnnotationTBuilder<B extends
TargetedAnnotationTBuilder<B>>
@SuppressWarnings("unchecked")
public B onClass(Class<?>...value) {
for (Class<?> v : value)
- onClass = append(onClass, v);
+ onClass = addAll(onClass, v);
return asThis();
}
}
\ No newline at end of file
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 1669574bf4..e2336ab23d 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
@@ -138,7 +138,7 @@ public class ObjectSorter implements ObjectTool<SortArgs> {
}
// We reverse the list and sort last to first.
- List<String> columns = CollectionUtils.listFrom(sort.keySet());
+ List<String> columns = CollectionUtils.toList(sort.keySet());
Collections.reverse(columns);
List<SortEntry> l3 = l;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ViewArgs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ViewArgs.java
index 415617a234..434c73f75f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ViewArgs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ViewArgs.java
@@ -64,7 +64,7 @@ public class ViewArgs {
* <br>Values are column names.
*/
public ViewArgs(Collection<String> viewArgs) {
- this.view = u(CollectionUtils.listFrom(viewArgs));
+ this.view = u(CollectionUtils.toList(viewArgs));
}
/**
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 3e0cf9da31..5ae3213afe 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
@@ -2278,7 +2278,7 @@ public class ClassInfo {
m.put(f.getName(), f);
}
}
- List<FieldInfo> l =
CollectionUtils.listFrom(m.values());
+ List<FieldInfo> l =
CollectionUtils.toList(m.values());
l.sort(null);
publicFields = l.toArray(new
FieldInfo[l.size()]);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 4bce660b87..153de5ff73 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -313,7 +313,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
if (nn(defaultNamespace) &&
(ns.uri.equals(defaultNamespace.uri) || ns.name.equals(defaultNamespace.name)))
defaultNamespace = ns;
else
- namespaces = append(namespaces, ns);
+ namespaces = addAll(namespaces, ns);
}
private Namespace findDefaultNamespace(Namespace n) {
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
index 29b1f1e970..9971349eb7 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.microservice.resources;
+import static org.apache.juneau.common.utils.CollectionUtils.*;
import static org.apache.juneau.common.utils.StateEnum.*;
import static org.apache.juneau.common.utils.Utils.*;
@@ -198,7 +199,7 @@ public class LogEntryFormatter extends Formatter {
sre = sre.replaceAll("\\\\%n", "\\\\n");
rePattern = Pattern.compile(sre);
- fieldIndexes = CollectionUtils.mapFrom(fieldIndexes);
+ fieldIndexes = copyOf(fieldIndexes);
}
@SuppressWarnings("deprecation")
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index d5c7684132..f75bc6b65f 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -402,7 +402,7 @@ public class MockServletRequest implements
HttpServletRequest {
}
@Override /* Overridden from HttpServletRequest */
- public Enumeration<String> getParameterNames() { return
enumeration(CollectionUtils.listFrom(getParameterMap().keySet())); }
+ public Enumeration<String> getParameterNames() { return
enumeration(CollectionUtils.toList(getParameterMap().keySet())); }
@Override /* Overridden from HttpServletRequest */
public String[] getParameterValues(String name) {
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 27c09d580e..abb32706e2 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
@@ -5058,16 +5058,16 @@ public class RestContext extends Context {
// @formatter:off
produces = builder.produces().orElseGet(
()->{
- Set<MediaType> s = opContexts.isEmpty()
? emptySet() :
CollectionUtils.setFrom(opContexts.get(0).getSerializers().getSupportedMediaTypes());
+ Set<MediaType> s = opContexts.isEmpty()
? emptySet() :
CollectionUtils.toSet(opContexts.get(0).getSerializers().getSupportedMediaTypes());
opContexts.forEach(x ->
s.retainAll(x.getSerializers().getSupportedMediaTypes()));
- return u(CollectionUtils.listFrom(s));
+ return u(CollectionUtils.toList(s));
}
);
consumes = builder.consumes().orElseGet(
()->{
- Set<MediaType> s = opContexts.isEmpty()
? emptySet() :
CollectionUtils.setFrom(opContexts.get(0).getParsers().getSupportedMediaTypes());
+ Set<MediaType> s = opContexts.isEmpty()
? emptySet() :
CollectionUtils.toSet(opContexts.get(0).getParsers().getSupportedMediaTypes());
opContexts.forEach(x ->
s.retainAll(x.getParsers().getSupportedMediaTypes()));
- return u(CollectionUtils.listFrom(s));
+ return u(CollectionUtils.toList(s));
}
);
// @formatter:on
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 ba564600aa..cac075aa67 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
@@ -127,7 +127,7 @@ public class RestOperations {
public RestOperations(Builder builder) {
Map<String,List<RestOpContext>> m = CollectionUtils.map();
for (Map.Entry<String,TreeSet<RestOpContext>> e :
builder.map.entrySet())
- m.put(e.getKey(),
CollectionUtils.listFrom(e.getValue()));
+ m.put(e.getKey(), CollectionUtils.toList(e.getValue()));
this.map = m;
this.list = array(builder.set, RestOpContext.class);
}
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 bffe9780e0..7cf1ce8515 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
@@ -485,7 +485,7 @@ public class RestUtils {
if (! b)
m.put(key, null);
} else if (b && nn(m.get(key))) {
- m.put(key, append(m.get(key), val));
+ m.put(key, addAll(m.get(key), val));
} else {
m.put(key, new String[] { val });
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/utils/ArrayUtilsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/common/utils/ArrayUtilsTest.java
index 628032d2a9..1a28e84f32 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/common/utils/ArrayUtilsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/utils/ArrayUtilsTest.java
@@ -32,19 +32,19 @@ class ArrayUtilsTest extends TestBase {
@Test void a01_appendArrayToArray() {
String[] s = {};
- s = CollectionUtils.append(s, "a", "b");
+ s = CollectionUtils.addAll(s, "a", "b");
assertList(s, "a", "b");
- s = CollectionUtils.append(s, "c");
+ s = CollectionUtils.addAll(s, "c");
assertList(s, "a", "b", "c");
- s = CollectionUtils.append(s);
+ s = CollectionUtils.addAll(s);
assertList(s, "a", "b", "c");
- var o = CollectionUtils.append((Object[])null);
+ var o = CollectionUtils.addAll((Object[])null);
assertEmpty(o);
- s = CollectionUtils.append((String[])null, "a", "b");
+ s = CollectionUtils.addAll((String[])null, "a", "b");
assertList(s, "a", "b");
}
@@ -52,10 +52,10 @@ class ArrayUtilsTest extends TestBase {
// asSet(T[])
//====================================================================================================
@Test void a02_asSet() {
- assertThrows(IllegalArgumentException.class,
()->CollectionUtils.asSet((String[])null));
+ assertThrows(IllegalArgumentException.class,
()->CollectionUtils.toSet((String[])null));
var s = a("a");
- var i = CollectionUtils.asSet(s).iterator();
+ var i = CollectionUtils.toSet(s).iterator();
assertEquals("a", i.next());
assertThrows(UnsupportedOperationException.class, i::remove);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/utils/CollectionUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/utils/CollectionUtils_Test.java
index 2a69525354..e2f4a759ef 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/utils/CollectionUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/utils/CollectionUtils_Test.java
@@ -32,19 +32,19 @@ class CollectionUtils_Test extends TestBase {
@Test
void a01_treeSet_fromSet() {
LinkedHashSet<String> input = new LinkedHashSet<>(List.of("c",
"a", "b"));
- TreeSet<String> result = treeSet(input);
+ TreeSet<String> result = toSortedSet(input);
assertNotNull(result);
assertEquals(List.of("a", "b", "c"), new ArrayList<>(result));
// Null input
- assertNull(treeSet((Set<String>)null));
+ assertNull(toSortedSet((Set<String>)null));
}
@Test
void a02_treeSet_fromSet_numbers() {
LinkedHashSet<Integer> input = new LinkedHashSet<>(List.of(3,
1, 2));
- TreeSet<Integer> result = treeSet(input);
+ TreeSet<Integer> result = toSortedSet(input);
assertNotNull(result);
assertEquals(List.of(1, 2, 3), new ArrayList<>(result));
@@ -55,7 +55,7 @@ class CollectionUtils_Test extends TestBase {
//====================================================================================================
@Test
void a03_treeSet_varargs() {
- TreeSet<String> result = treeSet("c", "a", "b");
+ TreeSet<String> result = sortedSet("c", "a", "b");
assertNotNull(result);
assertEquals(List.of("a", "b", "c"), new ArrayList<>(result));
@@ -63,7 +63,7 @@ class CollectionUtils_Test extends TestBase {
@Test
void a04_treeSet_varargs_empty() {
- TreeSet<String> result = treeSet();
+ TreeSet<String> result = sortedSet();
assertNotNull(result);
assertTrue(result.isEmpty());
@@ -71,7 +71,7 @@ class CollectionUtils_Test extends TestBase {
@Test
void a05_treeSet_varargs_single() {
- TreeSet<String> result = treeSet("a");
+ TreeSet<String> result = sortedSet("a");
assertNotNull(result);
assertEquals(List.of("a"), new ArrayList<>(result));
@@ -79,7 +79,7 @@ class CollectionUtils_Test extends TestBase {
@Test
void a06_treeSet_varargs_numbers() {
- TreeSet<Integer> result = treeSet(3, 1, 2, 5, 4);
+ TreeSet<Integer> result = sortedSet(3, 1, 2, 5, 4);
assertNotNull(result);
assertEquals(List.of(1, 2, 3, 4, 5), new ArrayList<>(result));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
index 2db34faee5..95834ae0f0 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/ArrayUtilsTest.java
@@ -33,19 +33,19 @@ class ArrayUtilsTest extends TestBase {
@Test void a01_appendArrayToArray() {
String[] s = {};
- s = CollectionUtils.append(s, "a", "b");
+ s = CollectionUtils.addAll(s, "a", "b");
assertList(s, "a", "b");
- s = CollectionUtils.append(s, "c");
+ s = CollectionUtils.addAll(s, "c");
assertList(s, "a", "b", "c");
- s = CollectionUtils.append(s);
+ s = CollectionUtils.addAll(s);
assertList(s, "a", "b", "c");
- var o = CollectionUtils.append((Object[])null);
+ var o = CollectionUtils.addAll((Object[])null);
assertEmpty(o);
- s = CollectionUtils.append((String[])null, "a", "b");
+ s = CollectionUtils.addAll((String[])null, "a", "b");
assertList(s, "a", "b");
}
@@ -53,10 +53,10 @@ class ArrayUtilsTest extends TestBase {
// asSet(T[])
//====================================================================================================
@Test void a02_asSet() {
- assertThrows(IllegalArgumentException.class,
()->CollectionUtils.asSet((String[])null));
+ assertThrows(IllegalArgumentException.class,
()->CollectionUtils.toSet((String[])null));
var s = a("a");
- var i = CollectionUtils.asSet(s).iterator();
+ var i = CollectionUtils.toSet(s).iterator();
assertEquals("a", i.next());
assertThrows(UnsupportedOperationException.class, i::remove);
