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 c752ee25e Javadocs
c752ee25e is described below
commit c752ee25ea0f2935ab4de16b48d2b2345ff56401
Author: JamesBognar <[email protected]>
AuthorDate: Sun Jun 19 04:46:12 2022 -0400
Javadocs
---
.../java/org/apache/juneau/AnnotationProvider.java | 20 ++++++-------
.../src/main/java/org/apache/juneau/BeanMeta.java | 4 +--
.../src/main/java/org/apache/juneau/ClassMeta.java | 4 +--
.../src/main/java/org/apache/juneau/Context.java | 20 ++++++-------
.../juneau/assertions/AssertionPredicate.java | 2 +-
.../juneau/assertions/AssertionPredicates.java | 2 +-
.../juneau/assertions/FluentStringAssertion.java | 2 +-
.../org/apache/juneau/collections/JsonList.java | 2 +-
.../org/apache/juneau/collections/JsonMap.java | 4 +--
.../org/apache/juneau/internal/ArrayBuilder.java | 2 +-
.../org/apache/juneau/internal/ConsumerUtils.java | 8 ++---
.../org/apache/juneau/reflect/AnnotationInfo.java | 4 +--
.../java/org/apache/juneau/reflect/ClassInfo.java | 22 +++++++-------
.../org/apache/juneau/reflect/ConstructorInfo.java | 2 +-
.../org/apache/juneau/reflect/ExecutableInfo.java | 2 +-
.../java/org/apache/juneau/reflect/FieldInfo.java | 2 +-
.../java/org/apache/juneau/reflect/MethodInfo.java | 2 +-
.../java/org/apache/juneau/reflect/ParamInfo.java | 4 +--
juneau-doc/docs/Topics/01.Overview/01.o.Core.html | 6 ++--
.../docs/Topics/01.Overview/06.o.RestClient.html | 2 +-
.../02.juneau-marshall/21.jm.FluentAssertions.html | 2 +-
juneau-doc/docs/Topics/10.juneau-rest-client.html | 4 +--
.../01.jrc.PojoMarshalling.html | 4 +--
.../03.jrc.RequestContent.html | 10 +++----
.../04.jrc.ResponseStatus.html | 4 +--
.../02.jrc.AuthenticationForm.html | 2 +-
juneau-doc/src/main/javadoc/overview.html | 34 +++++++++++-----------
.../apache/juneau/rest/client/ResponseContent.java | 12 ++++----
.../apache/juneau/rest/client/ResponseHeader.java | 10 +++----
.../juneau/rest/client/ResponseStatusLine.java | 2 +-
.../org/apache/juneau/rest/client/RestClient.java | 8 ++---
.../apache/juneau/rest/client/RestResponse.java | 28 +++++++++---------
.../assertion/FluentResponseBodyAssertion.java | 6 ++--
.../org/apache/juneau/rest/mock/MockConsole.java | 2 +-
.../apache/juneau/rest/mock/MockRestClient.java | 2 +-
35 files changed, 123 insertions(+), 123 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
index b3a6abc3a..3cbd0a3b6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
@@ -57,7 +57,7 @@ public interface AnnotationProvider {
public <A extends Annotation> A firstAnnotation(Class<A> type,
Class<?> onClass, Predicate<A> filter) {
if (type != null && onClass != null)
for (A a : annotations(type, onClass))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -67,7 +67,7 @@ public interface AnnotationProvider {
A x = null;
if (type != null && onClass != null)
for (A a : annotations(type, onClass))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
@@ -83,7 +83,7 @@ public interface AnnotationProvider {
public <A extends Annotation> A
firstDeclaredAnnotation(Class<A> type, Class<?> onClass, Predicate<A> filter) {
if (type != null && onClass != null)
for (A a : declaredAnnotations(type, onClass))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -93,7 +93,7 @@ public interface AnnotationProvider {
A x = null;
if (type != null && onClass != null)
for (A a : declaredAnnotations(type, onClass))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
@@ -109,7 +109,7 @@ public interface AnnotationProvider {
public <A extends Annotation> A firstAnnotation(Class<A> type,
Method onMethod, Predicate<A> filter) {
if (type != null && onMethod != null)
for (A a : annotations(type, onMethod))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -119,7 +119,7 @@ public interface AnnotationProvider {
A x = null;
if (type != null && onMethod != null)
for (A a : annotations(type, onMethod))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
@@ -135,7 +135,7 @@ public interface AnnotationProvider {
public <A extends Annotation> A firstAnnotation(Class<A> type,
Field onField, Predicate<A> filter) {
if (type != null && onField != null)
for (A a : annotations(type, onField))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -145,7 +145,7 @@ public interface AnnotationProvider {
A x = null;
if (type != null && onField != null)
for (A a : annotations(type, onField))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
@@ -161,7 +161,7 @@ public interface AnnotationProvider {
public <A extends Annotation> A firstAnnotation(Class<A> type,
Constructor<?> onConstructor, Predicate<A> filter) {
if (type != null && onConstructor != null)
for (A a : annotations(type, onConstructor))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -171,7 +171,7 @@ public interface AnnotationProvider {
A x = null;
if (type != null && onConstructor != null)
for (A a : annotations(type, onConstructor))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 591c59ba1..a2e829da5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -819,7 +819,7 @@ public class BeanMeta<T> {
*/
public void forEachProperty(Predicate<BeanPropertyMeta> filter,
Consumer<BeanPropertyMeta> action) {
for (BeanPropertyMeta x : propertyArray)
- if (passes(filter, x))
+ if (test(filter, x))
action.accept(x);
}
@@ -833,7 +833,7 @@ public class BeanMeta<T> {
*/
public <T2> Optional<T2> firstProperty(Predicate<BeanPropertyMeta>
filter, Function<BeanPropertyMeta,T2> function) {
for (BeanPropertyMeta x : propertyArray)
- if (passes(filter, x))
+ if (test(filter, x))
return Optional.ofNullable(function.apply(x));
return Optional.empty();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 0103d9ebf..75c85827e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -2140,7 +2140,7 @@ public final class ClassMeta<T> implements Type {
return Optional.empty();
}
for (A a : array)
- if (passes(filter, a))
+ if (test(filter, a))
return Optional.of(a);
return Optional.empty();
}
@@ -2161,7 +2161,7 @@ public final class ClassMeta<T> implements Type {
return Optional.empty();
}
for (int i = array.length-1; i >= 0; i--)
- if (passes(filter, array[i]))
+ if (test(filter, array[i]))
return Optional.of(array[i]);
return Optional.empty();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index fdf1291d8..df901c29b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -946,7 +946,7 @@ public abstract class Context implements AnnotationProvider
{
public <A extends Annotation> A firstAnnotation(Class<A> type, Class<?>
onClass, Predicate<A> filter) {
if (type != null && onClass != null)
for (A a : annotations(type, onClass))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -956,7 +956,7 @@ public abstract class Context implements AnnotationProvider
{
A x = null;
if (type != null && onClass != null)
for (A a : annotations(type, onClass))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
@@ -972,7 +972,7 @@ public abstract class Context implements AnnotationProvider
{
public <A extends Annotation> A firstDeclaredAnnotation(Class<A> type,
Class<?> onClass, Predicate<A> filter) {
if (type != null && onClass != null)
for (A a : declaredAnnotations(type, onClass))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -982,7 +982,7 @@ public abstract class Context implements AnnotationProvider
{
A x = null;
if (type != null && onClass != null)
for (A a : declaredAnnotations(type, onClass))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
@@ -998,7 +998,7 @@ public abstract class Context implements AnnotationProvider
{
public <A extends Annotation> A firstAnnotation(Class<A> type, Method
onMethod, Predicate<A> filter) {
if (type != null && onMethod != null)
for (A a : annotations(type, onMethod))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -1008,7 +1008,7 @@ public abstract class Context implements
AnnotationProvider {
A x = null;
if (type != null && onMethod != null)
for (A a : annotations(type, onMethod))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
@@ -1024,7 +1024,7 @@ public abstract class Context implements
AnnotationProvider {
public <A extends Annotation> A firstAnnotation(Class<A> type, Field
onField, Predicate<A> filter) {
if (type != null && onField != null)
for (A a : annotations(type, onField))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -1034,7 +1034,7 @@ public abstract class Context implements
AnnotationProvider {
A x = null;
if (type != null && onField != null)
for (A a : annotations(type, onField))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
@@ -1050,7 +1050,7 @@ public abstract class Context implements
AnnotationProvider {
public <A extends Annotation> A firstAnnotation(Class<A> type,
Constructor<?> onConstructor, Predicate<A> filter) {
if (type != null && onConstructor != null)
for (A a : annotations(type, onConstructor))
- if (passes(filter, a))
+ if (test(filter, a))
return a;
return null;
}
@@ -1060,7 +1060,7 @@ public abstract class Context implements
AnnotationProvider {
A x = null;
if (type != null && onConstructor != null)
for (A a : annotations(type, onConstructor))
- if (passes(filter, a))
+ if (test(filter, a))
x = a;
return x;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index 023b48260..ee48320fe 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -43,7 +43,7 @@ import org.apache.juneau.cp.*;
* <js>"Foo did not equal bar. Bean was=''{0}''"</js>,
* <jsf>VALUE</jsf>
* );
- * <jsm>assertObject</jsm>(<jv>myBean</jv>).passes(<jv>predicate</jv>);
+ * <jsm>assertObject</jsm>(<jv>myBean</jv>).is(<jv>predicate</jv>);
* </p>
*
* <ul class='seealso'>
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 92b01eb53..f7f4f4472 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
@@ -41,7 +41,7 @@ import org.apache.juneau.internal.*;
* <jc>// Asserts that a list contains te specified values.</jc>
* List<Object> <jv>myList</jv> = AList.<jsm>of</jsm>(...);
* <jsm>assertList</jsm>(<jv>myList</jv>)
- * .passes(<jsm>eq</jsm>(<js>"foo"</js>), <jsm>any</jsm>(),
<jsm>match</jsm>(<js>"bar*"</js>));
+ * .is(<jsm>eq</jsm>(<js>"foo"</js>), <jsm>any</jsm>(),
<jsm>match</jsm>(<js>"bar*"</js>));
* </p>
*
* <ul class='seealso'>
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 801a09877..d155b6613 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
@@ -327,7 +327,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
* <jv>client</jv>
* .get(<jsf>URL</jsf>)
* .run()
- * .assertContent().isEqualTo(<js>"OK"</js>);
+ * .assertContent().is(<js>"OK"</js>);
* </p>
*
* @param value
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index 4e374bd96..7953f193f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -472,7 +472,7 @@ public class JsonList extends LinkedList<Object> {
* @return This object.
*/
public <T> JsonList appendIf(Predicate<T> test, T value) {
- return appendIf(passes(test, value), value);
+ return appendIf(test(test, value), value);
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
index 021ec4848..3d51aa9e2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
@@ -480,7 +480,7 @@ public class JsonMap extends LinkedHashMap<String,Object> {
* @return This object.
*/
public <T> JsonMap appendIf(Predicate<T> test, String key, T value) {
- return appendIf(passes(test, value), key, value);
+ return appendIf(test(test, value), key, value);
}
/**
@@ -495,7 +495,7 @@ public class JsonMap extends LinkedHashMap<String,Object> {
@SafeVarargs
public final <T> JsonMap appendFirst(Predicate<T> test, String key,
T...values) {
for (T v : values)
- if (passes(test, v))
+ if (test(test, v))
return append(key, v);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayBuilder.java
index a2935c42b..67d671a63 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayBuilder.java
@@ -97,7 +97,7 @@ public final class ArrayBuilder<E> {
* @throws ArrayIndexOutOfBoundsException if size is exceeded.
*/
public ArrayBuilder<E> add(E t) {
- if (passes(filter, t)) {
+ if (test(filter, t)) {
if (list == null)
list = size < 0 ? new ArrayList<>() : new
ArrayList<>(size);
list.add(t);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ConsumerUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ConsumerUtils.java
index 417ba8325..6026ac52a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ConsumerUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ConsumerUtils.java
@@ -27,7 +27,7 @@ public final class ConsumerUtils {
* @param value The value to test.
* @return <jk>true</jk> if the specified predicate is <jk>null</jk> or
matches the specified value.
*/
- public static <T> boolean passes(Predicate<T> predicate, T value) {
+ public static <T> boolean test(Predicate<T> predicate, T value) {
return (predicate == null || predicate.test(value));
}
@@ -40,7 +40,7 @@ public final class ConsumerUtils {
* @param value The value.
* @return <jk>true</jk> if the specified predicate is <jk>null</jk> or
matches the specified value.
*/
- public static <T> boolean passes(Class<T> type, Predicate<T> predicate,
Object value) {
+ public static <T> boolean test(Class<T> type, Predicate<T> predicate,
Object value) {
return type.isInstance(value) && (predicate == null ||
predicate.test(type.cast(value)));
}
@@ -53,7 +53,7 @@ public final class ConsumerUtils {
* @param value The value.
*/
public static <T> void consume(Predicate<T> predicate, Consumer<T>
consumer, T value) {
- if (passes(predicate, value))
+ if (test(predicate, value))
consumer.accept(value);
}
@@ -67,7 +67,7 @@ public final class ConsumerUtils {
* @param value The value.
*/
public static <T> void consume(Class<T> type, Predicate<T> predicate,
Consumer<T> consumer, Object value) {
- if (passes(type, predicate, value))
+ if (test(type, predicate, value))
consumer.accept(type.cast(value));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
index 94a116804..2583aa800 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
@@ -265,7 +265,7 @@ public final class AnnotationInfo<T extends Annotation> {
* @return <jk>true</jk> if this object passes the specified predicate
test.
*/
public boolean matches(Predicate<AnnotationInfo<?>> test) {
- return passes(test, this);
+ return test(test, this);
}
/**
@@ -319,7 +319,7 @@ public final class AnnotationInfo<T extends Annotation> {
if (m.getName().equals(name) &&
m.getReturnType().equals(type)) {
try {
V v = (V)m.invoke(a);
- if (passes(test, v))
+ if (test(test, v))
return optional(v);
} catch (Exception e) {
e.printStackTrace(); // Shouldn't
happen.
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 ea7d195e6..45bcdd837 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
@@ -357,7 +357,7 @@ public final class ClassInfo {
*/
public ClassInfo getAnyParent(Predicate<ClassInfo> filter) {
for (ClassInfo ci : _getAllParents())
- if (passes(filter, ci))
+ if (test(filter, ci))
return ci;
return null;
}
@@ -464,7 +464,7 @@ public final class ClassInfo {
*/
public final MethodInfo getPublicMethod(Predicate<MethodInfo> filter) {
for (MethodInfo mi : _getPublicMethods())
- if (passes(filter, mi))
+ if (test(filter, mi))
return mi;
return null;
}
@@ -502,7 +502,7 @@ public final class ClassInfo {
*/
public MethodInfo getDeclaredMethod(Predicate<MethodInfo> filter) {
for (MethodInfo mi : _getDeclaredMethods())
- if (passes(filter, mi))
+ if (test(filter, mi))
return mi;
return null;
}
@@ -540,7 +540,7 @@ public final class ClassInfo {
*/
public MethodInfo getMethod(Predicate<MethodInfo> filter) {
for (MethodInfo mi : _getAllMethods())
- if (passes(filter, mi))
+ if (test(filter, mi))
return mi;
return null;
}
@@ -665,7 +665,7 @@ public final class ClassInfo {
*/
public ConstructorInfo getPublicConstructor(Predicate<ConstructorInfo>
filter) {
for (ConstructorInfo ci : _getPublicConstructors())
- if (passes(filter, ci))
+ if (test(filter, ci))
return ci;
return null;
}
@@ -702,7 +702,7 @@ public final class ClassInfo {
*/
public ConstructorInfo
getDeclaredConstructor(Predicate<ConstructorInfo> filter) {
for (ConstructorInfo ci : _getDeclaredConstructors())
- if (passes(filter, ci))
+ if (test(filter, ci))
return ci;
return null;
}
@@ -800,7 +800,7 @@ public final class ClassInfo {
*/
public FieldInfo getPublicField(Predicate<FieldInfo> filter) {
for (FieldInfo f : _getPublicFields())
- if (passes(filter, f))
+ if (test(filter, f))
return f;
return null;
}
@@ -838,7 +838,7 @@ public final class ClassInfo {
*/
public FieldInfo getDeclaredField(Predicate<FieldInfo> filter) {
for (FieldInfo f : _getDeclaredFields())
- if (passes(filter, f))
+ if (test(filter, f))
return f;
return null;
}
@@ -1044,7 +1044,7 @@ public final class ClassInfo {
annotationProvider = AnnotationProvider.DEFAULT;
A x = null;
x = getPackageAnnotation(type);
- if (x != null && passes(filter, x))
+ if (x != null && test(filter, x))
return x;
ClassInfo[] interfaces = _getInterfaces();
for (int i = interfaces.length-1; i >= 0; i--) {
@@ -1117,7 +1117,7 @@ public final class ClassInfo {
return x;
}
x = getPackageAnnotation(type);
- if (x != null && passes(filter, x))
+ if (x != null && test(filter, x))
return x;
return null;
}
@@ -2446,7 +2446,7 @@ public final class ClassInfo {
* @return <jk>true</jk> if this object passes the specified predicate
test.
*/
public boolean matches(Predicate<ClassInfo> test) {
- return passes(test, this);
+ return test(test, this);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
index 4c17c4d57..29d695156 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
@@ -163,7 +163,7 @@ public final class ConstructorInfo extends ExecutableInfo
implements Comparable<
* @return <jk>true</jk> if this object passes the specified predicate
test.
*/
public boolean matches(Predicate<ConstructorInfo> test) {
- return passes(test, this);
+ return test(test, this);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
index 274932cc7..7cbd2a55b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ExecutableInfo.java
@@ -153,7 +153,7 @@ public abstract class ExecutableInfo {
*/
public ExecutableInfo forEachParam(Predicate<ParamInfo> filter,
Consumer<ParamInfo> action) {
for (ParamInfo pi : _getParams())
- if (passes(filter, pi))
+ if (test(filter, pi))
action.accept(pi);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
index eb2341550..0a7ce181b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/FieldInfo.java
@@ -413,7 +413,7 @@ public final class FieldInfo implements
Comparable<FieldInfo> {
* @return <jk>true</jk> if this object passes the specified predicate
test.
*/
public boolean matches(Predicate<FieldInfo> test) {
- return passes(test, this);
+ return test(test, this);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index a7b514af4..4e70ba70b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -546,7 +546,7 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
* @return <jk>true</jk> if this object passes the specified predicate
test.
*/
public boolean matches(Predicate<MethodInfo> test) {
- return passes(test, this);
+ return test(test, this);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
index b72636d4a..203864dac 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
@@ -229,7 +229,7 @@ public final class ParamInfo {
if (o != null)
return o;
for (Annotation a2 :
eInfo._getParameterAnnotations(index))
- if (passes(type, filter, a2))
+ if (test(type, filter, a2))
return (A)a2;
} else {
MethodInfo mi = (MethodInfo)eInfo;
@@ -280,7 +280,7 @@ public final class ParamInfo {
* @return <jk>true</jk> if this object passes the specified predicate
test.
*/
public boolean matches(Predicate<ParamInfo> test) {
- return passes(test, this);
+ return test(test, this);
}
/**
diff --git a/juneau-doc/docs/Topics/01.Overview/01.o.Core.html
b/juneau-doc/docs/Topics/01.Overview/01.o.Core.html
index 316d91ba7..a9c6c2a47 100644
--- a/juneau-doc/docs/Topics/01.Overview/01.o.Core.html
+++ b/juneau-doc/docs/Topics/01.Overview/01.o.Core.html
@@ -493,9 +493,9 @@
| .build()
| .get(<jsf>URI</jsf>)
| .run()
- | .assertStatus().code().is(200)
- |
.assertHeader(<js>"Content-Type"</js>).matches(<js>"application/json*"</js>)
- |
.getContent().assertValue().asString().contains(<js>"OK"</js>)
+ | .assertStatus().asCode().is(200)
+ |
.assertHeader(<js>"Content-Type"</js>).isMatches(<js>"application/json*"</js>)
+ |
.getContent().assertValue().asString().isContains(<js>"OK"</js>)
| .getContent().as(MyBean.<jk>class</jk>);
</p>
<ul class='seealso'>
diff --git a/juneau-doc/docs/Topics/01.Overview/06.o.RestClient.html
b/juneau-doc/docs/Topics/01.Overview/06.o.RestClient.html
index 8b5ccad42..6e5829400 100644
--- a/juneau-doc/docs/Topics/01.Overview/06.o.RestClient.html
+++ b/juneau-doc/docs/Topics/01.Overview/06.o.RestClient.html
@@ -30,7 +30,7 @@
| .build()
| .get(<jsf>URI</jsf>)
| .run()
- | .assertStatus().code().is(200)
+ | .assertStatus().asCode().is(200)
|
.assertHeader(<js>"Content-Type"</js>).matchesSimple(<js>"application/json*"</js>)
| .getContent().as(MyBean.<jk>class</jk>);
</p>
diff --git
a/juneau-doc/docs/Topics/02.juneau-marshall/21.jm.FluentAssertions.html
b/juneau-doc/docs/Topics/02.juneau-marshall/21.jm.FluentAssertions.html
index 1c6fb8061..99a4c43a6 100644
--- a/juneau-doc/docs/Topics/02.juneau-marshall/21.jm.FluentAssertions.html
+++ b/juneau-doc/docs/Topics/02.juneau-marshall/21.jm.FluentAssertions.html
@@ -28,7 +28,7 @@
| .build()
| .get(<jsf>URI</jsf>)
| .run()
- | .assertStatus().code().is(200)
+ | .assertStatus().asCode().is(200)
|
.assertHeader(<js>"Content-Type"</js>).isMatches(<js>"application/json*"</js>)
|
.getContent().assertValue().asString().isContains(<js>"OK"</js>)
| .getContent().as(MyBean.<jk>class</jk>);
diff --git a/juneau-doc/docs/Topics/10.juneau-rest-client.html
b/juneau-doc/docs/Topics/10.juneau-rest-client.html
index 8f8dd7b3e..9561cb3ab 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client.html
@@ -48,7 +48,7 @@ specific language governing permissions and limitations under
the License.
| .build()
| .get(<jsf>URI</jsf>)
| .run()
- | .assertStatus().code().is(200)
+ | .assertStatus().asCode().is(200)
|
.assertHeader(<js>"Content-Type"</js>).matchesSimple(<js>"application/json*"</js>)
| .getContent().as(MyBean.<jk>class</jk>);
</p>
@@ -63,7 +63,7 @@ specific language governing permissions and limitations under
the License.
| RestRequest <jv>req</jv> =
<jv>client</jv>.get(<jsf>URI</jsf>);
| RestResponse <jv>res</jv> = <jv>req</jv>.run();
| RestResponseStatusLineAssertion
<jv>statusLineAssertion</jv> = <jv>res</jv>.assertStatus();
- | FluentIntegerAssertion<RestResponse>
<jv>codeAssertion</jv> = <jv>statusLineAssertion</jv>.code();
+ | FluentIntegerAssertion<RestResponse>
<jv>codeAssertion</jv> = <jv>statusLineAssertion</jv>.asCode();
| <jv>res</jv> = <jv>codeAssertion</jv>.is(200);
| FluentStringAssertion<RestResponse>
<jv>headerAssertion</jv> = <jv>res</jv>.assertHeader(<js>"Content-Type"</js>);
| <jv>res</jv> =
<jv>headerAssertion</jv>.matchesSimple(<js>"application/json*"</js>);
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html
index 2267ef699..bf1d2b316 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/01.jrc.PojoMarshalling.html
@@ -65,7 +65,7 @@
| <jv>client</jv>.post(<jsf>URI</jsf>, myBean)
| .contentType(<js>"application/json"</js>)
| .complete()
- | .assertStatus().code().is(200);
+ | .assertStatus().asCode().is(200);
</p>
<p>
@@ -79,7 +79,7 @@
| <jv>client</jv>.post(<jsf>URI</jsf>, myBean)
| .json()
| .complete()
- | .assertStatus().code().is(200);
+ | .assertStatus().asCode().is(200);
</p>
<p>
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/03.jrc.RequestContent.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/03.jrc.RequestContent.html
index d03e70f95..8a93a664e 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/03.jrc.RequestContent.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/03.jrc.RequestContent.html
@@ -23,8 +23,8 @@
<ul class='javatree'>
<li class='jc'>{@link oajrc.RestRequest}
<ul>
- <li class='jm'>{@link oajrc.RestRequest#body(Object)
body(Object)}
- <li class='jm'>{@link
oajrc.RestRequest#body(Object,HttpPartSchema) body(Object,HttpPartSchema)}
+ <li class='jm'>{@link oajrc.RestRequest#content(Object)
content(Object)}
+ <li class='jm'>{@link
oajrc.RestRequest#content(Object,HttpPartSchema) content(Object,HttpPartSchema)}
</ul>
</ul>
@@ -56,21 +56,21 @@
| .post(<jsf>URI</jsf>)
| .body(<jv>bean</jv>)
| .complete()
- | .assertStatus().code().is(200);
+ | .assertStatus().asCode().is(200);
|
| <jc>// Post contents from a reader.</jc>
| <jv>client</jv>
| .post(<jsf>URI</jsf>)
| .body(<jk>new</jk>
FileReader(<js>"/tmp/foo.json"</js>))
| .complete()
- | .assertStatus().code().is(200);
+ | .assertStatus().asCode().is(200);
|
| <jc>// Post contents from an Apache HttpEntity
object.</jc>
| <jv>client</jv>
| .post(<jsf>URI</jsf>)
| .body(<jk>new</jk>
StringEntity(<jv>jsonString</jv>, ContentType.<jsf>APPLICATION_JSON</jsf>))
| .complete()
- | .assertStatus().code().is(200);
+ | .assertStatus().asCode().is(200);
</p>
<ul class='notes'>
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html
index 395bf234d..8571fcabb 100644
--- a/juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html
+++ b/juneau-doc/docs/Topics/10.juneau-rest-client/04.jrc.ResponseStatus.html
@@ -65,13 +65,13 @@
| <jc>// Status assertion using a static value.</jc>
| String <jv>body1</jv> =
<jv>client</jv>.get(<jsf>URI</jsf>)
| .run()
- | .assertStatus().code().isBetween(200,399)
+ | .assertStatus().asCode().isBetween(200,399)
| .getContent().asString();
|
| <jc>// Status assertion using a predicate.</jc>
| String <jv>body2</jv> =
<jv>client</jv>.get(<jsf>URI</jsf>)
| .run()
- | .assertStatus().code().passes(<jv>x</jv> ->
<jv>x</jv><400)
+ | .assertStatus().asCode().is(<jv>x</jv> ->
<jv>x</jv><400)
| .getContent().asString();
</p>
</div>
\ No newline at end of file
diff --git
a/juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/02.jrc.AuthenticationForm.html
b/juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/02.jrc.AuthenticationForm.html
index 167c15d7e..efbefffd0 100644
---
a/juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/02.jrc.AuthenticationForm.html
+++
b/juneau-doc/docs/Topics/10.juneau-rest-client/13.jrc.Authentication/02.jrc.AuthenticationForm.html
@@ -75,7 +75,7 @@
|
| <jc>// The form auth request should
always respond with a 200 ok or 302 redirect code</jc>
| <jk>if</jk> (<jv>rc</jv> ==
<jsf>SC_MOVED_TEMPORARILY</jsf>) {
- | <jk>if</jk>
(<jv>response</jv>.getFirstHeader(<js>"Location"</js>).getValue().matches(<js>"^.*/auth/authfailed.*$"</js>))
+ | <jk>if</jk>
(<jv>response</jv>.getFirstHeader(<js>"Location"</js>).getValue().isPattern(<js>"^.*/auth/authfailed.*$"</js>))
| <jk>throw new</jk>
IOException(<js>"Invalid credentials."</js>);
| } <jk>else if</jk> (<jv>rc</jv> !=
<jsf>SC_OK</jsf>) {
| <jk>throw new</jk>
IOException(<js>"Unexpected HTTP status: "</js> + <jv>rc</jv>);
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index 1ef641a47..d7b7cfa68 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -1262,9 +1262,9 @@
.build()
.get(<jsf>URI</jsf>)
.run()
- .assertStatus().code().is(200)
-
.assertHeader(<js>"Content-Type"</js>).matches(<js>"application/json*"</js>)
- .getContent().assertValue().asString().contains(<js>"OK"</js>)
+ .assertStatus().asCode().is(200)
+
.assertHeader(<js>"Content-Type"</js>).isMatches(<js>"application/json*"</js>)
+ .getContent().assertValue().asString().isContains(<js>"OK"</js>)
.getContent().as(MyBean.<jk>class</jk>);
</p>
<ul class='seealso'>
@@ -1919,7 +1919,7 @@
.build()
.get(<jsf>URI</jsf>)
.run()
- .assertStatus().code().is(200)
+ .assertStatus().asCode().is(200)
.assertHeader(<js>"Content-Type"</js>).matchesSimple(<js>"application/json*"</js>)
.getContent().as(MyBean.<jk>class</jk>);
</p>
@@ -5612,7 +5612,7 @@
.build()
.get(<jsf>URI</jsf>)
.run()
- .assertStatus().code().is(200)
+ .assertStatus().asCode().is(200)
.assertHeader(<js>"Content-Type"</js>).isMatches(<js>"application/json*"</js>)
.getContent().assertValue().asString().isContains(<js>"OK"</js>)
.getContent().as(MyBean.<jk>class</jk>);
@@ -22789,7 +22789,7 @@
.build()
.get(<jsf>URI</jsf>)
.run()
- .assertStatus().code().is(200)
+ .assertStatus().asCode().is(200)
.assertHeader(<js>"Content-Type"</js>).matchesSimple(<js>"application/json*"</js>)
.getContent().as(MyBean.<jk>class</jk>);
</p>
@@ -22804,7 +22804,7 @@
RestRequest <jv>req</jv> = <jv>client</jv>.get(<jsf>URI</jsf>);
RestResponse <jv>res</jv> = <jv>req</jv>.run();
RestResponseStatusLineAssertion <jv>statusLineAssertion</jv> =
<jv>res</jv>.assertStatus();
- FluentIntegerAssertion<RestResponse> <jv>codeAssertion</jv> =
<jv>statusLineAssertion</jv>.code();
+ FluentIntegerAssertion<RestResponse> <jv>codeAssertion</jv> =
<jv>statusLineAssertion</jv>.asCode();
<jv>res</jv> = <jv>codeAssertion</jv>.is(200);
FluentStringAssertion<RestResponse> <jv>headerAssertion</jv> =
<jv>res</jv>.assertHeader(<js>"Content-Type"</js>);
<jv>res</jv> =
<jv>headerAssertion</jv>.matchesSimple(<js>"application/json*"</js>);
@@ -22975,7 +22975,7 @@
<jv>client</jv>.post(<jsf>URI</jsf>, myBean)
.contentType(<js>"application/json"</js>)
.complete()
- .assertStatus().code().is(200);
+ .assertStatus().asCode().is(200);
</p>
<p>
@@ -22989,7 +22989,7 @@
<jv>client</jv>.post(<jsf>URI</jsf>, myBean)
.json()
.complete()
- .assertStatus().code().is(200);
+ .assertStatus().asCode().is(200);
</p>
<p>
@@ -23139,8 +23139,8 @@
<ul class='javatree'>
<li class='jc'>{@link org.apache.juneau.rest.client.RestRequest}
<ul>
- <li class='jm'>{@link
org.apache.juneau.rest.client.RestRequest#body(Object) body(Object)}
- <li class='jm'>{@link
org.apache.juneau.rest.client.RestRequest#body(Object,HttpPartSchema)
body(Object,HttpPartSchema)}
+ <li class='jm'>{@link
org.apache.juneau.rest.client.RestRequest#content(Object) content(Object)}
+ <li class='jm'>{@link
org.apache.juneau.rest.client.RestRequest#content(Object,HttpPartSchema)
content(Object,HttpPartSchema)}
</ul>
</ul>
@@ -23172,21 +23172,21 @@
.post(<jsf>URI</jsf>)
.body(<jv>bean</jv>)
.complete()
- .assertStatus().code().is(200);
+ .assertStatus().asCode().is(200);
<jc>// Post contents from a reader.</jc>
<jv>client</jv>
.post(<jsf>URI</jsf>)
.body(<jk>new</jk> FileReader(<js>"/tmp/foo.json"</js>))
.complete()
- .assertStatus().code().is(200);
+ .assertStatus().asCode().is(200);
<jc>// Post contents from an Apache HttpEntity object.</jc>
<jv>client</jv>
.post(<jsf>URI</jsf>)
.body(<jk>new</jk> StringEntity(<jv>jsonString</jv>,
ContentType.<jsf>APPLICATION_JSON</jsf>))
.complete()
- .assertStatus().code().is(200);
+ .assertStatus().asCode().is(200);
</p>
<ul class='notes'>
@@ -23251,13 +23251,13 @@
<jc>// Status assertion using a static value.</jc>
String <jv>body1</jv> = <jv>client</jv>.get(<jsf>URI</jsf>)
.run()
- .assertStatus().code().isBetween(200,399)
+ .assertStatus().asCode().isBetween(200,399)
.getContent().asString();
<jc>// Status assertion using a predicate.</jc>
String <jv>body2</jv> = <jv>client</jv>.get(<jsf>URI</jsf>)
.run()
- .assertStatus().code().passes(<jv>x</jv> -> <jv>x</jv><400)
+ .assertStatus().asCode().is(<jv>x</jv> -> <jv>x</jv><400)
.getContent().asString();
</p>
</div>
@@ -25069,7 +25069,7 @@
<jc>// The form auth request should always respond with
a 200 ok or 302 redirect code</jc>
<jk>if</jk> (<jv>rc</jv> ==
<jsf>SC_MOVED_TEMPORARILY</jsf>) {
- <jk>if</jk>
(<jv>response</jv>.getFirstHeader(<js>"Location"</js>).getValue().matches(<js>"^.*/auth/authfailed.*$"</js>))
+ <jk>if</jk>
(<jv>response</jv>.getFirstHeader(<js>"Location"</js>).getValue().isPattern(<js>"^.*/auth/authfailed.*$"</js>))
<jk>throw new</jk>
IOException(<js>"Invalid credentials."</js>);
} <jk>else if</jk> (<jv>rc</jv> != <jsf>SC_OK</jsf>) {
<jk>throw new</jk> IOException(<js>"Unexpected
HTTP status: "</js> + <jv>rc</jv>);
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
index f7d26deba..dc1743259 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
@@ -1118,26 +1118,26 @@ public class ResponseContent implements HttpEntity {
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .getContent().assertValue().passes(<jv>x</jv> ->
<jv>x</jv>.contains(<js>"OK"</js>));
+ * .getContent().assertValue().is(<jv>x</jv> ->
<jv>x</jv>.contains(<js>"OK"</js>));
*
* <jc>// Validates the response body matches a regular
expression.</jc>
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .getContent().assertValue().matches(<js>".*OK.*"</js>);
+ *
.getContent().assertValue().isPattern(<js>".*OK.*"</js>);
*
* <jc>// Validates the response body matches a regular expression
using regex flags.</jc>
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .getContent().assertValue().matches(<js>".*OK.*"</js>,
<jsf>MULTILINE</jsf> & <jsf>CASE_INSENSITIVE</jsf>);
+ *
.getContent().assertValue().isPattern(<js>".*OK.*"</js>, <jsf>MULTILINE</jsf>
& <jsf>CASE_INSENSITIVE</jsf>);
*
* <jc>// Validates the response body matches a regular expression
in the form of an existing Pattern.</jc>
* Pattern <jv>pattern</jv> =
Pattern.<jsm>compile</jsm>(<js>".*OK.*"</js>);
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .getContent().assertValue().matches(<jv>pattern</jv>);
+ * .getContent().assertValue().isPattern(<jv>pattern</jv>);
* </p>
*
* <p>
@@ -1147,8 +1147,8 @@ public class ResponseContent implements HttpEntity {
* MyBean <jv>bean</jv> = <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .getContent().assertValue().matches(<js>".*OK.*"</js>);
- *
.getContent().assertValue().doesNotMatch(<js>".*ERROR.*"</js>)
+ *
.getContent().assertValue().isPattern(<js>".*OK.*"</js>);
+ *
.getContent().assertValue().isNotPattern(<js>".*ERROR.*"</js>)
* .getContent().as(MyBean.<jk>class</jk>);
* </p>
*
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
index 4f079de56..5a37cf153 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseHeader.java
@@ -485,7 +485,7 @@ public class ResponseHeader extends BasicHeader {
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- *
.getHeader(<js>"Content-Type"</js>).assertValue().passes(<jv>x</jv> ->
<jv>x</jv>.equals(<js>"application/json"</js>));
+ *
.getHeader(<js>"Content-Type"</js>).assertValue().is(<jv>x</jv> ->
<jv>x</jv>.equals(<js>"application/json"</js>));
*
* <jc>// Validates the content type is JSON by just checking for
substring.</jc>
* <jv>client</jv>
@@ -497,13 +497,13 @@ public class ResponseHeader extends BasicHeader {
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- *
.getHeader(<js>"Content-Type"</js>).assertValue().matches(<js>".*json.*"</js>);
+ *
.getHeader(<js>"Content-Type"</js>).assertValue().isPattern(<js>".*json.*"</js>);
*
* <jc>// Validates the content type is JSON using
case-insensitive regular expression.</jc>
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- *
.getHeader(<js>"Content-Type"</js>).assertValue().matches(<js>".*json.*"</js>,
<jsf>CASE_INSENSITIVE</jsf>);
+ *
.getHeader(<js>"Content-Type"</js>).assertValue().isPattern(<js>".*json.*"</js>,
<jsf>CASE_INSENSITIVE</jsf>);
* </p>
*
* <p>
@@ -513,8 +513,8 @@ public class ResponseHeader extends BasicHeader {
* MediaType <jv>mediaType</jv> = <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- *
.getHeader(<js>"Content-Type"</js>).assertValue().exists()
- *
.getHeader(<js>"Content-Type"</js>).assertValue().matches(<js>".*json.*"</js>)
+ *
.getHeader(<js>"Content-Type"</js>).assertValue().isNotEmpty()
+ *
.getHeader(<js>"Content-Type"</js>).assertValue().isPattern(<js>".*json.*"</js>)
*
.getHeader(<js>"Content-Type"</js>).as(MediaType.<jk>class</jk>);
* </p>
*
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseStatusLine.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseStatusLine.java
index 0c6fc54af..4509bc6c2 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseStatusLine.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseStatusLine.java
@@ -67,7 +67,7 @@ public class ResponseStatusLine implements StatusLine {
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .getStatusLine().assertValue().code().is(200);
+ * .getStatusLine().assertValue().asCode().is(200);
* </p>
*
* @return A new fluent assertion object.
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 3580036a5..3b6a5e553 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
@@ -108,7 +108,7 @@ import org.apache.juneau.xml.*;
* .build()
* .get(<jsf>URI</jsf>)
* .run()
- * .assertStatus().code().is(200)
+ * .assertStatus().asCode().is(200)
*
.assertHeader(<js>"Content-Type"</js>).matchesSimple(<js>"application/json*"</js>)
* .getContent().as(MyBean.<jk>class</jk>);
* </p>
@@ -121,7 +121,7 @@ import org.apache.juneau.xml.*;
* RestRequest <jv>req</jv> = <jv>client</jv>.get(<jsf>URI</jsf>);
* RestResponse <jv>res</jv> = <jv>req</jv>.run();
* RestResponseStatusLineAssertion <jv>statusLineAssertion</jv> =
<jv>res</jv>.assertStatus();
- * FluentIntegerAssertion<RestResponse> <jv>codeAssertion</jv> =
<jv>statusLineAssertion</jv>.code();
+ * FluentIntegerAssertion<RestResponse> <jv>codeAssertion</jv> =
<jv>statusLineAssertion</jv>.asCode();
* <jv>res</jv> = <jv>codeAssertion</jv>.is(200);
* FluentStringAssertion<RestResponse> <jv>headerAssertion</jv> =
<jv>res</jv>.assertHeader(<js>"Content-Type"</js>);
* <jv>res</jv> =
<jv>headerAssertion</jv>.matchesSimple(<js>"application/json*"</js>);
@@ -546,13 +546,13 @@ import org.apache.juneau.xml.*;
* <jc>// Status assertion using a static value.</jc>
* String <jv>body</jv> = <jv>client</jv>.get(<jsf>URI</jsf>)
* .run()
- * .assertStatus().code().isBetween(200,399)
+ * .assertStatus().asCode().isBetween(200,399)
* .getContent().asString();
*
* <jc>// Status assertion using a predicate.</jc>
* String <jv>body</jv> = <jv>client</jv>.get(<jsf>URI</jsf>)
* .run()
- * .assertStatus().code().passes(<jv>x</jv> ->
<jv>x</jv><400)
+ * .assertStatus().asCode().is(<jv>x</jv> -> <jv>x</jv><400)
* .getContent().asString();
* </p>
*
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
index 309011a45..65c97dff1 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
@@ -172,7 +172,7 @@ public class RestResponse implements HttpResponse {
* MyBean <jv>bean</jv> = <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertStatus().code().is(200)
+ * .assertStatus().asCode().is(200)
* .getContent().as(MyBean.<jk>class</jk>);
* </p>
*
@@ -281,7 +281,7 @@ public class RestResponse implements HttpResponse {
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- *
.assertHeader(<js>"Content-Type"</js>).passes(<jv>x</jv> ->
<jv>x</jv>.equals(<js>"application/json"</js>));
+ * .assertHeader(<js>"Content-Type"</js>).is(<jv>x</jv>
-> <jv>x</jv>.equals(<js>"application/json"</js>));
*
* <jc>// Validates the content type is JSON by just checking for
substring.</jc>
* <jv>client</jv>
@@ -293,13 +293,13 @@ public class RestResponse implements HttpResponse {
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- *
.assertHeader(<js>"Content-Type"</js>).matches(<js>".*json.*"</js>);
+ *
.assertHeader(<js>"Content-Type"</js>).isPattern(<js>".*json.*"</js>);
*
* <jc>// Validates the content type is JSON using
case-insensitive regular expression.</jc>
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- *
.assertHeader(<js>"Content-Type"</js>).matches(<js>".*json.*"</js>,
<jsf>CASE_INSENSITIVE</jsf>);
+ *
.assertHeader(<js>"Content-Type"</js>).isPattern(<js>".*json.*"</js>,
<jsf>CASE_INSENSITIVE</jsf>);
* </p>
*
* <p>
@@ -309,8 +309,8 @@ public class RestResponse implements HttpResponse {
* MediaType <jv>mediaType</jv> = <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertHeader(<js>"Content-Type"</js>).exists()
- *
.assertHeader(<js>"Content-Type"</js>).matches(<js>".*json.*"</js>)
+ * .assertHeader(<js>"Content-Type"</js>).isNotEmpty()
+ *
.assertHeader(<js>"Content-Type"</js>).isPattern(<js>".*json.*"</js>)
*
.getHeader(<js>"Content-Type"</js>).as(MediaType.<jk>class</jk>);
* </p>
*
@@ -345,38 +345,38 @@ public class RestResponse implements HttpResponse {
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertContent().equals(<js>"OK"</js>);
+ * .assertContent().is(<js>"OK"</js>);
*
* <jc>// Validates the response body contains the text "OK".</jc>
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertContent().contains(<js>"OK"</js>);
+ * .assertContent().isContains(<js>"OK"</js>);
*
* <jc>// Validates the response body passes a predicate test.</jc>
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertContent().passes(<jv>x</jv> ->
<jv>x</jv>.contains(<js>"OK"</js>));
+ * .assertContent().is(<jv>x</jv> ->
<jv>x</jv>.contains(<js>"OK"</js>));
*
* <jc>// Validates the response body matches a regular
expression.</jc>
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertContent().matches(<js>".*OK.*"</js>);
+ * .assertContent().isPattern(<js>".*OK.*"</js>);
*
* <jc>// Validates the response body matches a regular expression
using regex flags.</jc>
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertContent().matches(<js>".*OK.*"</js>,
<jsf>MULTILINE</jsf> & <jsf>CASE_INSENSITIVE</jsf>);
+ * .assertContent().isPattern(<js>".*OK.*"</js>,
<jsf>MULTILINE</jsf> & <jsf>CASE_INSENSITIVE</jsf>);
*
* <jc>// Validates the response body matches a regular expression
in the form of an existing Pattern.</jc>
* Pattern <jv>pattern</jv> =
Pattern.<jsm>compile</jsm>(<js>".*OK.*"</js>);
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertContent().matches(<jv>pattern</jv>);
+ * .assertContent().isPattern(<jv>pattern</jv>);
* </p>
*
* <p>
@@ -386,8 +386,8 @@ public class RestResponse implements HttpResponse {
* MyBean <jv>bean</jv> = <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertContent().matches(<js>".*OK.*"</js>);
- * .assertContent().doesNotMatch(<js>".*ERROR.*"</js>)
+ * .assertContent().isPattern(<js>".*OK.*"</js>);
+ * .assertContent().isNotPattern(<js>".*ERROR.*"</js>)
* .getContent().as(MyBean.<jk>class</jk>);
* </p>
*
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
index e0535f21f..c063c1bf4 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/assertion/FluentResponseBodyAssertion.java
@@ -169,7 +169,7 @@ public class FluentResponseBodyAssertion<R> extends
FluentObjectAssertion<Respon
* <jv>client</jv>
* .get(<jsf>URI</jsf>)
* .run()
- * .assertContent().isPasses(<jv>x</jv> ->
<jv>x</jv>.contains(<js>"OK"</js>));
+ * .assertContent().is(<jv>x</jv> ->
<jv>x</jv>.contains(<js>"OK"</js>));
*
* <jc>// Validates the response body matches a regular
expression.</jc>
* <jv>client</jv>
@@ -256,7 +256,7 @@ public class FluentResponseBodyAssertion<R> extends
FluentObjectAssertion<Respon
* <jv>client</jv>
* .get(<js>"/myBean"</js>)
* .run()
- * .assertContent().as(List.<jk>class</jk>,
String.<jk>class</jk>).isPasses(<jv>x</jv> -> <jv>x</jv>.size() > 0);
+ * .assertContent().as(List.<jk>class</jk>,
String.<jk>class</jk>).is(<jv>x</jv> -> <jv>x</jv>.size() > 0);
* </p>
*
* @param <T> The object type to create.
@@ -276,7 +276,7 @@ public class FluentResponseBodyAssertion<R> extends
FluentObjectAssertion<Respon
* <jv>client</jv>
* .get(<js>"/myBean"</js>)
* .run()
- * .assertContent().as(List.<jk>class</jk>,
String.<jk>class</jk>).isPasses(<jv>x</jv> -> <jv>x</jv>.size() > 0);
+ * .assertContent().as(List.<jk>class</jk>,
String.<jk>class</jk>).is(<jv>x</jv> -> <jv>x</jv>.size() > 0);
* </p>
*
* <p>
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockConsole.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockConsole.java
index fc62c2e05..b670a92de 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockConsole.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockConsole.java
@@ -124,7 +124,7 @@ public class MockConsole extends PrintStream {
* .get(<js>"/url"</js>)
* .run();
*
- * <jv>console</jv>.assertContents().contains(<js>"HTTP GET
/url"</js>);
+ * <jv>console</jv>.assertContents().isContains(<js>"HTTP GET
/url"</js>);
* </p>
*
* @return A new fluent-style assertion object.
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index a54145f85..a9d09ee81 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -538,7 +538,7 @@ public class MockRestClient extends RestClient implements
HttpClientConnection {
* .build()
* .get(<js>"/"</js>)
* .run()
- * .assertStatus().code().is(200)
+ * .assertStatus().asCode().is(200)
* .assertContent().is(<js>"bar"</js>);
* </p>
*
