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 3340e248e New assertions module.
3340e248e is described below
commit 3340e248e29130b213776f163373b49dbb6bc6d1
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jun 27 07:25:13 2022 -0400
New assertions module.
---
.../main/java/org/apache/juneau/config/Config.java | 2 +-
.../java/org/apache/juneau/config/Section.java | 2 +-
.../main/java/org/apache/juneau/BeanSession.java | 2 +-
.../juneau/assertions/AssertionPredicates.java | 3 +-
.../org/apache/juneau/assertions/Assertions.java | 76 -------------------
.../juneau/assertions/FluentAnyAssertion.java | 2 +-
.../juneau/assertions/FluentArrayAssertion.java | 2 +-
.../assertions/FluentComparableAssertion.java | 2 +-
.../juneau/assertions/FluentDateAssertion.java | 2 +-
.../juneau/assertions/FluentObjectAssertion.java | 2 +-
.../assertions/FluentPrimitiveArrayAssertion.java | 2 +-
.../juneau/assertions/FluentStringAssertion.java | 2 +-
.../assertions/FluentThrowableAssertion.java | 2 +-
.../assertions/FluentZonedDateTimeAssertion.java | 2 +-
.../apache/juneau/cp/BeanCreateMethodFinder.java | 3 +-
.../java/org/apache/juneau/cp/BeanStoreEntry.java | 2 +-
.../org/apache/juneau/cp/DefaultClassList.java | 2 +-
.../main/java/org/apache/juneau/cp/FileFinder.java | 2 +-
.../main/java/org/apache/juneau/cp/LocalDir.java | 3 +-
.../main/java/org/apache/juneau/cp/LocalFile.java | 2 +-
.../java/org/apache/juneau/internal/ArgUtils.java | 87 ++++++++++++++++++++++
.../org/apache/juneau/internal/ArrayUtils.java | 2 +-
.../java/org/apache/juneau/internal/FileUtils.java | 2 +-
.../org/apache/juneau/internal/FilteredMap.java | 3 +-
.../java/org/apache/juneau/internal/MultiSet.java | 2 +-
.../java/org/apache/juneau/internal/SimpleMap.java | 2 +-
.../org/apache/juneau/internal/StringUtils.java | 2 +-
.../java/org/apache/juneau/reflect/ClassInfo.java | 2 +-
.../main/java/org/apache/juneau/svl/MapVar.java | 2 +-
.../src/main/java/org/apache/juneau/svl/Var.java | 2 +-
.../java/org/apache/juneau/svl/vars/IfVar.java | 3 +-
.../java/org/apache/juneau/svl/vars/LenVar.java | 3 +-
.../apache/juneau/svl/vars/PatternExtractVar.java | 3 +-
.../apache/juneau/svl/vars/PatternMatchVar.java | 3 +-
.../apache/juneau/svl/vars/PatternReplaceVar.java | 3 +-
.../org/apache/juneau/svl/vars/SubstringVar.java | 3 +-
.../java/org/apache/juneau/svl/vars/SwitchVar.java | 2 +-
.../org/apache/juneau/rest/client/RestClient.java | 2 +-
.../apache/juneau/http/entity/ByteArrayEntity.java | 2 +-
.../org/apache/juneau/http/entity/FileEntity.java | 2 +-
.../juneau/http/entity/InputStreamEntity.java | 2 +-
.../apache/juneau/http/entity/ReaderEntity.java | 2 +-
.../apache/juneau/http/entity/StringEntity.java | 2 +-
.../org/apache/juneau/http/header/BasicHeader.java | 2 +-
.../juneau/http/header/BasicHeaderIterator.java | 2 +-
.../org/apache/juneau/http/header/EntityTag.java | 2 +-
.../org/apache/juneau/http/header/HeaderList.java | 2 +-
.../org/apache/juneau/http/part/BasicPart.java | 2 +-
.../apache/juneau/http/part/BasicPartIterator.java | 2 +-
.../java/org/apache/juneau/http/part/PartList.java | 2 +-
.../juneau/http/response/BasicHttpException.java | 1 +
.../juneau/http/response/BasicHttpResponse.java | 1 +
.../java/org/apache/juneau/rest/RestContext.java | 2 +-
.../org/apache/juneau/rest/arg/RestOpArgList.java | 2 +-
.../juneau/rest/httppart/RequestAttributes.java | 2 +-
.../juneau/rest/httppart/RequestFormParams.java | 2 +-
.../juneau/rest/httppart/RequestHeaders.java | 2 +-
.../juneau/rest/httppart/RequestPathParams.java | 2 +-
.../juneau/rest/httppart/RequestQueryParams.java | 2 +-
.../rest/processor/ResponseProcessorList.java | 2 +-
.../apache/juneau/assertions/Assertions_Test.java | 12 ---
61 files changed, 153 insertions(+), 146 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index 28675fc10..0e9ac38aa 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -12,9 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.config;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
index 8af786210..9c6787cd2 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Section.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.config;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 2ca8087c4..d2504a2a9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -13,7 +13,7 @@
package org.apache.juneau;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index f7f4f4472..b885685b9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.assertions.AssertionPredicate.*;
-import static org.apache.juneau.assertions.Assertions.*;
-
import java.text.*;
import java.util.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
index 9a2baae08..7c2ceca87 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/Assertions.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
import java.io.*;
@@ -21,7 +20,6 @@ import java.util.*;
import java.util.stream.*;
import org.apache.juneau.*;
-import org.apache.juneau.cp.*;
/**
* Main class for creation of assertions for stand-alone testing.
@@ -72,10 +70,6 @@ import org.apache.juneau.cp.*;
*/
public class Assertions {
- private static final Messages MESSAGES = Messages.of(Assertions.class,
"Messages");
- private static final String
- MSG_argumentCannotBeNull =
MESSAGES.getString("argumentCannotBeNull");
-
//-----------------------------------------------------------------------------------------------------------------
// Fluent assertions
//-----------------------------------------------------------------------------------------------------------------
@@ -983,74 +977,4 @@ public class Assertions {
}
return assertThrowable(null);
}
-
-
//-----------------------------------------------------------------------------------------------------------------
- // Other assertions
-
//-----------------------------------------------------------------------------------------------------------------
-
- /**
- * Throws an {@link IllegalArgumentException} if the specified argument
is <jk>null</jk>.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bjava'>
- * <jk>import static</jk>
org.apache.juneau.assertions.Assertions.*;
- *
- * <jk>public</jk> String setFoo(String <jv>foo</jv>) {
- * <jsm>assertArgNotNull</jsm>(<js>"foo"</js>,
<jv>foo</jv>);
- * ...
- * }
- * </p>
- *
- * @param <T> The argument data type.
- * @param name The argument name.
- * @param o The object to check.
- * @return The same argument.
- * @throws IllegalArgumentException Constructed exception.
- */
- public static final <T> T assertArgNotNull(String name, T o) throws
IllegalArgumentException {
- assertArg(o != null, MSG_argumentCannotBeNull, name);
- return o;
- }
-
- /**
- * Throws an {@link IllegalArgumentException} if the specified
expression is <jk>false</jk>.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bjava'>
- * <jk>import static</jk>
org.apache.juneau.assertions.Assertions.*;
- *
- * <jk>public</jk> String setFoo(List<String> <jv>foo</jv>) {
- * <jsm>assertArg</jsm>(<jv>foo</jv> != <jk>null</jk>
&& ! <jv>foo</jv>.isEmpty(), <js>"'foo' cannot be null or empty."</js>);
- * ...
- * }
- * </p>
- *
- * @param expression The boolean expression to check.
- * @param msg The exception message.
- * @param args The exception message args.
- * @throws IllegalArgumentException Constructed exception.
- */
- public static final void assertArg(boolean expression, String msg,
Object...args) throws IllegalArgumentException {
- if (! expression)
- throw illegalArgumentException(msg, args);
- }
-
- /**
- * Throws an {@link IllegalArgumentException} if the specified value
doesn't have all subclasses of the specified type.
- *
- * @param <E> The element type.
- * @param name The argument name.
- * @param type The expected parent class.
- * @param value The array value being checked.
- * @return The value cast to the specified array type.
- * @throws IllegalArgumentException Constructed exception.
- */
- @SuppressWarnings("unchecked")
- public static final <E> Class<E>[] assertClassArrayArgIsType(String
name, Class<E> type, Class<?>[] value) throws IllegalArgumentException {
- for (int i = 0; i < value.length; i++)
- if (! type.isAssignableFrom(value[i]))
- throw illegalArgumentException("Arg {0} did not
have arg of type {1} at index {2}: {3}", name, type.getName(), i,
value[i].getName());
- return (Class<E>[])value;
- }
-
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
index 76a4a4d8e..7077d0e2e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import java.io.*;
import java.time.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index 75ffb9bcb..2aac8cc4f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index 9620aaa13..f51b08b8c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import java.io.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index 1a4b904f5..525fa2270 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 66681071e..6aed4f1df 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index 9914e5ddb..fdfa11dd3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static java.util.Arrays.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index d155b6613..f0cab86b8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index 8d6a94022..dae5e9eee 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.assertions.Assertions.*;
import static java.util.Collections.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.list;
import static org.apache.juneau.internal.ThrowableUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
index f1870d0cb..2a3791f36 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import java.io.*;
import java.time.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
index 0b86b44e4..cbfef3580 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreateMethodFinder.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.cp;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
+
import java.util.*;
import java.util.function.*;
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 b68099f1b..d12cbb213 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.cp;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.collections.JsonMap.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import java.util.function.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
index 50f922c71..54d73e7e3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/DefaultClassList.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.cp;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
index 9f3f1f544..5507c7741 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.cp;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
index 26adac35b..50d61920c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalDir.java
@@ -12,10 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.cp;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.assertions.Assertions.*;
-
import java.net.*;
import java.nio.file.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java
index 8804342a7..b5c1f8200 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/LocalFile.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.cp;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArgUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArgUtils.java
new file mode 100644
index 000000000..6810b59d9
--- /dev/null
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArgUtils.java
@@ -0,0 +1,87 @@
+//
***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
+// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
+// * with the License. You may obtain a copy of the License at
*
+// *
*
+// * http://www.apache.org/licenses/LICENSE-2.0
*
+// *
*
+// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
+// * specific language governing permissions and limitations under the
License. *
+//
***************************************************************************************************************************
+package org.apache.juneau.internal;
+
+import static org.apache.juneau.internal.ThrowableUtils.*;
+
+/**
+ * Method argument utility methods.
+ */
+public class ArgUtils {
+
+ /**
+ * Throws an {@link IllegalArgumentException} if the specified argument
is <jk>null</jk>.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bjava'>
+ * <jk>import static</jk> org.apache.juneau.internal.ArgUtils.*;
+ *
+ * <jk>public</jk> String setFoo(String <jv>foo</jv>) {
+ * <jsm>assertArgNotNull</jsm>(<js>"foo"</js>,
<jv>foo</jv>);
+ * ...
+ * }
+ * </p>
+ *
+ * @param <T> The argument data type.
+ * @param name The argument name.
+ * @param o The object to check.
+ * @return The same argument.
+ * @throws IllegalArgumentException Constructed exception.
+ */
+ public static final <T> T assertArgNotNull(String name, T o) throws
IllegalArgumentException {
+ assertArg(o != null, "Argument ''{0}'' cannot be null.", name);
+ return o;
+ }
+
+ /**
+ * Throws an {@link IllegalArgumentException} if the specified
expression is <jk>false</jk>.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bjava'>
+ * <jk>import static</jk> org.apache.juneau.internal.ArgUtils.*;
+ *
+ * <jk>public</jk> String setFoo(List<String> <jv>foo</jv>) {
+ * <jsm>assertArg</jsm>(<jv>foo</jv> != <jk>null</jk>
&& ! <jv>foo</jv>.isEmpty(), <js>"'foo' cannot be null or empty."</js>);
+ * ...
+ * }
+ * </p>
+ *
+ * @param expression The boolean expression to check.
+ * @param msg The exception message.
+ * @param args The exception message args.
+ * @throws IllegalArgumentException Constructed exception.
+ */
+ public static final void assertArg(boolean expression, String msg,
Object...args) throws IllegalArgumentException {
+ if (! expression)
+ throw illegalArgumentException(msg, args);
+ }
+
+ /**
+ * Throws an {@link IllegalArgumentException} if the specified value
doesn't have all subclasses of the specified type.
+ *
+ * @param <E> The element type.
+ * @param name The argument name.
+ * @param type The expected parent class.
+ * @param value The array value being checked.
+ * @return The value cast to the specified array type.
+ * @throws IllegalArgumentException Constructed exception.
+ */
+ @SuppressWarnings("unchecked")
+ public static final <E> Class<E>[] assertClassArrayArgIsType(String
name, Class<E> type, Class<?>[] value) throws IllegalArgumentException {
+ for (int i = 0; i < value.length; i++)
+ if (! type.isAssignableFrom(value[i]))
+ throw illegalArgumentException("Arg {0} did not
have arg of type {1} at index {2}: {3}", name, type.getName(), i,
value[i].getName());
+ return (Class<E>[])value;
+ }
+
+}
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 bbd1fecf5..c81b39fcf 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FileUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FileUtils.java
index dcab1639b..477b05dc7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FileUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FileUtils.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FilteredMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FilteredMap.java
index dfc0f0fc0..0ad768fdd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FilteredMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/FilteredMap.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
+
import java.util.*;
import org.apache.juneau.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/MultiSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/MultiSet.java
index 0a57eb078..5e4e68727 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/MultiSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/MultiSet.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleMap.java
index 16a9b3ab2..b31202c4a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SimpleMap.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import java.lang.reflect.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
index 0f25de38b..dfb3d45e7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.internal;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index 45bcdd837..02ae4586b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -13,9 +13,9 @@
package org.apache.juneau.reflect;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
index 0a788bc3a..f4e005b53 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.util.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
index 02d11e706..21e85ba02 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/Var.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import java.io.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/IfVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/IfVar.java
index d05e78eac..5b938890a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/IfVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/IfVar.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl.vars;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
+
import org.apache.juneau.svl.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LenVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LenVar.java
index c08787eab..924d66ed7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LenVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/LenVar.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl.vars;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
+
import java.util.regex.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternExtractVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternExtractVar.java
index 852867bdc..8f3d12e0b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternExtractVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternExtractVar.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl.vars;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
+
import java.util.regex.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternMatchVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternMatchVar.java
index 18029b4d0..89e16715f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternMatchVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternMatchVar.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl.vars;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
+
import java.util.regex.*;
import org.apache.juneau.svl.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternReplaceVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternReplaceVar.java
index 1671ce64a..0d69c9c61 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternReplaceVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/PatternReplaceVar.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl.vars;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
+
import org.apache.juneau.svl.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SubstringVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SubstringVar.java
index e4b2dc59a..164ca7525 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SubstringVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SubstringVar.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl.vars;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
+
import org.apache.juneau.svl.*;
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
index 9170ec7e6..c53560c9f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/vars/SwitchVar.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.svl.vars;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import java.util.regex.*;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 7f6b5c5b2..26933a543 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -17,12 +17,12 @@ import static org.apache.juneau.httppart.HttpPartType.*;
import static org.apache.juneau.http.HttpMethod.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.http.HttpParts.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.http.HttpEntities.*;
import static org.apache.juneau.rest.client.RestOperation.*;
import static java.util.logging.Level.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StateMachineState.*;
import static java.lang.Character.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
index 77893d984..e6160205b 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ByteArrayEntity.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.entity;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
index 927c3e4c5..35952c140 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/FileEntity.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.entity;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/InputStreamEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/InputStreamEntity.java
index 7fa2d7472..d2eed7ce5 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/InputStreamEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/InputStreamEntity.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.entity;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
import java.io.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
index 23cfffdb6..6a99615ef 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/ReaderEntity.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.entity;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
index dc5c04793..7549284ff 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/entity/StringEntity.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.entity;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.IOUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
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 83525c6f2..ef3c75f35 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,7 @@
package org.apache.juneau.http.header;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import java.io.*;
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 fa8a1c28e..3a1dff039 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import java.util.NoSuchElementException;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
index 373b16846..bb2c2456e 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/EntityTag.java
@@ -13,8 +13,8 @@
package org.apache.juneau.http.header;
import static org.apache.juneau.internal.StringUtils.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
/**
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 ba85d450e..c763c11e2 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
@@ -12,9 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
index fe4accb64..2ff513361 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.part;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
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 808c17337..7904676c2 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
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.part;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import java.util.NoSuchElementException;
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 0bb49cff1..6b4311648 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
@@ -12,9 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.part;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
index 0a66bdaf5..6d3f76785 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpException.java
@@ -13,6 +13,7 @@
package org.apache.juneau.http.response;
import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.http.HttpEntities.*;
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpResponse.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpResponse.java
index 1b72373db..2fd131fdf 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpResponse.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/response/BasicHttpResponse.java
@@ -14,6 +14,7 @@ package org.apache.juneau.http.response;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpEntities.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index d60b8d043..945af027d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -13,9 +13,9 @@
package org.apache.juneau.rest;
import static javax.servlet.http.HttpServletResponse.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.collections.JsonMap.*;
import static org.apache.juneau.http.HttpHeaders.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
index cdd571834..3cbdb00cc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArgList.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.arg;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
index 236ec870a..3f193e067 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttributes.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.httppart;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
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 52b107b86..bbe3d5c02 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
@@ -12,8 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.httppart;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.httppart.HttpPartType.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
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 9a9ab620c..339562a2b 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
@@ -12,12 +12,12 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.httppart;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
import static java.util.stream.Collectors.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import java.util.*;
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 4ca3f0a98..e180df9ff 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
@@ -12,11 +12,11 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.httppart;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import java.util.*;
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 d940ef8f1..fbe0daa2f 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
@@ -12,11 +12,11 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.httppart;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ThrowableUtils.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.httppart.HttpPartType.*;
import static java.util.Optional.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
index b9d5a9593..f9e680aa4 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessorList.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.processor;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.internal.ArgUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
index 41dfaf067..4478eca91 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
@@ -183,18 +183,6 @@ public class Assertions_Test {
assertMap(map(1,2)).asSize().is(1);
}
- @Test
- public void a22_assertArgNotNull() throws Exception {
- assertArgNotNull("foo", 123);
- assertThrown(()->assertArgNotNull("foo",
null)).asMessage().is("Argument 'foo' cannot be null.");
- }
-
- @Test
- public void a23_assertArg() throws Exception {
- assertArg(true, "foo {0}", 1);
- assertThrown(()->assertArg(false, "foo {0}",
1)).asMessage().is("foo 1");
- }
-
@Test
public void a24_assertOptional() throws Exception {
assertOptional(empty()).isNull();
