From 179a818418fa21422f0fdfd9bc7553e9eeff5051 Mon Sep 17 00:00:00 2001
From: Kalle Stenflo <kalle.stenflo@gmail.com>
Date: Wed, 4 Nov 2015 19:20:12 +0100
Subject: [PATCH] Minor cache fixes.

---
 .../com/jayway/jsonpath/Configuration.java    | 41 +------------------
 .../com/jayway/jsonpath/ParseContext.java     |  1 -
 .../jsonpath/internal/DefaultsImpl.java       | 17 ++------
 .../jayway/jsonpath/internal/JsonReader.java  |  4 +-
 .../jsonpath/internal/PathCompiler.java       |  1 -
 .../internal/function/FunctionFactory.java    |  6 ++-
 .../jsonpath/internal/function/Length.java    |  3 --
 .../function/numeric/AbstractAggregation.java |  3 --
 .../jsonpath/internal/token/PathToken.java    |  6 ---
 .../com/jayway/jsonpath/spi/cache/Cache.java  | 23 +++++++++++
 .../jsonpath/spi/cache/CacheProvider.java     | 36 ++++++++--------
 .../{DefaultCache.java => LRUCache.java}      | 18 ++++----
 .../jayway/jsonpath/spi/cache/NOOPCache.java  | 14 +++++++
 13 files changed, 74 insertions(+), 99 deletions(-)
 create mode 100644 json-path/src/main/java/com/jayway/jsonpath/spi/cache/Cache.java
 rename json-path/src/main/java/com/jayway/jsonpath/spi/cache/{DefaultCache.java => LRUCache.java} (91%)
 create mode 100644 json-path/src/main/java/com/jayway/jsonpath/spi/cache/NOOPCache.java

diff --git a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
index cebb3a99..1a591ea8 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
@@ -15,8 +15,6 @@
 package com.jayway.jsonpath;
 
 import com.jayway.jsonpath.internal.DefaultsImpl;
