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 67d8a1afbe SonarQube bug fixes
67d8a1afbe is described below
commit 67d8a1afbe0edaebb7efe4517d18297623b540a4
Author: James Bognar <[email protected]>
AuthorDate: Tue Feb 3 10:09:47 2026 -0500
SonarQube bug fixes
---
.../org/apache/juneau/annotation/BeanConfig.java | 2 +-
.../apache/juneau/uon/annotation/UonConfig.java | 2 +-
.../rest/annotation/RestDeleteAnnotation.java | 2 +-
.../rest/annotation/RestDestroyAnnotation.java | 2 +-
.../rest/annotation/RestEndCallAnnotation.java | 2 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 2 +-
.../juneau/rest/annotation/RestInitAnnotation.java | 2 +-
.../rest/annotation/RestInjectAnnotation.java | 2 +-
.../juneau/rest/annotation/RestOpAnnotation.java | 2 +-
.../rest/annotation/RestOptionsAnnotation.java | 2 +-
.../rest/annotation/RestPatchAnnotation.java | 2 +-
.../juneau/rest/annotation/RestPostAnnotation.java | 2 +-
.../rest/annotation/RestPostCallAnnotation.java | 2 +-
.../rest/annotation/RestPostInitAnnotation.java | 2 +-
.../rest/annotation/RestPreCallAnnotation.java | 2 +-
.../juneau/rest/annotation/RestPutAnnotation.java | 2 +-
.../rest/annotation/RestStartCallAnnotation.java | 2 +-
.../juneau/rest/httppart/RequestContent.java | 2 +-
.../apache/juneau/BasicRuntimeException_Test.java | 12 ---
.../java/org/apache/juneau/BeanContext_Test.java | 5 +-
.../juneau/commons/collections/MultiList_Test.java | 8 --
.../juneau/commons/collections/MultiMap_Test.java | 14 +--
.../commons/collections/ReversedList_Test.java | 9 --
.../juneau/commons/inject/BasicBeanStore_Test.java | 5 -
.../juneau/commons/lang/BooleanValue_Test.java | 2 +-
.../juneau/commons/lang/StringFormat_Test.java | 6 --
.../commons/reflect/AnnotationTraversal_Test.java | 2 +-
.../juneau/commons/reflect/ClassInfo_Test.java | 39 +-------
.../juneau/commons/reflect/ElementInfo_Test.java | 12 +--
.../commons/reflect/ExecutableException_Test.java | 6 +-
.../juneau/commons/reflect/PackageInfo_Test.java | 4 +-
.../commons/reflect/ReflectionUtils_Test.java | 12 +--
.../juneau/commons/utils/AssertionUtils_Test.java | 110 ++++++++++-----------
.../juneau/commons/utils/PredicateUtils_Test.java | 44 ++++-----
.../commons/utils/ResourceBundleUtils_Test.java | 6 +-
.../juneau/commons/utils/StringUtils_Test.java | 3 +
.../java/org/apache/juneau/cp/BeanStore_Test.java | 58 -----------
.../HttpPartSchema_JakartaValidation_Test.java | 8 --
.../apache/juneau/junit/bct/Stringifiers_Test.java | 72 +++++++-------
39 files changed, 163 insertions(+), 310 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index 50fac6ef17..6004c11ccc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -915,7 +915,7 @@ public @interface BeanConfig {
* <li class='note'>
* Supports <a class="doclink"
href="https://juneau.apache.org/docs/topics/DefaultVarResolver";>VarResolver.DEFAULT</a>
(e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
-
+ *
* <h5 class='section'>See Also:</h5><ul>
* <li class='ja'>{@link Bean#typePropertyName()}
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#typePropertyName(String)}
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 bd2f911965..f716219e6a 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
@@ -175,7 +175,7 @@ public @interface UonConfig {
* <li class='note'>
* Supports <a class="doclink"
href="https://juneau.apache.org/docs/topics/DefaultVarResolver";>VarResolver.DEFAULT</a>
(e.g. <js>"$C{myConfigVar}"</js>).
* </ul>
-
+ *
* <h5 class='section'>See Also:</h5><ul>
* <li class='jm'>{@link
org.apache.juneau.uon.UonParser.Builder#validateEnd()}
* </ul>
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
index 7071f81006..9a20b11c94 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
@@ -286,7 +286,7 @@ public class RestDeleteAnnotation {
super.on(value);
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder on(MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
index d0bf73761b..7e158b48ef 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation.java
@@ -98,7 +98,7 @@ public class RestDestroyAnnotation {
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder
on(org.apache.juneau.commons.reflect.MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
index 63a7958820..d7b27671c2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation.java
@@ -98,7 +98,7 @@ public class RestEndCallAnnotation {
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder
on(org.apache.juneau.commons.reflect.MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
index 81001d2bc7..c8838c7d22 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
@@ -325,7 +325,7 @@ public class RestGetAnnotation {
super.on(value);
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder on(MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
index 7151e2649e..53b5810379 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInitAnnotation.java
@@ -98,7 +98,7 @@ public class RestInitAnnotation {
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder
on(org.apache.juneau.commons.reflect.MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
index 05528f08c6..874912a177 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInjectAnnotation.java
@@ -130,7 +130,7 @@ public class RestInjectAnnotation {
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder
on(org.apache.juneau.commons.reflect.MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index a475ab8cc2..b9ed53030f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -397,7 +397,7 @@ public class RestOpAnnotation {
super.on(value);
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder on(MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
index 65850c8a7d..0a1e0272a1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
@@ -325,7 +325,7 @@ public class RestOptionsAnnotation {
super.on(value);
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder on(MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
index 1db5711449..4500005f26 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
@@ -381,7 +381,7 @@ public class RestPatchAnnotation {
super.on(value);
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder on(MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index 217f94f50f..79bf6d09a1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -382,7 +382,7 @@ public class RestPostAnnotation {
super.on(value);
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder on(MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
index e91b6e48bc..85df92dff1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation.java
@@ -98,7 +98,7 @@ public class RestPostCallAnnotation {
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder
on(org.apache.juneau.commons.reflect.MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
index 8238fb2fe7..2ed3aff2ad 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation.java
@@ -109,7 +109,7 @@ public class RestPostInitAnnotation {
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder
on(org.apache.juneau.commons.reflect.MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
index f59619c003..6c8aa61856 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation.java
@@ -98,7 +98,7 @@ public class RestPreCallAnnotation {
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder
on(org.apache.juneau.commons.reflect.MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index c7a0fcd7fe..4e580c824a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -382,7 +382,7 @@ public class RestPutAnnotation {
super.on(value);
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder on(MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
index 31ca1f7d8f..ada71dedb9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation.java
@@ -98,7 +98,7 @@ public class RestStartCallAnnotation {
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderM */
public Builder
on(org.apache.juneau.commons.reflect.MethodInfo...value) {
super.on(value);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
index 8bbe3b3e2f..b7901c65b2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
@@ -176,7 +176,7 @@ public class RequestContent {
*
* <jc>// Parse into an int array.</jc>
* <jk>int</jk>[] <jv>content2</jv> =
<jv>req</jv>.getContent().as(<jk>int</jk>[].<jk>class</jk>);
-
+ *
* <jc>// Parse into a bean.</jc>
* MyBean <jv>content3</jv> =
<jv>req</jv>.getContent().as(MyBean.<jk>class</jk>);
*
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/BasicRuntimeException_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/BasicRuntimeException_Test.java
index 57443cbca9..ea9a213b5c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/BasicRuntimeException_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/BasicRuntimeException_Test.java
@@ -67,18 +67,6 @@ class BasicRuntimeException_Test extends TestBase {
assertEquals("Message arg1", x.getMessage());
}
-// @Test void a05_ExecutableException_fluentSetters() {
-// ExecutableException x = new ExecutableException("Original
message");
-//
-// // Test setMessage returns same instance for fluent chaining
-// assertSame(x, x.setMessage("New message"));
-// assertEquals("New message", x.getMessage());
-//
-// // Test setMessage with args
-// assertSame(x, x.setMessage("Message {0}", "arg1"));
-// assertEquals("Message arg1", x.getMessage());
-// }
-
@Test void a06_InvalidAnnotationException_fluentSetters() {
var x = new InvalidAnnotationException("Original message");
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanContext_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanContext_Test.java
index 4c3d8506a9..0d77da5c80 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanContext_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanContext_Test.java
@@ -160,14 +160,13 @@ class BeanContext_Test extends TestBase {
// BeanContext.Builder.impl() - Line 2372 coverage
//====================================================================================================
- @Test void e01_impl() {
- // Create a BeanContext to use as the implementation
+ @Test
+ void e01_impl() {
var impl = BeanContext.create()
.sortProperties()
.locale(Locale.CANADA)
.build();
- // Call impl() which exercises line 2372: super.impl(value);
var builder = BeanContext.create()
.impl(impl);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
index cb851c5d5b..4cd3941bc1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
@@ -697,7 +697,6 @@ class MultiList_Test extends TestBase {
@Test
void h07_listIterator_hasPrevious_findsPreviousList() {
- // Line 387: return true when previous list has elements
var l1 = l(a("1", "2"));
List<String> l2 = l(a()); // Empty list
var l3 = l(a("3", "4"));
@@ -714,7 +713,6 @@ class MultiList_Test extends TestBase {
@Test
void h08_listIterator_remove_throwsWhenCurrentIteratorIsNull() {
- // Line 418: throw IllegalStateException when currentIterator
== null
var l1 = l(a("1"));
var ml = new MultiList<>(l1);
var li = ml.listIterator();
@@ -724,7 +722,6 @@ class MultiList_Test extends TestBase {
@Test
void h09_listIterator_set_throwsWhenCurrentIteratorIsNull() {
- // Line 426: throw IllegalStateException when currentIterator
== null
var l1 = l(a("1"));
var ml = new MultiList<>(l1);
var li = ml.listIterator();
@@ -734,8 +731,6 @@ class MultiList_Test extends TestBase {
@Test
void h10_listIterator_constructor_atEndWithNonEmptyLists() {
- // Line 346: if (currentIterator == null && l.length > 0)
- // This happens when index is at the end
var l1 = l(a("1", "2"));
var l2 = l(a("3", "4"));
var ml = new MultiList<>(l1, l2);
@@ -748,8 +743,6 @@ class MultiList_Test extends TestBase {
@Test
void h11_equals_differentLengths() {
- // Line 509: while (e1.hasNext() && e2.hasNext())
- // Line 515: return !(e1.hasNext() || e2.hasNext());
// Test when lists have different lengths
var l1 = l(a("1", "2"));
var ml1 = new MultiList<>(l1);
@@ -777,7 +770,6 @@ class MultiList_Test extends TestBase {
@Test
void h13_hashCode_iteratesThroughAllElements() {
- // Line 541: for (E e : this)
// Test that hashCode iterates through all elements
var l1 = l(a("1", "2"));
var l2 = l(a("3", "4"));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
index e2013da888..debc45f9c9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
@@ -520,7 +520,6 @@ class MultiMap_Test extends TestBase {
@Test
void m01_entrySet_iterator_emptyMaps() {
- // Line 218: if (m.length > 0) - when there are no maps
Map<String, String> map1 = map();
Map<String, String> map2 = map();
var multiMap = new MultiMap<>(map1, map2);
@@ -530,7 +529,6 @@ class MultiMap_Test extends TestBase {
@Test
void m02_entrySet_iterator_next_throwsWhenNextEntryIsNull() {
- // Line 253: throw NoSuchElementException when nextEntry == null
Map<String, String> map1 = map();
var multiMap = new MultiMap<>(map1);
var iterator = multiMap.entrySet().iterator();
@@ -539,7 +537,6 @@ class MultiMap_Test extends TestBase {
@Test
void m03_entrySet_iterator_remove_throwsWhenCanRemoveIsFalse() {
- // Line 264: throw IllegalStateException when canRemove is
false or lastIterator is null
var map1 = new LinkedHashMap<>(map("key1", "value1"));
var multiMap = new MultiMap<>(map1);
var iterator = multiMap.entrySet().iterator();
@@ -549,7 +546,6 @@ class MultiMap_Test extends TestBase {
@Test
void m04_entrySet_iterator_remove_throwsWhenLastIteratorIsNull() {
- // Line 264: throw IllegalStateException when lastIterator is
null
var map1 = new LinkedHashMap<>(map("key1", "value1"));
var multiMap = new MultiMap<>(map1);
var iterator = multiMap.entrySet().iterator();
@@ -561,22 +557,20 @@ class MultiMap_Test extends TestBase {
@Test
void m05_values_iterator_remove() {
- // Lines 350-351: entryIterator.remove() in values iterator
// Test that remove() delegates to entryIterator.remove()
var map1 = new LinkedHashMap<>(map("key1", "value1"));
var multiMap = new MultiMap<>(map1);
var valuesIterator = multiMap.values().iterator();
-
+
// Get first value
assertEquals("value1", valuesIterator.next());
-
+
// Remove should work (delegates to entryIterator.remove()
which calls entrySet iterator remove)
// This covers lines 350-351
valuesIterator.remove();
-
+
// Verify the entry was removed from the underlying map
assertFalse(map1.containsKey("key1"));
assertTrue(map1.isEmpty());
}
-}
-
+}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ReversedList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ReversedList_Test.java
index 8743787b68..ee4da380a0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ReversedList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ReversedList_Test.java
@@ -598,26 +598,18 @@ class ReversedList_Test extends TestBase {
@Test
void l01_equals_differentLengths() {
- // Line 320: while (e1.hasNext() && e2.hasNext())
- // Line 326: return !(e1.hasNext() || e2.hasNext());
- // Test when lists have different lengths - one iterator
exhausted before the other
var original1 = new ArrayList<>(List.of("a", "b", "c"));
var reversed1 = new ReversedList<>(original1);
var original2 = new ArrayList<>(List.of("a", "b", "c", "d"));
var reversed2 = new ReversedList<>(original2);
- // reversed1: ["c", "b", "a"]
- // reversed2: ["d", "c", "b", "a"]
- // After comparing first 3 elements, e1 is exhausted but e2 has
more
- // Line 326: return !(e1.hasNext() || e2.hasNext()) should
return false
assertNotEquals(reversed1, reversed2);
assertNotEquals(reversed2, reversed1);
}
@Test
void l02_equals_oneExhausted() {
- // Line 326: return !(e1.hasNext() || e2.hasNext());
// Test when one iterator is exhausted before the other
var original1 = new ArrayList<>(List.of("a", "b"));
var reversed1 = new ReversedList<>(original1);
@@ -633,7 +625,6 @@ class ReversedList_Test extends TestBase {
@Test
void l03_hashCode_withNullElements() {
- // Line 356: hashCode = 31 * hashCode + (e == null ? 0 :
e.hashCode());
// Test hashCode with null elements
var original = new ArrayList<>(Arrays.asList("a", null, "c"));
var reversed = new ReversedList<>(original);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
index 32b78690ca..be975f8106 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/inject/BasicBeanStore_Test.java
@@ -582,14 +582,12 @@ class BasicBeanStore_Test extends TestBase {
var store = new BasicBeanStore2(parent);
// Store has no beans, but parent does
- // This should hit line 259: return nn(parent) &&
parent.hasBean(beanType);
assertTrue(store.hasBean(TestBean.class));
}
@Test
void j07_hasBean_unnamed_noParentAndNotFound() {
var store = new BasicBeanStore2(null);
- // No beans, no parent - should hit line 259 with parent=null
assertFalse(store.hasBean(TestBean.class));
}
@@ -650,7 +648,6 @@ class BasicBeanStore_Test extends TestBase {
var store = new BasicBeanStore2(parent);
// Store has no beans, but parent does
- // This should hit line 280: return nn(parent) &&
parent.hasBean(beanType, name);
assertTrue(store.hasBean(TestBean.class, "name1"));
}
@@ -661,14 +658,12 @@ class BasicBeanStore_Test extends TestBase {
store.addBean(TestBean.class, new TestBean("test1"), "name1");
// hasBean should return false since "name2" doesn't exist
- // This should hit line 277: if (typeMap.containsKey(key)) -
false branch
assertFalse(store.hasBean(TestBean.class, "name2"));
}
@Test
void k09_hasBean_named_noParentAndNotFound() {
var store = new BasicBeanStore2(null);
- // No beans, no parent - should hit line 280 with parent=null
assertFalse(store.hasBean(TestBean.class, "name1"));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/lang/BooleanValue_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/BooleanValue_Test.java
index 0779db22c1..fb562a8faf 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/lang/BooleanValue_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/BooleanValue_Test.java
@@ -321,7 +321,7 @@ class BooleanValue_Test extends TestBase {
assertFalse(v.isAny(true));
assertFalse(v.isAny(false));
assertFalse(v.isAny());
-
+
// Test that null array throws IllegalArgumentException
assertThrows(IllegalArgumentException.class, () ->
v.isAny((Boolean[])null));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringFormat_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringFormat_Test.java
index ff75b4e8c8..fd9c43379d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringFormat_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/lang/StringFormat_Test.java
@@ -409,7 +409,6 @@ class StringFormat_Test extends TestBase {
//====================================================================================================
// Test coverage for line 162 branches in MessageFormatToken.append()
- // Line 162: if (args == null || index >= args.length || index < 0)
//====================================================================================================
@Test void a14_messageFormatTokenBranches() {
// Test args == null branch - covers line 162 (args == null)
@@ -455,7 +454,6 @@ class StringFormat_Test extends TestBase {
//====================================================================================================
// Test coverage for line 217 branches in StringFormatToken.append()
- // Line 217: if (args == null || index >= args.length || index < 0)
//====================================================================================================
@Test void a15_stringFormatTokenBranches() {
// Test args == null branch - covers line 217 (args == null)
@@ -488,10 +486,6 @@ class StringFormat_Test extends TestBase {
}
@Test void a12_localeHandling() {
- // Lines 259-260: Test locale null checks and default locale
detection in StringFormatToken
- // Line 259: var l = locale == null ? Locale.getDefault() :
locale;
- // Line 260: var dl = locale == null ||
locale.equals(Locale.getDefault());
-
// Test with null locale (covers locale == null on both lines)
assertStringFormat("Hello %s", (Locale)null, "John");
assertStringFormat("Number: %d", (Locale)null, 42);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/AnnotationTraversal_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/AnnotationTraversal_Test.java
index 32d0081b43..d7fdcd121c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/AnnotationTraversal_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/AnnotationTraversal_Test.java
@@ -38,7 +38,7 @@ class AnnotationTraversal_Test extends TestBase {
assertEquals(35,
AnnotationTraversal.DECLARING_CLASS.getOrder());
assertEquals(40, AnnotationTraversal.PACKAGE.getOrder());
assertEquals(999, AnnotationTraversal.REVERSE.getOrder());
-
+
// Verify order values are as expected (lower values = higher
precedence)
assertTrue(AnnotationTraversal.SELF.getOrder() <
AnnotationTraversal.PARENTS.getOrder());
assertTrue(AnnotationTraversal.PARENTS.getOrder() <
AnnotationTraversal.RETURN_TYPE.getOrder());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
index a563f32c83..f95fdab8a4 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ClassInfo_Test.java
@@ -538,6 +538,7 @@ public class ClassInfo_Test extends TestBase {
// arrayType()
//====================================================================================================
@Test
+ @SuppressWarnings("java:S125")
void a002_arrayType() {
var ci = ClassInfo.of(String.class);
var arrayType = ci.arrayType();
@@ -778,16 +779,6 @@ public class ClassInfo_Test extends TestBase {
assertTrue(ClassInfo.of(Number.class).canAcceptArg(42));
assertTrue(ClassInfo.of(Number.class).canAcceptArg(Integer.valueOf(42)));
- // Test line 434: all 4 branches of if (this.isPrimitive() ||
child.getClass().isPrimitive())
- // Branch 1: this.isPrimitive() == true &&
child.getClass().isPrimitive() == true
- // Note: When you pass a primitive value like 42, it gets
autoboxed to Integer, so child.getClass() returns Integer.class (not primitive)
- // This branch is likely unreachable in practice since
primitive values are always autoboxed
-
- // Branch 2: this.isPrimitive() == true &&
child.getClass().isPrimitive() == false (already covered above at line 707)
- // Branch 3: this.isPrimitive() == false &&
child.getClass().isPrimitive() == true (already covered above at line 710)
- // Branch 4: this.isPrimitive() == false &&
child.getClass().isPrimitive() == false
- // This happens when both are non-primitive, isInstance returns
false, and we fall through to return false
- // This is the missing branch - need to test when condition is
false (both false), so we skip the if and return false
assertFalse(ClassInfo.of(String.class).canAcceptArg(new
Object())); // Both non-primitive, isInstance false, condition false, returns
false
assertFalse(ClassInfo.of(String.class).canAcceptArg(42)); //
String is not primitive, Integer is not primitive, isInstance false, condition
false, returns false
@@ -1424,28 +1415,20 @@ public class ClassInfo_Test extends TestBase {
// When inner is null but isParameterizedType is true, code
extracts raw type and uses its simple name
assertEquals("Map", formatted2);
- // Test line 326: FULL format separator replacement (4 branches)
- // Branch 1: separator != '$' && sb.indexOf("$") != -1 (true,
true) - should replace '$' with separator
var ci12 = ClassInfo.of(Map.Entry.class);
assertEquals("java.util.Map.Entry", ci12.getNameFormatted(FULL,
false, '.', BRACKETS));
- // Branch 2: separator != '$' && sb.indexOf("$") == -1 (true,
false) - no '$' in name, no replacement needed
var ci13 = ClassInfo.of(String.class);
assertEquals("java.lang.String", ci13.getNameFormatted(FULL,
false, '.', BRACKETS));
- // Branch 3: separator == '$' && sb.indexOf("$") != -1 (false,
true) - separator is '$', no replacement
assertEquals("java.util.Map$Entry", ci12.getNameFormatted(FULL,
false, '$', BRACKETS));
- // Branch 4: separator == '$' && sb.indexOf("$") == -1 (false,
false) - separator is '$', no '$' in name
assertEquals("java.lang.String", ci13.getNameFormatted(FULL,
false, '$', BRACKETS));
- // Test line 360: SIMPLE format with null class (not
ParameterizedType) - should use innerType.getTypeName()
- // Use an existing TypeVariable from MC class which has type
parameters
var typeVar = MC.class.getTypeParameters()[0]; // MC<K,E> has K
as first type parameter
var ci14 = ClassInfo.of((Class<?>)null, typeVar);
var formatted3 = ci14.getNameFormatted(SIMPLE, false, '$',
BRACKETS);
assertNotNull(formatted3);
- // Should use innerType.getTypeName() which returns the type
variable name
assertEquals(typeVar.getName(), formatted3);
}
@@ -2112,8 +2095,6 @@ public class ClassInfo_Test extends TestBase {
// @Repeatable itself is not repeatable, so should return null
assertNull(method);
- // Test isRepeatedAnnotation() (line 2135)
- // When getRepeatedAnnotationMethod() returns null,
isRepeatedAnnotation() should return false
assertFalse(repeatable.isRepeatedAnnotation());
// Test with a class that has a repeatable annotation method
@@ -2124,19 +2105,9 @@ public class ClassInfo_Test extends TestBase {
assertNotNull(containerMethod); // Should find the value()
method
assertTrue(container.isRepeatedAnnotation()); // Line 2135:
getRepeatedAnnotationMethod() != null returns true
- // Test line 2364 branches: return r != null &&
r.value().equals(inner);
- // Branch 1: r != null is false (r is null) - when component
type doesn't have @Repeatable
- // This is covered by NonRepeatableArrayContainer which has
value() returning String[], but String is not a repeatable annotation
var nonRepeatableContainer =
ClassInfo.of(NonRepeatableArrayContainer.class);
assertNull(nonRepeatableContainer.getRepeatedAnnotationMethod()); // Should
return null because String is not repeatable
- // Branch 2: r != null is true, r.value().equals(inner) is true
- covered by TestRepeatableContainer above
- // TestRepeatableContainer has value() returning
TestRepeatable[], and TestRepeatable is marked with
@Repeatable(TestRepeatableContainer.class)
- // So when checking TestRepeatableContainer, r.value() equals
TestRepeatableContainer.class (inner)
-
- // Branch 3: r != null is true, r.value().equals(inner) is
false - when @Repeatable points to a different container
- // WrongContainer has value() returning TestRepeatable[], but
TestRepeatable's @Repeatable points to TestRepeatableContainer, not
WrongContainer
- // So when checking WrongContainer, r.value() would be
TestRepeatableContainer.class, not WrongContainer.class, so equals(inner) is
false
var wrongContainer = ClassInfo.of(WrongContainer.class);
assertNull(wrongContainer.getRepeatedAnnotationMethod()); //
Should return null because the @Repeatable points to a different container
@@ -3130,17 +3101,9 @@ public class ClassInfo_Test extends TestBase {
var nullInnerCi = ClassInfo.of((Class<?>)null, pType);
assertFalse(nullInnerCi.isParentOfLenient(ClassInfo.of(String.class)));
- // Test all branches of line 2087: if (this.isPrimitive() ||
child.isPrimitive())
- // Branch 1: this.isPrimitive() == true, child.isPrimitive() ==
false (already covered above)
- // Branch 2: this.isPrimitive() == false, child.isPrimitive()
== true (already covered above)
- // Branch 3: this.isPrimitive() == true, child.isPrimitive() ==
true
- // Note: If both are the same primitive, isAssignableFrom
returns true, so we return early at line 2086
- // To reach line 2087 with both primitives, we need different
primitive types
assertFalse(ClassInfo.of(int.class).isParentOfLenient(ClassInfo.of(long.class)));
- // Same primitive type (returns true at line 2086, doesn't
reach line 2087)
assertTrue(ClassInfo.of(int.class).isParentOfLenient(int.class));
assertTrue(ClassInfo.of(int.class).isParentOfLenient(ClassInfo.of(int.class)));
- // Branch 4: this.isPrimitive() == false, child.isPrimitive()
== false (already covered by String tests)
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ElementInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ElementInfo_Test.java
index 6f13e730b6..6386e0e081 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ElementInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ElementInfo_Test.java
@@ -262,17 +262,17 @@ class ElementInfo_Test extends TestBase {
// Empty flags array - allMatch on empty stream returns true
(vacuous truth) (line 143)
assertTrue(publicClass.isAll());
assertTrue(staticMethod.isAll());
-
+
// Single flag - ensures stream(flags).allMatch(this::is) is
executed (line 143)
assertTrue(publicClass.isAll(PUBLIC));
assertFalse(publicClass.isAll(PRIVATE));
assertTrue(staticMethod.isAll(STATIC));
assertFalse(staticMethod.isAll(FINAL));
-
+
// Multiple flags where first doesn't match (short-circuit) -
line 143
// allMatch short-circuits on first false, so this tests the
short-circuit branch
assertFalse(publicClass.isAll(PRIVATE, PUBLIC, NOT_PRIVATE));
-
+
// Multiple flags where all match (full iteration) - line 143
// allMatch iterates through all elements when all are true
assertTrue(publicClass.isAll(PUBLIC, NOT_PRIVATE,
NOT_PROTECTED, NOT_FINAL));
@@ -299,17 +299,17 @@ class ElementInfo_Test extends TestBase {
// Empty flags array - anyMatch on empty stream returns false
(line 157)
assertFalse(publicClass.isAny(new ElementFlag[0]));
assertFalse(staticMethod.isAny(new ElementFlag[0]));
-
+
// Single flag - ensures stream(flags).anyMatch(this::is) is
executed (line 157)
assertTrue(publicClass.isAny(PUBLIC));
assertFalse(publicClass.isAny(PRIVATE));
assertTrue(staticMethod.isAny(STATIC));
assertFalse(staticMethod.isAny(FINAL));
-
+
// Multiple flags where first matches (short-circuit) - line 157
// anyMatch short-circuits on first true, so this tests the
short-circuit branch
assertTrue(publicClass.isAny(PUBLIC, PRIVATE, PROTECTED));
-
+
// Multiple flags where none match (full iteration) - line 157
// anyMatch iterates through all elements when all are false
assertFalse(publicClass.isAny(PRIVATE, PROTECTED, FINAL,
ABSTRACT));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableException_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableException_Test.java
index 793c9d1331..4c7c2bbe2b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableException_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableException_Test.java
@@ -83,12 +83,12 @@ class ExecutableException_Test extends TestBase {
InvocationTargetException ite = new
InvocationTargetException(targetException);
ExecutableException e = new ExecutableException(ite);
assertSame(targetException, e.getTargetException());
-
+
// With other exception
IllegalArgumentException iae = new
IllegalArgumentException("test");
ExecutableException e2 = new ExecutableException(iae);
assertSame(iae, e2.getTargetException());
-
+
// With no cause
ExecutableException e3 = new ExecutableException("message");
assertNull(e3.getTargetException());
@@ -103,7 +103,7 @@ class ExecutableException_Test extends TestBase {
Throwable cause = new RuntimeException("cause");
ExecutableException e = new ExecutableException(cause);
assertSame(cause, e.unwrap());
-
+
// Without cause
ExecutableException e2 = new ExecutableException("message");
assertSame(e2, e2.unwrap());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
index ef4cad1c7d..ccaeb75faf 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
@@ -228,7 +228,7 @@ class PackageInfo_Test extends TestBase {
// Package versions come from JAR manifest
(Specification-Version header)
// Most test packages don't have versions, so isCompatibleWith
throws NumberFormatException
// However, line 309 is still executed - the exception is
thrown FROM that line
-
+
// Try to find a package with a version (e.g., from standard
library or a dependency)
// If found, test the normal return path
var specVersion = pi.getSpecificationVersion();
@@ -236,7 +236,7 @@ class PackageInfo_Test extends TestBase {
// Line 309: normal return path when package has a
version
var compatible = pi.isCompatibleWith("1.0");
assertNotNull(compatible);
-
+
// Test with another version
var compatible2 = pi.isCompatibleWith("2.0");
assertNotNull(compatible2);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ReflectionUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ReflectionUtils_Test.java
index c9ccbb491d..fd9d0dbef3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ReflectionUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ReflectionUtils_Test.java
@@ -51,7 +51,7 @@ class ReflectionUtils_Test extends TestBase {
ClassInfo ci = ReflectionUtils.info(TestClass.class);
assertNotNull(ci);
assertEquals(TestClass.class, ci.inner());
-
+
// Null class - ClassInfo.of(null) throws
IllegalArgumentException
assertThrows(IllegalArgumentException.class, () ->
ReflectionUtils.info((Class<?>)null));
}
@@ -66,7 +66,7 @@ class ReflectionUtils_Test extends TestBase {
ConstructorInfo ci = ReflectionUtils.info(ctor);
assertNotNull(ci);
assertEquals(ctor, ci.inner());
-
+
// Null constructor - ConstructorInfo.of(null) throws
IllegalArgumentException
assertThrows(IllegalArgumentException.class, () ->
ReflectionUtils.info((Constructor<?>)null));
}
@@ -81,7 +81,7 @@ class ReflectionUtils_Test extends TestBase {
FieldInfo fi = ReflectionUtils.info(field);
assertNotNull(fi);
assertEquals(field, fi.inner());
-
+
// Null field - FieldInfo.of(null) throws
IllegalArgumentException
assertThrows(IllegalArgumentException.class, () ->
ReflectionUtils.info((Field)null));
}
@@ -96,7 +96,7 @@ class ReflectionUtils_Test extends TestBase {
MethodInfo mi = ReflectionUtils.info(method);
assertNotNull(mi);
assertEquals(method, mi.inner());
-
+
// Null method - MethodInfo.of(null) throws
IllegalArgumentException
assertThrows(IllegalArgumentException.class, () ->
ReflectionUtils.info((Method)null));
}
@@ -111,10 +111,10 @@ class ReflectionUtils_Test extends TestBase {
ClassInfo ci = ReflectionUtils.info(obj);
assertNotNull(ci);
assertEquals(TestClass.class, ci.inner());
-
+
// Null object - ClassInfo.of(null) calls object.getClass()
which throws NPE
assertThrows(NullPointerException.class, () ->
ReflectionUtils.info((Object)null));
-
+
// Class object
ClassInfo ciClass = ReflectionUtils.info(TestClass.class);
assertNotNull(ciClass);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/AssertionUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/AssertionUtils_Test.java
index 2712690ab6..850958c594 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/AssertionUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/AssertionUtils_Test.java
@@ -47,16 +47,16 @@ class AssertionUtils_Test extends TestBase {
assertArg(true, "Should not throw");
assertArg(true, "Message with {0}", "arg");
assertArg(true, "Test {0} {1} {2}", "a", "b", "c");
-
+
// Should throw when expression is false
assertThrowsWithMessage(IllegalArgumentException.class, "Test
message", () -> {
assertArg(false, "Test message");
});
-
+
assertThrowsWithMessage(IllegalArgumentException.class, l("Test
message", "arg1"), () -> {
assertArg(false, "Test message {0}", "arg1");
});
-
+
assertThrowsWithMessage(IllegalArgumentException.class, "Test",
() -> {
assertArg(false, "Test {0} {1} {2}", "a", "b", "c");
});
@@ -71,19 +71,19 @@ class AssertionUtils_Test extends TestBase {
var value = "test";
var result = assertArgNotNull("arg", value);
assertSame(value, result);
-
+
var obj = new Object();
var result2 = assertArgNotNull("arg", obj);
assertSame(obj, result2);
-
+
var i = 123;
var result3 = assertArgNotNull("int", i);
assertEquals(i, result3);
-
+
var d = 45.6;
var result4 = assertArgNotNull("double", d);
assertEquals(d, result4);
-
+
// Should throw when value is null
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg", "cannot be null"), () -> {
assertArgNotNull("arg", null);
@@ -99,26 +99,26 @@ class AssertionUtils_Test extends TestBase {
var value = "test";
var result = assertArgNotNullOrBlank("arg", value);
assertSame(value, result);
-
+
// Should throw when value is null
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg", "cannot be null"), () -> {
assertArgNotNullOrBlank("arg", null);
});
-
+
// Should throw when value is empty
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg", "cannot be blank"), () -> {
assertArgNotNullOrBlank("arg", "");
});
-
+
// Should throw when value is whitespace
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg", "cannot be blank"), () -> {
assertArgNotNullOrBlank("arg", " ");
});
-
+
assertThrowsWithMessage(IllegalArgumentException.class, "cannot
be blank", () -> {
assertArgNotNullOrBlank("arg", "\t");
});
-
+
assertThrowsWithMessage(IllegalArgumentException.class, "cannot
be blank", () -> {
assertArgNotNullOrBlank("arg", "\n");
});
@@ -131,17 +131,17 @@ class AssertionUtils_Test extends TestBase {
void a004_assertArgsNotNull_2args() {
// Should not throw when both are not null
assertArgsNotNull("arg1", "value1", "arg2", "value2");
-
+
// Should throw when first is null
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg1", "cannot be null"), () -> {
assertArgsNotNull("arg1", null, "arg2", "value2");
});
-
+
// Should throw when second is null
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg2", "cannot be null"), () -> {
assertArgsNotNull("arg1", "value1", "arg2", null);
});
-
+
// Should fail on first null when both are null
assertThrowsWithMessage(IllegalArgumentException.class, "arg1",
() -> {
assertArgsNotNull("arg1", null, "arg2", null);
@@ -155,17 +155,17 @@ class AssertionUtils_Test extends TestBase {
void a005_assertArgsNotNull_3args() {
// Should not throw when all are not null
assertArgsNotNull("arg1", "value1", "arg2", "value2", "arg3",
"value3");
-
+
// Should throw when first is null
assertThrowsWithMessage(IllegalArgumentException.class, "arg1",
() -> {
assertArgsNotNull("arg1", null, "arg2", "value2",
"arg3", "value3");
});
-
+
// Should throw when second is null
assertThrowsWithMessage(IllegalArgumentException.class, "arg2",
() -> {
assertArgsNotNull("arg1", "value1", "arg2", null,
"arg3", "value3");
});
-
+
// Should throw when third is null
assertThrowsWithMessage(IllegalArgumentException.class, "arg3",
() -> {
assertArgsNotNull("arg1", "value1", "arg2", "value2",
"arg3", null);
@@ -179,12 +179,12 @@ class AssertionUtils_Test extends TestBase {
void a006_assertArgsNotNull_4args() {
// Should not throw when all are not null
assertArgsNotNull("arg1", "value1", "arg2", "value2", "arg3",
"value3", "arg4", "value4");
-
+
// Should throw when first is null
assertThrowsWithMessage(IllegalArgumentException.class, "arg1",
() -> {
assertArgsNotNull("arg1", null, "arg2", "value2",
"arg3", "value3", "arg4", "value4");
});
-
+
// Should throw when fourth is null
assertThrowsWithMessage(IllegalArgumentException.class, "arg4",
() -> {
assertArgsNotNull("arg1", "value1", "arg2", "value2",
"arg3", "value3", "arg4", null);
@@ -198,12 +198,12 @@ class AssertionUtils_Test extends TestBase {
void a007_assertArgsNotNull_5args() {
// Should not throw when all are not null
assertArgsNotNull("arg1", "value1", "arg2", "value2", "arg3",
"value3", "arg4", "value4", "arg5", "value5");
-
+
// Should throw when first is null
assertThrowsWithMessage(IllegalArgumentException.class, "arg1",
() -> {
assertArgsNotNull("arg1", null, "arg2", "value2",
"arg3", "value3", "arg4", "value4", "arg5", "value5");
});
-
+
// Should throw when fifth is null
assertThrowsWithMessage(IllegalArgumentException.class, "arg5",
() -> {
assertArgsNotNull("arg1", "value1", "arg2", "value2",
"arg3", "value3", "arg4", "value4", "arg5", null);
@@ -219,28 +219,28 @@ class AssertionUtils_Test extends TestBase {
var classes = a(String.class, Object.class);
var result = assertClassArrayArgIsType("arg", Object.class,
classes);
assertSame(classes, result);
-
+
// Should not throw with empty array
var emptyClasses = new Class<?>[0];
var result2 = assertClassArrayArgIsType("arg", Object.class,
emptyClasses);
assertSame(emptyClasses, result2);
-
+
// Should not throw with subclasses
var subclasses = a(Integer.class, Double.class);
var result3 = assertClassArrayArgIsType("arg", Number.class,
subclasses);
assertSame(subclasses, result3);
-
+
// Should not throw with same class
var sameClasses = a(String.class);
var result4 = assertClassArrayArgIsType("arg", String.class,
sameClasses);
assertSame(sameClasses, result4);
-
+
// Should throw when class is not assignable
var invalidClasses = a(String.class, Integer.class);
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg", "String"), () -> {
assertClassArrayArgIsType("arg", Number.class,
invalidClasses);
});
-
+
// Should throw with index information
var invalidClasses2 = a(String.class, Integer.class,
Double.class);
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg", "index", "0"), () -> {
@@ -257,43 +257,43 @@ class AssertionUtils_Test extends TestBase {
assertEquals("test", assertOneOf("test", "test", "other"));
assertEquals(123, assertOneOf(123, 123, 456));
assertEquals("a", assertOneOf("a", "a", "b", "c"));
-
+
// Exact match
assertEquals("test", assertOneOf("test", "test"));
assertEquals(1, assertOneOf(1, 1, 2, 3));
-
+
// Match in middle
assertEquals(2, assertOneOf(2, 1, 2, 3));
-
+
// Match at end
assertEquals(3, assertOneOf(3, 1, 2, 3));
-
+
// Should handle nulls
assertNull(assertOneOf(null, null, "test"));
assertNull(assertOneOf(null, "test", null));
-
+
// Should return same instance
var value = "test";
var result = assertOneOf(value, "test", "other");
assertSame(value, result);
-
+
// Should work with objects
var obj1 = new Object();
var obj2 = new Object();
var result2 = assertOneOf(obj1, obj1, obj2);
assertSame(obj1, result2);
-
+
// Should throw when value doesn't match
assertThrowsWithMessage(AssertionError.class, l("Invalid value
specified", "test"), () -> {
assertOneOf("test", "other");
});
-
+
assertThrowsWithMessage(AssertionError.class, l("Invalid value
specified", "test"), () -> {
assertOneOf("test", "a", "b", "c");
});
-
+
assertThrows(AssertionError.class, () -> assertOneOf(10, 1, 2,
3, 4, 5));
-
+
// Should throw with empty expected
assertThrowsWithMessage(AssertionError.class, "Invalid value
specified", () -> {
assertOneOf("test");
@@ -309,37 +309,37 @@ class AssertionUtils_Test extends TestBase {
String value = "test";
String result = assertType(String.class, value);
assertSame(value, result);
-
+
// Should work with subclasses
Integer intValue = 123;
Number numberResult = assertType(Number.class, intValue);
assertSame(intValue, numberResult);
-
+
// Should work with same class
Object obj = new Object();
Object result2 = assertType(Object.class, obj);
assertSame(obj, result2);
-
+
// Should work with primitive wrappers
Integer intValue2 = 42;
Integer result3 = assertType(Integer.class, intValue2);
assertSame(intValue2, result3);
-
+
// Should throw when type is null
assertThrowsWithMessage(IllegalArgumentException.class,
l("type", "cannot be null"), () -> {
assertType(null, "test");
});
-
+
// Should throw when object is null
assertThrowsWithMessage(IllegalArgumentException.class, l("o",
"cannot be null"), () -> {
assertType(String.class, null);
});
-
+
// Should throw when object is not an instance
assertThrowsWithMessage(IllegalArgumentException.class,
l("Object is not an instance of", "String", "Integer"), () -> {
assertType(String.class, 123);
});
-
+
assertThrowsWithMessage(IllegalArgumentException.class, "Object
is not an instance of", () -> {
assertType(Integer.class, "test");
});
@@ -354,31 +354,31 @@ class AssertionUtils_Test extends TestBase {
String value = "test";
String result = assertType(String.class, value, () -> new
IllegalStateException("Should not throw"));
assertSame(value, result);
-
+
// Should throw when type is null
assertThrowsWithMessage(IllegalArgumentException.class,
l("type", "cannot be null"), () -> {
assertType(null, "test", () -> new
IllegalStateException("Custom"));
});
-
+
// Should throw when object is null
assertThrowsWithMessage(IllegalArgumentException.class, l("o",
"cannot be null"), () -> {
assertType(String.class, null, () -> new
IllegalStateException("Custom"));
});
-
+
// Should throw custom exception when object is not an instance
IllegalStateException customException = new
IllegalStateException("Custom exception");
IllegalStateException thrown =
assertThrows(IllegalStateException.class, () -> {
assertType(String.class, 123, () -> customException);
});
assertSame(customException, thrown);
-
+
// Should work with different exception types
RuntimeException runtimeException = new
RuntimeException("Custom runtime exception");
RuntimeException thrown2 = assertThrows(RuntimeException.class,
() -> {
assertType(Integer.class, "test", () ->
runtimeException);
});
assertSame(runtimeException, thrown2);
-
+
// Should work with supplier that creates new exception
IllegalStateException thrown3 =
assertThrows(IllegalStateException.class, () -> {
assertType(String.class, 123, () -> new
IllegalStateException("Not a string"));
@@ -395,33 +395,33 @@ class AssertionUtils_Test extends TestBase {
var array = a("a", "b", "c");
var result = assertArgNoNulls("arg", array);
assertSame(array, result);
-
+
// Should not throw with empty array
var emptyArray = new String[0];
var result2 = assertArgNoNulls("arg", emptyArray);
assertSame(emptyArray, result2);
-
+
// Should work with integer array
var intArray = a(1, 2, 3);
var result3 = assertArgNoNulls("arg", intArray);
assertSame(intArray, result3);
-
+
// Should work with object array
var objArray = a(new Object(), new Object());
var result4 = assertArgNoNulls("arg", objArray);
assertSame(objArray, result4);
-
+
// Should throw when array is null
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg", "cannot be null"), () -> {
assertArgNoNulls("arg", (String[])null);
});
-
+
// Should throw when element is null
var nullElementArray = a("a", null, "c");
assertThrowsWithMessage(IllegalArgumentException.class,
l("arg", "parameter", "1"), () -> {
assertArgNoNulls("arg", nullElementArray);
});
-
+
// Should fail on first null when multiple elements are null
var multipleNullArray = a("a", null, null, "d");
assertThrowsWithMessage(IllegalArgumentException.class, "1", ()
-> {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/PredicateUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/PredicateUtils_Test.java
index 794fa4e3de..31bc96fe2b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/PredicateUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/PredicateUtils_Test.java
@@ -46,25 +46,25 @@ class PredicateUtils_Test {
void a001_consumeIf() {
List<String> consumed = new ArrayList<>();
Consumer<String> consumer = consumed::add;
-
+
// When predicate is null, should consume
consumeIf(null, consumer, "test");
assertEquals(1, consumed.size());
assertEquals("test", consumed.get(0));
-
+
// When predicate matches, should consume
consumed.clear();
Predicate<String> matches = s -> s.equals("match");
consumeIf(matches, consumer, "match");
assertEquals(1, consumed.size());
assertEquals("match", consumed.get(0));
-
+
// When predicate doesn't match, should not consume
consumed.clear();
Predicate<String> noMatch = s -> s.equals("match");
consumeIf(noMatch, consumer, "nomatch");
assertTrue(consumed.isEmpty());
-
+
// Test with different types
List<Integer> intConsumed = new ArrayList<>();
Consumer<Integer> intConsumer = intConsumed::add;
@@ -72,7 +72,7 @@ class PredicateUtils_Test {
consumeIf(even, intConsumer, 2);
assertEquals(1, intConsumed.size());
assertEquals(2, intConsumed.get(0));
-
+
consumeIf(even, intConsumer, 3);
assertEquals(1, intConsumed.size()); // Should not add 3
}
@@ -86,19 +86,19 @@ class PredicateUtils_Test {
PrintStream originalErr = System.err;
ByteArrayOutputStream errCapture = new ByteArrayOutputStream();
System.setErr(new PrintStream(errCapture));
-
+
try {
// Test peek() function
Function<String, String> peekFunc = peek();
String result = peekFunc.apply("test value");
-
+
// Should return the value unchanged
assertEquals("test value", result);
-
+
// Should have printed to stderr
String output = errCapture.toString();
assertTrue(output.contains("test value"), "Output
should contain 'test value', but was: " + output);
-
+
// Test with null
errCapture.reset();
Function<Object, Object> peekFunc2 = peek();
@@ -106,7 +106,7 @@ class PredicateUtils_Test {
assertNull(result2);
String output2 = errCapture.toString();
assertTrue(output2.contains("null"), "Output should
contain 'null', but was: " + output2);
-
+
// Test with different types
errCapture.reset();
Function<Integer, Integer> peekInt = peek();
@@ -128,19 +128,19 @@ class PredicateUtils_Test {
PrintStream originalErr = System.err;
ByteArrayOutputStream errCapture = new ByteArrayOutputStream();
System.setErr(new PrintStream(errCapture));
-
+
try {
// Test peek() with message and formatter
Function<String, String> peekFunc = peek("Processing:
{0}", String::toUpperCase);
String result = peekFunc.apply("test");
-
+
// Should return the value unchanged
assertEquals("test", result);
-
+
// Should have printed formatted message to stderr
String output = errCapture.toString();
assertTrue(output.contains("Processing: TEST"), "Output
should contain 'Processing: TEST', but was: " + output);
-
+
// Test with different formatter
errCapture.reset();
Function<Integer, Integer> peekInt = peek("Value: {0}",
i -> i * 2);
@@ -148,7 +148,7 @@ class PredicateUtils_Test {
assertEquals(5, result2);
String output2 = errCapture.toString();
assertTrue(output2.contains("Value: 10"), "Output
should contain 'Value: 10', but was: " + output2);
-
+
// Test with null value
errCapture.reset();
Function<String, String> peekNull = peek("Null value:
{0}", s -> s == null ? "null" : s);
@@ -156,7 +156,7 @@ class PredicateUtils_Test {
assertNull(result3);
String output3 = errCapture.toString();
assertTrue(output3.contains("Null value: null"),
"Output should contain 'Null value: null', but was: " + output3);
-
+
// Test with complex formatter
errCapture.reset();
class Person {
@@ -183,32 +183,32 @@ class PredicateUtils_Test {
assertTrue(test(null, "any value"));
assertTrue(test(null, null));
assertTrue(test(null, 123));
-
+
// When predicate matches, should return true
Predicate<String> matches = s -> s.equals("match");
assertTrue(test(matches, "match"));
-
+
// When predicate doesn't match, should return false
assertFalse(test(matches, "nomatch"));
-
+
// Test with different types
Predicate<Integer> even = i -> i % 2 == 0;
assertTrue(test(even, 2));
assertTrue(test(even, 4));
assertFalse(test(even, 3));
assertFalse(test(even, 5));
-
+
// Test with null value
Predicate<String> notNull = s -> s != null;
assertTrue(test(notNull, "test"));
assertFalse(test(notNull, null));
-
+
// Test with always true predicate
Predicate<Object> alwaysTrue = o -> true;
assertTrue(test(alwaysTrue, "anything"));
assertTrue(test(alwaysTrue, null));
assertTrue(test(alwaysTrue, 123));
-
+
// Test with always false predicate
Predicate<Object> alwaysFalse = o -> false;
assertFalse(test(alwaysFalse, "anything"));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ResourceBundleUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ResourceBundleUtils_Test.java
index eadbc05b8b..e14d5784ad 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ResourceBundleUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ResourceBundleUtils_Test.java
@@ -128,10 +128,10 @@ class ResourceBundleUtils_Test extends TestBase {
void a10_findBundle_differentClassLoaders() {
var loader1 = getClass().getClassLoader();
var loader2 = Thread.currentThread().getContextClassLoader();
-
+
var bundle1 =
ResourceBundleUtils.findBundle("org.apache.juneau.rest.NlsTest",
Locale.getDefault(), loader1);
var bundle2 =
ResourceBundleUtils.findBundle("org.apache.juneau.rest.NlsTest",
Locale.getDefault(), loader2);
-
+
// Both should find the bundle (assuming same classpath)
assertNotNull(bundle1);
assertNotNull(bundle2);
@@ -242,7 +242,7 @@ class ResourceBundleUtils_Test extends TestBase {
assertThrows(MissingResourceException.class, () -> {
ResourceBundle.getBundle("definitely.does.not.exist.Bundle",
Locale.getDefault(), loader);
});
-
+
// But utils call should return null
var bundle =
ResourceBundleUtils.findBundle("definitely.does.not.exist.Bundle",
Locale.getDefault(), loader);
assertNull(bundle);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringUtils_Test.java
index 0c1e110057..d46017b3de 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/StringUtils_Test.java
@@ -1490,6 +1490,7 @@ class StringUtils_Test extends TestBase {
// formatNamed(String,Map<String,Object>)
//====================================================================================================
@Test
+ @SuppressWarnings("java:S125")
void a059_formatNamed() {
var args = new HashMap<String,Object>();
args.put("name", "John");
@@ -1687,6 +1688,7 @@ class StringUtils_Test extends TestBase {
// getDuration(String)
//====================================================================================================
@Test
+ @SuppressWarnings("java:S125")
void a066_getDuration() {
// Basic tests
assertEquals(-1, getDuration(null));
@@ -6464,6 +6466,7 @@ class StringUtils_Test extends TestBase {
// unescapeChars(String,AsciiSet)
//====================================================================================================
@Test
+ @SuppressWarnings("java:S125")
void a222_unescapeChars() {
var escape = AsciiSet.of("\\,|");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index a1819bbef8..2e0847aed3 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -137,56 +137,6 @@ class BeanStore_Test extends TestBase {
assertTrue(b.hasBean(A1.class));
assertEquals(a1a, b.getBean(A1.class).get());
}
-//
-// b1p.add(A1.class, a1b);
-// b2p.add(A1.class, a1b);
-// for (var b : array(b1p, b1c, b2p, b2c)) {
-// assertTrue(b.hasBean(A1.class));
-// assertEquals(a1b, b.getBean(A1.class).get());
-//
assertList(b.stream(A1.class).map(BasicBeanStore.Entry::get), a1b, a1a);
-// }
-//
-// b1c.add(A2.class, a2a);
-// b2c.add(A2.class, a2a);
-// for (var b : array(b1p, b2p)) {
-// assertFalse(b.hasBean(A2.class));
-// assertEmpty(b.getBean(A2.class));
-// assertEmpty(b.stream(A2.class));
-// }
-// for (var b : array(b1c, b2c)) {
-// assertTrue(b.hasBean(A2.class));
-// assertEquals(a2a, b.getBean(A2.class).get());
-//
assertList(b.stream(A2.class).map(BasicBeanStore.Entry::get), a2a);
-// }
-//
-//
assertMatchesGlob("{entries=[{type=A1,bean="+Utils.id(a1b)+"},{type=A1,bean="+Utils.id(a1a)+"}],identity=*}",
b1p);
-//
assertMatchesGlob("{entries=[{type=A2,bean="+Utils.id(a2a)+"}],identity=*,parent={entries=[{type=A1,bean="+Utils.id(a1b)+"},{type=A1,bean="+Utils.id(a1a)+"}],identity=*}}",
b1c);
-//
assertMatchesGlob("{entries=[{type=A1,bean="+Utils.id(a1b)+"},{type=A1,bean="+Utils.id(a1a)+"}],identity=*,threadSafe=true}",
b2p);
-//
assertMatchesGlob("{entries=[{type=A2,bean="+Utils.id(a2a)+"}],identity=*,parent={entries=[{type=A1,bean="+Utils.id(a1b)+"},{type=A1,bean="+Utils.id(a1a)+"}],identity=*,threadSafe=true},threadSafe=true}",
b2c);
-//
-// b1p.removeBean(A1.class);
-// b1c.clear().addBean(A1.class, a1a);
-// b2p.removeBean(A1.class);
-// b2c.clear().addBean(A1.class, a1a);
-//
-// for (var b : array(b1p, b2p)) {
-// assertFalse(b.hasBean(A1.class));
-// assertEmpty(b.getBean(A1.class));
-// assertEmpty(b.stream(A1.class));
-// }
-// for (var b : array(b1c, b2c)) {
-// assertTrue(b.hasBean(A1.class));
-// assertEquals(a1a, b.getBean(A1.class).get());
-//
assertList(b.stream(A1.class).map(BasicBeanStore.Entry::get), a1a);
-// }
-//
-// b1c.removeBean(A1.class);
-// b2c.removeBean(A1.class);
-// for (var b : array(b1p, b1c, b2p, b2c)) {
-// assertFalse(b.hasBean(A1.class));
-// assertEmpty(b.getBean(A1.class));
-// assertEmpty(b.stream(A1.class));
-// }
}
@Test void a05_addNamedBeans() {
@@ -202,13 +152,6 @@ class BeanStore_Test extends TestBase {
b.addBean(A1.class, a1e);
}
-// for (var b : array(b1p, b2p)) {
-//
assertList(b.stream(A1.class).map(BasicBeanStore.Entry::get), a1d,a1c,a1b,a1a);
-// }
-// for (var b : array(b1c, b2c)) {
-//
assertList(b.stream(A1.class).map(BasicBeanStore.Entry::get),
a1e,a1d,a1c,a1b,a1a);
-// }
-//
for (var b : array(b1p, b1c, b2p, b2c)) {
assertEquals(a1b, b.getBean(A1.class, "foo").get());
assertEquals(a1d, b.getBean(A1.class, "bar").get());
@@ -490,7 +433,6 @@ class BeanStore_Test extends TestBase {
@Test void c00_createMethodFinder_invalidArgs() {
var b = BasicBeanStore.create().build();
-// assertThrowsWithMessage(IllegalArgumentException.class, "Method
cannot be used without outer bean definition.", ()->new
BeanCreateMethodFinder<>(null, b));
assertThrowsWithMessage(IllegalArgumentException.class,
"Argument 'beanType' cannot be null.", ()->new
BeanCreateMethodFinder<>((Class<?>)null, "", b));
assertThrowsWithMessage(IllegalArgumentException.class,
"Argument 'resourceClass' cannot be null.", ()->new
BeanCreateMethodFinder<>(String.class, null, b));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_JakartaValidation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_JakartaValidation_Test.java
index c74e3f9d33..4431591325 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_JakartaValidation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_JakartaValidation_Test.java
@@ -126,14 +126,6 @@ class HttpPartSchema_JakartaValidation_Test extends
TestBase {
public String value;
}
- // Disabled: HttpPartFormat enum does not support "email" format
- // @Test
- // void f01_jakarta_Email() throws Exception {
- // Email anno =
F01.class.getDeclaredField("value").getAnnotation(Email.class);
- // var s = HttpPartSchema.create().apply(anno).build();
- // assertEquals("email", s.getFormat().toString());
- // }
-
//-----------------------------------------------------------------------------------------------------------------
// @Positive
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers_Test.java
index 45a8fd7a9b..c8e82618f8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/junit/bct/Stringifiers_Test.java
@@ -83,10 +83,10 @@ class Stringifiers_Test extends TestBase {
@Test
void a05_stringifyWithComplexValues() {
- var converter =
BasicBeanConverter.builder().defaultSettings().build();
- var stringifier = Stringifiers.mapEntryStringifier();
- var entry = Map.entry("list", l("a", "b"));
- var result = stringifier.apply(converter, entry);
+ var converter =
BasicBeanConverter.builder().defaultSettings().build();
+ var stringifier = Stringifiers.mapEntryStringifier();
+ var entry = Map.entry("list", l("a", "b"));
+ var result = stringifier.apply(converter, entry);
assertEquals("list=[a,b]", result);
}
@@ -455,20 +455,20 @@ class Stringifiers_Test extends TestBase {
@Test
void l01_stringifyList() {
- var converter =
BasicBeanConverter.builder().defaultSettings().build();
- var stringifier = Stringifiers.listStringifier();
- var input = l("a", "b", "c");
- var result = stringifier.apply(converter, input);
+ var converter =
BasicBeanConverter.builder().defaultSettings().build();
+ var stringifier = Stringifiers.listStringifier();
+ var input = l("a", "b", "c");
+ var result = stringifier.apply(converter, input);
assertEquals("[a,b,c]", result);
}
@Test
void l02_stringifyEmptyList() {
- var converter =
BasicBeanConverter.builder().defaultSettings().build();
- var stringifier = Stringifiers.listStringifier();
- var input = l();
- var result = stringifier.apply(converter, input);
+ var converter =
BasicBeanConverter.builder().defaultSettings().build();
+ var stringifier = Stringifiers.listStringifier();
+ var input = l();
+ var result = stringifier.apply(converter, input);
assertEquals("[]", result);
}
@@ -480,10 +480,10 @@ class Stringifiers_Test extends TestBase {
.addSetting("fieldSeparator", "; ")
.addSetting("collectionPrefix", "(")
.addSetting("collectionSuffix", ")")
- .build();
- var stringifier = Stringifiers.listStringifier();
- var input = l("x", "y", "z");
- var result = stringifier.apply(converter, input);
+ .build();
+ var stringifier = Stringifiers.listStringifier();
+ var input = l("x", "y", "z");
+ var result = stringifier.apply(converter, input);
assertEquals("(x; y; z)", result);
}
@@ -508,7 +508,7 @@ class Stringifiers_Test extends TestBase {
var stringifier = Stringifiers.mapStringifier();
var input = m("key1", "value1", "key2", "value2");
var result = stringifier.apply(converter, input);
-
+
// Order may vary, so check both possibilities
assertTrue(result.equals("{key1=value1,key2=value2}") ||
result.equals("{key2=value2,key1=value1}"));
@@ -520,7 +520,7 @@ class Stringifiers_Test extends TestBase {
var stringifier = Stringifiers.mapStringifier();
var input = m();
var result = stringifier.apply(converter, input);
-
+
assertEquals("{}", result);
}
@@ -558,26 +558,26 @@ class Stringifiers_Test extends TestBase {
@Test
void n01_useInBasicBeanConverter() {
- // Test various stringifiable objects
- assertBean(Map.entry("k", "v"), "<self>", "k=v");
- assertBean(l("a", "b"), "<self>", "[a,b]");
- assertBean(m("x", "y"), "<self>", "{x=y}");
- assertBean(TestEnum.VALUE1, "<self>", "VALUE1");
- assertBean(String.class, "<self>", "String");
- }
+ // Test various stringifiable objects
+ assertBean(Map.entry("k", "v"), "<self>", "k=v");
+ assertBean(l("a", "b"), "<self>", "[a,b]");
+ assertBean(m("x", "y"), "<self>", "{x=y}");
+ assertBean(TestEnum.VALUE1, "<self>", "VALUE1");
+ assertBean(String.class, "<self>", "String");
+ }
- @Test
- void n02_customStringifierRegistration() {
- // Test that custom registration works
- assertBean(l("custom"), "<self>", "[custom]");
- }
+ @Test
+ void n02_customStringifierRegistration() {
+ // Test that custom registration works
+ assertBean(l("custom"), "<self>", "[custom]");
+ }
- @Test
- void n03_stringifierChaining() {
- // Map with list values
- var complexMap = m("items", l("a", "b"));
- assertMatchesGlob("*items=[a,b]*",
BasicBeanConverter.DEFAULT.stringify(complexMap));
- }
+ @Test
+ void n03_stringifierChaining() {
+ // Map with list values
+ var complexMap = m("items", l("a", "b"));
+ assertMatchesGlob("*items=[a,b]*",
BasicBeanConverter.DEFAULT.stringify(complexMap));
+ }
private enum TestEnum { VALUE1, VALUE2 }
}
