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 735ccda00 Test modernization, clean up utility classes.
735ccda00 is described below
commit 735ccda00d93078beee9b80d17a490a000fb222c
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Mon Aug 25 16:31:20 2025 -0400
Test modernization, clean up utility classes.
---
.../org/apache/juneau/common/internal/Utils.java | 16 +------------
.../src/main/java/org/apache/juneau/BeanMeta.java | 2 +-
.../main/java/org/apache/juneau/MediaRange.java | 2 +-
.../java/org/apache/juneau/parser/ParserSet.java | 6 ++---
.../java/org/apache/juneau/reflect/ClassInfo.java | 26 +++++++++++-----------
.../org/apache/juneau/reflect/ExecutableInfo.java | 13 ++++++-----
.../apache/juneau/serializer/SerializerSet.java | 6 ++---
.../apache/juneau/http/header/BasicCsvHeader.java | 6 ++---
.../org/apache/juneau/http/header/EntityTags.java | 2 +-
.../apache/juneau/http/part/BasicCsvArrayPart.java | 4 ++--
.../juneau/rest/mock/MockServletResponse.java | 3 ++-
.../org/apache/juneau/rest/RestOperations.java | 2 +-
.../org/apache/juneau/rest/widget/Tooltip.java | 5 ++++-
13 files changed, 42 insertions(+), 51 deletions(-)
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 8f759d1e0..88ab25f26 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
@@ -65,7 +65,7 @@ public class Utils {
*/
@SafeVarargs
public static <T> List<T> alist(T...values) { // NOSONAR
- return Arrays.asList(values);
+ return values == null ? null : Arrays.asList(values);
}
/**
@@ -1434,20 +1434,6 @@ public class Utils {
return value == null ? null :
Collections.unmodifiableSet(value);
}
- /**
- * 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}.
*
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 1cfbf2cba..80e6b6365 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
@@ -806,7 +806,7 @@ public class BeanMeta<T> {
* @return Metadata on all properties associated with this bean.
*/
public Collection<BeanPropertyMeta> getPropertyMetas() {
- return Utils.ulist2(propertyArray);
+ return u(alist(propertyArray));
}
/**
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 12186226a..53d480879 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
@@ -102,7 +102,7 @@ public class MediaRange extends MediaType {
* @return The optional list of extensions, never <jk>null</jk>.
*/
public List<NameValuePair> getExtensions() {
- return Utils.ulist2(extensions);
+ return u(alist(extensions));
}
/**
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 5039c009e..0544c9b9f 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
@@ -538,7 +538,7 @@ public final class ParserSet {
return pm;
MediaType ct = MediaType.of(contentTypeHeader);
- int match = ct.match(Utils.ulist2(mediaTypes));
+ int match = ct.match(alist(mediaTypes));
if (match >= 0) {
pm = new ParserMatch(mediaTypes[match],
mediaTypeParsers[match]);
@@ -589,7 +589,7 @@ public final class ParserSet {
* @return An unmodifiable list of media types.
*/
public List<MediaType> getSupportedMediaTypes() {
- return Utils.ulist2(mediaTypes);
+ return u(alist(mediaTypes));
}
/**
@@ -598,7 +598,7 @@ public final class ParserSet {
* @return An unmodifiable list of parsers in this group.
*/
public List<Parser> getParsers() {
- return Utils.ulist2(entries);
+ return u(alist(entries));
}
/**
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 ade942cfc..7045896fd 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
@@ -299,7 +299,7 @@ public final class ClassInfo {
* <br>Results are in the same order as {@link
Class#getInterfaces()}.
*/
public List<ClassInfo> getDeclaredInterfaces() {
- return Utils.ulist2(_getDeclaredInterfaces());
+ return u(alist(_getDeclaredInterfaces()));
}
/**
@@ -313,7 +313,7 @@ public final class ClassInfo {
* <br>Results are in child-to-parent order.
*/
public List<ClassInfo> getInterfaces() {
- return Utils.ulist2(_getInterfaces());
+ return u(alist(_getInterfaces()));
}
/**
@@ -329,7 +329,7 @@ public final class ClassInfo {
* <br>Results are in child-to-parent order.
*/
public List<ClassInfo> getParents() {
- return Utils.ulist2(_getParents());
+ return u(alist(_getParents()));
}
/**
@@ -342,7 +342,7 @@ public final class ClassInfo {
* <br>Results are ordered child-to-parent order with classes
listed before interfaces.
*/
public List<ClassInfo> getAllParents() {
- return Utils.ulist2(_getAllParents());
+ return u(alist(_getAllParents()));
}
/**
@@ -439,7 +439,7 @@ public final class ClassInfo {
* <br>Results are ordered alphabetically.
*/
public List<MethodInfo> getPublicMethods() {
- return Utils.ulist2(_getPublicMethods());
+ return u(alist(_getPublicMethods()));
}
/**
@@ -477,7 +477,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<MethodInfo> getDeclaredMethods() {
- return Utils.ulist2(_getDeclaredMethods());
+ return u(alist(_getDeclaredMethods()));
}
/**
@@ -515,7 +515,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<MethodInfo> getMethods() {
- return Utils.ulist2(_getAllMethods());
+ return u(alist(_getAllMethods()));
}
/**
@@ -553,7 +553,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<MethodInfo> getAllMethodsParentFirst() {
- return Utils.ulist2(_getAllMethodsParentFirst());
+ return u(alist(_getAllMethodsParentFirst()));
}
/**
@@ -640,7 +640,7 @@ public final class ClassInfo {
* @return All public constructors defined on this class.
*/
public List<ConstructorInfo> getPublicConstructors() {
- return Utils.ulist2(_getPublicConstructors());
+ return u(alist(_getPublicConstructors()));
}
/**
@@ -677,7 +677,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<ConstructorInfo> getDeclaredConstructors() {
- return Utils.ulist2(_getDeclaredConstructors());
+ return u(alist(_getDeclaredConstructors()));
}
/**
@@ -775,7 +775,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<FieldInfo> getPublicFields() {
- return Utils.ulist2(_getPublicFields());
+ return u(alist(_getPublicFields()));
}
/**
@@ -813,7 +813,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<FieldInfo> getDeclaredFields() {
- return Utils.ulist2(_getDeclaredFields());
+ return u(alist(_getDeclaredFields()));
}
/**
@@ -853,7 +853,7 @@ public final class ClassInfo {
* <br>List is unmodifiable.
*/
public List<FieldInfo> getAllFields() {
- return Utils.ulist2(_getAllFields());
+ return u(alist(_getAllFields()));
}
/**
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 1b27284f9..b9fb0ad8c 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
@@ -13,6 +13,7 @@
package org.apache.juneau.reflect;
import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
import java.lang.annotation.*;
@@ -139,7 +140,7 @@ public abstract class ExecutableInfo {
* @return An array of parameter information, never <jk>null</jk>.
*/
public final List<ParamInfo> getParams() {
- return Utils.ulist2(_getParams());
+ return u(alist(_getParams()));
}
/**
@@ -173,7 +174,7 @@ public abstract class ExecutableInfo {
* @return The parameter types on this executable.
*/
public final List<ClassInfo> getParamTypes() {
- return Utils.ulist2(_getParameterTypes());
+ return u(alist(_getParameterTypes()));
}
/**
@@ -193,7 +194,7 @@ public abstract class ExecutableInfo {
* @return The raw parameter types on this executable.
*/
public final List<Class<?>> getRawParamTypes() {
- return Utils.ulist2(_getRawParamTypes());
+ return u(alist(_getRawParamTypes()));
}
/**
@@ -213,7 +214,7 @@ public abstract class ExecutableInfo {
* @return The raw generic parameter types on this executable.
*/
public final List<Type> getRawGenericParamTypes() {
- return Utils.ulist2(_getRawGenericParamTypes());
+ return u(alist(_getRawGenericParamTypes()));
}
/**
@@ -234,7 +235,7 @@ public abstract class ExecutableInfo {
* @see Executable#getParameters()
*/
public final List<Parameter> getRawParameters() {
- return Utils.ulist2(_getRawParameters());
+ return u(alist(_getRawParameters()));
}
/**
@@ -392,7 +393,7 @@ public abstract class ExecutableInfo {
* @return The exception types on this executable.
*/
public final List<ClassInfo> getExceptionTypes() {
- return Utils.ulist2(_getExceptionTypes());
+ return u(alist(_getExceptionTypes()));
}
final ClassInfo[] _getExceptionTypes() {
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 1245a2d44..a65178f1d 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
@@ -498,7 +498,7 @@ public final class SerializerSet {
protected SerializerSet(Builder builder) {
this.entries =
builder.entries.stream().map(this::build).toArray(Serializer[]::new);
- this.entriesList = Utils.ulist2(entries);
+ this.entriesList = u(alist(entries));
List<MediaRange> lmtr = list();
Set<MediaType> lmt = set();
@@ -512,9 +512,9 @@ public final class SerializerSet {
}
this.mediaRanges = lmtr.toArray(new MediaRange[lmtr.size()]);
- this.mediaRangesList = Utils.ulist2(mediaRanges);
+ this.mediaRangesList = u(alist(mediaRanges));
this.mediaTypes = lmt.toArray(new MediaType[lmt.size()]);
- this.mediaTypesList = Utils.ulist2(mediaTypes);
+ this.mediaTypesList = u(alist(mediaTypes));
this.mediaTypeRangeSerializers = l.toArray(new
Serializer[l.size()]);
}
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 387b73677..f92e903b2 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
@@ -184,7 +184,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(Utils.ulist2(value()));
+ return opt(u(alist(value())));
}
/**
@@ -196,7 +196,7 @@ public class BasicCsvHeader extends BasicHeader {
* @return The header value as a list. Can be <jk>null</jk>.
*/
public List<String> toList() {
- return Utils.ulist2(value());
+ return u(alist(value()));
}
/**
@@ -249,7 +249,7 @@ public class BasicCsvHeader extends BasicHeader {
* @throws AssertionError If assertion failed.
*/
public FluentListAssertion<String,BasicCsvHeader> assertList() {
- return new FluentListAssertion<>(Utils.ulist2(value()), this);
+ return new FluentListAssertion<>(u(alist(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 cbf3c16ba..3fcf8ce5d 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
@@ -99,7 +99,7 @@ public class EntityTags {
* @return The entity tags in this object as a list. Can be
<jk>null</jk>.
*/
public List<EntityTag> toList() {
- return Utils.ulist2(value);
+ return u(alist(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 6b422e464..bd0af70d7 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
@@ -160,7 +160,7 @@ public class BasicCsvArrayPart extends BasicPart {
* @throws AssertionError If assertion failed.
*/
public FluentListAssertion<String,BasicCsvArrayPart> assertList() {
- return new FluentListAssertion<>(Utils.ulist2(value()), this);
+ return new FluentListAssertion<>(u(alist(value())), this);
}
/**
@@ -172,7 +172,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 Utils.ulist2(value());
+ return u(alist(value()));
}
/**
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 57655480a..363bb0368 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
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.mock;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.io.*;
@@ -264,7 +265,7 @@ public class MockServletResponse implements
HttpServletResponse {
@Override /* HttpServletResponse */
public Collection<String> getHeaders(String name) {
String[] s = headerMap.get(name);
- return s == null ? Collections.emptyList() : Utils.ulist2(s);
+ return s == null ? Collections.emptyList() : u(alist(s));
}
@Override /* HttpServletResponse */
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 e242f4e83..530d3ed54 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
@@ -209,6 +209,6 @@ public class RestOperations {
* @return An unmodifiable list of method contexts in this object.
*/
public List<RestOpContext> getOpContexts() {
- return Utils.ulist2(list);
+ return u(alist(list));
}
}
\ 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 f5c8f66e3..4926d54f5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/widget/Tooltip.java
@@ -13,6 +13,9 @@
package org.apache.juneau.rest.widget;
import static org.apache.juneau.bean.html5.HtmlBuilder.*;
+import static org.apache.juneau.common.internal.Utils.*;
+import static org.apache.juneau.common.internal.Utils.u;
+
import java.util.*;
import org.apache.juneau.*;
@@ -46,7 +49,7 @@ public class Tooltip {
*/
public Tooltip(String display, Object... content) {
this.display = new HtmlText(display);
- this.content = Utils.ulist2(content);
+ this.content = u(alist(content));
}
/**
