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 d29fe239b Test modernization, clean up utility classes.
d29fe239b is described below
commit d29fe239b5fb6f4842510cdc789d0c65b01fc782
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 15:49:22 2025 -0400
Test modernization, clean up utility classes.
---
.../org/apache/juneau/common/internal/Utils.java | 25 ++--------------------
.../apache/juneau/config/internal/ConfigMap.java | 2 +-
.../main/java/org/apache/juneau/BeanFilter.java | 10 ++++-----
.../java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../org/apache/juneau/BeanTraverseSession.java | 2 +-
.../apache/juneau/annotation/SchemaAnnotation.java | 4 ++--
.../juneau/annotation/SubItemsAnnotation.java | 2 +-
.../apache/juneau/csv/CsvSerializerSession.java | 2 +-
.../rest/swagger/BasicSwaggerProviderSession.java | 8 +++----
9 files changed, 18 insertions(+), 39 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 ad45b0728..231f3c4e4 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
@@ -446,16 +446,6 @@ public class Utils {
public static boolean isNotEmpty(String o) {
return ! isEmpty(o);
}
- /**
- * Returns <jk>true</jk> if the specified collection is not
<jk>null</jk> and not empty.
- *
- * @param <E> The element type.
- * @param value The value being checked.
- * @return <jk>true</jk> if the specified collection is not
<jk>null</jk> and not empty.
- */
- public static <E> boolean isNotEmpty2(Collection<E> value) {
- return value != null && ! value.isEmpty();
- }
/**
* Returns <jk>true</jk> if the specified map is not <jk>null</jk> and
not empty.
@@ -466,7 +456,7 @@ public class Utils {
* @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 value != null && ! value.isEmpty();
+ return isNotEmpty(value);
}
/**
@@ -476,18 +466,7 @@ public class Utils {
* @return <jk>true</jk> if specified string is not <jk>null</jk> or
empty.
*/
public static boolean isNotEmpty3(String s) {
- return ! isEmpty(s);
- }
-
- /**
- * Returns <jk>true</jk> if either of the specified strings are not
<jk>null</jk> or empty.
- *
- * @param s1 The string to check.
- * @param s2 The string to check.
- * @return <jk>true</jk> if either of the specified strings are not
<jk>null</jk> or empty.
- */
- public static boolean isNotEmpty3(String s1, String s2) {
- return isNotEmpty3(s1) || isNotEmpty3(s2);
+ return isNotEmpty(s);
}
/**
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 ee7a0f669..f1932082b 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
@@ -719,7 +719,7 @@ public class ConfigMap implements ConfigStoreListener {
}
private void signal(ConfigEvents changes) {
- if (Utils.isNotEmpty2(changes))
+ if (Utils.isNotEmpty(changes))
listeners.forEach(x -> x.onConfigChange(changes));
}
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 97d8fe5c3..9f44eb210 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
@@ -96,13 +96,13 @@ public final class BeanFilter {
public Builder applyAnnotations(List<Bean> annotations) {
annotations.forEach(x -> {
- if (Utils.isNotEmpty3(x.properties(), x.p()))
properties(x.properties(), x.p());
+ if (isNotEmpty(x.properties()) ||
isNotEmpty(x.p())) properties(x.properties(), x.p());
if (x.sort()) sortProperties(true);
if (x.findFluentSetters()) findFluentSetters();
- if (Utils.isNotEmpty3(x.excludeProperties(),
x.xp())) excludeProperties(x.excludeProperties(), x.xp());
- if (Utils.isNotEmpty3(x.readOnlyProperties(),
x.ro())) readOnlyProperties(x.readOnlyProperties(), x.ro());
- if (Utils.isNotEmpty3(x.writeOnlyProperties(),
x.wo())) writeOnlyProperties(x.writeOnlyProperties(), x.wo());
- if (Utils.isNotEmpty3(x.typeName()))
typeName(x.typeName());
+ if (isNotEmpty(x.excludeProperties()) ||
isNotEmpty(x.xp())) excludeProperties(x.excludeProperties(), x.xp());
+ if (isNotEmpty(x.readOnlyProperties()) ||
isNotEmpty(x.ro())) readOnlyProperties(x.readOnlyProperties(), x.ro());
+ if (isNotEmpty(x.writeOnlyProperties()) ||
isNotEmpty(x.wo())) writeOnlyProperties(x.writeOnlyProperties(), x.wo());
+ if (isNotEmpty(x.typeName()))
typeName(x.typeName());
if (isNotVoid(x.propertyNamer()))
propertyNamer(x.propertyNamer());
if (isNotVoid(x.interfaceClass()))
interfaceClass(x.interfaceClass());
if (isNotVoid(x.stopClass()))
stopClass(x.stopClass());
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 c23f60e4d..191f11db2 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
@@ -182,7 +182,7 @@ public final class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
if (innerField != null) {
List<Beanp> lp = list();
bc.forEachAnnotation(Beanp.class, innerField, x
-> true, x -> lp.add(x));
- if (field != null || Utils.isNotEmpty2(lp)) {
+ if (field != null || Utils.isNotEmpty(lp)) {
// Only use field type if it's a bean
property or has @Beanp annotation.
// Otherwise, we want to infer the type
from the getter or setter.
rawTypeMeta =
bc.resolveClassMeta(last(lp), innerField.getGenericType(), typeVarImpls);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
index d4d7371b3..3c27bcbe7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
@@ -383,7 +383,7 @@ public class BeanTraverseSession extends BeanSession {
*/
public final JsonMap getLastLocation() {
Predicate<Object> nn = Utils::isNotNull;
- Predicate<Collection<?>> nec = Utils::isNotEmpty2;
+ Predicate<Collection<?>> nec = Utils::isNotEmpty;
return JsonMap.create()
.appendIf(nn, "currentClass", currentClass)
.appendIf(nn, "currentProperty", currentProperty)
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 0cd0d7528..90f80783a 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
@@ -96,7 +96,7 @@ public class SchemaAnnotation {
if (SchemaAnnotation.empty(a))
return m;
Predicate<String> ne = Utils::isNotEmpty3;
- Predicate<Collection<?>> nec = Utils::isNotEmpty2;
+ Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
@@ -139,7 +139,7 @@ public class SchemaAnnotation {
if (ItemsAnnotation.empty(a))
return m;
Predicate<String> ne = Utils::isNotEmpty3;
- Predicate<Collection<?>> nec = Utils::isNotEmpty2;
+ Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
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 761a8011f..240dfaffd 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
@@ -69,7 +69,7 @@ public class SubItemsAnnotation {
if (SubItemsAnnotation.empty(a))
return om;
Predicate<String> ne = Utils::isNotEmpty3;
- Predicate<Collection<?>> nec = Utils::isNotEmpty2;
+ Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index 12be430d4..fd4174500 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -226,7 +226,7 @@ public final class CsvSerializerSession extends
WriterSerializerSession {
}
// TODO - Doesn't support DynaBeans.
- if (Utils.isNotEmpty2(l)) {
+ if (Utils.isNotEmpty(l)) {
ClassMeta<?> entryType =
getClassMetaForObject(l.iterator().next());
if (entryType.isBean()) {
BeanMeta<?> bm =
entryType.getBeanMeta();
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 ca8c71de0..60aac0f6d 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
@@ -98,7 +98,7 @@ public class BasicSwaggerProviderSession {
InputStream is = ff.getStream(rci.getSimpleName() + ".json",
locale).orElse(null);
Predicate<String> ne = Utils::isNotEmpty3;
- Predicate<Collection<?>> nec = Utils::isNotEmpty2;
+ Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
// Load swagger JSON from classpath.
@@ -932,7 +932,7 @@ public class BasicSwaggerProviderSession {
return om;
om = newMap(om);
Predicate<String> ne = Utils::isNotEmpty3;
- Predicate<Collection<?>> nec = Utils::isNotEmpty2;
+ Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
@@ -990,7 +990,7 @@ public class BasicSwaggerProviderSession {
return om;
om = newMap(om);
Predicate<String> ne = Utils::isNotEmpty3;
- Predicate<Collection<?>> nec = Utils::isNotEmpty2;
+ Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
@@ -1021,7 +1021,7 @@ public class BasicSwaggerProviderSession {
return om;
om = newMap(om);
Predicate<String> ne = Utils::isNotEmpty3;
- Predicate<Collection<?>> nec = Utils::isNotEmpty2;
+ Predicate<Collection<?>> nec = Utils::isNotEmpty;
Predicate<Map<?,?>> nem = Utils::isNotEmpty2;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
