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 1ff612b3d Test modernization, clean up utility classes.
1ff612b3d is described below
commit 1ff612b3d6180bfeaba14b3c494c1cfbc1e01ddd
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 11:36:09 2025 -0400
Test modernization, clean up utility classes.
---
.../src/main/java/org/apache/juneau/internal/ObjectUtils.java | 11 -----------
.../src/main/java/org/apache/juneau/parser/ParserSet.java | 3 ++-
.../main/java/org/apache/juneau/reflect/AnnotationInfo.java | 3 ++-
.../main/java/org/apache/juneau/serializer/SerializerSet.java | 3 ++-
.../src/main/java/org/apache/juneau/utils/BeanDiff.java | 3 ++-
.../test/java/org/apache/juneau/internal/ObjectUtilsTest.java | 10 ----------
6 files changed, 8 insertions(+), 25 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
index a600801a9..2d0bf0d9b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ObjectUtils.java
@@ -30,17 +30,6 @@ import org.apache.juneau.reflect.*;
*/
public class ObjectUtils {
- /**
- * Tests two objects for equality, gracefully handling nulls and arrays.
- *
- * @param o1 Object 1.
- * @param o2 Object 2.
- * @return <jk>false</jk> if both objects are equal based on the {@link
Object#equals(Object)} method.
- */
- public static boolean ne(Object o1, Object o2) {
- return ! Utils.eq(o1, o2);
- }
-
/**
* If the specified object is a {@link Supplier} or {@link Value},
returns the inner value, otherwise the same value.
*
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 c0fb997b3..47357fd85 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
@@ -22,6 +22,7 @@ import java.util.function.*;
import java.util.stream.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
@@ -181,7 +182,7 @@ public final class ParserSet {
if (o instanceof Parser.Builder) {
Parser.Builder x = (Parser.Builder)o;
Parser.Builder x2 = x.copy();
- if (ne(x.getClass(), x2.getClass()))
+ if (Utils.ne(x.getClass(), x2.getClass()))
throw new BasicRuntimeException("Copy
method not implemented on class {0}", x.getClass().getName());
x = x2;
if (bcBuilder != null)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
index ab70303c5..2e92e710c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
@@ -25,6 +25,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.svl.*;
@@ -176,7 +177,7 @@ public final class AnnotationInfo<T extends Annotation> {
try {
Object v = x.invoke(a);
Object d = x.inner().getDefaultValue();
- if (ne(v, d)) {
+ if (Utils.ne(v, d)) {
if (! (ArrayUtils.isArray(v) &&
Array.getLength(v) == 0 && Array.getLength(d) == 0))
ja.put(m.getName(), v);
}
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 3e9e2f335..538d48332 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
@@ -22,6 +22,7 @@ import java.util.function.*;
import java.util.stream.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
@@ -180,7 +181,7 @@ public final class SerializerSet {
if (o instanceof Serializer.Builder) {
Serializer.Builder x = (Serializer.Builder)o;
Serializer.Builder x2 = x.copy();
- if (ne(x.getClass(), x2.getClass()))
+ if (Utils.ne(x.getClass(), x2.getClass()))
throw new BasicRuntimeException("Copy
method not implemented on class {0}", x.getClass().getName());
x = x2;
if (bcBuilder != null)
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 4c4caaeb7..c15bbbb30 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
@@ -19,6 +19,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.Bean;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.marshaller.*;
/**
@@ -206,7 +207,7 @@ public class BeanDiff {
if ((include == null || include.contains(k)) &&
(exclude == null || ! exclude.contains(k))) {
Object o1 = bm1 == null ? null : bm1.get(k);
Object o2 = bm2 == null ? null : bm2.get(k);
- if (ne(o1, o2)) {
+ if (Utils.ne(o1, o2)) {
if (o1 != null)
v1.put(k, o1);
if (o2 != null)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/internal/ObjectUtilsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/internal/ObjectUtilsTest.java
index 153382786..5a6b24f6b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/internal/ObjectUtilsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/internal/ObjectUtilsTest.java
@@ -12,17 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.junit.Assert.*;
-
import org.apache.juneau.*;
-import org.junit.jupiter.api.*;
class ObjectUtilsTest extends SimpleTestBase {
-
- @Test void a02_ne() {
- assertFalse(ObjectUtils.ne("foo","foo"));
- assertFalse(ObjectUtils.ne(null,null));
- assertTrue(ObjectUtils.ne(null,"foo"));
- assertTrue(ObjectUtils.ne("foo",null));
- }
}
\ No newline at end of file
