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 8eb977a34 Test modernization, clean up utility classes.
8eb977a34 is described below
commit 8eb977a345711992549b0d2d939e8de25f3db871
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 15:51:22 2025 -0400
Test modernization, clean up utility classes.
---
.../main/java/org/apache/juneau/common/internal/Utils.java | 12 ------------
.../java/org/apache/juneau/annotation/SchemaAnnotation.java | 4 ++--
.../org/apache/juneau/annotation/SubItemsAnnotation.java | 2 +-
.../juneau/rest/swagger/BasicSwaggerProviderSession.java | 12 ++++++------
4 files changed, 9 insertions(+), 21 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 231f3c4e4..20541765e 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
@@ -447,18 +447,6 @@ public class Utils {
return ! isEmpty(o);
}
- /**
- * Returns <jk>true</jk> if the specified map is not <jk>null</jk> and
not empty.
- *
- * @param <K> The key type.
- * @param <V> The value type.
- * @param value The value being checked.
- * @return <jk>true</jk> if the specified map is not <jk>null</jk> and
not empty.
- */
- public static <K,V> boolean isNotEmpty2(Map<K,V> value) {
- return isNotEmpty(value);
- }
-
/**
* Returns <jk>true</jk> if specified string is not <jk>null</jk> or
empty.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
index 90f80783a..025e50eb1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
@@ -97,7 +97,7 @@ public class SchemaAnnotation {
return m;
Predicate<String> ne = Utils::isNotEmpty3;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
- Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
+ Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
return m
@@ -140,7 +140,7 @@ public class SchemaAnnotation {
return m;
Predicate<String> ne = Utils::isNotEmpty3;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
- Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
+ Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
return m
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
index 240dfaffd..469e77e23 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
@@ -70,7 +70,7 @@ public class SubItemsAnnotation {
return om;
Predicate<String> ne = Utils::isNotEmpty3;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
- Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
+ Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
return om
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 60aac0f6d..91153cbb2 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
@@ -99,7 +99,7 @@ public class BasicSwaggerProviderSession {
Predicate<String> ne = Utils::isNotEmpty3;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
- Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
+ Predicate<Map<?,?>> nem = Utils::isNotEmpty;
// Load swagger JSON from classpath.
JsonMap omSwagger = Json5.DEFAULT.read(is, JsonMap.class);
@@ -762,7 +762,7 @@ public class BasicSwaggerProviderSession {
private JsonMap toMap(Tag a, String location, Object...locationArgs) {
JsonMap om = JsonMap.create();
Predicate<String> ne = Utils::isNotEmpty3;
- Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
+ Predicate<Map<?,?>> nem = Utils::isNotEmpty;
om
.appendIf(ne, "name", resolve(a.name()))
.appendIf(ne, "description",
resolve(joinnl(a.description())))
@@ -933,7 +933,7 @@ public class BasicSwaggerProviderSession {
om = newMap(om);
Predicate<String> ne = Utils::isNotEmpty3;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
- Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
+ Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
return om
@@ -991,7 +991,7 @@ public class BasicSwaggerProviderSession {
om = newMap(om);
Predicate<String> ne = Utils::isNotEmpty3;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
- Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
+ Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
return om
@@ -1022,7 +1022,7 @@ public class BasicSwaggerProviderSession {
om = newMap(om);
Predicate<String> ne = Utils::isNotEmpty3;
Predicate<Collection<?>> nec = Utils::isNotEmpty;
- Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
+ Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
return om
@@ -1051,7 +1051,7 @@ public class BasicSwaggerProviderSession {
if (ResponseAnnotation.empty(a))
return om;
om = newMap(om);
- Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
+ Predicate<Map<?,?>> nem = Utils::isNotEmpty;
if (! SchemaAnnotation.empty(a.schema()))
merge(om, a.schema());
return om
