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 acbcc63479 Code cleanup
acbcc63479 is described below
commit acbcc63479aa4b9f2c5a181a9729fd64e6ba3a65
Author: James Bognar <[email protected]>
AuthorDate: Thu Oct 16 16:41:02 2025 -0400
Code cleanup
---
.../java/org/apache/juneau/bean/LinkString.java | 6 ------
.../apache/juneau/bean/jsonschema/JsonSchema.java | 3 ---
.../juneau/bean/jsonschema/JsonSchemaProperty.java | 3 ---
.../jsonschema/JsonSchemaPropertySimpleArray.java | 3 ---
.../juneau/bean/jsonschema/JsonSchemaRef.java | 3 ---
.../org/apache/juneau/assertions/AnyAssertion.java | 14 +++++++-------
.../apache/juneau/assertions/ArrayAssertion.java | 9 ---------
.../org/apache/juneau/assertions/Assertion.java | 15 ---------------
.../juneau/assertions/AssertionPredicate.java | 15 ---------------
.../org/apache/juneau/assertions/Assertions.java | 6 ------
.../org/apache/juneau/assertions/BeanAssertion.java | 9 ---------
.../apache/juneau/assertions/BeanListAssertion.java | 9 ---------
.../apache/juneau/assertions/BooleanAssertion.java | 9 ---------
.../juneau/assertions/ByteArrayAssertion.java | 9 ---------
.../juneau/assertions/CollectionAssertion.java | 9 ---------
.../juneau/assertions/ComparableAssertion.java | 9 ---------
.../org/apache/juneau/assertions/DateAssertion.java | 9 ---------
.../juneau/assertions/FluentAnyAssertion.java | 15 ---------------
.../juneau/assertions/FluentArrayAssertion.java | 18 ------------------
.../apache/juneau/assertions/FluentAssertion.java | 9 ---------
.../juneau/assertions/FluentBeanAssertion.java | 12 ------------
.../juneau/assertions/FluentBeanListAssertion.java | 12 ------------
.../juneau/assertions/FluentBooleanAssertion.java | 12 ------------
.../juneau/assertions/FluentByteArrayAssertion.java | 9 ---------
.../assertions/FluentCollectionAssertion.java | 18 ------------------
.../assertions/FluentComparableAssertion.java | 15 ---------------
.../juneau/assertions/FluentDateAssertion.java | 15 ---------------
.../juneau/assertions/FluentIntegerAssertion.java | 6 ------
.../juneau/assertions/FluentListAssertion.java | 18 ------------------
.../juneau/assertions/FluentLongAssertion.java | 9 ---------
.../juneau/assertions/FluentMapAssertion.java | 18 ------------------
.../juneau/assertions/FluentObjectAssertion.java | 18 ------------------
.../assertions/FluentPrimitiveArrayAssertion.java | 18 ------------------
.../juneau/assertions/FluentStringAssertion.java | 21 ---------------------
.../assertions/FluentStringListAssertion.java | 9 ---------
.../juneau/assertions/FluentThrowableAssertion.java | 18 ------------------
.../juneau/assertions/FluentVersionAssertion.java | 9 ---------
.../assertions/FluentZonedDateTimeAssertion.java | 12 ------------
.../apache/juneau/assertions/IntegerAssertion.java | 9 ---------
.../org/apache/juneau/assertions/ListAssertion.java | 9 ---------
.../org/apache/juneau/assertions/LongAssertion.java | 9 ---------
.../org/apache/juneau/assertions/MapAssertion.java | 9 ---------
.../apache/juneau/assertions/ObjectAssertion.java | 9 ---------
.../juneau/assertions/PrimitiveArrayAssertion.java | 9 ---------
.../apache/juneau/assertions/StringAssertion.java | 9 ---------
.../juneau/assertions/StringListAssertion.java | 9 ---------
.../juneau/assertions/ThrowableAssertion.java | 9 ---------
.../java/org/apache/juneau/assertions/Verify.java | 12 ------------
.../apache/juneau/assertions/VersionAssertion.java | 9 ---------
.../juneau/assertions/ZonedDateTimeAssertion.java | 9 ---------
.../org/apache/juneau/csv/annotation/CsvConfig.java | 3 ---
.../apache/juneau/html/annotation/HtmlConfig.java | 3 ---
.../apache/juneau/json/annotation/JsonConfig.java | 3 ---
.../juneau/msgpack/annotation/MsgPackConfig.java | 3 ---
.../juneau/oapi/annotation/OpenApiConfig.java | 3 ---
.../plaintext/annotation/PlainTextConfig.java | 3 ---
.../juneau/soap/annotation/SoapXmlConfig.java | 3 ---
.../org/apache/juneau/uon/annotation/UonConfig.java | 3 ---
.../urlencoding/annotation/UrlEncodingConfig.java | 3 ---
.../org/apache/juneau/xml/annotation/XmlConfig.java | 3 ---
.../org/apache/juneau/rest/client/RestClient.java | 6 ------
.../org/apache/juneau/rest/client/RestRequest.java | 3 ---
62 files changed, 7 insertions(+), 574 deletions(-)
diff --git
a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
index e16ff71851..349dd21128 100644
---
a/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
+++
b/juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java
@@ -68,9 +68,6 @@ public class LinkString implements Comparable<LinkString> {
setUri(uri, uriArgs);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Bean properties
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Bean property getter: <property>name</property>.
@@ -100,9 +97,6 @@ public class LinkString implements Comparable<LinkString> {
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // uri
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Bean property getter: <property>uri</property>.
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
index de65dbd6cb..70670a69b4 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
@@ -256,9 +256,6 @@ public class JsonSchema {
*/
public JsonSchema() { /* Empty constructor. */ }
-
//-----------------------------------------------------------------------------------------------------------------
- // Bean properties
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Bean property getter: <property>name</property>.
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
index 6cf750e384..930254b118 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
@@ -48,9 +48,6 @@ public class JsonSchemaProperty extends JsonSchema {
setType(type);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Overridden methods
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from JsonSchema */
public JsonSchemaProperty setName(String name) {
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray.java
index 7041cc5464..d64049186b 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray.java
@@ -48,9 +48,6 @@ public class JsonSchemaPropertySimpleArray extends
JsonSchemaProperty {
);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Overridden methods
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from JsonSchemaProperty */
public JsonSchemaPropertySimpleArray setName(String name) {
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
index e63a87b295..4137550f40 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
@@ -49,9 +49,6 @@ public class JsonSchemaRef extends JsonSchema {
this.setRef(uri);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Overridden methods
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from JsonSchema */
public JsonSchemaRef setName(String name) {
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
index b17d8a63f6..27ce8c7abd 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AnyAssertion.java
@@ -133,9 +133,9 @@ import org.apache.juneau.serializer.*;
*/
public class AnyAssertion<T> extends FluentAnyAssertion<T,AnyAssertion<T>> {
-
//-----------------------------------------------------------------------------------------------------------------
+ //
-----------------------------------------------------------------------------------------------------------------
// Static
-
//-----------------------------------------------------------------------------------------------------------------
+ //
-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -150,9 +150,9 @@ public class AnyAssertion<T> extends
FluentAnyAssertion<T,AnyAssertion<T>> {
return new AnyAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
+ //
-----------------------------------------------------------------------------------------------------------------
// Instance
-
//-----------------------------------------------------------------------------------------------------------------
+ //
-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -165,11 +165,11 @@ public class AnyAssertion<T> extends
FluentAnyAssertion<T,AnyAssertion<T>> {
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
+ //
-----------------------------------------------------------------------------------------------------------------
// Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
+ //
-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
- public AnyAssertion<T> setMsg(String msg, Object...args) {
+ public AnyAssertion<T> setMsg(String msg, Object... args) {
super.setMsg(msg, args);
return this;
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
index 958adb1273..f58b55262f 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ArrayAssertion.java
@@ -116,9 +116,6 @@ import org.apache.juneau.serializer.*;
*/
public class ArrayAssertion<E> extends
FluentArrayAssertion<E,ArrayAssertion<E>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -133,9 +130,6 @@ public class ArrayAssertion<E> extends
FluentArrayAssertion<E,ArrayAssertion<E>>
return new ArrayAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -148,9 +142,6 @@ public class ArrayAssertion<E> extends
FluentArrayAssertion<E,ArrayAssertion<E>>
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public ArrayAssertion<E> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
index 8fd9913cff..072794574a 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertion.java
@@ -59,9 +59,6 @@ import org.apache.juneau.internal.*;
*/
public class Assertion {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES = Messages.of(Assertion.class,
"Messages");
@@ -69,9 +66,6 @@ public class Assertion {
MSG_parameterCannotBeNull =
MESSAGES.getString("parameterCannotBeNull"),
MSG_causedBy = MESSAGES.getString("causedBy");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Convenience method for getting the array class of the specified
element type.
@@ -98,9 +92,6 @@ public class Assertion {
private PrintStream out = System.err; // NOSONAR - Intentional.
-
//-----------------------------------------------------------------------------------------------------------------
- // Config
-
//-----------------------------------------------------------------------------------------------------------------
private Class<? extends RuntimeException> throwable;
@@ -169,12 +160,6 @@ public class Assertion {
return setOut(null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* If an error occurs, send the error message to STDOUT instead of
STDERR.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index cb4cd8dbab..352d67da58 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -60,9 +60,6 @@ import org.apache.juneau.cp.*;
*/
public class AssertionPredicate<T> implements Predicate<T> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Encapsulates multiple predicates into a single AND operation.
@@ -189,9 +186,6 @@ public class AssertionPredicate<T> implements Predicate<T> {
}
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Argument placeholder for tested value.
@@ -207,15 +201,9 @@ public class AssertionPredicate<T> implements Predicate<T>
{
private final Object[] args;
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
final ThreadLocal<String> failedMessage = new ThreadLocal<>();
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -243,9 +231,6 @@ public class AssertionPredicate<T> implements Predicate<T> {
}
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Subclasses
-
//-----------------------------------------------------------------------------------------------------------------
AssertionPredicate() {
this.inner = null;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
index ef36b13e44..fc621ca41c 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Assertions.java
@@ -111,9 +111,6 @@ public class Assertions {
return AnyAssertion.create(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent assertions
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Performs an assertion on an array of POJOs.
@@ -979,9 +976,6 @@ public class Assertions {
return ZonedDateTimeAssertion.create(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Snippet assertions
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
index c58b15ad3d..a67d791ef8 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanAssertion.java
@@ -99,9 +99,6 @@ import org.apache.juneau.serializer.*;
*/
public class BeanAssertion<T> extends FluentBeanAssertion<T,BeanAssertion<T>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -116,9 +113,6 @@ public class BeanAssertion<T> extends
FluentBeanAssertion<T,BeanAssertion<T>> {
return new BeanAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -131,9 +125,6 @@ public class BeanAssertion<T> extends
FluentBeanAssertion<T,BeanAssertion<T>> {
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public BeanAssertion<T> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
index 932a88e86d..0a51b88700 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BeanListAssertion.java
@@ -129,9 +129,6 @@ import org.apache.juneau.serializer.*;
*/
public class BeanListAssertion<E> extends
FluentBeanListAssertion<E,BeanListAssertion<E>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -146,9 +143,6 @@ public class BeanListAssertion<E> extends
FluentBeanListAssertion<E,BeanListAsse
return new BeanListAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -161,9 +155,6 @@ public class BeanListAssertion<E> extends
FluentBeanListAssertion<E,BeanListAsse
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public BeanListAssertion<E> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
index b965e936da..e618cc680d 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/BooleanAssertion.java
@@ -95,9 +95,6 @@ import org.apache.juneau.serializer.*;
*/
public class BooleanAssertion extends FluentBooleanAssertion<BooleanAssertion>
{
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -111,9 +108,6 @@ public class BooleanAssertion extends
FluentBooleanAssertion<BooleanAssertion> {
return new BooleanAssertion(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -126,9 +120,6 @@ public class BooleanAssertion extends
FluentBooleanAssertion<BooleanAssertion> {
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public BooleanAssertion setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
index c63f944255..a75641065f 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ByteArrayAssertion.java
@@ -115,9 +115,6 @@ import org.apache.juneau.serializer.*;
*/
public class ByteArrayAssertion extends
FluentByteArrayAssertion<ByteArrayAssertion> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -131,9 +128,6 @@ public class ByteArrayAssertion extends
FluentByteArrayAssertion<ByteArrayAssert
return new ByteArrayAssertion(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -146,9 +140,6 @@ public class ByteArrayAssertion extends
FluentByteArrayAssertion<ByteArrayAssert
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public ByteArrayAssertion setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
index 746176a637..8a8ec6880c 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/CollectionAssertion.java
@@ -106,9 +106,6 @@ import org.apache.juneau.serializer.*;
*/
public class CollectionAssertion<E> extends
FluentCollectionAssertion<E,CollectionAssertion<E>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -123,9 +120,6 @@ public class CollectionAssertion<E> extends
FluentCollectionAssertion<E,Collecti
return new CollectionAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -138,9 +132,6 @@ public class CollectionAssertion<E> extends
FluentCollectionAssertion<E,Collecti
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public CollectionAssertion<E> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
index 6e8168f7ad..f2e69a9fe9 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ComparableAssertion.java
@@ -92,9 +92,6 @@ import org.apache.juneau.serializer.*;
*/
public class ComparableAssertion<T extends Comparable<T>> extends
FluentComparableAssertion<T,ComparableAssertion<T>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -109,9 +106,6 @@ public class ComparableAssertion<T extends Comparable<T>>
extends FluentComparab
return new ComparableAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -124,9 +118,6 @@ public class ComparableAssertion<T extends Comparable<T>>
extends FluentComparab
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public ComparableAssertion<T> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
index e3e563b998..342ec08b23 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/DateAssertion.java
@@ -112,9 +112,6 @@ import org.apache.juneau.serializer.*;
*/
public class DateAssertion extends FluentDateAssertion<DateAssertion> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -128,9 +125,6 @@ public class DateAssertion extends
FluentDateAssertion<DateAssertion> {
return new DateAssertion(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -143,9 +137,6 @@ public class DateAssertion extends
FluentDateAssertion<DateAssertion> {
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public DateAssertion setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
index 715ed05b6d..fe347526b9 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAnyAssertion.java
@@ -137,17 +137,11 @@ import org.apache.juneau.serializer.*;
*/
public class FluentAnyAssertion<T,R> extends FluentObjectAssertion<T,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentAnyAssertion.class, "Messages");
private static final String
MSG_objectWasNotType = MESSAGES.getString("objectWasNotType");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -185,9 +179,6 @@ public class FluentAnyAssertion<T,R> extends
FluentObjectAssertion<T,R> {
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Converts this object assertion into an array assertion.
@@ -477,9 +468,6 @@ public class FluentAnyAssertion<T,R> extends
FluentObjectAssertion<T,R> {
return new FluentZonedDateTimeAssertion<>(this,
cast(ZonedDateTime.class), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentAnyAssertion<T,R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -509,9 +497,6 @@ public class FluentAnyAssertion<T,R> extends
FluentObjectAssertion<T,R> {
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
private <T2> T2 cast(Class<T2> c) throws AssertionError {
Object o = orElse(null);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index a065f5521c..7edd5daab1 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -115,9 +115,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentArrayAssertion<E,R> extends FluentObjectAssertion<E[],R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentArrayAssertion.class, "Messages");
private static final String
@@ -130,9 +127,6 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
MSG_arrayDidntContainAnyMatchingValue =
MESSAGES.getString("arrayDidntContainAnyMatchingValue"),
MSG_arrayContainedNonMatchingValueAt =
MESSAGES.getString("arrayContainedNonMatchingValueAt");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -170,9 +164,6 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Converts this assertion into a {@link FluentBeanListAssertion}.
@@ -276,9 +267,6 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
return new FluentArrayAssertion<>(this,
function.apply(orElse(null)), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the contents of this list pass the specified tests.
@@ -407,9 +395,6 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentArrayAssertion<E,R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -439,9 +424,6 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
@Override
public String toString() {
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
index b0644ca229..f2daafd945 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentAssertion.java
@@ -84,9 +84,6 @@ import java.io.*;
*/
public abstract class FluentAssertion<R> extends Assertion {
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
private final R returns;
@@ -106,9 +103,6 @@ public abstract class FluentAssertion<R> extends Assertion {
this.returns = returns;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentAssertion<R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -138,9 +132,6 @@ public abstract class FluentAssertion<R> extends Assertion {
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Returns the object that the fluent methods on this class should
return.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
index 2e7ffc5b64..3fe7cd1dd2 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
@@ -95,9 +95,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentBeanAssertion<T,R> extends FluentObjectAssertion<T,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -135,9 +132,6 @@ public class FluentBeanAssertion<T,R> extends
FluentObjectAssertion<T,R> {
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Extracts the specified property as an {@link FluentListAssertion}.
@@ -176,9 +170,6 @@ public class FluentBeanAssertion<T,R> extends
FluentObjectAssertion<T,R> {
return new FluentBeanAssertion<>(this,
function.apply(orElse(null)), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentBeanAssertion<T,R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -208,9 +199,6 @@ public class FluentBeanAssertion<T,R> extends
FluentObjectAssertion<T,R> {
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
private BeanMap<T> toBeanMap() {
return BeanMap.of(value());
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
index e143354632..584cd1f1f1 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanListAssertion.java
@@ -123,9 +123,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentBeanListAssertion<E,R> extends FluentListAssertion<E,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
private static BeanMap<?> beanMap(Object o) {
return BeanMap.of(o);
@@ -152,9 +149,6 @@ public class FluentBeanListAssertion<E,R> extends
FluentListAssertion<E,R> {
super(creator, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -193,9 +187,6 @@ public class FluentBeanListAssertion<E,R> extends
FluentListAssertion<E,R> {
return new FluentListAssertion<>(this, value().stream().map(x
-> beanMap(x).getProperties(n)).toList(), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentBeanListAssertion<E,R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -225,7 +216,4 @@ public class FluentBeanListAssertion<E,R> extends
FluentListAssertion<E,R> {
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
index 7c904c289b..4c66456b33 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBooleanAssertion.java
@@ -98,18 +98,12 @@ import org.apache.juneau.serializer.*;
*/
public class FluentBooleanAssertion<R> extends
FluentComparableAssertion<Boolean,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentBooleanAssertion.class, "Messages");
private static final String
MSG_valueWasFalse = MESSAGES.getString("valueWasFalse"),
MSG_valueWasTrue = MESSAGES.getString("valueWasTrue");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -147,9 +141,6 @@ public class FluentBooleanAssertion<R> extends
FluentComparableAssertion<Boolean
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the value is false.
@@ -175,9 +166,6 @@ public class FluentBooleanAssertion<R> extends
FluentComparableAssertion<Boolean
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentBooleanAssertion<R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
index 758aaf9ad0..ec1739e46a 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentByteArrayAssertion.java
@@ -113,9 +113,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentByteArrayAssertion<R> extends
FluentPrimitiveArrayAssertion<Byte,byte[],R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -153,9 +150,6 @@ public class FluentByteArrayAssertion<R> extends
FluentPrimitiveArrayAssertion<B
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Converts this byte array to a base-64 encoded string and returns it
as a new assertion.
@@ -234,9 +228,6 @@ public class FluentByteArrayAssertion<R> extends
FluentPrimitiveArrayAssertion<B
return new FluentStringAssertion<>(this, valueIsNull() ? null :
new String(value(), cs), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentByteArrayAssertion<R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index a9372a6743..4a2dd36d54 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -105,9 +105,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collection<E>,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentCollectionAssertion.class, "Messages");
private static final String
@@ -118,9 +115,6 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
MSG_collectionWasEmpty =
MESSAGES.getString("collectionWasEmpty"),
MSG_collectionDidNotHaveExpectedSize =
MESSAGES.getString("collectionDidNotHaveExpectedSize");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -158,9 +152,6 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Returns an integer assertion on the size of this collection.
@@ -189,9 +180,6 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
return new FluentCollectionAssertion<>(this,
function.apply(orElse(null)), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that all values in the collection pass the specified test.
@@ -292,9 +280,6 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentCollectionAssertion<E,R> setMsg(String msg, Object...args)
{
super.setMsg(msg, args);
@@ -324,9 +309,6 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Returns the size of this collection if it is not <jk>null</jk>.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index 5e1400e207..99baf1b2e7 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -96,9 +96,6 @@ import org.apache.juneau.serializer.*;
@SuppressWarnings("rawtypes")
public class FluentComparableAssertion<T extends Comparable,R> extends
FluentObjectAssertion<T,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentComparableAssertion.class, "Messages");
private static final String
@@ -107,9 +104,6 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
MSG_valueWasNotLessThanExpected =
MESSAGES.getString("valueWasNotLessThanExpected"),
MSG_valueWasNotLessOrEqualsToExpected =
MESSAGES.getString("valueWasNotLessOrEqualsToExpected");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -147,18 +141,12 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from FluentObjectAssertion */
public FluentComparableAssertion<T,R> asTransformed(Function<T,T>
function) { // NOSONAR - Intentional.
return new FluentComparableAssertion<>(this,
function.apply(orElse(null)), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the value is between (inclusive) the specified upper
and lower values.
@@ -233,9 +221,6 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentComparableAssertion<T,R> setMsg(String msg, Object...args)
{
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index f08c452899..3c4886a299 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -120,9 +120,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentDateAssertion<R> extends FluentComparableAssertion<Date,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentDateAssertion.class, "Messages");
private static final String
@@ -130,9 +127,6 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
MSG_valueWasNotAfterExpected =
MESSAGES.getString("valueWasNotAfterExpected"),
MSG_valueWasNotBeforeExpected =
MESSAGES.getString("valueWasNotBeforeExpected");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -170,9 +164,6 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Returns an long assertion on the epoch milliseconds of this date.
@@ -200,9 +191,6 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
return new FluentLongAssertion<>(this, valueIsNull() ? null :
value().getTime() / 1000, returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the value equals the specified value at the specified
precision.
@@ -283,9 +271,6 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentDateAssertion<R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
index f07627e240..5f01525411 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentIntegerAssertion.java
@@ -102,9 +102,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentIntegerAssertion<R> extends
FluentComparableAssertion<Integer,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -142,9 +139,6 @@ public class FluentIntegerAssertion<R> extends
FluentComparableAssertion<Integer
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentIntegerAssertion<R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
index bbc88950c4..bd0d7e0c35 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
@@ -121,17 +121,11 @@ import org.apache.juneau.serializer.*;
*/
public class FluentListAssertion<E,R> extends FluentCollectionAssertion<E,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentListAssertion.class, "Messages");
private static final String
MSG_listDidNotContainExpectedValueAt =
MESSAGES.getString("listDidNotContainExpectedValueAt");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -169,9 +163,6 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Applies a transform on the inner object and returns a new inner
object.
@@ -296,9 +287,6 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
return new FluentListAssertion<>(this, valueIsNull() ? null :
value().subList(start, end), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the contents of this list pass the specified tests.
@@ -333,9 +321,6 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
return isEach(p);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentListAssertion<E,R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -365,9 +350,6 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
private E at(int index) throws AssertionError {
return valueIsNull() || index < 0 || index >= getSize() ? null
: value().get(index);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
index 0ecfbea3d6..3f332cb0c9 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentLongAssertion.java
@@ -106,9 +106,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentLongAssertion<R> extends FluentComparableAssertion<Long,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -146,9 +143,6 @@ public class FluentLongAssertion<R> extends
FluentComparableAssertion<Long,R> {
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Converts this long into an integer and then returns it as an integer
assertion.
@@ -159,9 +153,6 @@ public class FluentLongAssertion<R> extends
FluentComparableAssertion<Long,R> {
return new FluentIntegerAssertion<>(this,
map(Long::intValue).orElse(null), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentLongAssertion<R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
index c71a81ea75..6d96785f04 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
@@ -108,9 +108,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentMapAssertion.class, "Messages");
private static final String
@@ -120,9 +117,6 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
MSG_mapWasEmpty = MESSAGES.getString("mapWasEmpty"),
MSG_mapDidNotHaveTheExpectedSize =
MESSAGES.getString("mapDidNotHaveTheExpectedSize");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -160,9 +154,6 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Returns an integer assertion on the size of this map.
@@ -227,9 +218,6 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
return new FluentListAssertion<>(this, valueIsNull() ? null :
stream(keys).map(this::get).collect(toList()), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the map contains the expected key.
@@ -294,9 +282,6 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentMapAssertion<K,V,R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -326,9 +311,6 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
private V get(K key) {
return orElse(emptyMap()).get(key);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 5f44be4892..8df63987e7 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -95,9 +95,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentObjectAssertion<T,R> extends FluentAssertion<R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentObjectAssertion.class, "Messages");
private static final String
@@ -123,9 +120,6 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
.sortMaps()
.build();
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
private final T value;
@@ -166,9 +160,6 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Converts this assertion into an {@link FluentAnyAssertion} so that
it can be converted to other assertion types.
@@ -291,9 +282,6 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
return new FluentObjectAssertion<>(this,
function.apply(orElse(null)), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the value passes the specified predicate test.
@@ -532,9 +520,6 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentObjectAssertion<T,R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -564,9 +549,6 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Returns the string form of the inner object.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index c7f037f704..06c3f7d784 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -110,9 +110,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<T,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Map<Class<?>,Function<Object,String>> STRINGIFIERS
= new HashMap<>();
static {
@@ -138,9 +135,6 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
MSG_arrayDidntContainAnyMatchingValue =
MESSAGES.getString("arrayDidntContainAnyMatchingValue"),
MSG_arrayContainedNonMatchingValueAt =
MESSAGES.getString("arrayContainedNonMatchingValueAt");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -183,9 +177,6 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Returns an object assertion on the item specified at the specified
index.
@@ -224,9 +215,6 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
return new FluentPrimitiveArrayAssertion<>(this,
function.apply(orElse(null)), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the contents of this list pass the specified tests.
@@ -355,9 +343,6 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentPrimitiveArrayAssertion<E,T,R> setMsg(String msg,
Object...args) {
super.setMsg(msg, args);
@@ -387,9 +372,6 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
@Override
public String toString() {
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 854c3d419a..5cae11f6cb 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -132,9 +132,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentStringAssertion<R> extends FluentObjectAssertion<String,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentStringAssertion.class, "Messages");
private static final String
@@ -151,9 +148,6 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
MSG_stringDidNotStartWithExpected =
MESSAGES.getString("stringDidNotStartWithExpected"),
MSG_stringDidNotEndWithExpected =
MESSAGES.getString("stringDidNotEndWithExpected");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
private boolean javaStrings;
@@ -193,9 +187,6 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Config methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* When enabled, text in the message is converted to valid Java strings.
@@ -211,9 +202,6 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Converts the text to lowercase.
@@ -320,9 +308,6 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
return asTransformed(StringUtils::urlDecode);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the text equals the specified value.
@@ -627,9 +612,6 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
return is(value == null ? null : toString());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentStringAssertion<R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -659,9 +641,6 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
super.setThrowable(value);
return this;
}
-
//------------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//------------------------------------------------------------------------------------------------------------------
private String fix(String text) {
if (javaStrings)
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
index 01d3b777ef..26264c3a71 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
@@ -125,9 +125,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentStringListAssertion<R> extends
FluentListAssertion<String,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -165,9 +162,6 @@ public class FluentStringListAssertion<R> extends
FluentListAssertion<String,R>
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Concatenates this list of strings into a {@link
FluentStringAssertion}.
@@ -209,9 +203,6 @@ public class FluentStringListAssertion<R> extends
FluentListAssertion<String,R>
return new FluentStringListAssertion<>(this, valueIsNull() ?
null : value().stream().map(StringUtils::trim).toList(), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentStringListAssertion<R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index cdf6f2d425..b03bbf8402 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -103,9 +103,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentThrowableAssertion<T extends Throwable,R> extends
FluentObjectAssertion<T,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentThrowableAssertion.class, "Messages");
private static final String
@@ -113,9 +110,6 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
MSG_exceptionWasNotThrown =
MESSAGES.getString("exceptionWasNotThrown"),
MSG_causedByExceptionNotExpectedType =
MESSAGES.getString("causedByExceptionNotExpectedType");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -153,9 +147,6 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Returns an assertion against the caused-by throwable.
@@ -349,9 +340,6 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
return new FluentThrowableAssertion<>(this,
function.apply(orElse(null)), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that this throwable is exactly the specified type.
@@ -413,9 +401,6 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentThrowableAssertion<T,R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
@@ -445,9 +430,6 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
super.setThrowable(value);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Utility methods
-
//-----------------------------------------------------------------------------------------------------------------
@Override
protected boolean equals(Object o1, Object o2) {
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
index caa4c6baae..0facc96d16 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentVersionAssertion.java
@@ -110,9 +110,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentVersionAssertion<R> extends
FluentComparableAssertion<Version,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -150,9 +147,6 @@ public class FluentVersionAssertion<R> extends
FluentComparableAssertion<Version
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Transform methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Extracts the maintenance part of the version string (index position
2).
@@ -191,9 +185,6 @@ public class FluentVersionAssertion<R> extends
FluentComparableAssertion<Version
return new FluentIntegerAssertion<>(this, valueIsNull() ? null
: value().getPart(index).orElse(null), returns());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentVersionAssertion<R> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
index eb26b7adbf..65ebbbaab1 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentZonedDateTimeAssertion.java
@@ -115,9 +115,6 @@ import org.apache.juneau.serializer.*;
*/
public class FluentZonedDateTimeAssertion<R> extends
FluentComparableAssertion<ZonedDateTime,R> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES =
Messages.of(FluentZonedDateTimeAssertion.class, "Messages");
private static final String
@@ -125,9 +122,6 @@ public class FluentZonedDateTimeAssertion<R> extends
FluentComparableAssertion<Z
MSG_valueWasNotAfterExpected =
MESSAGES.getString("valueWasNotAfterExpected"),
MSG_valueWasNotBeforeExpected =
MESSAGES.getString("valueWasNotBeforeExpected");
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Chained constructor.
@@ -165,9 +159,6 @@ public class FluentZonedDateTimeAssertion<R> extends
FluentComparableAssertion<Z
this(null, value, returns);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Asserts that the value equals the specified value at the specified
precision.
@@ -255,9 +246,6 @@ public class FluentZonedDateTimeAssertion<R> extends
FluentComparableAssertion<Z
return returns();
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public FluentZonedDateTimeAssertion<R> setMsg(String msg,
Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
index 60b4089f03..8bf9286e0f 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/IntegerAssertion.java
@@ -96,9 +96,6 @@ import org.apache.juneau.serializer.*;
*/
public class IntegerAssertion extends FluentIntegerAssertion<IntegerAssertion>
{
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -112,9 +109,6 @@ public class IntegerAssertion extends
FluentIntegerAssertion<IntegerAssertion> {
return new IntegerAssertion(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -127,9 +121,6 @@ public class IntegerAssertion extends
FluentIntegerAssertion<IntegerAssertion> {
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public IntegerAssertion setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
index b3c30880c5..ec279994f1 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ListAssertion.java
@@ -123,9 +123,6 @@ import org.apache.juneau.serializer.*;
*/
public class ListAssertion<E> extends FluentListAssertion<E,ListAssertion<E>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -153,9 +150,6 @@ public class ListAssertion<E> extends
FluentListAssertion<E,ListAssertion<E>> {
return new ListAssertion<>(value == null ? null :
value.toList());
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -168,9 +162,6 @@ public class ListAssertion<E> extends
FluentListAssertion<E,ListAssertion<E>> {
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public ListAssertion<E> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
index 1f01eb2ed3..31c1d210fd 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/LongAssertion.java
@@ -101,9 +101,6 @@ import org.apache.juneau.serializer.*;
*/
public class LongAssertion extends FluentLongAssertion<LongAssertion> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -117,9 +114,6 @@ public class LongAssertion extends
FluentLongAssertion<LongAssertion> {
return new LongAssertion(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -132,9 +126,6 @@ public class LongAssertion extends
FluentLongAssertion<LongAssertion> {
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public LongAssertion setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
index 0253e21314..51b7ba0239 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/MapAssertion.java
@@ -108,9 +108,6 @@ import org.apache.juneau.serializer.*;
*/
public class MapAssertion<K,V> extends
FluentMapAssertion<K,V,MapAssertion<K,V>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -126,9 +123,6 @@ public class MapAssertion<K,V> extends
FluentMapAssertion<K,V,MapAssertion<K,V>>
return new MapAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -141,9 +135,6 @@ public class MapAssertion<K,V> extends
FluentMapAssertion<K,V,MapAssertion<K,V>>
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public MapAssertion<K,V> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
index 7bbd36714f..c26dfc19bf 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ObjectAssertion.java
@@ -91,9 +91,6 @@ import org.apache.juneau.serializer.*;
*/
public class ObjectAssertion<T> extends
FluentObjectAssertion<T,ObjectAssertion<T>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -108,9 +105,6 @@ public class ObjectAssertion<T> extends
FluentObjectAssertion<T,ObjectAssertion<
return new ObjectAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -123,9 +117,6 @@ public class ObjectAssertion<T> extends
FluentObjectAssertion<T,ObjectAssertion<
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public ObjectAssertion<T> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
index 615f1336ab..9c8b34cc79 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/PrimitiveArrayAssertion.java
@@ -109,9 +109,6 @@ import org.apache.juneau.serializer.*;
*/
public class PrimitiveArrayAssertion<E,T> extends
FluentPrimitiveArrayAssertion<E,T,PrimitiveArrayAssertion<E,T>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -127,9 +124,6 @@ public class PrimitiveArrayAssertion<E,T> extends
FluentPrimitiveArrayAssertion<
return new PrimitiveArrayAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -142,9 +136,6 @@ public class PrimitiveArrayAssertion<E,T> extends
FluentPrimitiveArrayAssertion<
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public PrimitiveArrayAssertion<E,T> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
index 92d3972291..b14947eb5b 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
@@ -122,9 +122,6 @@ import org.apache.juneau.serializer.*;
*/
public class StringAssertion extends FluentStringAssertion<StringAssertion> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -138,9 +135,6 @@ public class StringAssertion extends
FluentStringAssertion<StringAssertion> {
return new StringAssertion(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -159,9 +153,6 @@ public class StringAssertion extends
FluentStringAssertion<StringAssertion> {
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public StringAssertion setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
index 2a9ea0e364..99f3e70327 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringListAssertion.java
@@ -120,9 +120,6 @@ import org.apache.juneau.serializer.*;
*/
public class StringListAssertion extends
FluentStringListAssertion<StringListAssertion> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -136,9 +133,6 @@ public class StringListAssertion extends
FluentStringListAssertion<StringListAss
return new StringListAssertion(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -151,9 +145,6 @@ public class StringListAssertion extends
FluentStringListAssertion<StringListAss
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public StringListAssertion setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
index 9774a4dfa6..bae731fd11 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ThrowableAssertion.java
@@ -102,9 +102,6 @@ import org.apache.juneau.serializer.*;
*/
public class ThrowableAssertion<T extends Throwable> extends
FluentThrowableAssertion<T,ThrowableAssertion<T>> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -119,9 +116,6 @@ public class ThrowableAssertion<T extends Throwable>
extends FluentThrowableAsse
return new ThrowableAssertion<>(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -134,9 +128,6 @@ public class ThrowableAssertion<T extends Throwable>
extends FluentThrowableAsse
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public ThrowableAssertion<T> setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
index 42d25d2a6d..8f25ebd0b8 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/Verify.java
@@ -42,9 +42,6 @@ import org.apache.juneau.cp.*;
*/
public class Verify {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
private static final Messages MESSAGES = Messages.of(Verify.class,
"Messages");
static final String
@@ -61,9 +58,6 @@ public class Verify {
return new Verify(o);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
private final Object o;
private Supplier<String> msg;
@@ -77,9 +71,6 @@ public class Verify {
this.o = o;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Config setters
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Verifies that this object is equal to the specified object.
@@ -95,9 +86,6 @@ public class Verify {
return null;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Test methods
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Verifies that this object is equal to {@link Boolean#FALSE}.
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
index 616a929d04..5bde749961 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/VersionAssertion.java
@@ -105,9 +105,6 @@ import org.apache.juneau.serializer.*;
*/
public class VersionAssertion extends FluentVersionAssertion<VersionAssertion>
{
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -121,9 +118,6 @@ public class VersionAssertion extends
FluentVersionAssertion<VersionAssertion> {
return new VersionAssertion(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -136,9 +130,6 @@ public class VersionAssertion extends
FluentVersionAssertion<VersionAssertion> {
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public VersionAssertion setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
index d5acd827c7..1fb8f54b86 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/ZonedDateTimeAssertion.java
@@ -108,9 +108,6 @@ import org.apache.juneau.serializer.*;
*/
public class ZonedDateTimeAssertion extends
FluentZonedDateTimeAssertion<ZonedDateTimeAssertion> {
-
//-----------------------------------------------------------------------------------------------------------------
- // Static
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Static creator.
@@ -124,9 +121,6 @@ public class ZonedDateTimeAssertion extends
FluentZonedDateTimeAssertion<ZonedDa
return new ZonedDateTimeAssertion(value);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Instance
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Constructor.
@@ -139,9 +133,6 @@ public class ZonedDateTimeAssertion extends
FluentZonedDateTimeAssertion<ZonedDa
super(value, null);
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Fluent setters
-
//-----------------------------------------------------------------------------------------------------------------
@Override /* Overridden from Assertion */
public ZonedDateTimeAssertion setMsg(String msg, Object...args) {
super.setMsg(msg, args);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
index c8e4e34efe..dafd5f948f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
@@ -48,7 +48,4 @@ public @interface CsvConfig {
* @return The annotation value.
*/
int rank() default 0;
-
//-------------------------------------------------------------------------------------------------------------------
- // CsvSerializer
-
//-------------------------------------------------------------------------------------------------------------------
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
index a0bf85c6d9..2c2ceaa733 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
@@ -250,9 +250,6 @@ public @interface HtmlConfig {
* @return The annotation value.
*/
int rank() default 0;
-
//-------------------------------------------------------------------------------------------------------------------
- // HtmlSerializer
-
//-------------------------------------------------------------------------------------------------------------------
/**
* Anchor text source.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
index e1abc65132..7417ac7c0a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
@@ -105,9 +105,6 @@ public @interface JsonConfig {
* @return The annotation value.
*/
int rank() default 0;
-
//-------------------------------------------------------------------------------------------------------------------
- // JsonParser
-
//-------------------------------------------------------------------------------------------------------------------
/**
* Simple JSON attribute mode.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
index 8a428b308b..fff1f7c414 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
@@ -79,7 +79,4 @@ public @interface MsgPackConfig {
* @return The annotation value.
*/
int rank() default 0;
-
//-------------------------------------------------------------------------------------------------------------------
- // MsgPackSerializer
-
//-------------------------------------------------------------------------------------------------------------------
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
index d094e1753a..479516f7f6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
@@ -67,9 +67,6 @@ public @interface OpenApiConfig {
* @return The annotation value.
*/
String collectionFormat() default "";
-
//-------------------------------------------------------------------------------------------------------------------
- // OpenApiParser
-
//-------------------------------------------------------------------------------------------------------------------
/**
* Default format for HTTP parts.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfig.java
index 70201b2917..2225676593 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfig.java
@@ -48,7 +48,4 @@ public @interface PlainTextConfig {
* @return The annotation value.
*/
int rank() default 0;
-
//-------------------------------------------------------------------------------------------------------------------
- // PlainTextSerializer
-
//-------------------------------------------------------------------------------------------------------------------
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
index 5072e1b954..becec3bdbf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
@@ -48,9 +48,6 @@ public @interface SoapXmlConfig {
* @return The annotation value.
*/
int rank() default 0;
-
//-------------------------------------------------------------------------------------------------------------------
- // SoapXmlSerializer
-
//-------------------------------------------------------------------------------------------------------------------
/**
* The <c>SOAPAction</c> HTTP header value to set on responses.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
index e89136c4b8..3ac65fc125 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
@@ -157,9 +157,6 @@ public @interface UonConfig {
* @return The annotation value.
*/
int rank() default 0;
-
//-------------------------------------------------------------------------------------------------------------------
- // UonParser
-
//-------------------------------------------------------------------------------------------------------------------
/**
* Validate end.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
index 7ae6508d32..3dbc559f39 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
@@ -83,7 +83,4 @@ public @interface UrlEncodingConfig {
* @return The annotation value.
*/
int rank() default 0;
-
//-------------------------------------------------------------------------------------------------------------------
- // UrlEncodingSerializer
-
//-------------------------------------------------------------------------------------------------------------------
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
index e182790731..24ec662437 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
@@ -253,9 +253,6 @@ public @interface XmlConfig {
* @return The annotation value.
*/
int rank() default 0;
-
//-------------------------------------------------------------------------------------------------------------------
- // XmlParser
-
//-------------------------------------------------------------------------------------------------------------------
/**
* XML reporter.
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 ba55829d04..5df2ada249 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
@@ -3580,9 +3580,6 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // InputStreamParser Properties
-
//-----------------------------------------------------------------------------------------------------------------
/**
* <i><l>OpenApiCommon</l> configuration property: </i>
Default OpenAPI format for HTTP parts.
*
@@ -5754,9 +5751,6 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
serializers().forEachWS(org.apache.juneau.serializer.WriterSerializer.Builder::ws);
return this;
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Parser Properties
-
//-----------------------------------------------------------------------------------------------------------------
/**
* Convenience method for specifying XML as the marshalling
transmission media type.
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index 0e43c24768..7c1626a453 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -119,9 +119,6 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
return null;
}
}
-
//-----------------------------------------------------------------------------------------------------------------
- // Other methods
-
//-----------------------------------------------------------------------------------------------------------------
private class SimplePart implements NameValuePair {
final String name;
final String value;
