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 61307f485 Test modernization, clean up utility classes.
61307f485 is described below
commit 61307f4856f593b731f318dd93ffbad221fe88af
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 14:58:33 2025 -0400
Test modernization, clean up utility classes.
---
.../apache/juneau/bean/swagger/ui/SwaggerUI.java | 3 +-
.../apache/juneau/config/internal/ConfigMap.java | 2 +-
.../main/java/org/apache/juneau/BeanFilter.java | 18 ++++----
.../org/apache/juneau/html/HtmlParserSession.java | 3 +-
.../apache/juneau/html/HtmlSerializerSession.java | 3 +-
.../apache/juneau/internal/CollectionUtils.java | 53 +---------------------
.../apache/juneau/internal/DelegateBeanMap.java | 6 +--
.../org/apache/juneau/jsonschema/SchemaUtils.java | 3 +-
.../org/apache/juneau/jsonschema/TypeCategory.java | 4 +-
.../java/org/apache/juneau/reflect/ClassInfo.java | 3 +-
.../apache/juneau/serializer/SerializerSet.java | 4 +-
.../java/org/apache/juneau/utils/BeanDiff.java | 6 ++-
.../java/org/apache/juneau/rest/RestOpContext.java | 2 +-
.../org/apache/juneau/rest/RestOperations.java | 3 +-
.../rest/swagger/BasicSwaggerProviderSession.java | 3 +-
15 files changed, 41 insertions(+), 75 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ui/SwaggerUI.java
index b3994b4eb..a0e1e3541 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,6 +15,7 @@ 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.common.internal.Utils.set;
import java.util.*;
@@ -42,7 +43,7 @@ public class SwaggerUI extends ObjectSwap<Swagger,Div> {
.caching(Boolean.getBoolean("RestContext.disableClasspathResourceCaching.b") ?
-1 : 1_000_000)
.build();
- private static final Set<String> STANDARD_METHODS = set2("get", "put",
"post", "delete", "options");
+ private static final Set<String> STANDARD_METHODS = set("get", "put",
"post", "delete", "options");
/**
* This UI applies to HTML requests only.
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 68b2a81ec..d3533088c 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
@@ -283,7 +283,7 @@ public class ConfigMap implements ConfigStoreListener {
public Set<String> getKeys(String section) {
checkSectionName(section);
var cs = entries.get(section);
- var s = imports.isEmpty() && cs != null ? cs.entries.keySet() :
CollectionUtils.<String>set2();
+ var s = imports.isEmpty() && cs != null ? cs.entries.keySet() :
Utils.<String>set();
if (! imports.isEmpty()) {
imports.forEach(x ->
s.addAll(x.getConfigMap().getKeys(section)));
if (cs != null)
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 41a59cd89..4cab4b446 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
@@ -17,10 +17,12 @@ import java.util.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.swap.*;
@@ -66,10 +68,10 @@ public final class BeanFilter {
Class<?> beanClass;
String typeName, example;
Set<String>
- properties = set2(),
- excludeProperties = set2(),
- readOnlyProperties = set2(),
- writeOnlyProperties = set2();
+ properties = set(),
+ excludeProperties = set(),
+ readOnlyProperties = set(),
+ writeOnlyProperties = set();
Class<?> implClass, interfaceClass, stopClass;
boolean sortProperties, fluentSetters;
BeanCreator<PropertyNamer> propertyNamer =
BeanCreator.of(PropertyNamer.class);
@@ -450,7 +452,7 @@ public final class BeanFilter {
* @return This object.
*/
public Builder properties(String...value) {
- this.properties = set2();
+ this.properties = set();
for (String v : value)
split3(v, x -> properties.add(x));
return this;
@@ -494,7 +496,7 @@ public final class BeanFilter {
* @return This object.
*/
public Builder excludeProperties(String...value) {
- this.excludeProperties = set2();
+ this.excludeProperties = set();
for (String v : value)
split3(v, x -> excludeProperties.add(x));
return this;
@@ -540,7 +542,7 @@ public final class BeanFilter {
* @return This object.
*/
public Builder readOnlyProperties(String...value) {
- this.readOnlyProperties = set2();
+ this.readOnlyProperties = set();
for (String v : value)
split3(v, x -> readOnlyProperties.add(x));
return this;
@@ -586,7 +588,7 @@ public final class BeanFilter {
* @return This object.
*/
public Builder writeOnlyProperties(String...value) {
- this.writeOnlyProperties = set2();
+ this.writeOnlyProperties = set();
for (String v : value)
split3(v, x -> writeOnlyProperties.add(x));
return this;
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 4080e4e8a..51df6939b 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
@@ -16,6 +16,7 @@ import static javax.xml.stream.XMLStreamConstants.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.html.HtmlTag.*;
import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.io.IOException;
import java.lang.reflect.*;
@@ -53,7 +54,7 @@ public final class HtmlParserSession extends XmlParserSession
{
// Static
//-------------------------------------------------------------------------------------------------------------------
- private static final Set<String> whitespaceElements =
set2("br","bs","sp","ff");
+ private static final Set<String> whitespaceElements =
set("br","bs","sp","ff");
/**
* Creates a new builder for this object.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 06e561a73..c50e37ae7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -15,6 +15,7 @@ package org.apache.juneau.html;
import static org.apache.juneau.common.internal.IOUtils.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.xml.XmlSerializerSession.ContentResult.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.io.*;
import java.lang.reflect.*;
@@ -912,7 +913,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
// If it's a non-bean map, only use table if all entries are
also maps.
if (cm1.isMap() && ! cm1.isBeanMap()) {
- Set<Object> set = CollectionUtils.set2();
+ Set<Object> set = set();
for (Object o : c) {
o = swap(swap, o);
if (! canIgnoreValue(cm1, null, o)) {
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 803cd3e43..df7c9e284 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
@@ -217,21 +217,6 @@ public final class CollectionUtils {
return l;
}
- /**
- * Convenience method for creating a {@link LinkedHashSet}.
- *
- * @param <E> The element type.
- * @param values The values to initialize the set with.
- * @return A new modifiable set.
- */
- @SafeVarargs
- public static <E> LinkedHashSet<E> set2(E...values) {
- LinkedHashSet<E> l = new LinkedHashSet<>();
- for (E v : values)
- l.add(v);
- return l;
- }
-
/**
* Convenience method for creating a {@link LinkedHashSet}.
*
@@ -242,7 +227,7 @@ public final class CollectionUtils {
*/
@SafeVarargs
public static <E> LinkedHashSet<E> setOf(Class<E> elementType,
E...values) {
- return set2(values);
+ return Utils.set(values);
}
/**
@@ -435,40 +420,6 @@ public final class CollectionUtils {
return l;
}
-// /**
-// * Wraps the specified list in {@link
Collections#unmodifiableList(List)}.
-// *
-// * @param <E> The element type.
-// * @param value The list to wrap.
-// * @return The wrapped list.
-// */
-// public static <E> List<E> unmodifiable(List<E> value) {
-// return value == null ? null:
Collections.unmodifiableList(value);
-// }
-//
-// /**
-// * Wraps the specified set in {@link Collections#unmodifiableSet(Set)}.
-// *
-// * @param <E> The element type.
-// * @param value The set to wrap.
-// * @return The wrapped set.
-// */
-// public static <E> Set<E> unmodifiable(Set<E> value) {
-// return value == null ? null: Collections.unmodifiableSet(value);
-// }
-//
-// /**
-// * Wraps the specified map in {@link Collections#unmodifiableMap(Map)}.
-// *
-// * @param <K> The key type.
-// * @param <V> The value type.
-// * @param value The map to wrap.
-// * @return The wrapped map.
-// */
-// public static <K,V> Map<K,V> unmodifiable(Map<K,V> value) {
-// return value == null ? null: Collections.unmodifiableMap(value);
-// }
-
/**
* Wraps the specified list in {@link
Collections#unmodifiableList(List)}.
*
@@ -546,7 +497,7 @@ public final class CollectionUtils {
public static <E> Set<E> addAll(Set<E> value, E...entries) {
if (entries != null) {
if (value == null)
- value = set2(entries);
+ value = Utils.set(entries);
else
Collections.addAll(value, entries);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
index 2d5a1160c..726ea7bbc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateBeanMap.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.util.*;
import java.util.function.*;
@@ -35,7 +35,7 @@ import org.apache.juneau.collections.*;
*/
public class DelegateBeanMap<T> extends BeanMap<T> {
- private Set<String> keys = set2();
+ private Set<String> keys = set();
private JsonMap overrideValues = new JsonMap();
/**
@@ -106,7 +106,7 @@ public class DelegateBeanMap<T> extends BeanMap<T> {
@Override /* Map */
public synchronized Set<Entry<String,Object>> entrySet() {
- Set<Entry<String,Object>> s = set2();
+ Set<Entry<String,Object>> s = set();
keys.forEach(k -> {
BeanMapEntry bme;
if (overrideValues.containsKey(k))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
index d5bb434bc..e9acef335 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/SchemaUtils.java
@@ -15,6 +15,7 @@ package org.apache.juneau.jsonschema;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.util.*;
@@ -89,7 +90,7 @@ public class SchemaUtils {
String s = joinnl(ss);
if (s.isEmpty())
return null;
- Set<String> set = set2();
+ Set<String> set = set();
JsonList.ofJsonOrCdl(s).forEach(x -> set.add(x.toString()));
return set;
}
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 7e4e81046..edc184151 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
@@ -14,6 +14,8 @@ package org.apache.juneau.jsonschema;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
+
import java.util.*;
/**
@@ -69,7 +71,7 @@ public enum TypeCategory {
public static Set<TypeCategory> parse(String s) {
if (s == null || s.isEmpty())
return Collections.emptySet();
- Set<TypeCategory> set = set2();
+ Set<TypeCategory> set = set();
split3(s, x -> set.add(valueOf(x.toUpperCase())));
return set;
}
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 e386055dd..82a197f2f 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
@@ -15,6 +15,7 @@ package org.apache.juneau.reflect;
import static org.apache.juneau.common.internal.ArgUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
import java.lang.annotation.*;
@@ -364,7 +365,7 @@ public final class ClassInfo {
ClassInfo[] _getInterfaces() {
if (interfaces == null) {
synchronized(this) {
- Set<ClassInfo> s = set2();
+ Set<ClassInfo> s = set();
for (ClassInfo ci : _getParents())
for (ClassInfo ci2 :
ci._getDeclaredInterfaces()) {
s.add(ci2);
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 abdd5638d..6e155adff 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
@@ -14,6 +14,8 @@ package org.apache.juneau.serializer;
import static java.util.stream.Collectors.*;
import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
+
import java.util.*;
import java.util.concurrent.*;
import java.util.function.*;
@@ -499,7 +501,7 @@ public final class SerializerSet {
this.entriesList = Utils.ulist2(entries);
List<MediaRange> lmtr = list2();
- Set<MediaType> lmt = set2();
+ Set<MediaType> lmt = set();
List<Serializer> l = list2();
for (Serializer e : entries) {
e.getMediaTypeRanges().forEachRange(x -> {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
index 63ee2967e..67787141d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
@@ -13,6 +13,8 @@
package org.apache.juneau.utils;
import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
+
import java.util.*;
import org.apache.juneau.*;
@@ -125,7 +127,7 @@ public class BeanDiff {
* @return This object.
*/
public Builder<T> include(String...properties) {
- include = set2(properties);
+ include = set(properties);
return this;
}
@@ -150,7 +152,7 @@ public class BeanDiff {
* @return This object.
*/
public Builder<T> exclude(String...properties) {
- exclude = set2(properties);
+ exclude = set(properties);
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 4cef4f937..b3001aad3 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -1100,7 +1100,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
RestGuardList getGuards() {
RestGuardList.Builder b = guards();
- Set<String> roleGuard =
Utils.opt(this.roleGuard).orElseGet(CollectionUtils::set2);
+ Set<String> roleGuard =
Utils.opt(this.roleGuard).orElseGet(Utils::set);
for (String rg : roleGuard) {
try {
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 b6ea34a2b..e242f4e83 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
@@ -14,6 +14,7 @@ package org.apache.juneau.rest;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.util.*;
@@ -77,7 +78,7 @@ public class RestOperations {
protected Builder(BeanStore beanStore) {
super(RestOperations.class, beanStore);
map = new TreeMap<>();
- set = set2();
+ set = set();
}
@Override /* BeanBuilder */
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 562301868..dc8ab836e 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
@@ -17,6 +17,7 @@ import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.rest.httppart.RestPartType.*;
import static org.apache.juneau.rest.annotation.RestOpAnnotation.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.io.*;
import java.lang.reflect.*;
@@ -1126,7 +1127,7 @@ public class BasicSwaggerProviderSession {
private Set<String> toSet(String[] ss) {
if (ss.length == 0)
return null;
- Set<String> set = set2();
+ Set<String> set = set();
for (String s : ss)
split3(s, x -> set.add(x));
return set.isEmpty() ? null : set;
