diff --git a/src/main/java/com/fasterxml/classmate/util/LRUTypeCache.java b/src/main/java/com/fasterxml/classmate/util/LRUTypeCache.java index 3dcd935..bf6ccef 100644 --- a/src/main/java/com/fasterxml/classmate/util/LRUTypeCache.java +++ b/src/main/java/com/fasterxml/classmate/util/LRUTypeCache.java @@ -76,6 +76,7 @@ private final static class CacheMap protected final int _maxEntries; public CacheMap(int maxEntries) { + super(16, 0.75f, true); _maxEntries = maxEntries; } diff --git a/src/test/java/com/fasterxml/classmate/util/TestResolvedTypeCache.java b/src/test/java/com/fasterxml/classmate/util/TestResolvedTypeCache.java index d878f7e..fc779ab 100644 --- a/src/test/java/com/fasterxml/classmate/util/TestResolvedTypeCache.java +++ b/src/test/java/com/fasterxml/classmate/util/TestResolvedTypeCache.java @@ -29,6 +29,44 @@ public void testSimpleLRUCaching() _testSimple(cache, true); } + @Test + public void testLRUCacheRetainsRecentlyAccessedEntry() + { + ResolvedTypeCache cache = ResolvedTypeCache.lruCache(2); + ResolvedType first = new ResolvedInterfaceType(Map.class, null, null); + ResolvedType second = new ResolvedInterfaceType(Set.class, null, null); + ResolvedType third = new ResolvedInterfaceType(List.class, null, null); + cache._addForTest(first); + cache._addForTest(second); + + assertSame(first, cache.find(cache.key(Map.class))); + cache._addForTest(third); + + assertEquals(2, cache.size()); + assertNull(cache.find(cache.key(Set.class))); + assertSame(first, cache.find(cache.key(Map.class))); + assertSame(third, cache.find(cache.key(List.class))); + } + + @Test + public void testLRUCacheReplacementRefreshesAccessOrder() + { + ResolvedTypeCache cache = ResolvedTypeCache.lruCache(2); + ResolvedType first = new ResolvedInterfaceType(Map.class, null, null); + ResolvedType replacement = new ResolvedInterfaceType(Map.class, null, null); + ResolvedType second = new ResolvedInterfaceType(Set.class, null, null); + ResolvedType third = new ResolvedInterfaceType(List.class, null, null); + cache._addForTest(first); + cache._addForTest(second); + cache._addForTest(replacement); + cache._addForTest(third); + + assertEquals(2, cache.size()); + assertNull(cache.find(cache.key(Set.class))); + assertSame(replacement, cache.find(cache.key(Map.class))); + assertSame(third, cache.find(cache.key(List.class))); + } + @Test public void testSimpleConcurrentCaching() {