-import com.jayway.jsonpath.spi.cache.CacheProvider;
-import com.jayway.jsonpath.spi.cache.DefaultCache;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
@@ -57,16 +55,14 @@ public class Configuration {
     private final MappingProvider mappingProvider;
     private final Set<Option> options;
     private final Collection<EvaluationListener> evaluationListeners;
-    private final CacheProvider cacheProvider;
 
-    private Configuration(JsonProvider jsonProvider, MappingProvider mappingProvider, CacheProvider cacheProvider, EnumSet<Option> options, Collection<EvaluationListener> evaluationListeners) {
+    private Configuration(JsonProvider jsonProvider, MappingProvider mappingProvider, EnumSet<Option> options, Collection<EvaluationListener> evaluationListeners) {
         notNull(jsonProvider, "jsonProvider can not be null");
         notNull(mappingProvider, "mappingProvider can not be null");
         notNull(options, "setOptions can not be null");
         notNull(evaluationListeners, "evaluationListeners can not be null");
         this.jsonProvider = jsonProvider;
         this.mappingProvider = mappingProvider;
-        this.cacheProvider = cacheProvider;
         this.options = Collections.unmodifiableSet(options);
         this.evaluationListeners = Collections.unmodifiableCollection(evaluationListeners);
     }
@@ -130,23 +126,6 @@ public class Configuration {
     public MappingProvider mappingProvider() {
         return mappingProvider;
     }
-    
-    /**
-     * Creates a new Configuration based on the given {@link com.jayway.jsonpath.spi.cache.CacheProvider}
-     * @param newCacheProvider cache provider to use in new configuration
-     * @return a new configuration
-     */
-    public Configuration CacheProvider(CacheProvider newCacheProvider) {
-        return Configuration.builder().jsonProvider(jsonProvider).mappingProvider(mappingProvider).cacheProvider(newCacheProvider).options(options).evaluationListener(evaluationListeners).build();
-    }
-
-    /**
-     * Returns {@link com.jayway.jsonpath.spi.cache.CacheProvider} used by this configuration
-     * @return cacheProvider used
-     */
-    public CacheProvider CacheProvider() {
-        return cacheProvider;
-    }
 
     /**
      * Creates a new configuration by adding the new options to the options used in this configuration.
@@ -210,7 +189,6 @@ public class Configuration {
 
         private JsonProvider jsonProvider;
         private MappingProvider mappingProvider;
-        private CacheProvider cacheProvider = new DefaultCache(200);
         private EnumSet<Option> options = EnumSet.noneOf(Option.class);
         private Collection<EvaluationListener> evaluationListener = new ArrayList<EvaluationListener>();
 
@@ -223,11 +201,6 @@ public class Configuration {
             this.mappingProvider = provider;
             return this;
         }
-        
-        public ConfigurationBuilder cacheProvider(CacheProvider provider) {
-            this.cacheProvider = provider;
-            return this;
-        }
 
         public ConfigurationBuilder options(Option... flags) {
             if(flags.length > 0) {
@@ -260,11 +233,8 @@ public class Configuration {
                 if (mappingProvider == null){
                     mappingProvider = defaults.mappingProvider();
                 }
-                if (cacheProvider == null){
-                    cacheProvider = defaults.cacheProvider();
-                }
             }
-            return new Configuration(jsonProvider, mappingProvider, cacheProvider, options, evaluationListener);
+            return new Configuration(jsonProvider, mappingProvider, options, evaluationListener);
         }
     }
 
@@ -287,13 +257,6 @@ public class Configuration {
          * @return default mapping provider
          */
         MappingProvider mappingProvider();
-        
-        /**
-         * Returns the default {@link com.jayway.jsonpath.spi.cache.CacheProvider}
-         *
-         * @return default cache provider
-         */
-        CacheProvider cacheProvider();
 
     }
 }
diff --git a/json-path/src/main/java/com/jayway/jsonpath/ParseContext.java b/json-path/src/main/java/com/jayway/jsonpath/ParseContext.java
index 16000b3e..edbdf03e 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/ParseContext.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/ParseContext.java
@@ -17,7 +17,6 @@ package com.jayway.jsonpath;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 
 public interface ParseContext {
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/DefaultsImpl.java b/json-path/src/main/java/com/jayway/jsonpath/internal/DefaultsImpl.java
index 5023edd9..d4919ca8 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/DefaultsImpl.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/DefaultsImpl.java
@@ -1,24 +1,20 @@
 package com.jayway.jsonpath.internal;
 
-import java.util.EnumSet;
-import java.util.Set;
-
 import com.jayway.jsonpath.Configuration.Defaults;
 import com.jayway.jsonpath.Option;
-import com.jayway.jsonpath.spi.cache.DefaultCache;
-import com.jayway.jsonpath.spi.cache.CacheProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.jayway.jsonpath.spi.json.JsonSmartJsonProvider;
 import com.jayway.jsonpath.spi.mapper.JsonSmartMappingProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
+import java.util.EnumSet;
+import java.util.Set;
+
 public final class DefaultsImpl implements Defaults {
 
   public static final DefaultsImpl INSTANCE = new DefaultsImpl();
 
   private final MappingProvider mappingProvider = new JsonSmartMappingProvider();
-  
-  private final CacheProvider cacheProvider = new DefaultCache(200);
 
   @Override
   public JsonProvider jsonProvider() {
@@ -36,11 +32,6 @@ public final class DefaultsImpl implements Defaults {
   }
 
   private DefaultsImpl() {
-  }
-
-	@Override
-	public CacheProvider cacheProvider() {
-		return cacheProvider;
-	};
+  };
 
 }
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/JsonReader.java b/json-path/src/main/java/com/jayway/jsonpath/internal/JsonReader.java
index c896ed9b..5e072bfb 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/JsonReader.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/JsonReader.java
@@ -23,8 +23,8 @@ import com.jayway.jsonpath.ParseContext;
 import com.jayway.jsonpath.Predicate;
 import com.jayway.jsonpath.ReadContext;
 import com.jayway.jsonpath.TypeRef;
+import com.jayway.jsonpath.spi.cache.Cache;
 import com.jayway.jsonpath.spi.cache.CacheProvider;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -136,7 +136,7 @@ public class JsonReader implements ParseContext, DocumentContext {
     @Override
     public <T> T read(String path, Predicate... filters) {
         notEmpty(path, "path can not be null or empty");
-        CacheProvider cache = configuration.CacheProvider();
+        Cache cache = CacheProvider.getCache();
         
         path = path.trim();
         LinkedList filterStack = new LinkedList<Predicate>(asList(filters));
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java b/json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java
index 32c210ab..a42c74c1 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java
@@ -5,7 +5,6 @@ import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.Predicate;
 import com.jayway.jsonpath.internal.token.ArrayIndexOperation;
 import com.jayway.jsonpath.internal.token.ArraySliceOperation;
-import com.jayway.jsonpath.internal.token.FunctionPathToken;
 import com.jayway.jsonpath.internal.token.PathTokenAppender;
 import com.jayway.jsonpath.internal.token.PathTokenFactory;
 import com.jayway.jsonpath.internal.token.RootPathToken;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/FunctionFactory.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/FunctionFactory.java
index 35104ab3..a03e72a3 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/FunctionFactory.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/FunctionFactory.java
@@ -2,7 +2,11 @@ package com.jayway.jsonpath.internal.function;
 
 import com.jayway.jsonpath.Function;
 import com.jayway.jsonpath.InvalidPathException;
-import com.jayway.jsonpath.internal.function.numeric.*;
+import com.jayway.jsonpath.internal.function.numeric.Average;
+import com.jayway.jsonpath.internal.function.numeric.Max;
+import com.jayway.jsonpath.internal.function.numeric.Min;
+import com.jayway.jsonpath.internal.function.numeric.StandardDeviation;
+import com.jayway.jsonpath.internal.function.numeric.Sum;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/Length.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/Length.java
index 12188833..1fdf1278 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/Length.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/Length.java
@@ -3,9 +3,6 @@ package com.jayway.jsonpath.internal.function;
 import com.jayway.jsonpath.Function;
 import com.jayway.jsonpath.internal.EvaluationContext;
 import com.jayway.jsonpath.internal.PathRef;
-import net.minidev.json.JSONArray;
-
-import java.util.*;
 
 /**
  * Provides the length of a JSONArray Object
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java
index d7bb97c1..ddb2ad7d 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java
@@ -3,9 +3,6 @@ package com.jayway.jsonpath.internal.function.numeric;
 import com.jayway.jsonpath.Function;
 import com.jayway.jsonpath.internal.EvaluationContext;
 import com.jayway.jsonpath.internal.PathRef;
-import net.minidev.json.JSONArray;
-
-import java.util.Iterator;
 
 /**
  * Defines the pattern for processing numerical values via an abstract implementation that iterates over the collection
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java
index 47b76383..d9bc9292 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java
@@ -15,16 +15,10 @@
 package com.jayway.jsonpath.internal.token;
 
 import com.jayway.jsonpath.Function;
-import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
 import com.jayway.jsonpath.internal.PathRef;
 import com.jayway.jsonpath.internal.Utils;
-import com.jayway.jsonpath.internal.function.FunctionFactory;
-import com.jayway.jsonpath.internal.function.numeric.Average;
-import com.jayway.jsonpath.internal.function.Length;
-import com.jayway.jsonpath.internal.function.PassthruFunction;
-import com.jayway.jsonpath.internal.function.numeric.Sum;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 
 import java.util.List;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/cache/Cache.java b/json-path/src/main/java/com/jayway/jsonpath/spi/cache/Cache.java
new file mode 100644
index 00000000..bef6e7c2
--- /dev/null
+++ b/json-path/src/main/java/com/jayway/jsonpath/spi/cache/Cache.java
@@ -0,0 +1,23 @@
+package com.jayway.jsonpath.spi.cache;
+
+import com.jayway.jsonpath.InvalidJsonException;
+import com.jayway.jsonpath.JsonPath;
+
+public interface Cache {
+
+	/**
+     * Get the Cached JsonPath
+     * @param key cache key to lookup the JsonPath
+     * @return JsonPath
+     */
+	public JsonPath get(String key);
+	
+	/**
+     * Add JsonPath to the cache
+     * @param key cache key to store the JsonPath
+     * @param value JsonPath to be cached
+     * @return void
+     * @throws InvalidJsonException
+     */
+	public void put(String key, JsonPath value);
+}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/cache/CacheProvider.java b/json-path/src/main/java/com/jayway/jsonpath/spi/cache/CacheProvider.java
index 6299a4f1..1a256f3d 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/spi/cache/CacheProvider.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/spi/cache/CacheProvider.java
@@ -1,23 +1,21 @@
 package com.jayway.jsonpath.spi.cache;
 
-import com.jayway.jsonpath.InvalidJsonException;
-import com.jayway.jsonpath.JsonPath;
+import com.jayway.jsonpath.JsonPathException;
 
-public interface CacheProvider {
+public class CacheProvider {
+    private static Cache cache = new LRUCache(200);
 
-	/**
-     * Get the Cached JsonPath
-     * @param key cache key to lookup the JsonPath
-     * @return JsonPath
-     */
-	public JsonPath get(String key);
-	
-	/**
-     * Add JsonPath to the cache
-     * @param key cache key to store the JsonPath
-     * @param value JsonPath to be cached
-     * @return void
-     * @throws InvalidJsonException
-     */
-	public void put(String key, JsonPath value);
-}
+    public static void setCache(Cache cache){
+        if (cache != null){
+            CacheProvider.cache = cache;
+        }
+    }
+
+    public static Cache getCache() {
+        try {
+            return cache;
+        } catch (Exception e) {
+            throw new JsonPathException("Failed to get cache", e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/cache/DefaultCache.java b/json-path/src/main/java/com/jayway/jsonpath/spi/cache/LRUCache.java
similarity index 91%
rename from json-path/src/main/java/com/jayway/jsonpath/spi/cache/DefaultCache.java
rename to json-path/src/main/java/com/jayway/jsonpath/spi/cache/LRUCache.java
index 48eae99a..3646e2c8 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/spi/cache/DefaultCache.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/spi/cache/LRUCache.java
@@ -14,20 +14,15 @@
  */
 package com.jayway.jsonpath.spi.cache;
 
+import com.jayway.jsonpath.JsonPath;
+
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
-import com.jayway.jsonpath.JsonPath;
-
-/*
- * LRU implementation copied from com.jayway.jsonpath.internal.Cache
- * Will have the same bugs
- */
-
-public class DefaultCache implements CacheProvider{
+public class LRUCache implements Cache {
 
     private final ReentrantLock lock = new ReentrantLock();
 
@@ -35,7 +30,7 @@ public class DefaultCache implements CacheProvider{
     private final Deque<String> queue = new LinkedList<String>();
     private final int limit;
 
-    public DefaultCache(int limit) {
+    public LRUCache(int limit) {
         this.limit = limit;
     }
 
@@ -52,10 +47,11 @@ public class DefaultCache implements CacheProvider{
     }
 
     public JsonPath get(String key) {
-        if(map.containsKey(key)){
+        JsonPath jsonPath = map.get(key);
+        if(jsonPath != null){
             removeThenAddKey(key);
         }
-        return map.get(key);
+        return jsonPath;
     }
 
     private void addKey(String key) {
diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/cache/NOOPCache.java b/json-path/src/main/java/com/jayway/jsonpath/spi/cache/NOOPCache.java
new file mode 100644
index 00000000..66cd93c4
--- /dev/null
+++ b/json-path/src/main/java/com/jayway/jsonpath/spi/cache/NOOPCache.java
@@ -0,0 +1,14 @@
+package com.jayway.jsonpath.spi.cache;
+
+import com.jayway.jsonpath.JsonPath;
+
+public class NOOPCache implements Cache {
+    @Override
+    public JsonPath get(String key) {
+        return null;
+    }
+
+    @Override
+    public void put(String key, JsonPath value) {
+    }
+}