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 08bbcf4b55 StringFormatter class
08bbcf4b55 is described below
commit 08bbcf4b5526361b5cb654347c86e47e27d9d1a9
Author: James Bognar <[email protected]>
AuthorDate: Sat Nov 29 10:36:54 2025 -0500
StringFormatter class
---
.../java/org/apache/juneau/assertions/AssertionPredicate.java | 8 ++++----
.../java/org/apache/juneau/assertions/AssertionPredicates.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
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 af8e55f507..dac33a4a3b 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
@@ -245,12 +245,12 @@ public class AssertionPredicate<T> implements
Predicate<T> {
var oargs = new Object[this.args.length];
for (var i = 0; i < oargs.length; i++) {
var a = this.args[i];
- if (a instanceof Function a2) // NOSONAR - Intentional.
- oargs[i] = a2.apply(t);
+ if (a instanceof Function a2) // NOSONAR -
Intentional.
+ oargs[i] = a2.apply(t);
else
- oargs[i] = a;
+ oargs[i] = r(a);
}
- m = mformat(m, oargs);
+ m = f(m, oargs);
if (inner instanceof AssertionPredicate inner2) //
NOSONAR - Intentional.
m += "\n\t" + inner2.getFailureMessage();
failedMessage.set(m);
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 d3c54f811c..ca0653e078 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
@@ -170,7 +170,7 @@ public class AssertionPredicates {
*/
public static final <T> AssertionPredicate<T> exactType(Class<?> type) {
assertArgNotNull("type", type);
- return test(x -> x != null && x.getClass().equals(type),
MSG_valueWasNotExpectedType, type, TYPENAME);
+ return test(x -> x != null && x.getClass().equals(type),
MSG_valueWasNotExpectedType, cn(type), TYPENAME);
}
/**
@@ -382,7 +382,7 @@ public class AssertionPredicates {
*/
public static final <T> AssertionPredicate<T> type(Class<?> type) {
assertArgNotNull("type", type);
- return test(x -> x != null &&
type.isAssignableFrom(x.getClass()), MSG_valueWasNotExpectedType, type,
TYPENAME);
+ return test(x -> x != null &&
type.isAssignableFrom(x.getClass()), MSG_valueWasNotExpectedType, cn(type),
TYPENAME);
}
/**
