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 36c213c10 Test modernization, clean up utility classes.
36c213c10 is described below
commit 36c213c10793dbc438db2e08294fc5e46f1ffc57
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 15:22:22 2025 -0400
Test modernization, clean up utility classes.
---
.../java/org/apache/juneau/bean/html5/Select.java | 5 +-
.../org/apache/juneau/bean/swagger/Operation.java | 3 +-
.../juneau/assertions/AssertionPredicates.java | 2 +-
.../juneau/assertions/FluentObjectAssertion.java | 2 +-
.../juneau/assertions/FluentStringAssertion.java | 10 ++--
.../apache/juneau/common/internal/StringUtils.java | 58 +---------------------
.../apache/juneau/config/event/ConfigEvents.java | 6 +--
.../apache/juneau/config/internal/ConfigMap.java | 4 +-
.../org/apache/juneau/config/store/FileStore.java | 7 ++-
.../java/org/apache/juneau/collections/Args.java | 2 -
.../java/org/apache/juneau/cp/BeanStoreEntry.java | 2 +-
.../org/apache/juneau/internal/ArrayUtils.java | 2 +-
.../org/apache/juneau/utils/ReflectionMap.java | 12 ++---
.../apache/juneau/xml/XmlSerializerSession.java | 3 +-
.../examples/core/config/store/SqlStore.java | 2 +-
.../apache/juneau/http/header/BasicCsvHeader.java | 8 +--
.../org/apache/juneau/http/header/BasicHeader.java | 5 +-
.../juneau/http/header/BasicHeaderIterator.java | 2 +-
.../org/apache/juneau/http/header/HeaderList.java | 2 +-
.../apache/juneau/http/part/BasicCsvArrayPart.java | 4 +-
.../apache/juneau/http/part/BasicPartIterator.java | 2 +-
.../java/org/apache/juneau/http/part/PartList.java | 2 +-
.../juneau/rest/httppart/RequestFormParams.java | 4 +-
.../juneau/rest/httppart/RequestHeaders.java | 4 +-
.../juneau/rest/httppart/RequestPathParams.java | 4 +-
.../juneau/rest/httppart/RequestQueryParams.java | 4 +-
.../apache/juneau/config/ConfigImportsTest.java | 4 +-
.../juneau/transforms/OneWayStringSwapTest.java | 3 +-
.../juneau/transforms/OneWayStringSwapTester.java | 4 +-
.../apache/juneau/transforms/StringSwapTester.java | 6 +--
30 files changed, 58 insertions(+), 120 deletions(-)
diff --git
a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Select.java
b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Select.java
index b10687ceb..74e576645 100644
---
a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Select.java
+++
b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Select.java
@@ -12,9 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.html5;
-import static org.apache.juneau.common.internal.StringUtils.*;
-
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -161,7 +160,7 @@ public class Select extends HtmlElementContainer {
public Select choose(Object optionValue) {
if (optionValue != null) {
getChildren().forEach(x -> {
- if (x instanceof Option o &&
eq3(optionValue.toString(), o.getAttr(String.class, "value")))
+ if (x instanceof Option o &&
Utils.eq(optionValue.toString(), o.getAttr(String.class, "value")))
o.selected(true);
});
}
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 d6542fccc..eaeca57dc 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.bean.swagger;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
@@ -433,7 +432,7 @@ public class Operation extends SwaggerElement {
public ParameterInfo getParameter(String in, String name) {
if (parameters != null)
for (var pi : parameters)
- if (eq3(pi.getIn(), in) && (eq3(pi.getName(),
name) || "body".equals(pi.getIn())))
+ if (Utils.eq(pi.getIn(), in) &&
(Utils.eq(pi.getName(), name) || "body".equals(pi.getIn())))
return pi;
return null;
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index 42eaab909..d8349c265 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -175,7 +175,7 @@ public class AssertionPredicates {
* @return A new predicate.
*/
public static final <T> AssertionPredicate<T> eqic(String value) {
- return test(x -> StringUtils.eqic3(Utils.s(x), value),
MSG_valueDidNotMatchExpected, value, VALUE);
+ return test(x -> Utils.eqic(Utils.s(x), value),
MSG_valueDidNotMatchExpected, value, VALUE);
}
/**
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index bb90c5488..3cbef6a29 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -450,7 +450,7 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
public R isSameSerializedAs(Object o, WriterSerializer serializer) {
var s1 = serializer.toString(value);
var s2 = serializer.toString(o);
- if (ne3(s1, s2))
+ if (Utils.ne(s1, s2))
throw error(MSG_unexpectedComparison, s2, s1);
return returns();
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index e19f86e52..1f659b9d7 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -348,7 +348,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
@Override
public R is(String value) throws AssertionError {
var s = orElse(null);
- if (ne3(value, s))
+ if (Utils.ne(value, s))
throw error(MSG_stringDifferedAtPosition,
diffPosition(value, s), fix(value), fix(s));
return returns();
}
@@ -363,7 +363,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
@Override
public R isNot(String value) throws AssertionError {
var s = orElse(null);
- if (eq3(value, s))
+ if (Utils.eq(value, s))
throw error(MSG_stringEqualedUnexpected, fix(s));
return returns();
}
@@ -394,7 +394,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
assertArgNotNull("lines", lines);
var v = join(lines, '\n');
var s = value();
- if (ne3(v, s))
+ if (Utils.ne(v, s))
throw error(MSG_stringDifferedAtPosition,
diffPosition(v, s), fix(v), fix(s));
return returns();
}
@@ -450,7 +450,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
public R isIc(String value) throws AssertionError {
var s = orElse(null);
- if (neic3(value, s))
+ if (Utils.neic(value, s))
throw error(MSG_stringDifferedAtPosition,
diffPositionIc(value, s), fix(value), fix(s));
return returns();
}
@@ -464,7 +464,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
public R isNotIc(String value) throws AssertionError {
var s = orElse(null);
- if (eqic3(value, s))
+ if (Utils.eqic(value, s))
throw error(MSG_stringEqualedUnexpected, fix(s));
return returns();
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
index 988ad9403..19beb0a39 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
@@ -1299,29 +1299,6 @@ public final class StringUtils {
return n;
}
- /**
- * Tests two strings for equality, but gracefully handles nulls.
- *
- * @param s1 String 1.
- * @param s2 String 2.
- * @return <jk>true</jk> if the strings are equal.
- */
- public static boolean eq3(String s1, String s2) {
- return Utils.eq(s1, s2);
- }
-
- /**
- * Tests two strings for equality, but gracefully handles nulls.
- *
- * @param caseInsensitive Use case-insensitive matching.
- * @param s1 String 1.
- * @param s2 String 2.
- * @return <jk>true</jk> if the strings are equal.
- */
- public static boolean eq3(boolean caseInsensitive, String s1, String
s2) {
- return Utils.eq(caseInsensitive, s1, s2);
- }
-
/**
* Finds the position where the two strings differ.
*
@@ -1368,39 +1345,6 @@ public final class StringUtils {
return i;
}
- /**
- * Tests two strings for case-insensitive equality, but gracefully
handles nulls.
- *
- * @param s1 String 1.
- * @param s2 String 2.
- * @return <jk>true</jk> if the strings are equal.
- */
- public static boolean eqic3(String s1, String s2) {
- return Utils.eqic(s1, s2);
- }
-
- /**
- * Tests two strings for non-equality, but gracefully handles nulls.
- *
- * @param s1 String 1.
- * @param s2 String 2.
- * @return <jk>true</jk> if the strings are not equal.
- */
- public static boolean ne3(String s1, String s2) {
- return Utils.ne(s1, s2);
- }
-
- /**
- * Tests two strings for non-equality ignoring case, but gracefully
handles nulls.
- *
- * @param s1 String 1.
- * @param s2 String 2.
- * @return <jk>true</jk> if the strings are not equal ignoring case.
- */
- public static boolean neic3(String s1, String s2) {
- return Utils.neic(s1, s2);
- }
-
/**
* Shortcut for calling
<code>base64Encode(in.getBytes(<js>"UTF-8"</js>))</code>
*
@@ -1909,7 +1853,7 @@ public final class StringUtils {
*/
public static boolean isOneOf(String s, String...values) {
for (var value : values)
- if (eq3(s, value))
+ if (Utils.eq(s, value))
return true;
return false;
}
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvents.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvents.java
index 87333f0bb..8b614acac 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvents.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/event/ConfigEvents.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.config.event;
-import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.util.*;
@@ -31,7 +31,7 @@ public class ConfigEvents extends ArrayList<ConfigEvent> {
* @return <jk>true</jk> if the specified section was modified in this
list of events.
*/
public boolean isSectionModified(String name) {
- return stream().anyMatch(x -> eq3(name, x.getSection()));
+ return stream().anyMatch(x -> eq(name, x.getSection()));
}
/**
@@ -42,6 +42,6 @@ public class ConfigEvents extends ArrayList<ConfigEvent> {
* @return <jk>true</jk> if the specified key was modified in this list
of events.
*/
public boolean isKeyModified(String section, String key) {
- return stream().anyMatch(x -> eq3(section, x.getSection()) &&
eq3(key, x.getKey()));
+ return stream().anyMatch(x -> eq(section, x.getSection()) &&
eq(key, x.getKey()));
}
}
\ No newline at end of file
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 d3533088c..ee7a0f669 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
@@ -580,7 +580,7 @@ public class ConfigMap implements ConfigStoreListener {
public void onChange(String newContents) {
ConfigEvents changes2 = null;
try (var x = lock.write()) {
- if (ne3(contents, newContents)) {
+ if (Utils.ne(contents, newContents)) {
changes2 = findDiffs(newContents);
load(newContents);
@@ -762,7 +762,7 @@ public class ConfigMap implements ConfigStoreListener {
} else {
for (var ne : ns.oentries.values()) {
var e = s.oentries.get(ne.key);
- if (e == null || ne3(e.value,
ne.value)) {
+ if (e == null || Utils.ne(e.value,
ne.value)) {
changes2.add(ConfigEvent.setEntry(name, s.name, ne.key, ne.value, ne.modifiers,
ne.comment, ne.preLines));
}
}
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
index 92453905f..61086708c 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
@@ -15,7 +15,6 @@ package org.apache.juneau.config.store;
import static java.nio.file.StandardWatchEventKinds.*;
import static java.nio.file.StandardOpenOption.*;
import static org.apache.juneau.collections.JsonMap.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.common.internal.ThrowableUtils.*;
import static org.apache.juneau.common.internal.Utils.*;
@@ -437,7 +436,7 @@ public class FileStore extends ConfigStore {
name = resolveName(name);
// This is a no-op.
- if (eq3(expectedContents, newContents))
+ if (Utils.eq(expectedContents, newContents))
return null;
dir.mkdirs();
@@ -467,7 +466,7 @@ public class FileStore extends ConfigStore {
}
currentContents =
sb.toString();
}
- if (expectedContents != null &&
! eq3(currentContents, expectedContents)) {
+ if (expectedContents != null &&
! Utils.eq(currentContents, expectedContents)) {
if (currentContents ==
null)
cache.remove(name);
else
@@ -634,7 +633,7 @@ public class FileStore extends ConfigStore {
cache.remove(fn);
var newContents = read(fn);
- if (! eq3(oldContents, newContents)) {
+ if (! Utils.eq(oldContents, newContents)) {
update(fn, newContents);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
index 84c506113..291c0dc84 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/Args.java
@@ -16,8 +16,6 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import static java.util.stream.Collectors.*;
import java.util.*;
-import java.util.stream.*;
-
import org.apache.juneau.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
index d147bae80..a220fe350 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStoreEntry.java
@@ -95,7 +95,7 @@ public class BeanStoreEntry<T> {
*/
public boolean matches(Class<?> type, String name) {
name = nullIfEmpty3(name);
- return matches(type) && StringUtils.eq3(this.name, name);
+ return matches(type) && Utils.eq(this.name, name);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
index 6b46ce978..b780a38b0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
@@ -269,7 +269,7 @@ public final class ArrayUtils {
if (a1.length != a2.length)
return false;
for (int i = 0; i < a1.length; i++)
- if (! StringUtils.eq3(a1[i], a2[i]))
+ if (! Utils.eq(a1[i], a2[i]))
return false;
return true;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
index d521b8701..25a31cd6e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ReflectionMap.java
@@ -656,7 +656,7 @@ public class ReflectionMap<V> {
Class<?> c = m.getDeclaringClass();
return
classMatches(simpleClassName, fullClassName, c)
- && (eq3(m.getName(), methodName))
+ && (Utils.eq(m.getName(), methodName))
&& (argsMatch(args, m.getParameterTypes()));
}
@@ -724,7 +724,7 @@ public class ReflectionMap<V> {
Class<?> c = f.getDeclaringClass();
return
classMatches(simpleClassName, fullClassName, c)
- && (eq3(f.getName(), fieldName));
+ && (Utils.eq(f.getName(), fieldName));
}
@Override
@@ -746,7 +746,7 @@ public class ReflectionMap<V> {
for (int i = 0; i < args.length; i++) {
String n = names[i];
Class<?> a = args[i];
- if (! (eq3(n, a.getSimpleName()) || eq3(n,
a.getName())))
+ if (! (Utils.eq(n, a.getSimpleName()) || Utils.eq(n,
a.getName())))
return false;
}
return true;
@@ -765,18 +765,18 @@ public class ReflectionMap<V> {
// c.getFullName() ==
"org.apache.juneau.a.rttests.RountTripBeansWithBuilders$Ac$Builder"
// c.getPackage() == "org.apache.juneau.a.rttests"
String cSimple = c.getSimpleName(), cFull = c.getName();
- if (eq3(simpleName, cSimple) || eq3(fullName, cFull) ||
"*".equals(simpleName))
+ if (Utils.eq(simpleName, cSimple) || Utils.eq(fullName, cFull)
|| "*".equals(simpleName))
return true;
if (cFull.indexOf('$') != -1) {
Package p = c.getPackage();
if (p != null)
cFull = cFull.substring(p.getName().length() +
1);
- if (eq3(simpleName, cFull))
+ if (Utils.eq(simpleName, cFull))
return true;
int i = cFull.indexOf('$');
while (i != -1) {
cFull = cFull.substring(i+1);
- if (eq3(simpleName, cFull))
+ if (Utils.eq(simpleName, cFull))
return true;
i = cFull.indexOf('$');
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 597c8ce70..9db893a82 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -13,7 +13,6 @@
package org.apache.juneau.xml;
import static org.apache.juneau.common.internal.IOUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.xml.XmlSerializerSession.ContentResult.*;
import static org.apache.juneau.xml.XmlSerializerSession.JsonType.*;
@@ -526,7 +525,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
name = null;
}
- if (eq3(name, elementName))
+ if (Utils.eq(name, elementName))
name = null;
if (isEnableNamespaces()) {
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
index 85889be5e..1aba56635 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/config/store/SqlStore.java
@@ -191,7 +191,7 @@ public class SqlStore extends ConfigStore {
var currentContents = read(name);
- if (expectedContents != null &&
StringUtils.ne3(currentContents, expectedContents))
+ if (expectedContents != null && Utils.ne(currentContents,
expectedContents))
return currentContents;
update(name, newContents);
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
index aa66bd7ca..b7233110e 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicCsvHeader.java
@@ -208,13 +208,13 @@ public class BasicCsvHeader extends BasicHeader {
public boolean contains(String val) {
if (value != null)
for (String v : value)
- if (eq3(v, val))
+ if (Utils.eq(v, val))
return true;
if (supplier != null) {
String[] value2 = supplier.get();
if (value2 != null)
for (String v : supplier.get())
- if (eq3(v, val))
+ if (Utils.eq(v, val))
return true;
}
@@ -230,13 +230,13 @@ public class BasicCsvHeader extends BasicHeader {
public boolean containsIgnoreCase(String val) {
if (value != null)
for (String v : value)
- if (eqic3(v, val))
+ if (Utils.eqic(v, val))
return true;
if (supplier != null) {
String[] value2 = supplier.get();
if (value2 != null)
for (String v : supplier.get())
- if (eqic3(v, val))
+ if (Utils.eqic(v, val))
return true;
}
return false;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
index 68c9a531b..b5c488bf9 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
@@ -13,7 +13,6 @@
package org.apache.juneau.http.header;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import java.io.*;
import java.util.*;
import java.util.function.*;
@@ -179,7 +178,7 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
* @return <jk>true</jk> if the specified value is the same.
*/
public boolean equalsIgnoreCase(String compare) {
- return eqic3(getValue(), compare);
+ return Utils.eqic(getValue(), compare);
}
/**
@@ -264,7 +263,7 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
// Not a perfect equality operator if using SVL vars.
if (! (o instanceof Header))
return false;
- return Utils.eq(this, (Header)o, (x,y)->eq3(x.name,y.getName())
&& eq3(x.getValue(),y.getValue()));
+ return Utils.eq(this, (Header)o, (x,y)->Utils.eq(x.name,
y.getName()) && Utils.eq(x.getValue(), y.getValue()));
}
@Override /* Object */
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeaderIterator.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeaderIterator.java
index b9dc6124b..14566318f 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeaderIterator.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeaderIterator.java
@@ -104,6 +104,6 @@ public class BasicHeaderIterator implements HeaderIterator {
}
private boolean eq(String s1, String s2) {
- return StringUtils.eq3(!caseSensitive, s1, s2);
+ return Utils.eq(!caseSensitive, s1, s2);
}
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
index 85d048e42..a187fd861 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -944,7 +944,7 @@ public class HeaderList extends ControlledArrayList<Header>
{
}
private boolean eq(String s1, String s2) {
- return caseSensitive ? StringUtils.eq3(s1, s2) :
StringUtils.eqic3(s1, s2);
+ return caseSensitive ? Utils.eq(s1, s2) : Utils.eqic(s1, s2);
}
@Override /* Object */
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
index 495f99665..0127bd393 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicCsvArrayPart.java
@@ -134,7 +134,7 @@ public class BasicCsvArrayPart extends BasicPart {
public boolean contains(String val) {
if (val != null)
for (String v : value())
- if (eq3(v, val))
+ if (Utils.eq(v, val))
return true;
return false;
}
@@ -148,7 +148,7 @@ public class BasicCsvArrayPart extends BasicPart {
public boolean containsIgnoreCase(String val) {
if (val != null)
for (String v : value())
- if (eqic3(v, val))
+ if (Utils.eqic(v, val))
return true;
return false;
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPartIterator.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPartIterator.java
index db8e6fd5f..52f603d7e 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPartIterator.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPartIterator.java
@@ -97,6 +97,6 @@ public class BasicPartIterator implements PartIterator {
}
private boolean eq(String s1, String s2) {
- return StringUtils.eq3(caseInsensitive, s1, s2);
+ return Utils.eq(caseInsensitive, s1, s2);
}
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
index 4503c6a10..0c9146bf7 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
@@ -911,7 +911,7 @@ public class PartList extends
ControlledArrayList<NameValuePair> {
}
private boolean eq(String s1, String s2) {
- return caseInsensitive ? StringUtils.eqic3(s1, s2) :
StringUtils.eq3(s1, s2);
+ return caseInsensitive ? Utils.eqic(s1, s2) : Utils.eq(s1, s2);
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
index 8c62c05bb..2fd684343 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
@@ -555,8 +555,8 @@ public class RequestFormParams extends
ArrayList<RequestFormParam> {
private boolean eq(String s1, String s2) {
if (caseSensitive)
- return StringUtils.eq3(s1, s2);
- return StringUtils.eqic3(s1, s2);
+ return Utils.eq(s1, s2);
+ return Utils.eqic(s1, s2);
}
@Override /* Object */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
index 051311a64..cedf21fa0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
@@ -499,8 +499,8 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
private boolean eq(String s1, String s2) {
if (caseSensitive)
- return StringUtils.eq3(s1, s2);
- return StringUtils.eqic3(s1, s2);
+ return Utils.eq(s1, s2);
+ return Utils.eqic(s1, s2);
}
@Override /* Object */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
index 08728a2fc..3890bf3dd 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
@@ -567,8 +567,8 @@ public class RequestPathParams extends
ArrayList<RequestPathParam> {
private boolean eq(String s1, String s2) {
if (caseSensitive)
- return StringUtils.eq3(s1, s2);
- return StringUtils.eqic3(s1, s2);
+ return Utils.eq(s1, s2);
+ return Utils.eqic(s1, s2);
}
@Override /* Object */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
index 551550c6a..6838ef656 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
@@ -570,8 +570,8 @@ public class RequestQueryParams extends
ArrayList<RequestQueryParam> {
private boolean eq(String s1, String s2) {
if (caseSensitive)
- return StringUtils.eq3(s1, s2);
- return StringUtils.eqic3(s1, s2);
+ return Utils.eq(s1, s2);
+ return Utils.eqic(s1, s2);
}
@Override /* Object */
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
index 42c6ff7ba..cf0cc335a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
@@ -12,10 +12,10 @@
//
***************************************************************************************************************************
package org.apache.juneau.config;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.config.event.*;
import org.apache.juneau.config.store.*;
import org.junit.jupiter.api.*;
@@ -165,7 +165,7 @@ class ConfigImportsTest extends SimpleTestBase {
if (events.isEmpty())
return null;
for (ConfigEvent ce : events)
- if (eq3(section, ce.getSection()) && eq3(key,
ce.getKey()))
+ if (Utils.eq(section, ce.getSection()) &&
Utils.eq(key, ce.getKey()))
return ce.getValue();
return null;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTest.java
index 9e0363bc3..e552c4624 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTest.java
@@ -16,6 +16,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.swap.*;
import org.junit.*;
@@ -43,7 +44,7 @@ public abstract class OneWayStringSwapTest<T> {
@Test
public void testSwap() throws Exception {
String s = ss.swap(bs, o);
- if (ne3(expected, s)) {
+ if (Utils.ne(expected, s)) {
if (expected.isEmpty()) {
if (! label.startsWith("[]"))
System.err.println(label.substring(0,
label.indexOf(']')+1) + " "+s); // NOT DEBUG
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTester.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTester.java
index a297bad5a..b7896ab99 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTester.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/OneWayStringSwapTester.java
@@ -12,13 +12,13 @@
//
***************************************************************************************************************************
package org.apache.juneau.transforms;
-import static org.apache.juneau.common.internal.StringUtils.ne3;
import static org.apache.juneau.common.internal.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.swap.*;
/**
@@ -77,7 +77,7 @@ public class OneWayStringSwapTester<T> {
try {
var o = objectSupplier.get();
var s = swap.swap(beanSession, o);
- if (ne3(expected, s)) {
+ if (Utils.ne(expected, s)) {
if (expected.isEmpty()) {
if (! label.startsWith("[]"))
System.err.println(label.substring(0, label.indexOf(']')+1) + " "+s); // NOT
DEBUG
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTester.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTester.java
index 6fa5781ff..0aed7e76f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTester.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/StringSwapTester.java
@@ -12,13 +12,13 @@
//
***************************************************************************************************************************
package org.apache.juneau.transforms;
-import static org.apache.juneau.common.internal.StringUtils.ne3;
import static org.apache.juneau.common.internal.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.swap.*;
/**
@@ -76,7 +76,7 @@ public class StringSwapTester<T> {
try {
var o = objectSupplier.get();
var s = swap.swap(beanSession, o);
- if (ne3(expected, s)) {
+ if (Utils.ne(expected, s)) {
if (expected.isEmpty()) {
if (! label.startsWith("[]"))
System.err.println(label.substring(0, label.indexOf(']')+1) + " "+s); // NOT
DEBUG
@@ -102,7 +102,7 @@ public class StringSwapTester<T> {
String s = swap.swap(beanSession, o);
T o2 = swap.unswap(beanSession, s,
beanSession.getClassMetaForObject(o));
String s2 = swap.swap(beanSession, o2);
- if (ne3(s, s2)) {
+ if (Utils.ne(s, s2)) {
if (expected.isEmpty())
fail("Test [" + label + " unswap]
failed - expected was empty");
fail("Test [" + label + " unswap] failed.
Expected=[" + s + "], Actual=[" + s2 + "]");
