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 cbc57fb7d2 org.apache.juneau.common.reflect API improvements
cbc57fb7d2 is described below
commit cbc57fb7d269f846e03a23b633b8b5d8c955d052
Author: James Bognar <[email protected]>
AuthorDate: Thu Nov 20 16:26:31 2025 -0500
org.apache.juneau.common.reflect API improvements
---
.../juneau/common/collections/Cache2_Test.java | 23 ++++----
.../juneau/common/collections/Cache3_Test.java | 9 ++--
.../juneau/common/collections/Cache4_Test.java | 9 ++--
.../juneau/common/collections/Cache5_Test.java | 9 ++--
.../juneau/common/collections/Cache_Test.java | 63 +++++++++++-----------
5 files changed, 59 insertions(+), 54 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache2_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache2_Test.java
index ceb708bb9d..8af66c587c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache2_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache2_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.common.collections;
import static org.junit.jupiter.api.Assertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import java.util.concurrent.atomic.*;
@@ -43,7 +44,7 @@ class Cache2_Test extends TestBase {
assertEquals("user:123", result);
assertEquals(1, callCount.get());
- assertEquals(1, x.size());
+ assertSize(1, x);
assertEquals(0, x.getCacheHits());
}
@@ -67,7 +68,7 @@ class Cache2_Test extends TestBase {
assertEquals("user:123", result2);
assertSame(result1, result2);
assertEquals(1, callCount.get()); // Supplier only called once
- assertEquals(1, x.size());
+ assertSize(1, x);
assertEquals(1, x.getCacheHits());
}
@@ -89,7 +90,7 @@ class Cache2_Test extends TestBase {
assertEquals("admin:456", v2);
assertEquals("guest:789", v3);
assertEquals(3, callCount.get());
- assertEquals(3, x.size());
+ assertSize(3, x);
assertEquals(0, x.getCacheHits());
}
@@ -107,7 +108,7 @@ class Cache2_Test extends TestBase {
var result = x.get("user", 123, () -> "OVERRIDE");
assertEquals("OVERRIDE", result);
- assertEquals(1, x.size());
+ assertSize(1, x);
}
@Test
@@ -200,7 +201,7 @@ class Cache2_Test extends TestBase {
assertEquals("user:456", x.get("user", 456));
assertEquals(2, defaultCallCount.get()); // Called again
- assertTrue(x.isEmpty()); // Nothing cached
+ assertEmpty(x); // Nothing cached
}
//====================================================================================================
@@ -216,15 +217,15 @@ class Cache2_Test extends TestBase {
x.get("k1", 1);
x.get("k2", 2);
- assertEquals(2, x.size());
+ assertSize(2, x);
// Adding a third entry doesn't exceed maxSize (2 > 2 is false)
x.get("k3", 3);
- assertEquals(3, x.size());
+ assertSize(3, x);
// Fourth entry triggers clear (3 > 2 is true)
x.get("k4", 4);
- assertEquals(1, x.size()); // Only the new entry
+ assertSize(1, x); // Only the new entry
}
//====================================================================================================
@@ -265,11 +266,11 @@ class Cache2_Test extends TestBase {
x.get("user", 123);
x.get("admin", 456);
- assertEquals(2, x.size());
+ assertSize(2, x);
x.clear();
- assertTrue(x.isEmpty());
+ assertEmpty(x);
}
//====================================================================================================
@@ -290,7 +291,7 @@ class Cache2_Test extends TestBase {
var result = x.get("user", 123, () -> "CUSTOM");
assertEquals("CUSTOM", result);
- assertEquals(1, x.size());
+ assertSize(1, x);
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache3_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache3_Test.java
index 6e1c3e48b2..8981e63a14 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache3_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache3_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.common.collections;
import static org.junit.jupiter.api.Assertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import java.util.concurrent.atomic.*;
@@ -85,7 +86,7 @@ class Cache3_Test extends TestBase {
x.get("en", "US", 1);
assertEquals(2, callCount.get()); // Called twice
- assertTrue(x.isEmpty());
+ assertEmpty(x);
}
@Test
@@ -97,13 +98,13 @@ class Cache3_Test extends TestBase {
x.get("en", "US", 1);
x.get("fr", "FR", 2);
- assertEquals(2, x.size());
+ assertSize(2, x);
x.get("de", "DE", 3);
- assertEquals(3, x.size());
+ assertSize(3, x);
x.get("es", "ES", 4); // This exceeds max (3 > 2)
- assertEquals(1, x.size()); // Cleared
+ assertSize(1, x); // Cleared
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache4_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache4_Test.java
index 2f879f6d3d..59dd58254e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache4_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache4_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.common.collections;
import static org.junit.jupiter.api.Assertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import java.util.concurrent.atomic.*;
@@ -86,7 +87,7 @@ class Cache4_Test extends TestBase {
x.get("en", "US", "formal", 1);
assertEquals(2, callCount.get()); // Called twice
- assertTrue(x.isEmpty());
+ assertEmpty(x);
}
@Test
@@ -98,13 +99,13 @@ class Cache4_Test extends TestBase {
x.get("en", "US", "formal", 1);
x.get("fr", "FR", "formal", 2);
- assertEquals(2, x.size());
+ assertSize(2, x);
x.get("de", "DE", "formal", 3); // Doesn't exceed yet
- assertEquals(3, x.size());
+ assertSize(3, x);
x.get("es", "ES", "formal", 4); // Exceeds max (3 > 2),
triggers clear
- assertEquals(1, x.size()); // Cleared
+ assertSize(1, x); // Cleared
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache5_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache5_Test.java
index b78128c0bc..0075a83093 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache5_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache5_Test.java
@@ -17,6 +17,7 @@
package org.apache.juneau.common.collections;
import static org.junit.jupiter.api.Assertions.*;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import java.util.concurrent.atomic.*;
@@ -87,7 +88,7 @@ class Cache5_Test extends TestBase {
x.get("en", "US", "west", "formal", 1);
assertEquals(2, callCount.get()); // Called twice
- assertTrue(x.isEmpty());
+ assertEmpty(x);
}
@Test
@@ -99,13 +100,13 @@ class Cache5_Test extends TestBase {
x.get("en", "US", "west", "formal", 1);
x.get("fr", "FR", "north", "formal", 2);
- assertEquals(2, x.size());
+ assertSize(2, x);
x.get("de", "DE", "south", "formal", 3); // Doesn't exceed yet
- assertEquals(3, x.size());
+ assertSize(3, x);
x.get("es", "ES", "east", "formal", 4); // Exceeds max (3 > 2),
triggers clear
- assertEquals(1, x.size()); // Cleared
+ assertSize(1, x); // Cleared
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache_Test.java
index 1efe7be60a..4954cca8c4 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/collections/Cache_Test.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.common.collections;
+import static org.apache.juneau.junit.bct.BctAssertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.concurrent.*;
@@ -41,7 +42,7 @@ class Cache_Test extends TestBase {
assertEquals("value1", result);
assertEquals(1, callCount.get());
- assertEquals(1, cache.size());
+ assertSize(1, cache);
assertEquals(0, cache.getCacheHits());
}
@@ -65,7 +66,7 @@ class Cache_Test extends TestBase {
assertEquals("value1", result2);
assertSame(result1, result2); // Same instance
assertEquals(1, callCount.get()); // Supplier only called once
- assertEquals(1, cache.size());
+ assertSize(1, cache);
assertEquals(1, cache.getCacheHits());
}
@@ -79,7 +80,7 @@ class Cache_Test extends TestBase {
assertEquals(1, v1);
assertEquals(2, v2);
assertEquals(3, v3);
- assertEquals(3, cache.size());
+ assertSize(3, cache);
assertEquals(0, cache.getCacheHits());
// Verify all cached
@@ -112,20 +113,20 @@ class Cache_Test extends TestBase {
@Test void a06_size() {
var cache = Cache.of(String.class, Integer.class).build();
- assertTrue(cache.isEmpty());
+ assertEmpty(cache);
cache.get("one", () -> 1);
- assertEquals(1, cache.size());
+ assertSize(1, cache);
cache.get("two", () -> 2);
- assertEquals(2, cache.size());
+ assertSize(2, cache);
cache.get("three", () -> 3);
- assertEquals(3, cache.size());
+ assertSize(3, cache);
// Accessing existing key doesn't change size
cache.get("one", () -> 999);
- assertEquals(3, cache.size());
+ assertSize(3, cache);
}
@Test void a07_clear() {
@@ -135,18 +136,18 @@ class Cache_Test extends TestBase {
cache.get("two", () -> 2);
cache.get("one", () -> 999); // Cache hit
- assertEquals(2, cache.size());
+ assertSize(2, cache);
assertEquals(1, cache.getCacheHits());
cache.clear();
- assertTrue(cache.isEmpty());
+ assertEmpty(cache);
assertEquals(1, cache.getCacheHits()); // Hits not cleared
// Values must be recomputed after clear
var v1 = cache.get("one", () -> 10);
assertEquals(10, v1);
- assertEquals(1, cache.size());
+ assertSize(1, cache);
}
//====================================================================================================
@@ -161,15 +162,15 @@ class Cache_Test extends TestBase {
cache.get("one", () -> 1);
cache.get("two", () -> 2);
cache.get("three", () -> 3);
- assertEquals(3, cache.size());
+ assertSize(3, cache);
// 4th item doesn't trigger eviction (size > maxSize means 4 >
3)
cache.get("four", () -> 4);
- assertEquals(4, cache.size());
+ assertSize(4, cache);
// 5th item triggers eviction (size=4, 4 > 3, so clear then add)
cache.get("five", () -> 5);
- assertEquals(1, cache.size()); // Only the new item
+ assertSize(1, cache); // Only the new item
}
@Test void a09_maxSize_custom() {
@@ -181,15 +182,15 @@ class Cache_Test extends TestBase {
final int index = i;
cache.get("key" + index, () -> "value" + index);
}
- assertEquals(5, cache.size());
+ assertSize(5, cache);
// 6th item doesn't trigger clear yet (5 > 5 is false)
cache.get("key6", () -> "value6");
- assertEquals(6, cache.size());
+ assertSize(6, cache);
// 7th item triggers clear (6 > 5 is true)
cache.get("key7", () -> "value7");
- assertEquals(1, cache.size());
+ assertSize(1, cache);
}
//====================================================================================================
@@ -215,7 +216,7 @@ class Cache_Test extends TestBase {
assertEquals("value1", result1);
assertEquals("value2", result2);
assertEquals(2, callCount.get()); // Always calls supplier
- assertTrue(cache.isEmpty());
+ assertEmpty(cache);
assertEquals(0, cache.getCacheHits());
}
@@ -228,7 +229,7 @@ class Cache_Test extends TestBase {
cache.get("two", () -> 2);
cache.get("three", () -> 3);
- assertTrue(cache.isEmpty());
+ assertEmpty(cache);
}
@Test void a12_disabled_clearHasNoEffect() {
@@ -237,7 +238,7 @@ class Cache_Test extends TestBase {
.build();
cache.clear(); // Should not throw
- assertTrue(cache.isEmpty());
+ assertEmpty(cache);
}
//====================================================================================================
@@ -249,7 +250,7 @@ class Cache_Test extends TestBase {
// Should work with defaults
cache.get("key1", () -> "value1");
- assertEquals(1, cache.size());
+ assertSize(1, cache);
}
@Test void a14_builder_chaining() {
@@ -260,7 +261,7 @@ class Cache_Test extends TestBase {
// Disabled takes precedence
cache.get("key1", () -> "value1");
- assertTrue(cache.isEmpty());
+ assertEmpty(cache);
}
//====================================================================================================
@@ -327,7 +328,7 @@ class Cache_Test extends TestBase {
// Supplier might be called multiple times due to putIfAbsent
semantics,
// but should be much less than 100
assertTrue(callCount.get() < 10, "Supplier called " +
callCount.get() + " times");
- assertEquals(1, cache.size());
+ assertSize(1, cache);
executor.shutdown();
}
@@ -348,7 +349,7 @@ class Cache_Test extends TestBase {
// Wait for all tasks to complete
CompletableFuture.allOf(futures).get(5, TimeUnit.SECONDS);
- assertEquals(10, cache.size());
+ assertSize(10, cache);
executor.shutdown();
}
@@ -364,7 +365,7 @@ class Cache_Test extends TestBase {
cache.get(2, () -> "two");
assertEquals("one", cache.get(1, () -> "should not call"));
- assertEquals(2, cache.size());
+ assertSize(2, cache);
assertEquals(1, cache.getCacheHits());
}
@@ -375,7 +376,7 @@ class Cache_Test extends TestBase {
cache.get(Integer.class, () -> "Integer");
assertEquals("String", cache.get(String.class, () -> "should
not call"));
- assertEquals(2, cache.size());
+ assertSize(2, cache);
}
//====================================================================================================
@@ -390,16 +391,16 @@ class Cache_Test extends TestBase {
assertEquals("first", result1);
assertEquals("first", result2); // Returns cached, not "second"
- assertEquals(1, cache.size());
+ assertSize(1, cache);
}
@Test void a22_emptyCache_operations() {
var cache = Cache.of(String.class, String.class).build();
- assertTrue(cache.isEmpty());
+ assertEmpty(cache);
assertEquals(0, cache.getCacheHits());
cache.clear(); // Should not throw on empty cache
- assertTrue(cache.isEmpty());
+ assertEmpty(cache);
}
@Test void a23_maxSize_exactBoundary() {
@@ -411,12 +412,12 @@ class Cache_Test extends TestBase {
cache.get(2, () -> "two");
cache.get(3, () -> "three");
- assertEquals(3, cache.size());
+ assertSize(3, cache);
// Accessing existing keys shouldn't trigger eviction
cache.get(1, () -> "should not call");
cache.get(2, () -> "should not call");
- assertEquals(3, cache.size());
+ assertSize(3, cache);
assertEquals(2, cache.getCacheHits());
}
}
