From 1ff9401b61b6ebf2d8dc9d61e61d50a6bd91aa0c Mon Sep 17 00:00:00 2001 From: BobDu Date: Thu, 29 Feb 2024 23:21:40 +0800 Subject: [PATCH] refactor: remove commons-collections dependency Signed-off-by: BobDu --- core/pom.xml | 4 ---- core/src/main/java/hudson/util/LRUStringConverter.java | 9 +++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 4280e9075da9..3557ddcc1cfe 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -156,10 +156,6 @@ THE SOFTWARE. commons-codec commons-codec - - commons-collections - commons-collections - commons-fileupload commons-fileupload diff --git a/core/src/main/java/hudson/util/LRUStringConverter.java b/core/src/main/java/hudson/util/LRUStringConverter.java index bb2eca7a75e4..9cf482dda81f 100644 --- a/core/src/main/java/hudson/util/LRUStringConverter.java +++ b/core/src/main/java/hudson/util/LRUStringConverter.java @@ -2,8 +2,8 @@ import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.Map; -import org.apache.commons.collections.map.LRUMap; public class LRUStringConverter extends AbstractSingleValueConverter { @@ -18,7 +18,12 @@ public LRUStringConverter() { } public LRUStringConverter(int size) { - cache = Collections.synchronizedMap(new LRUMap(size)); + cache = Collections.synchronizedMap(new LinkedHashMap<>(size, 0.75f, true) { + @Override + protected boolean removeEldestEntry(Map.Entry eldest) { + return size() > size; + } + }); } @Override