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 bbfcb3c0b1 Utility class cleanup
bbfcb3c0b1 is described below
commit bbfcb3c0b1f8d7f4a48923b3ca9711cf75859435
Author: James Bognar <[email protected]>
AuthorDate: Mon Oct 27 14:15:47 2025 -0400
Utility class cleanup
---
.../main/java/org/apache/juneau/common/collections/Cache.java | 7 ++++---
.../main/java/org/apache/juneau/common/collections/Cache2.java | 5 +++--
.../main/java/org/apache/juneau/common/collections/Cache3.java | 5 +++--
.../main/java/org/apache/juneau/common/collections/Cache4.java | 5 +++--
.../main/java/org/apache/juneau/common/collections/Cache5.java | 5 +++--
.../apache/juneau/common/collections/ConcurrentHashMap2Key.java | 7 ++++---
.../apache/juneau/common/collections/ConcurrentHashMap3Key.java | 7 ++++---
.../apache/juneau/common/collections/ConcurrentHashMap4Key.java | 7 ++++---
.../apache/juneau/common/collections/ConcurrentHashMap5Key.java | 7 ++++---
.../main/java/org/apache/juneau/common/collections/MultiSet.java | 8 ++++----
.../java/org/apache/juneau/common/collections/SimpleMap.java | 4 +---
.../main/java/org/apache/juneau/common/function/Function2.java | 6 +++---
.../main/java/org/apache/juneau/common/function/Function3.java | 6 +++---
.../main/java/org/apache/juneau/common/function/Function4.java | 6 +++---
.../main/java/org/apache/juneau/common/function/Function5.java | 6 +++---
.../src/main/java/org/apache/juneau/common/utils/ClassUtils.java | 6 +++---
.../java/org/apache/juneau/common/utils/CollectionUtils.java | 5 +++--
.../src/main/java/org/apache/juneau/common/utils/DateUtils.java | 3 ++-
.../src/main/java/org/apache/juneau/common/utils/FileUtils.java | 5 +++--
.../java/org/apache/juneau/common/utils/MimeTypeDetector.java | 9 +++++----
.../main/java/org/apache/juneau/common/utils/StringUtils.java | 7 ++++---
.../src/main/java/org/apache/juneau/common/utils/Utils.java | 8 +++++---
22 files changed, 74 insertions(+), 60 deletions(-)
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache.java
index 4228e329c2..837f073085 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.util.concurrent.*;
@@ -339,7 +340,7 @@ public class Cache<K,V> extends ConcurrentHashMap<K,V> {
@SuppressWarnings("unchecked")
@Override /* ConcurrentHashMap */
public V get(Object key) {
- AssertionUtils.assertArgNotNull("key", key);
+ assertArgNotNull("key", key);
return get((K)key, () -> supplier.apply((K)key));
}
@@ -383,7 +384,7 @@ public class Cache<K,V> extends ConcurrentHashMap<K,V> {
* @throws IllegalArgumentException if key is <jk>null</jk>.
*/
public V get(K key, Supplier<V> supplier) {
- AssertionUtils.assertArgNotNull("key", key);
+ assertArgNotNull("key", key);
if (disableCaching)
return supplier.get();
V v = super.get(key);
@@ -416,7 +417,7 @@ public class Cache<K,V> extends ConcurrentHashMap<K,V> {
*/
@Override /* ConcurrentHashMap */
public V put(K key, V value) {
- AssertionUtils.assertArgNotNull("key", key);
+ assertArgNotNull("key", key);
return super.put(key, value);
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache2.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache2.java
index 527dfa63ca..1c0b629a97 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache2.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache2.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.util.concurrent.atomic.*;
@@ -375,7 +376,7 @@ public class Cache2<K1,K2,V> extends
ConcurrentHashMap2Key<K1,K2,V> {
*/
@Override /* ConcurrentHashMap2Key */
public V get(K1 key1, K2 key2) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2);
+ assertArgsNotNull("key1", key1, "key2", key2);
return get(key1, key2, () -> supplier.apply(key1, key2));
}
@@ -421,7 +422,7 @@ public class Cache2<K1,K2,V> extends
ConcurrentHashMap2Key<K1,K2,V> {
* @throws IllegalArgumentException if key1 or key2 is <jk>null</jk>.
*/
public V get(K1 key1, K2 key2, java.util.function.Supplier<V> supplier)
{
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2);
+ assertArgsNotNull("key1", key1, "key2", key2);
if (disableCaching)
return supplier.get();
V v = super.get(key1, key2);
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache3.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache3.java
index 66cb6aeabc..b34b6df059 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache3.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache3.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.util.concurrent.atomic.*;
@@ -209,7 +210,7 @@ public class Cache3<K1,K2,K3,V> extends
ConcurrentHashMap3Key<K1,K2,K3,V> {
*/
@Override /* ConcurrentHashMap3Key */
public V get(K1 key1, K2 key2, K3 key3) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3);
return get(key1, key2, key3, () -> supplier.apply(key1, key2,
key3));
}
@@ -224,7 +225,7 @@ public class Cache3<K1,K2,K3,V> extends
ConcurrentHashMap3Key<K1,K2,K3,V> {
* @throws IllegalArgumentException if any key is <jk>null</jk>.
*/
public V get(K1 key1, K2 key2, K3 key3, java.util.function.Supplier<V>
supplier) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3);
if (disableCaching)
return supplier.get();
V v = super.get(key1, key2, key3);
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache4.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache4.java
index a8ffc57903..1087917928 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache4.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache4.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.util.concurrent.atomic.*;
@@ -199,7 +200,7 @@ public class Cache4<K1,K2,K3,K4,V> extends
ConcurrentHashMap4Key<K1,K2,K3,K4,V>
*/
@Override /* ConcurrentHashMap4Key */
public V get(K1 key1, K2 key2, K3 key3, K4 key4) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3, "key4", key4);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3,
"key4", key4);
return get(key1, key2, key3, key4, () -> supplier.apply(key1,
key2, key3, key4));
}
@@ -215,7 +216,7 @@ public class Cache4<K1,K2,K3,K4,V> extends
ConcurrentHashMap4Key<K1,K2,K3,K4,V>
* @throws IllegalArgumentException if any key is <jk>null</jk>.
*/
public V get(K1 key1, K2 key2, K3 key3, K4 key4,
java.util.function.Supplier<V> supplier) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3, "key4", key4);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3,
"key4", key4);
if (disableCaching)
return supplier.get();
V v = super.get(key1, key2, key3, key4);
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache5.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache5.java
index 2697aa48a0..a2b732bc59 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache5.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/Cache5.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.util.concurrent.atomic.*;
@@ -205,7 +206,7 @@ public class Cache5<K1,K2,K3,K4,K5,V> extends
ConcurrentHashMap5Key<K1,K2,K3,K4,
*/
@Override /* ConcurrentHashMap5Key */
public V get(K1 key1, K2 key2, K3 key3, K4 key4, K5 key5) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3, "key4", key4, "key5", key5);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3,
"key4", key4, "key5", key5);
return get(key1, key2, key3, key4, key5, () ->
supplier.apply(key1, key2, key3, key4, key5));
}
@@ -222,7 +223,7 @@ public class Cache5<K1,K2,K3,K4,K5,V> extends
ConcurrentHashMap5Key<K1,K2,K3,K4,
* @throws IllegalArgumentException if any key is <jk>null</jk>.
*/
public V get(K1 key1, K2 key2, K3 key3, K4 key4, K5 key5,
java.util.function.Supplier<V> supplier) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3, "key4", key4, "key5", key5);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3,
"key4", key4, "key5", key5);
if (disableCaching)
return supplier.get();
V v = super.get(key1, key2, key3, key4, key5);
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap2Key.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap2Key.java
index f6f8899403..ad4c73c946 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap2Key.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap2Key.java
@@ -16,10 +16,11 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
+
import java.util.concurrent.*;
import org.apache.juneau.common.function.*;
-import org.apache.juneau.common.utils.*;
/**
* A thread-safe concurrent hash map that uses composite two-part keys for
lookups.
@@ -115,7 +116,7 @@ public class ConcurrentHashMap2Key<K1,K2,V> extends
ConcurrentHashMap<Tuple2<K1,
* @throws IllegalArgumentException if key1 or key2 is <jk>null</jk>.
*/
public V get(K1 key1, K2 key2) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2);
+ assertArgsNotNull("key1", key1, "key2", key2);
return super.get(Tuple2.of(key1, key2));
}
@@ -141,7 +142,7 @@ public class ConcurrentHashMap2Key<K1,K2,V> extends
ConcurrentHashMap<Tuple2<K1,
* @throws IllegalArgumentException if key1 or key2 is <jk>null</jk>.
*/
public V put(K1 key1, K2 key2, V value) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2);
+ assertArgsNotNull("key1", key1, "key2", key2);
return super.put(Tuple2.of(key1, key2), value);
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap3Key.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap3Key.java
index fa0a22d564..64660e1e77 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap3Key.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap3Key.java
@@ -16,10 +16,11 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
+
import java.util.concurrent.*;
import org.apache.juneau.common.function.*;
-import org.apache.juneau.common.utils.*;
/**
* A thread-safe concurrent hash map that uses composite three-part keys for
lookups.
@@ -138,7 +139,7 @@ public class ConcurrentHashMap3Key<K1,K2,K3,V> extends
ConcurrentHashMap<Tuple3<
* @throws IllegalArgumentException if key1, key2, or key3 is
<jk>null</jk>.
*/
public V get(K1 key1, K2 key2, K3 key3) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3);
return super.get(Tuple3.of(key1, key2, key3));
}
@@ -153,7 +154,7 @@ public class ConcurrentHashMap3Key<K1,K2,K3,V> extends
ConcurrentHashMap<Tuple3<
* @throws IllegalArgumentException if key1, key2, or key3 is
<jk>null</jk>.
*/
public V put(K1 key1, K2 key2, K3 key3, V value) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3);
return super.put(Tuple3.of(key1, key2, key3), value);
}
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap4Key.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap4Key.java
index 3e15159659..74d24f16e6 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap4Key.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap4Key.java
@@ -16,10 +16,11 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
+
import java.util.concurrent.*;
import org.apache.juneau.common.function.*;
-import org.apache.juneau.common.utils.*;
/**
* A thread-safe concurrent hash map that uses composite four-part keys for
lookups.
@@ -143,7 +144,7 @@ public class ConcurrentHashMap4Key<K1,K2,K3,K4,V> extends
ConcurrentHashMap<Tupl
* @throws IllegalArgumentException if any key is <jk>null</jk>.
*/
public V get(K1 key1, K2 key2, K3 key3, K4 key4) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3, "key4", key4);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3,
"key4", key4);
return super.get(Tuple4.of(key1, key2, key3, key4));
}
@@ -159,7 +160,7 @@ public class ConcurrentHashMap4Key<K1,K2,K3,K4,V> extends
ConcurrentHashMap<Tupl
* @throws IllegalArgumentException if any key is <jk>null</jk>.
*/
public V put(K1 key1, K2 key2, K3 key3, K4 key4, V value) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3, "key4", key4);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3,
"key4", key4);
return super.put(Tuple4.of(key1, key2, key3, key4), value);
}
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap5Key.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap5Key.java
index 0d03cc368b..9a591491ad 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap5Key.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/ConcurrentHashMap5Key.java
@@ -16,10 +16,11 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
+
import java.util.concurrent.*;
import org.apache.juneau.common.function.*;
-import org.apache.juneau.common.utils.*;
/**
* A thread-safe concurrent hash map that uses composite five-part keys for
lookups.
@@ -122,7 +123,7 @@ public class ConcurrentHashMap5Key<K1,K2,K3,K4,K5,V>
extends ConcurrentHashMap<T
* @throws IllegalArgumentException if any key is <jk>null</jk>.
*/
public V get(K1 key1, K2 key2, K3 key3, K4 key4, K5 key5) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3, "key4", key4, "key5", key5);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3,
"key4", key4, "key5", key5);
return super.get(Tuple5.of(key1, key2, key3, key4, key5));
}
@@ -139,7 +140,7 @@ public class ConcurrentHashMap5Key<K1,K2,K3,K4,K5,V>
extends ConcurrentHashMap<T
* @throws IllegalArgumentException if any key is <jk>null</jk>.
*/
public V put(K1 key1, K2 key2, K3 key3, K4 key4, K5 key5, V value) {
- AssertionUtils.assertArgsNotNull("key1", key1, "key2", key2,
"key3", key3, "key4", key4, "key5", key5);
+ assertArgsNotNull("key1", key1, "key2", key2, "key3", key3,
"key4", key4, "key5", key5);
return super.put(Tuple5.of(key1, key2, key3, key4, key5),
value);
}
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MultiSet.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MultiSet.java
index 6265c5edb2..e739d7d0c2 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MultiSet.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/MultiSet.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.common.collections;
-import java.util.*;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
-import org.apache.juneau.common.utils.*;
+import java.util.*;
/**
* A composite set that presents multiple collections as a single unified set.
@@ -129,9 +129,9 @@ public class MultiSet<E> extends AbstractSet<E> {
*/
@SafeVarargs
public MultiSet(Collection<E>...c) {
- AssertionUtils.assertArgNotNull("c", c);
+ assertArgNotNull("c", c);
for (var cc : c)
- AssertionUtils.assertArgNotNull("c", cc);
+ assertArgNotNull("c", cc);
l = c;
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
index 4ccf9a257c..0aa3d898a8 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/collections/SimpleMap.java
@@ -23,8 +23,6 @@ import static org.apache.juneau.common.utils.Utils.*;
import java.lang.reflect.*;
import java.util.*;
-import org.apache.juneau.common.utils.*;
-
/**
* A lightweight, fixed-size map implementation backed by parallel key and
value arrays.
*
@@ -193,7 +191,7 @@ public class SimpleMap<K,V> extends AbstractMap<K,V> {
this.values = values;
entries =
(SimpleMapEntry[])Array.newInstance(SimpleMapEntry.class, keys.length);
for (var i = 0; i < keys.length; i++) {
- AssertionUtils.assertArg(nn(keys[i]), "Keys array
cannot contain a null value.");
+ assertArg(nn(keys[i]), "Keys array cannot contain a
null value.");
entries[i] = new SimpleMapEntry(i);
}
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function2.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function2.java
index f5154e5a40..34432031ce 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function2.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function2.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.common.function;
-import java.util.function.*;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
-import org.apache.juneau.common.utils.*;
+import java.util.function.*;
/**
* A function that takes in 2 arguments.
@@ -35,7 +35,7 @@ import org.apache.juneau.common.utils.*;
public interface Function2<A,B,R> {
default <V> Function2<A,B,V> andThen(Function<? super R,? extends V>
after) {
- AssertionUtils.assertArgNotNull("after", after);
+ assertArgNotNull("after", after);
return (A a, B b) -> after.apply(apply(a, b));
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function3.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function3.java
index 51d81edf3f..339017ee65 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function3.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function3.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.common.function;
-import java.util.function.*;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
-import org.apache.juneau.common.utils.*;
+import java.util.function.*;
/**
* A function that takes in 3 arguments.
@@ -36,7 +36,7 @@ import org.apache.juneau.common.utils.*;
public interface Function3<A,B,C,R> {
default <V> Function3<A,B,C,V> andThen(Function<? super R,? extends V>
after) {
- AssertionUtils.assertArgNotNull("after", after);
+ assertArgNotNull("after", after);
return (A a, B b, C c) -> after.apply(apply(a, b, c));
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function4.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function4.java
index 9e61b1a802..bf5d34444a 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function4.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function4.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.common.function;
-import java.util.function.*;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
-import org.apache.juneau.common.utils.*;
+import java.util.function.*;
/**
* A function that takes in 4 arguments.
@@ -37,7 +37,7 @@ import org.apache.juneau.common.utils.*;
public interface Function4<A,B,C,D,R> {
default <V> Function4<A,B,C,D,V> andThen(Function<? super R,? extends
V> after) {
- AssertionUtils.assertArgNotNull("after", after);
+ assertArgNotNull("after", after);
return (A a, B b, C c, D d) -> after.apply(apply(a, b, c, d));
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function5.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function5.java
index 6486a958a1..21c8a85782 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function5.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/function/Function5.java
@@ -16,9 +16,9 @@
*/
package org.apache.juneau.common.function;
-import java.util.function.*;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
-import org.apache.juneau.common.utils.*;
+import java.util.function.*;
/**
* A function that takes in 5 arguments.
@@ -38,7 +38,7 @@ import org.apache.juneau.common.utils.*;
public interface Function5<A,B,C,D,E,R> {
default <V> Function5<A,B,C,D,E,V> andThen(Function<? super R,? extends
V> after) {
- AssertionUtils.assertArgNotNull("after", after);
+ assertArgNotNull("after", after);
return (A a, B b, C c, D d, E e) -> after.apply(apply(a, b, c,
d, e));
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ClassUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ClassUtils.java
index 901d0f9f65..5ede7123c0 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ClassUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/ClassUtils.java
@@ -122,16 +122,16 @@ public class ClassUtils {
while (pt != cc.getSuperclass()) {
extractTypes(typeMap, cc);
cc = cc.getSuperclass();
- AssertionUtils.assertArg(nn(cc), "Class ''{0}'' is not
a subclass of parameterized type ''{1}''", c.getSimpleName(),
pt.getSimpleName());
+ assertArg(nn(cc), "Class ''{0}'' is not a subclass of
parameterized type ''{1}''", c.getSimpleName(), pt.getSimpleName());
}
Type gsc = cc.getGenericSuperclass();
- AssertionUtils.assertArg(gsc instanceof ParameterizedType,
"Class ''{0}'' is not a parameterized type", pt.getSimpleName());
+ assertArg(gsc instanceof ParameterizedType, "Class ''{0}'' is
not a parameterized type", pt.getSimpleName());
ParameterizedType cpt = (ParameterizedType)gsc;
Type[] atArgs = cpt.getActualTypeArguments();
- AssertionUtils.assertArg(index < atArgs.length, "Invalid type
index. index={0}, argsLength={1}", index, atArgs.length);
+ assertArg(index < atArgs.length, "Invalid type index.
index={0}, argsLength={1}", index, atArgs.length);
Type actualType = cpt.getActualTypeArguments()[index];
if (typeMap.containsKey(actualType))
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
index ecb8530180..1adb7562ab 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/CollectionUtils.java
@@ -1,6 +1,7 @@
package org.apache.juneau.common.utils;
import static java.util.stream.Collectors.*;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.lang.reflect.*;
@@ -681,7 +682,7 @@ public class CollectionUtils {
* @return The new set.
*/
public static <T> Set<T> toSet(final T[] array) {
- AssertionUtils.assertArgNotNull("array", array);
+ assertArgNotNull("array", array);
return new AbstractSet<>() {
@Override /* Overridden from Set */
@@ -726,7 +727,7 @@ public class CollectionUtils {
*/
@SuppressWarnings("unchecked")
public static <E> E[] combine(E[]...arrays) {
- AssertionUtils.assertArgNotNull("arrays", arrays);
+ assertArgNotNull("arrays", arrays);
int l = 0;
E[] a1 = null;
for (E[] a : arrays) {
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
index 520e6d6866..23c5a6bb31 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/DateUtils.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.utils;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.StateEnum.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
@@ -376,7 +377,7 @@ public class DateUtils {
* @return The padded string.
*/
public static String toValidIso8601DT(String in) {
- AssertionUtils.assertArgNotNull("in", in);
+ assertArgNotNull("in", in);
in = in.trim();
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileUtils.java
index f74cc4ffda..78e8a8b2c2 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/FileUtils.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.utils;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.StringUtils.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
@@ -193,7 +194,7 @@ public class FileUtils {
* @throws RuntimeException if directory could not be created.
*/
public static File mkdirs(File f, boolean clean) {
- AssertionUtils.assertArgNotNull("f", f);
+ assertArgNotNull("f", f);
if (f.exists()) {
if (clean) {
if (! delete(f))
@@ -215,7 +216,7 @@ public class FileUtils {
* @return The directory.
*/
public static File mkdirs(String path, boolean clean) {
- AssertionUtils.assertArgNotNull("path", path);
+ assertArgNotNull("path", path);
return mkdirs(new File(path), clean);
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/MimeTypeDetector.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/MimeTypeDetector.java
index cd89768d6b..ae9ca35a62 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/MimeTypeDetector.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/MimeTypeDetector.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.utils;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.Utils.*;
import java.nio.file.*;
@@ -86,8 +87,8 @@ public class MimeTypeDetector {
* @throws IllegalArgumentException If name or type is null or
blank.
*/
public Builder addFileType(String name, String type) {
- AssertionUtils.assertArgNotNullOrBlank("name", name);
- AssertionUtils.assertArgNotNullOrBlank("type", type);
+ assertArgNotNullOrBlank("name", name);
+ assertArgNotNullOrBlank("type", type);
fileMap.put(name, type);
return this;
}
@@ -101,8 +102,8 @@ public class MimeTypeDetector {
* @throws IllegalArgumentException If ext or type is null or
blank.
*/
public Builder addExtensionType(String ext, String type) {
- AssertionUtils.assertArgNotNullOrBlank("ext", ext);
- AssertionUtils.assertArgNotNullOrBlank("type", type);
+ assertArgNotNullOrBlank("ext", ext);
+ assertArgNotNullOrBlank("type", type);
extMap.put(ext.toLowerCase(), type);
return this;
}
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
index b0bfe94922..3145be63bb 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/StringUtils.java
@@ -18,6 +18,7 @@ package org.apache.juneau.common.utils;
import static java.lang.Character.*;
import static java.nio.charset.StandardCharsets.*;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
import static org.apache.juneau.common.utils.IOUtils.*;
import static org.apache.juneau.common.utils.StateEnum.*;
import static org.apache.juneau.common.utils.ThrowableUtils.*;
@@ -155,7 +156,7 @@ public class StringUtils {
var bIn = in.getBytes(IOUtils.UTF8);
- AssertionUtils.assertArg(bIn.length % 4 == 0, "Invalid BASE64
string length. Must be multiple of 4.");
+ assertArg(bIn.length % 4 == 0, "Invalid BASE64 string length.
Must be multiple of 4.");
// Strip out any trailing '=' filler characters.
var inLength = bIn.length;
@@ -1936,7 +1937,7 @@ public class StringUtils {
* @return The parsed value.
*/
public static int parseIntWithSuffix(String s) {
- AssertionUtils.assertArgNotNull("s", s);
+ assertArgNotNull("s", s);
var m = multiplier(s);
if (m == 1)
return Integer.decode(s);
@@ -2012,7 +2013,7 @@ public class StringUtils {
* @return The parsed value.
*/
public static long parseLongWithSuffix(String s) {
- AssertionUtils.assertArgNotNull("s", s);
+ assertArgNotNull("s", s);
var m = multiplier2(s);
if (m == 1)
return Long.decode(s);
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
index 7765dc6651..2d4aa5b3d0 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/utils/Utils.java
@@ -16,6 +16,8 @@
*/
package org.apache.juneau.common.utils;
+import static org.apache.juneau.common.utils.AssertionUtils.*;
+
import java.lang.reflect.*;
import java.nio.charset.*;
import java.text.*;
@@ -128,7 +130,7 @@ public class Utils {
return null; // NOSONAR
}
- AssertionUtils.assertArg(isArray(array), "Input must be an
array but was {0}", array.getClass().getName());
+ assertArg(isArray(array), "Input must be an array but was {0}",
array.getClass().getName());
var componentType = array.getClass().getComponentType();
var length = Array.getLength(array);
@@ -1150,7 +1152,7 @@ public class Utils {
* @see #arrayToList(Object)
*/
public static final List<?> toList(Object o) { // NOSONAR
- AssertionUtils.assertArgNotNull("o", o);
+ assertArgNotNull("o", o);
if (o instanceof List<?> o2)
return o2;
if (o instanceof Iterable<?> o2)
@@ -1176,7 +1178,7 @@ public class Utils {
* @return A new stream.
*/
public static Stream<Object> toStream(Object array) {
- AssertionUtils.assertArg(isArray(array), "Arg was not an array.
Type: {0}", array.getClass().getName());
+ assertArg(isArray(array), "Arg was not an array. Type: {0}",
array.getClass().getName());
var length = Array.getLength(array);
return IntStream.range(0, length).mapToObj(i ->
Array.get(array, i));
}
