From b5f34a26baede89cacb017a46902f992acb32ba8 Mon Sep 17 00:00:00 2001 From: James Ward Date: Fri, 26 Apr 2024 08:46:16 -0600 Subject: [PATCH] remove webJarVersion and hide the constructor to override the cache imp --- README.md | 9 --------- src/main/java/org/webjars/WebJarCache.java | 2 +- src/main/java/org/webjars/WebJarCacheDefault.java | 2 +- src/main/java/org/webjars/WebJarVersionLocator.java | 13 +------------ 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 539c028..43865d2 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,3 @@ WebJarVersionLocator webJarVersionLocator = new WebJarVersionLocator(); webJarVersionLocator.version("bootstrap"); // cache miss webJarVersionLocator.version("bootstrap"); // cache hit, avoiding looking up metadata in the classpath ``` - -The default cache uses a `ConcurrentHashMap` but you can provide a custom cache implementation: -``` -class WebJarCacheMine implements WebJarCache { - ... -} - -WebJarVersionLocator webJarVersionLocator = new WebJarVersionLocator(new WebJarCacheMine()); -``` diff --git a/src/main/java/org/webjars/WebJarCache.java b/src/main/java/org/webjars/WebJarCache.java index ef00a29..670ef4a 100644 --- a/src/main/java/org/webjars/WebJarCache.java +++ b/src/main/java/org/webjars/WebJarCache.java @@ -12,7 +12,7 @@ * Cache keys and values are Strings because that is all that is needed. */ @NullMarked -public interface WebJarCache { +interface WebJarCache { Optional computeIfAbsent(String key, Function> function); diff --git a/src/main/java/org/webjars/WebJarCacheDefault.java b/src/main/java/org/webjars/WebJarCacheDefault.java index e15e567..4c7ca26 100644 --- a/src/main/java/org/webjars/WebJarCacheDefault.java +++ b/src/main/java/org/webjars/WebJarCacheDefault.java @@ -8,7 +8,7 @@ @NullMarked -public class WebJarCacheDefault implements WebJarCache { +class WebJarCacheDefault implements WebJarCache { final ConcurrentMap> cache; diff --git a/src/main/java/org/webjars/WebJarVersionLocator.java b/src/main/java/org/webjars/WebJarVersionLocator.java index 29b245a..6cd6803 100644 --- a/src/main/java/org/webjars/WebJarVersionLocator.java +++ b/src/main/java/org/webjars/WebJarVersionLocator.java @@ -34,7 +34,7 @@ public WebJarVersionLocator() { this.cache = new WebJarCacheDefault(new ConcurrentHashMap<>()); } - public WebJarVersionLocator(WebJarCache cache) { + WebJarVersionLocator(WebJarCache cache) { this.cache = cache; } @@ -77,17 +77,6 @@ public String path(final String webJarName, final String exactPath) { return null; } - /** - * @param webJarName The name of the WebJar, i.e. bootstrap - * @return The version of the WebJar, i.e 3.1.1 - * @deprecated Use {@link #version(String)} instead - */ - @Deprecated - @Nullable - public String webJarVersion(final String webJarName) { - return version(webJarName); - } - /** * @param webJarName The name of the WebJar, i.e. bootstrap * @return The version of the WebJar, i.e 3.1.1