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 f40c97987 Test modernization, clean up utility classes.
f40c97987 is described below
commit f40c97987f10443843d5ecd08c3fae687491ff9c
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 13:30:33 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 ++++----
.../juneau/config/internal/ConfigMapEntry.java | 4 ++--
.../src/main/java/org/apache/juneau/Context.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 2 +-
.../apache/juneau/internal/CollectionUtils.java | 24 +---------------------
.../juneau/rest/mock/MockServletResponse.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 4 ++--
12 files changed, 22 insertions(+), 44 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 a36e2dab7..31cc01281 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 = setFrom(value);
+ _enum = toSet(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 2a0e593a4..cbb0c8a37 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 = setFrom(value);
+ _enum = toSet(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 6f947bccd..2a856dcde 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 = setFrom(value);
+ consumes = toSet(value);
return this;
}
@@ -512,7 +512,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setProduces(Collection<MediaType> value) {
- produces = setFrom(value);
+ produces = toSet(value);
return this;
}
@@ -639,7 +639,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setSchemes(Collection<String> value) {
- schemes = setFrom(value);
+ schemes = toSet(value);
return this;
}
@@ -758,7 +758,7 @@ public class Operation extends SwaggerElement {
* @return This object.
*/
public Operation setTags(Collection<String> value) {
- tags = setFrom(value);
+ tags = toSet(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 04cc21418..07f57e66e 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 = setFrom(value);
+ _enum = toSet(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 02f17fb44..f105508c5 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 = setFrom(value);
+ allOf = toSet(value);
return this;
}
@@ -322,7 +322,7 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setEnum(Collection<Object> value) {
- _enum = setFrom(value);
+ _enum = toSet(value);
return this;
}
@@ -850,7 +850,7 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setRequiredProperties(Collection<String> value) {
- requiredProperties = setFrom(value);
+ requiredProperties = toSet(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 9f10e7957..5717de176 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 = setFrom(value);
+ consumes = toSet(value);
return this;
}
@@ -456,7 +456,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setProduces(Collection<MediaType> value) {
- produces = setFrom(value);
+ produces = toSet(value);
return this;
}
@@ -566,7 +566,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setSchemes(Collection<String> value) {
- schemes = setFrom(value);
+ schemes = toSet(value);
return this;
}
@@ -754,7 +754,7 @@ public class Swagger extends SwaggerElement {
* @return This object.
*/
public Swagger setTags(Collection<Tag> value) {
- tags = setFrom(value);
+ tags = toSet(value);
return this;
}
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
index b2db96c87..744ada42d 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
@@ -61,7 +61,7 @@ public class ConfigMapEntry {
this.value = StringUtils.replaceUnicodeSequences(line.trim());
- this.preLines = preLines == null ? emptyList() :
unmodifiable(copyOf(preLines));
+ this.preLines = preLines == null ? Collections.emptyList() :
unmodifiable(copyOf(preLines));
}
ConfigMapEntry(String key, String value, String modifiers, String
comment, List<String> preLines) {
@@ -70,7 +70,7 @@ public class ConfigMapEntry {
this.value = value;
this.comment = comment;
this.modifiers = modifiers;
- this.preLines = preLines == null ? emptyList() :
unmodifiable(copyOf(preLines));
+ this.preLines = preLines == null ? Collections.emptyList() :
unmodifiable(copyOf(preLines));
}
/**
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 4a2a2fbcc..c4eec6f34 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
@@ -818,7 +818,7 @@ public abstract class Context implements AnnotationProvider
{
protected Context(Builder builder) {
init(builder);
debug = builder.debug;
- annotations =
optional(builder.annotations).orElseGet(CollectionUtils::emptyList);
+ annotations =
optional(builder.annotations).orElseGet(Collections::emptyList);
ReflectionMap.Builder<Annotation> rmb =
ReflectionMap.create(Annotation.class);
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 96daee7eb..1b797db42 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
@@ -1694,7 +1694,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
nowrap = builder.nowrap;
resolveBodyVars = builder.resolveBodyVars;
template = builder.template;
- widgets = builder.widgets == null ? emptyList() :
copyOf(builder.widgets);
+ widgets = builder.widgets == null ? Collections.emptyList() :
copyOf(builder.widgets);
templateBean = newInstance(template);
widgetMap = new HtmlWidgetMap();
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 924279d93..737065b3d 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
@@ -36,7 +36,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> setFrom(Collection<E> val) {
+ public static <E> Set<E> toSet(Collection<E> val) {
return val == null ? null : new LinkedHashSet<>(val);
}
@@ -146,16 +146,6 @@ public final class CollectionUtils {
return new SetBuilder<>(elementType, elementTypeArgs);
}
- /**
- * Simple passthrough to {@link Collections#emptyList()}
- *
- * @param <E> The element type.
- * @return A new unmodifiable empty list.
- */
- public static <E> List<E> emptyList() {
- return Collections.emptyList();
- }
-
/**
* Convenience method for creating an {@link ArrayList}.
*
@@ -210,18 +200,6 @@ public final class CollectionUtils {
return l;
}
- /**
- * Convenience method for creating an array-backed list by calling
{@link Arrays#asList(Object...)}.
- *
- * @param <E> The element type.
- * @param values The values to initialize the list with.
- * @return A new modifiable list, or <jk>null</jk> if the array was
<jk>null</jk>.
- */
-// @SafeVarargs
-// public static <E> List<E> alist(E...values) {
-// return Utils.alist(values);
-// }
-
/**
* Creates an {@link ArrayList} copy from a collection.
*
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 643cd1e7f..8991e24df 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
@@ -263,7 +263,7 @@ public class MockServletResponse implements
HttpServletResponse {
@Override /* HttpServletResponse */
public Collection<String> getHeaders(String name) {
String[] s = headerMap.get(name);
- return s == null ? emptyList() : ulist(s);
+ return s == null ? Collections.emptyList() : ulist(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 83a5002cf..54beca03c 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() :
setFrom(opContexts.get(0).getSerializers().getSupportedMediaTypes());
+ Set<MediaType> s = opContexts.isEmpty()
? emptySet() :
toSet(opContexts.get(0).getSerializers().getSupportedMediaTypes());
opContexts.forEach(x ->
s.retainAll(x.getSerializers().getSupportedMediaTypes()));
return unmodifiable(listFrom(s));
}
);
consumes = builder.consumes().orElseGet(
()->{
- Set<MediaType> s = opContexts.isEmpty()
? emptySet() : setFrom(opContexts.get(0).getParsers().getSupportedMediaTypes());
+ Set<MediaType> s = opContexts.isEmpty()
? emptySet() : toSet(opContexts.get(0).getParsers().getSupportedMediaTypes());
opContexts.forEach(x ->
s.retainAll(x.getParsers().getSupportedMediaTypes()));
return unmodifiable(listFrom(s));
}
