From 26daa86c5bb80b819cb033f4fe503bcd3d978176 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Jun 2017 23:08:34 -0400 Subject: [PATCH] Remove guava cache map to fix 1.7 support - resolves #52 --- .../java/co/aikar/commands/ACFPatterns.java | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/co/aikar/commands/ACFPatterns.java b/core/src/main/java/co/aikar/commands/ACFPatterns.java index 1aae19f9..bb6cb331 100644 --- a/core/src/main/java/co/aikar/commands/ACFPatterns.java +++ b/core/src/main/java/co/aikar/commands/ACFPatterns.java @@ -23,12 +23,9 @@ package co.aikar.commands; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; +import com.google.common.collect.Maps; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; +import java.util.Map; import java.util.regex.Pattern; @SuppressWarnings("WeakerAccess") @@ -52,18 +49,8 @@ final class ACFPatterns { private ACFPatterns() {} @SuppressWarnings("Convert2MethodRef") - static final LoadingCache patternCache = - CacheBuilder.newBuilder() - .expireAfterAccess(90, TimeUnit.DAYS) - .maximumSize(1024) - // has to be this or fails to compile - .build(CacheLoader.from((pattern) -> Pattern.compile(pattern))); + static final Map patternCache = Maps.newHashMap(); public static Pattern getPattern(String pattern) { - try { - return patternCache.get(pattern); - } catch (ExecutionException e) { - e.printStackTrace(); - return Pattern.compile(pattern); - } + return patternCache.computeIfAbsent(pattern, s -> Pattern.compile(pattern)); } }