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 9894aaa8b Fix SonarQube issues.
9894aaa8b is described below
commit 9894aaa8b5b62544c0993da44fec0a2fa99b8b1c
Author: James Bognar <[email protected]>
AuthorDate: Sun Jul 27 13:06:51 2025 -0400
Fix SonarQube issues.
---
.../org/apache/juneau/assertions/Assertion.java | 5 +--
.../juneau/assertions/AssertionPredicate.java | 48 +++++++++++-----------
.../juneau/assertions/AssertionPredicates.java | 10 +++--
.../org/apache/juneau/assertions/Assertions.java | 2 +
.../juneau/assertions/FluentAnyAssertion.java | 6 ---
.../juneau/assertions/FluentArrayAssertion.java | 19 ++++-----
.../apache/juneau/assertions/FluentAssertion.java | 2 -
.../juneau/assertions/FluentBeanAssertion.java | 5 +--
.../juneau/assertions/FluentBeanListAssertion.java | 6 +--
.../juneau/assertions/FluentBooleanAssertion.java | 4 +-
.../assertions/FluentCollectionAssertion.java | 11 +++--
.../assertions/FluentComparableAssertion.java | 6 +--
.../juneau/assertions/FluentDateAssertion.java | 4 +-
.../juneau/assertions/FluentListAssertion.java | 10 ++---
.../juneau/assertions/FluentMapAssertion.java | 11 +++--
.../juneau/assertions/FluentObjectAssertion.java | 16 ++++----
.../assertions/FluentPrimitiveArrayAssertion.java | 19 ++++-----
.../juneau/assertions/FluentStringAssertion.java | 45 ++++++++++----------
.../assertions/FluentStringListAssertion.java | 2 +-
.../assertions/FluentThrowableAssertion.java | 8 ++--
.../assertions/FluentZonedDateTimeAssertion.java | 4 +-
.../apache/juneau/assertions/ListAssertion.java | 2 +-
.../java/org/apache/juneau/assertions/Verify.java | 3 +-
.../assertions/AssertionPredicates_Test.java | 5 ---
.../apache/juneau/assertions/Assertions_Test.java | 5 ---
25 files changed, 112 insertions(+), 146 deletions(-)
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 1a9913473..87c936b91 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
@@ -72,7 +72,7 @@ public class Assertion {
private String msg;
private Object[] msgArgs;
- private PrintStream out = System.err;
+ private PrintStream out = System.err; // NOSONAR - Intentional.
private Class<? extends RuntimeException> throwable;
/**
@@ -127,7 +127,7 @@ public class Assertion {
*/
@FluentSetter
public Assertion setStdOut() {
- return setOut(System.out);
+ return setOut(System.out); // NOSONAR - Intentional.
}
/**
@@ -262,7 +262,6 @@ public class Assertion {
* @param c The object to get the class name for.
* @return The class name for an object.
*/
- @SuppressWarnings("unchecked")
protected static <E> Class<E[]> arrayClass(Class<E> c) {
return (Class<E[]>)Array.newInstance(c,0).getClass();
}
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 399dbb7dc..28bb44bdf 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
@@ -116,23 +116,22 @@ public class AssertionPredicate<T> implements
Predicate<T> {
//-----------------------------------------------------------------------------------------------------------------
@Override /* Predicate */
- @SuppressWarnings({"unchecked","rawtypes"})
public boolean test(T t) {
failedMessage.remove();
- boolean b = inner.test(t);
+ var b = inner.test(t);
if (! b) {
- String m = message;
- Object[] args = new Object[this.args.length];
- for (int i = 0; i < args.length; i++) {
- Object a = this.args[i];
- if (a instanceof Function)
- args[i] = ((Function)a).apply(t);
+ var m = message;
+ var oargs = new Object[this.args.length];
+ for (var i = 0; i < oargs.length; i++) {
+ var a = this.args[i];
+ if (a instanceof Function af) // NOSONAR -
Intentional.
+ oargs[i] = af.apply(t);
else
- args[i] = a;
+ oargs[i] = a;
}
- m = format(m, args);
- if (inner instanceof AssertionPredicate)
- m += "\n\t" +
((AssertionPredicate<?>)inner).getFailureMessage();
+ m = format(m, oargs);
+ if (inner instanceof AssertionPredicate inner2) //
NOSONAR - Intentional.
+ m += "\n\t" + inner2.getFailureMessage();
failedMessage.set(m);
}
return inner.test(t);
@@ -185,14 +184,14 @@ public class AssertionPredicate<T> implements
Predicate<T> {
@Override /* Predicate */
public boolean test(T t) {
failedMessage.remove();
- for (int i = 0; i < inner.length; i++) {
- Predicate<T> p = inner[i];
+ for (var i = 0; i < inner.length; i++) {
+ var p = inner[i];
if (p != null) {
- boolean b = p.test(t);
+ var b = p.test(t);
if (! b) {
- String m =
format(MSG_predicateTestFailed, i+1);
- if (p instanceof
AssertionPredicate)
- m += "\n\t" +
((AssertionPredicate<?>)p).getFailureMessage();
+ var m =
format(MSG_predicateTestFailed, i+1);
+ if (p instanceof
AssertionPredicate p2) // NOSONAR - Intentional.
+ m += "\n\t" +
p2.getFailureMessage();
failedMessage.set(m);
return false;
}
@@ -232,11 +231,10 @@ public class AssertionPredicate<T> implements
Predicate<T> {
@Override /* Predicate */
public boolean test(T t) {
failedMessage.remove();
- for (Predicate<T> p : inner)
- if (p != null)
- if (p.test(t))
- return true;
- String m = format(MSG_noPredicateTestsPassed);
+ for (var p : inner)
+ if (p != null && p.test(t))
+ return true;
+ var m = format(MSG_noPredicateTestsPassed);
failedMessage.set(m);
return false;
}
@@ -270,9 +268,9 @@ public class AssertionPredicate<T> implements Predicate<T> {
@Override /* Predicate */
public boolean test(T t) {
failedMessage.remove();
- Predicate<T> p = inner;
+ var p = inner;
if (p != null) {
- boolean b = p.test(t);
+ var b = p.test(t);
if (b) {
failedMessage.set(format(MSG_predicateTestsUnexpectedlyPassed));
return false;
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index b6e9adac0..d9c33cee9 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -51,7 +51,9 @@ import org.apache.juneau.cp.*;
*/
public class AssertionPredicates {
- private static Function<Object,String> TYPENAME = x -> x == null ? null
: x.getClass().getName();
+ private AssertionPredicates() {}
+
+ private static final Function<Object,String> TYPENAME = x -> x == null
? null : x.getClass().getName();
private static final Messages MESSAGES =
Messages.of(AssertionPredicates.class, "Messages");
private static final String
@@ -234,7 +236,7 @@ public class AssertionPredicates {
*/
public static final <T> AssertionPredicate<T> match(String value) {
assertArgNotNull("value", value);
- Pattern p = StringUtils.getMatchPattern(value);
+ var p = StringUtils.getMatchPattern(value);
return test(x -> x != null &&
p.matcher(stringify(x)).matches(), MSG_valueDidNotMatchPattern, value, VALUE);
}
@@ -250,7 +252,7 @@ public class AssertionPredicates {
*/
public static final <T> AssertionPredicate<T> regex(String expression) {
assertArgNotNull("expression", expression);
- Pattern p = Pattern.compile(expression);
+ var p = Pattern.compile(expression);
return test(x -> x != null &&
p.matcher(stringify(x)).matches(), MSG_valueDidNotMatchPattern, expression,
VALUE);
}
@@ -277,7 +279,7 @@ public class AssertionPredicates {
*/
public static final <T> AssertionPredicate<T> regex(String expression,
int flags) {
assertArgNotNull("expression", expression);
- Pattern p = Pattern.compile(expression, flags);
+ var p = Pattern.compile(expression, flags);
return test(x -> x != null &&
p.matcher(stringify(x)).matches(), MSG_valueDidNotMatchPattern, expression,
VALUE);
}
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 87076c5a0..ce6c7682e 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
@@ -71,6 +71,8 @@ import org.apache.juneau.common.utils.*;
*/
public class Assertions {
+ private Assertions() {}
+
//-----------------------------------------------------------------------------------------------------------------
// Fluent assertions
//-----------------------------------------------------------------------------------------------------------------
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 777b887c1..768120c2f 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
@@ -319,7 +319,6 @@ public class FluentAnyAssertion<T,R> extends
FluentObjectAssertion<T,R> {
* @return A new assertion.
* @throws AssertionError If object is not a collection.
*/
- @SuppressWarnings("unchecked")
public <E> FluentCollectionAssertion<E,R> asCollection(Class<E>
elementType) {
assertArgNotNull("elementType", elementType);
return new FluentCollectionAssertion<>(this,
cast(Collection.class), returns());
@@ -331,7 +330,6 @@ public class FluentAnyAssertion<T,R> extends
FluentObjectAssertion<T,R> {
* @return A new assertion.
* @throws AssertionError If object is not a collection.
*/
- @SuppressWarnings("unchecked")
public FluentStringListAssertion<R> asStringList() {
return new FluentStringListAssertion<>(this, cast(List.class),
returns());
}
@@ -343,7 +341,6 @@ public class FluentAnyAssertion<T,R> extends
FluentObjectAssertion<T,R> {
* @return A new assertion.
* @throws AssertionError If object is not an instance of {@link
Comparable}.
*/
- @SuppressWarnings("unchecked")
public <T2 extends Comparable<T2>> FluentComparableAssertion<T2,R>
asComparable() {
return new FluentComparableAssertion<>(this,
(T2)cast(Comparable.class), returns());
}
@@ -396,7 +393,6 @@ public class FluentAnyAssertion<T,R> extends
FluentObjectAssertion<T,R> {
* @return A new assertion.
* @throws AssertionError If object is not a list.
*/
- @SuppressWarnings("unchecked")
public <E> FluentListAssertion<E,R> asList(Class<E> elementType) {
assertArgNotNull("elementType", elementType);
return new FluentListAssertion<>(this, cast(List.class),
returns());
@@ -422,7 +418,6 @@ public class FluentAnyAssertion<T,R> extends
FluentObjectAssertion<T,R> {
* @return A new assertion.
* @throws AssertionError If object is not a map.
*/
- @SuppressWarnings("unchecked")
public <K,V> FluentMapAssertion<K,V,R> asMap(Class<K> keyType, Class<V>
valueType) {
assertArgNotNull("keyType", keyType);
assertArgNotNull("valueType", valueType);
@@ -460,7 +455,6 @@ public class FluentAnyAssertion<T,R> extends
FluentObjectAssertion<T,R> {
* @return A new assertion.
* @throws AssertionError If object is not a bean.
*/
- @SuppressWarnings("unchecked")
public <T2> FluentBeanListAssertion<T2,R> asBeanList(Class<T2>
beanType) {
assertArgNotNull("beanType", beanType);
return new FluentBeanListAssertion<>(this, cast(List.class),
returns());
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 023999fb7..b507bcc37 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
@@ -21,7 +21,6 @@ import static java.util.Arrays.*;
import java.io.*;
import java.util.*;
import java.util.function.*;
-import java.util.stream.*;
import org.apache.juneau.common.internal.*;
import org.apache.juneau.cp.*;
@@ -176,7 +175,7 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
//-----------------------------------------------------------------------------------------------------------------
@Override /* FluentObjectAssertion */
- public FluentArrayAssertion<E,R> asTransformed(Function<E[],E[]>
function) {
+ public FluentArrayAssertion<E,R> asTransformed(Function<E[],E[]>
function) { // NOSONAR - Intentional.
return new FluentArrayAssertion<>(this,
function.apply(orElse(null)), returns());
}
@@ -191,7 +190,7 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
* @return A new fluent string assertion.
*/
public FluentStringListAssertion<R> asStrings() {
- return new FluentStringListAssertion<>(this, valueIsNull() ?
null :
stream(value()).map(StringUtils::stringify).collect(Collectors.toList()),
returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ?
null : stream(value()).map(StringUtils::stringify).toList(), returns());
}
/**
@@ -201,7 +200,7 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
* @return A new fluent string list assertion. Never <jk>null</jk>.
*/
public FluentStringListAssertion<R> asStrings(Function<E,String>
function) {
- List<String> l = valueIsNull() ? null : stream(value()).map(x
-> function.apply(x)).collect(Collectors.toList());
+ List<String> l = valueIsNull() ? null :
stream(value()).map(function::apply).toList();
return new FluentStringListAssertion<>(this, l, returns());
}
@@ -221,7 +220,7 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
* @return A fluent string assertion. Never <jk>null</jk>.
*/
public FluentStringAssertion<R> asCdl(Function<E,String> function) {
- List<String> l = valueIsNull() ? null : stream(value()).map(x
-> function.apply(x)).collect(Collectors.toList());
+ List<String> l = valueIsNull() ? null :
stream(value()).map(function::apply).toList();
return new FluentStringAssertion<>(this, join(l, ','),
returns());
}
@@ -288,7 +287,6 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
* @return This object.
* @throws AssertionError If assertion failed.
*/
- @SuppressWarnings("unchecked")
public R isHas(E...entries) throws AssertionError {
assertArgNotNull("entries", entries);
Predicate<E>[] p =
stream(entries).map(AssertionPredicates::eq).toArray(Predicate[]::new);
@@ -306,10 +304,9 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
public final R is(Predicate<E>...tests) throws AssertionError {
isSize(tests.length);
for (int i = 0, j = length(); i < j; i++) {
- Predicate<E> t = tests[i];
- if (t != null)
- if (! t.test(at(i)))
- throw
error(MSG_arrayDidNotContainExpectedValueAt, i, getFailureMessage(t, at(i)));
+ var t = tests[i];
+ if (t != null && ! t.test(at(i)))
+ throw
error(MSG_arrayDidNotContainExpectedValueAt, i, getFailureMessage(t, at(i)));
}
return returns();
}
@@ -323,7 +320,7 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
*/
public R isAny(Predicate<E> test) throws AssertionError {
assertArgNotNull("test", test);
- for (E v : value())
+ for (var v : value())
if (test.test(v))
return returns();
throw error(MSG_arrayDidntContainAnyMatchingValue,
(Object)value());
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 679910904..1f653ecc7 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
@@ -152,9 +152,7 @@ public abstract class FluentAssertion<R> extends Assertion {
*
* @return The response object.
*/
- @SuppressWarnings("unchecked")
protected R returns() {
return returns != null ? returns : (R)this;
}
-
}
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 d9d6e297f..66ea8f692 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static java.util.stream.Collectors.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static java.util.Arrays.*;
@@ -139,7 +138,7 @@ public class FluentBeanAssertion<T,R> extends
FluentObjectAssertion<T,R> {
//-----------------------------------------------------------------------------------------------------------------
@Override /* FluentObjectAssertion */
- public FluentBeanAssertion<T,R> asTransformed(Function<T,T> function) {
+ public FluentBeanAssertion<T,R> asTransformed(Function<T,T> function) {
// NOSONAR - Intentional.
return new FluentBeanAssertion<>(this,
function.apply(orElse(null)), returns());
}
@@ -172,7 +171,7 @@ public class FluentBeanAssertion<T,R> extends
FluentObjectAssertion<T,R> {
*/
public FluentListAssertion<Object,R> asProperties(String...names) {
BeanMap<T> bm = toBeanMap();
- return new FluentListAssertion<>(this, stream(names).map(x ->
bm.get(x)).collect(toList()), returns());
+ return new FluentListAssertion<>(this,
stream(names).map(bm::get).toList(), returns());
}
//-----------------------------------------------------------------------------------------------------------------
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 6df3d3bb4..d8f2ba8ff 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
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static java.util.stream.Collectors.*;
-
import java.io.*;
import java.util.*;
import java.util.function.*;
@@ -176,7 +174,7 @@ public class FluentBeanListAssertion<E,R> extends
FluentListAssertion<E,R> {
*/
public FluentListAssertion<Map<String,Object>,R>
asPropertyMaps(String...names) {
String[] n = StringUtils.split(names, ',');
- return new FluentListAssertion<>(this, value().stream().map(x
-> beanMap(x).getProperties(n)).collect(toList()), returns());
+ return new FluentListAssertion<>(this, value().stream().map(x
-> beanMap(x).getProperties(n)).toList(), returns());
}
/**
@@ -186,7 +184,7 @@ public class FluentBeanListAssertion<E,R> extends
FluentListAssertion<E,R> {
* @return This object.
*/
public FluentListAssertion<Object,R> asProperty(String name) {
- return new FluentListAssertion<>(this, value().stream().map(x
-> beanMap(x).get(name)).collect(toList()), returns());
+ return new FluentListAssertion<>(this, value().stream().map(x
-> beanMap(x).get(name)).toList(), returns());
}
//-----------------------------------------------------------------------------------------------------------------
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 d5e151b2e..a34d09654 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
@@ -157,7 +157,7 @@ public class FluentBooleanAssertion<R> extends
FluentComparableAssertion<Boolean
* @throws AssertionError If assertion failed.
*/
public R isTrue() throws AssertionError {
- if (! value())
+ if (Boolean.FALSE.equals(value()))
throw error(MSG_valueWasFalse);
return returns();
}
@@ -169,7 +169,7 @@ public class FluentBooleanAssertion<R> extends
FluentComparableAssertion<Boolean
* @throws AssertionError If assertion failed.
*/
public R isFalse() throws AssertionError {
- if (value())
+ if (Boolean.TRUE.equals(value()))
throw error(MSG_valueWasTrue);
return returns();
}
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 83ffffabb..e28db0f4d 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
@@ -17,7 +17,6 @@ import static org.apache.juneau.internal.ObjectUtils.*;
import java.io.*;
import java.util.*;
import java.util.function.*;
-import java.util.stream.*;
import org.apache.juneau.common.internal.StringUtils;
import org.apache.juneau.cp.*;
@@ -162,7 +161,7 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
//-----------------------------------------------------------------------------------------------------------------
@Override /* FluentObjectAssertion */
- public FluentCollectionAssertion<E,R>
asTransformed(Function<Collection<E>,Collection<E>> function) {
+ public FluentCollectionAssertion<E,R>
asTransformed(Function<Collection<E>,Collection<E>> function) { // NOSONAR -
Intentional.
return new FluentCollectionAssertion<>(this,
function.apply(orElse(null)), returns());
}
@@ -172,7 +171,7 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
* @return A new fluent string assertion.
*/
public FluentStringListAssertion<R> asStrings() {
- return new FluentStringListAssertion<>(this, valueIsNull() ?
null :
value().stream().map(StringUtils::stringify).collect(Collectors.toList()),
returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ?
null : value().stream().map(StringUtils::stringify).toList(), returns());
}
@@ -186,7 +185,7 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
* @return A new assertion.
*/
public FluentIntegerAssertion<R> asSize() {
- return new FluentIntegerAssertion<R>(this, valueIsNull() ? null
: value().size(), returns());
+ return new FluentIntegerAssertion<>(this, valueIsNull() ? null
: value().size(), returns());
}
//-----------------------------------------------------------------------------------------------------------------
@@ -225,7 +224,7 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
* @throws AssertionError If assertion failed or value was
<jk>null</jk>.
*/
public R isContains(E entry) throws AssertionError {
- for (Object v : value())
+ for (var v : value())
if (eq(v, entry))
return returns();
throw error(MSG_collectionDidNotContainExpectedValue, entry,
value());
@@ -256,7 +255,7 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
public R isAny(Predicate<E> test) throws AssertionError {
if (test == null)
return returns();
- for (E v : value())
+ for (var v : value())
if (test.test(v))
return returns();
throw error(MSG_collectionDidNotContainTestedValue, value());
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 ddc0c88bf..0de3de576 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
@@ -151,7 +151,7 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
//-----------------------------------------------------------------------------------------------------------------
@Override /* FluentObjectAssertion */
- public FluentComparableAssertion<T,R> asTransformed(Function<T,T>
function) {
+ public FluentComparableAssertion<T,R> asTransformed(Function<T,T>
function) { // NOSONAR - Intentional.
return new FluentComparableAssertion<>(this,
function.apply(orElse(null)), returns());
}
@@ -166,7 +166,6 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
- @SuppressWarnings("unchecked")
public R isGt(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (value().compareTo(value) <= 0)
@@ -181,7 +180,6 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
- @SuppressWarnings("unchecked")
public R isGte(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (value().compareTo(value) < 0)
@@ -196,7 +194,6 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
- @SuppressWarnings("unchecked")
public R isLt(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (value().compareTo(value) >= 0)
@@ -211,7 +208,6 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
- @SuppressWarnings("unchecked")
public R isLte(Comparable value) throws AssertionError {
assertArgNotNull("value", value);
if (value().compareTo(value) > 0)
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 03191104b..fe7491e16 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
@@ -184,7 +184,7 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
* @return A new assertion.
*/
public FluentLongAssertion<R> asEpochMillis() {
- return new FluentLongAssertion<R>(this, valueIsNull() ? null :
value().getTime(), returns());
+ return new FluentLongAssertion<>(this, valueIsNull() ? null :
value().getTime(), returns());
}
/**
@@ -197,7 +197,7 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
* @return A new assertion.
*/
public FluentLongAssertion<R> asEpochSeconds() {
- return new FluentLongAssertion<R>(this, valueIsNull() ? null :
value().getTime() / 1000, returns());
+ return new FluentLongAssertion<>(this, valueIsNull() ? null :
value().getTime() / 1000, returns());
}
//-----------------------------------------------------------------------------------------------------------------
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 301760d77..78215ebe0 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
@@ -13,7 +13,6 @@
package org.apache.juneau.assertions;
import static java.util.Arrays.*;
-import static java.util.stream.Collectors.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -179,7 +178,7 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
* @param function The transform to apply.
* @return A new assertion.
*/
- public FluentListAssertion<E,R> asApplied2(Function<List<E>,List<E>>
function) {
+ public FluentListAssertion<E,R> asApplied2(Function<List<E>,List<E>>
function) { // NOSONAR - Intentional.
return new FluentListAssertion<>(this,
function.apply((List<E>)orElse(null)), returns());
}
@@ -272,7 +271,7 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
* @return A new fluent string list assertion. Never <jk>null</jk>.
*/
public FluentStringListAssertion<R> asStrings(Function<E,String>
function) {
- List<String> l = valueIsNull() ? null : value().stream().map(x
-> function.apply(x)).collect(toList());
+ List<String> l = valueIsNull() ? null :
value().stream().map(function::apply).toList();
return new FluentStringListAssertion<>(this, l, returns());
}
@@ -292,7 +291,7 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
* @return A fluent string assertion. Never <jk>null</jk>.
*/
public FluentStringAssertion<R> asCdl(Function<E,String> function) {
- List<String> l = valueIsNull() ? null : value().stream().map(x
-> function.apply(x)).collect(toList());
+ List<String> l = valueIsNull() ? null :
value().stream().map(function::apply).toList();
return new FluentStringAssertion<>(this, join(l, ','),
returns());
}
@@ -307,7 +306,6 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
- @SuppressWarnings("unchecked")
public R isHas(E...entries) throws AssertionError {
Predicate<E>[] p =
stream(entries).map(AssertionPredicates::eq).toArray(Predicate[]::new);
return isEach(p);
@@ -326,7 +324,7 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
public final R isEach(Predicate<E>...tests) throws AssertionError {
isSize(tests.length);
for (int i = 0, j = getSize(); i < j; i++) {
- Predicate<E> t = tests[i];
+ var t = tests[i];
if (t != null && ! t.test(at(i)))
throw
error(MSG_listDidNotContainExpectedValueAt, i, getFailureMessage(t, at(i)));
}
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 a4e73f472..6518bcee4 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
@@ -162,7 +162,7 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
//-----------------------------------------------------------------------------------------------------------------
@Override /* FluentObjectAssertion */
- public FluentMapAssertion<K,V,R>
asTransformed(Function<Map<K,V>,Map<K,V>> function) {
+ public FluentMapAssertion<K,V,R>
asTransformed(Function<Map<K,V>,Map<K,V>> function) { // NOSONAR - Intentional.
return new FluentMapAssertion<>(this,
function.apply(orElse(null)), returns());
}
@@ -189,8 +189,8 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
* @param keys The keys of the values to retrieve from the map.
* @return A new assertion.
*/
- public FluentListAssertion<Object,R>
asValues(@SuppressWarnings("unchecked") K...keys) {
- return new FluentListAssertion<>(this, valueIsNull() ? null :
stream(keys).map(x -> get(x)).collect(toList()), returns());
+ public FluentListAssertion<Object,R> asValues(K...keys) {
+ return new FluentListAssertion<>(this, valueIsNull() ? null :
stream(keys).map(this::get).collect(toList()), returns());
}
/**
@@ -199,13 +199,12 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
* @param keys The entries to extract.
* @return This object.
*/
- @SuppressWarnings("unchecked")
public FluentMapAssertion<K,V,R> asValueMap(K...keys) {
if (valueIsNull())
return new FluentMapAssertion<>(this, null, returns());
Map<K,V> m1 = value(), m2 = CollectionUtils.map();
if (m1 != null)
- for (K k : keys)
+ for (var k : keys)
m2.put(k, m1.get(k));
return new FluentMapAssertion<>(this, m2, returns());
}
@@ -220,7 +219,7 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
* @return A new assertion.
*/
public FluentIntegerAssertion<R> asSize() {
- return new FluentIntegerAssertion<R>(this, valueIsNull() ? null
: value().size(), returns());
+ return new FluentIntegerAssertion<>(this, valueIsNull() ? null
: value().size(), returns());
}
//-----------------------------------------------------------------------------------------------------------------
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 f94490a2f..5e3b52634 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
@@ -109,11 +109,11 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
MSG_unexpectedValueFound =
MESSAGES.getString("unexpectedValueFound"),
MSG_unexpectedValue2 = MESSAGES.getString("unexpectedValue2");
- private static JsonSerializer JSON = JsonSerializer.create()
+ private static final JsonSerializer JSON = JsonSerializer.create()
.json5()
.build();
- private static JsonSerializer JSON_SORTED = JsonSerializer.create()
+ private static final JsonSerializer JSON_SORTED =
JsonSerializer.create()
.json5()
.sortProperties()
.sortCollections()
@@ -264,7 +264,7 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @param function The function to apply.
* @return This object.
*/
- public FluentObjectAssertion<T,R> asTransformed(Function<T,T> function)
{
+ public FluentObjectAssertion<T,R> asTransformed(Function<T,T> function)
{ // NOSONAR - Intentional.
return new FluentObjectAssertion<>(this,
function.apply(orElse(null)), returns());
}
@@ -381,9 +381,8 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
- @SuppressWarnings("unchecked")
public R isAny(T...values) throws AssertionError {
- for (T v : values)
+ for (var v : values)
if (equals(orElse(null), v))
return returns();
throw error(MSG_expectedValueNotFound, values, value);
@@ -396,9 +395,8 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
- @SuppressWarnings("unchecked")
public R isNotAny(T...values) throws AssertionError {
- for (T v : values)
+ for (var v : values)
if (equals(orElse(null), v))
throw error(MSG_unexpectedValueFound, v, value);
return returns();
@@ -451,8 +449,8 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @throws AssertionError If assertion failed.
*/
public R isSameSerializedAs(Object o, WriterSerializer serializer) {
- String s1 = serializer.toString(value);
- String s2 = serializer.toString(o);
+ var s1 = serializer.toString(value);
+ var s2 = serializer.toString(o);
if (ne(s1, s2))
throw error(MSG_unexpectedComparison, s2, s1);
return returns();
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index bd0d5d4d8..ab1d01988 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
@@ -176,7 +176,7 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
public FluentPrimitiveArrayAssertion(Assertion creator, T value, R
returns) {
super(creator, value, returns);
if (value != null) {
- Class<?> c = value.getClass();
+ var c = value.getClass();
if (! (c.isArray() &&
c.getComponentType().isPrimitive()))
throw new
BasicAssertionError(MSG_objectWasNotAnArray, value.getClass());
}
@@ -187,7 +187,7 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
//-----------------------------------------------------------------------------------------------------------------
@Override /* FluentObjectAssertion */
- public FluentPrimitiveArrayAssertion<E,T,R> asTransformed(Function<T,T>
function) {
+ public FluentPrimitiveArrayAssertion<E,T,R> asTransformed(Function<T,T>
function) { // NOSONAR - Intentional.
return new FluentPrimitiveArrayAssertion<>(this,
function.apply(orElse(null)), returns());
}
@@ -220,7 +220,7 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
* @return A new assertion.
*/
public FluentIntegerAssertion<R> asLength() {
- return new FluentIntegerAssertion<R>(this, valueIsNull() ? null
: Array.getLength(value()), returns());
+ return new FluentIntegerAssertion<>(this, valueIsNull() ? null
: Array.getLength(value()), returns());
}
//-----------------------------------------------------------------------------------------------------------------
@@ -234,7 +234,6 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
* @return This object.
* @throws AssertionError If assertion failed.
*/
- @SuppressWarnings("unchecked")
public R isHas(E...entries) throws AssertionError {
assertArgNotNull("entries", entries);
Predicate<E>[] p =
stream(entries).map(AssertionPredicates::eq).toArray(Predicate[]::new);
@@ -252,10 +251,9 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
public final R is(Predicate<E>...tests) throws AssertionError {
isSize(tests.length);
for (int i = 0, j = length2(); i < j; i++) {
- Predicate<E> t = tests[i];
- if (t != null)
- if (! t.test(at(i)))
- throw
error(MSG_arrayDidNotContainExpectedValueAt, i, getFailureMessage(t, at(i)));
+ var t = tests[i];
+ if (t != null && ! t.test(at(i)))
+ throw
error(MSG_arrayDidNotContainExpectedValueAt, i, getFailureMessage(t, at(i)));
}
return returns();
}
@@ -349,7 +347,7 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
* @throws AssertionError If assertion failed.
*/
public R isNotContains(E entry) throws AssertionError {
- for (int i = 0; i < length2(); i++)
+ for (var i = 0; i < length2(); i++)
if (eq(at(i), entry))
throw error(MSG_arrayContainedUnexpectedValue,
entry, value());
return returns();
@@ -397,7 +395,6 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
// Utility methods
//-----------------------------------------------------------------------------------------------------------------
- @SuppressWarnings("unchecked")
private E at(int index) {
return valueIsNull() || index < 0 || index >= length2() ? null
: (E)Array.get(value(), index);
}
@@ -409,7 +406,7 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
@Override
public String toString() {
if (valueIsNull())
- return null;
+ return null; // NOSONAR - Intentional.
return
STRINGIFIERS.get(value().getClass().getComponentType()).apply(value());
}
}
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 8ea74bd74..5176b7fd9 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
@@ -216,7 +216,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
//-----------------------------------------------------------------------------------------------------------------
@Override /* FluentObjectAssertion */
- public FluentStringAssertion<R> asTransformed(Function<String,String>
function) {
+ public FluentStringAssertion<R> asTransformed(Function<String,String>
function) { // NOSONAR - Intentional.
return new FluentStringAssertion<>(this,
function.apply(orElse(null)), returns());
}
@@ -299,7 +299,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
* @return This object.
*/
public FluentIntegerAssertion<R> asLength() {
- return new FluentIntegerAssertion<R>(this, valueIsNull() ? null
: value().length(), returns());
+ return new FluentIntegerAssertion<>(this, valueIsNull() ? null
: value().length(), returns());
}
/**
@@ -347,7 +347,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
@Override
public R is(String value) throws AssertionError {
- String s = orElse(null);
+ var s = orElse(null);
if (ne(value, s))
throw error(MSG_stringDifferedAtPosition,
diffPosition(value, s), fix(value), fix(s));
return returns();
@@ -362,7 +362,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
@Override
public R isNot(String value) throws AssertionError {
- String s = orElse(null);
+ var s = orElse(null);
if (eq(value, s))
throw error(MSG_stringEqualedUnexpected, fix(s));
return returns();
@@ -392,8 +392,8 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
public R isLines(String...lines) throws AssertionError {
assertArgNotNull("lines", lines);
- String v = join(lines, '\n');
- String s = value();
+ var v = join(lines, '\n');
+ var s = value();
if (ne(v, s))
throw error(MSG_stringDifferedAtPosition,
diffPosition(v, s), fix(v), fix(s));
return returns();
@@ -425,7 +425,8 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
assertArgNotNull("lines", lines);
// Must work for windows too.
- String[] e = StringUtils.join(lines,
'\n').trim().split("[\r\n]+"), a = value().trim().split("[\r\n]+");
+ var e = StringUtils.join(lines, '\n').trim().split("[\r\n]+");
+ var a = value().trim().split("[\r\n]+");
if (e.length != a.length)
throw
error(MSG_expectedStringHadDifferentNumbersOfLines, e.length, a.length);
@@ -433,7 +434,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
Arrays.sort(e);
Arrays.sort(a);
- for (int i = 0; i < e.length; i++)
+ for (var i = 0; i < e.length; i++)
if (! e[i].equals(a[i]))
throw
error(MSG_expectedStringHadDifferentValuesAtLine, i+1, e[i], a[i]);
@@ -448,7 +449,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
* @throws AssertionError If assertion failed.
*/
public R isIc(String value) throws AssertionError {
- String s = orElse(null);
+ var s = orElse(null);
if (neic(value, s))
throw error(MSG_stringDifferedAtPosition,
diffPositionIc(value, s), fix(value), fix(s));
return returns();
@@ -462,7 +463,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
* @throws AssertionError If assertion failed.
*/
public R isNotIc(String value) throws AssertionError {
- String s = orElse(null);
+ var s = orElse(null);
if (eqic(value, s))
throw error(MSG_stringEqualedUnexpected, fix(s));
return returns();
@@ -477,8 +478,8 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
public R isContains(String...values) throws AssertionError {
assertArgNotNull("values", values);
- String s = orElse(null);
- for (String substring : values)
+ var s = orElse(null);
+ for (var substring : values)
if (substring != null && ! StringUtils.contains(s,
substring))
throw
error(MSG_stringDidNotContainExpectedSubstring, fix(substring), fix(s));
return returns();
@@ -493,8 +494,8 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
public R isNotContains(String...values) throws AssertionError {
assertArgNotNull("values", values);
- String s = orElse(null);
- for (String substring : values)
+ var s = orElse(null);
+ for (var substring : values)
if (substring != null && StringUtils.contains(s,
substring))
throw
error(MSG_stringContainedUnexpectedSubstring, fix(substring), fix(s));
return returns();
@@ -507,7 +508,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
* @throws AssertionError If assertion failed.
*/
public R isEmpty() throws AssertionError {
- String s = orElse(null);
+ var s = orElse(null);
if (s != null && ! s.isEmpty())
throw error(MSG_stringWasNotEmpty, fix(s));
return returns();
@@ -520,7 +521,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
* @throws AssertionError If assertion failed.
*/
public R isNotEmpty() throws AssertionError {
- String s = orElse(null);
+ var s = orElse(null);
if (s == null)
throw error(MSG_stringWasNull);
if (s.isEmpty())
@@ -564,8 +565,8 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
public R isPattern(String regex, int flags) throws AssertionError {
assertArgNotNull("regex", regex);
- Pattern p = Pattern.compile(regex, flags);
- String s = value();
+ var p = Pattern.compile(regex, flags);
+ var s = value();
if (! p.matcher(s).matches())
throw error(MSG_stringDidNotMatchExpectedPattern,
fix(regex), fix(s));
return returns();
@@ -580,7 +581,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
public R isPattern(Pattern pattern) throws AssertionError {
assertArgNotNull("pattern", pattern);
- String s = value();
+ var s = value();
if (! pattern.matcher(s).matches())
throw error(MSG_stringDidNotMatchExpectedPattern,
fix(pattern.pattern()), fix(s));
return returns();
@@ -595,7 +596,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
public R isStartsWith(String string) {
assertArgNotNull("string", string);
- String s = value();
+ var s = value();
if (! s.startsWith(string))
throw error(MSG_stringDidNotStartWithExpected,
fix(string), fix(s));
return returns();
@@ -610,7 +611,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
*/
public R isEndsWith(String string) {
assertArgNotNull("string", string);
- String s = value();
+ var s = value();
if (! s.endsWith(string))
throw error(MSG_stringDidNotEndWithExpected,
fix(string), fix(s));
return returns();
@@ -670,7 +671,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
private String fix(String text) {
if (javaStrings)
- text = text.replaceAll("\\\\",
"\\\\\\\\").replaceAll("\n", "\\\\n").replaceAll("\t", "\\\\t");
+ text = text.replace("\\", "\\\\").replace("\n",
"\\n").replace("\t", "\\t");
return text;
}
}
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 b392c18b4..daee0ffbb 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
@@ -204,7 +204,7 @@ public class FluentStringListAssertion<R> extends
FluentListAssertion<String,R>
* @return A new assertion.
*/
public FluentStringListAssertion<R> asTrimmed() {
- return new FluentStringListAssertion<>(this, valueIsNull() ?
null : value().stream().map(StringUtils::trim).collect(toList()), returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ?
null : value().stream().map(StringUtils::trim).toList(), returns());
}
//-----------------------------------------------------------------------------------------------------------------
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 0cf524fa0..bd37ca1b9 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
@@ -156,7 +156,7 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
//-----------------------------------------------------------------------------------------------------------------
@Override /* FluentObjectAssertion */
- public FluentThrowableAssertion<T,R> asTransformed(Function<T,T>
function) {
+ public FluentThrowableAssertion<T,R> asTransformed(Function<T,T>
function) { // NOSONAR - Intentional.
return new FluentThrowableAssertion<>(this,
function.apply(orElse(null)), returns());
}
@@ -313,7 +313,7 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
* @return An assertion against the caused-by. Never <jk>null</jk>.
*/
public <X extends Throwable> FluentThrowableAssertion<X,R>
asCausedBy(Class<X> type) {
- Throwable t = map(Throwable::getCause).orElse(null);
+ var t = map(Throwable::getCause).orElse(null);
if (t == null || type.isInstance(t))
return new FluentThrowableAssertion<>(this,
type.cast(t), returns());
throw error(MSG_causedByExceptionNotExpectedType, type,
t.getClass());
@@ -455,8 +455,8 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
@Override
protected boolean equals(Object o1, Object o2) {
- if (o1 instanceof Throwable && o2 instanceof Throwable)
- return ObjectUtils.eq((Throwable)o1, (Throwable)o2,
(x,y)->ObjectUtils.eq(x.getClass(),y.getClass()) &&
ObjectUtils.eq(x.getMessage(),y.getMessage()));
+ if (o1 instanceof Throwable o1t && o2 instanceof Throwable o2t)
+ return ObjectUtils.eq(o1t, o2t,
(x,y)->ObjectUtils.eq(x.getClass(),y.getClass()) &&
ObjectUtils.eq(x.getMessage(),y.getMessage()));
return super.equals(o1, o2);
}
}
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 f273edbce..8c4cc7e5f 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
@@ -178,11 +178,11 @@ public class FluentZonedDateTimeAssertion<R> extends
FluentComparableAssertion<Z
*/
public R is(ZonedDateTime value, ChronoUnit precision) throws
AssertionError {
assertArgNotNull("precision", precision);
- ZonedDateTime v = orElse(null);
+ var v = orElse(null);
if (valueIsNull() && value == null)
return returns();
if (valueIsNotNull() && value != null) {
- Duration d = Duration.between(value(), value);
+ var d = Duration.between(value(), value);
if (d.compareTo(precision.getDuration()) <= 0)
return returns();
}
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 e6e23dc5e..da569ce08 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
@@ -148,7 +148,7 @@ public class ListAssertion<E> extends
FluentListAssertion<E,ListAssertion<E>> {
* @return A new assertion object.
*/
public static <E> ListAssertion<E> create(Stream<E> value) {
- return new ListAssertion<>(value == null ? null :
value.collect(Collectors.toList()));
+ return new ListAssertion<>(value == null ? null :
value.toList());
}
//-----------------------------------------------------------------------------------------------------------------
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 2454bfec0..2aad92108 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
@@ -102,7 +102,8 @@ public class Verify {
public String isType(Class<?> type) {
if ((type == null && o == null) || (type != null &&
type.isInstance(o)))
return null;
- return msg != null ? msg.get() :
StringUtils.format(MSG_unexpectedType, type, (o == null ? null : o.getClass()));
+ var c = o == null ? null : o.getClass();
+ return msg != null ? msg.get() :
StringUtils.format(MSG_unexpectedType, type, c);
}
/**
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
index 4f79f25a2..3a9ae25b0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/AssertionPredicates_Test.java
@@ -31,11 +31,6 @@ public class AssertionPredicates_Test {
private static StringAssertion A1 = assertString("foo").setSilent(), A2
= assertString(empty()).setSilent();
- @Test
- public void a00_dummyConstructor() {
- new AssertionPredicates();
- }
-
@Test
public void a01_any() {
A1.is(any());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
index e8abb99b2..80376d21e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
@@ -32,11 +32,6 @@ public class Assertions_Test {
// Basic tests
//------------------------------------------------------------------------------------------------------------------
- @Test
- public void a00_basic() {
- new Assertions();
- }
-
@Test
public void a01_assertDate() throws Exception {
assertDate(new Date()).isAfter(new Date(0));
