Allow the cache and functions to be configurable in different contexts.

.gitignore

@@ -13,4 +13,7 @@ TODO
 gradle.properties
 build
 bin/
+json-path-assert/out
+json-path-web-test/out
+json-path/out
 out/

json-path/src/main/java/com/jayway/jsonpath/Configuration.java

@@ -15,12 +15,23 @@
 package com.jayway.jsonpath;
 
 import com.jayway.jsonpath.internal.DefaultsImpl;
+import com.jayway.jsonpath.internal.function.PathFunction;
+import com.jayway.jsonpath.spi.cache.Cache;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 import static com.jayway.jsonpath.internal.Utils.notNull;
+import static com.jayway.jsonpath.internal.function.PathFunctionFactory.FUNCTIONS;
 import static java.util.Arrays.asList;
 
 /**
@@ -32,64 +43,80 @@ public class Configuration {
 
     /**
      * Set Default configuration
+     *
      * @param defaults default configuration settings
      */
-    public static synchronized void setDefaults(Defaults defaults){
+    public static synchronized void setDefaults(Defaults defaults) {
         DEFAULTS = defaults;
     }
 
-    private static Defaults getEffectiveDefaults(){
+    private static Defaults getEffectiveDefaults() {
         if (DEFAULTS == null) {
-          return DefaultsImpl.INSTANCE;
+            return DefaultsImpl.INSTANCE;
         } else {
-          return DEFAULTS;
+            return DEFAULTS;
         }
     }
 
     private final JsonProvider jsonProvider;
     private final MappingProvider mappingProvider;
     private final Set<Option> options;
+    private final Cache cache;
     private final Collection<EvaluationListener> evaluationListeners;
-
-    private Configuration(JsonProvider jsonProvider, MappingProvider mappingProvider, EnumSet<Option> options, Collection<EvaluationListener> evaluationListeners) {
+    private Map<String, Class<? extends PathFunction>> functions;
+
+    private Configuration(
+            JsonProvider jsonProvider,
+            MappingProvider mappingProvider,
+            EnumSet<Option> options,
+            Collection<EvaluationListener> evaluationListeners,
+            Cache cache,
+            Map<String, Class<? extends PathFunction>> functions) {
         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");
+        notNull(functions, "functions can not be null");
         this.jsonProvider = jsonProvider;
         this.mappingProvider = mappingProvider;
         this.options = Collections.unmodifiableSet(options);
         this.evaluationListeners = Collections.unmodifiableCollection(evaluationListeners);
+        this.cache = cache;
+        this.functions = functions;
     }
 
     /**
      * Creates a new Configuration by the provided evaluation listeners to the current listeners
+     *
      * @param evaluationListener listeners
      * @return a new configuration
      */
-    public Configuration addEvaluationListeners(EvaluationListener... evaluationListener){
+    public Configuration addEvaluationListeners(EvaluationListener... evaluationListener) {
         return Configuration.builder().jsonProvider(jsonProvider).mappingProvider(mappingProvider).options(options).evaluationListener(evaluationListener).build();
     }
 
     /**
      * Creates a new Configuration with the provided evaluation listeners
+     *
      * @param evaluationListener listeners
      * @return a new configuration
      */
-    public Configuration setEvaluationListeners(EvaluationListener... evaluationListener){
+    public Configuration setEvaluationListeners(EvaluationListener... evaluationListener) {
         return Configuration.builder().jsonProvider(jsonProvider).mappingProvider(mappingProvider).options(options).evaluationListener(evaluationListener).build();
     }
 
     /**
      * Returns the evaluation listeners registered in this configuration
+     *
      * @return the evaluation listeners
      */
-    public Collection<EvaluationListener> getEvaluationListeners(){
+    public Collection<EvaluationListener> getEvaluationListeners() {
         return evaluationListeners;
     }
 
     /**
      * Creates a new Configuration based on the given {@link com.jayway.jsonpath.spi.json.JsonProvider}
+     *
      * @param newJsonProvider json provider to use in new configuration
      * @return a new configuration
      */
@@ -99,6 +126,7 @@ public Configuration jsonProvider(JsonProvider newJsonProvider) {
 
     /**
      * Returns {@link com.jayway.jsonpath.spi.json.JsonProvider} used by this configuration
+     *
      * @return jsonProvider used
      */
     public JsonProvider jsonProvider() {
@@ -107,6 +135,7 @@ public JsonProvider jsonProvider() {
 
     /**
      * Creates a new Configuration based on the given {@link com.jayway.jsonpath.spi.mapper.MappingProvider}
+     *
      * @param newMappingProvider mapping provider to use in new configuration
      * @return a new configuration
      */
@@ -116,6 +145,7 @@ public Configuration mappingProvider(MappingProvider newMappingProvider) {
 
     /**
      * Returns {@link com.jayway.jsonpath.spi.mapper.MappingProvider} used by this configuration
+     *
      * @return mappingProvider used
      */
     public MappingProvider mappingProvider() {
@@ -124,27 +154,65 @@ public MappingProvider mappingProvider() {
 
     /**
      * Creates a new configuration by adding the new options to the options used in this configuration.
+     *
      * @param options options to add
      * @return a new configuration
      */
     public Configuration addOptions(Option... options) {
         EnumSet<Option> opts = EnumSet.noneOf(Option.class);
         opts.addAll(this.options);
         opts.addAll(asList(options));
-        return Configuration.builder().jsonProvider(jsonProvider).mappingProvider(mappingProvider).options(opts).evaluationListener(evaluationListeners).build();
+        return Configuration.builder()
+                .jsonProvider(jsonProvider)
+                .mappingProvider(mappingProvider)
+                .cache(cache)
+                .functions(functions)
+                .options(opts)
+                .evaluationListener(evaluationListeners).build();
     }
 
     /**
      * Creates a new configuration with the provided options. Options in this configuration are discarded.
+     *
      * @param options
      * @return the new configuration instance
      */
     public Configuration setOptions(Option... options) {
-        return Configuration.builder().jsonProvider(jsonProvider).mappingProvider(mappingProvider).options(options).evaluationListener(evaluationListeners).build();
+        return Configuration.builder()
+                .jsonProvider(jsonProvider)
+                .mappingProvider(mappingProvider)
+                .cache(cache)
+                .options(options)
+                .evaluationListener(evaluationListeners).build();
+    }
+
+    /**
+     * Returns the cache used by this configuration, can be null if none.
+     *
+     * @return
+     */
+    public Cache getCache() {
+        return cache;
+    }
+
+    /**
+     * Creates a new configuration with the provided cache.
+     *
+     * @param cache
+     * @return
+     */
+    public Configuration setCache(Cache cache) {
+        return Configuration.builder()
+                .jsonProvider(jsonProvider)
+                .mappingProvider(mappingProvider)
+                .options(options)
+                .cache(cache)
+                .evaluationListener(evaluationListeners).build();
     }
 
     /**
      * Returns the options used by this configuration
+     *
      * @return the new configuration instance
      */
     public Set<Option> getOptions() {
@@ -153,15 +221,17 @@ public Set<Option> getOptions() {
 
     /**
      * Check if this configuration contains the given option
+     *
      * @param option option to check
      * @return true if configurations contains option
      */
-    public boolean containsOption(Option option){
+    public boolean containsOption(Option option) {
         return options.contains(option);
     }
 
     /**
      * Creates a new configuration based on default values
+     *
      * @return a new configuration based on defaults
      */
     public static Configuration defaultConfiguration() {
@@ -171,12 +241,17 @@ public static Configuration defaultConfiguration() {
 
     /**
      * Returns a new ConfigurationBuilder
+     *
      * @return a builder
      */
     public static ConfigurationBuilder builder() {
         return new ConfigurationBuilder();
     }
 
+    public Map<String, Class<? extends PathFunction>> getFunctions() {
+        return functions;
+    }
+
     /**
      * Configuration builder
      */
@@ -186,6 +261,8 @@ public static class ConfigurationBuilder {
         private MappingProvider mappingProvider;
         private EnumSet<Option> options = EnumSet.noneOf(Option.class);
         private Collection<EvaluationListener> evaluationListener = new ArrayList<EvaluationListener>();
+        private Cache cache;
+        private Map<String, Class<? extends PathFunction>> functions = null;
 
         public ConfigurationBuilder jsonProvider(JsonProvider provider) {
             this.jsonProvider = provider;
@@ -198,7 +275,7 @@ public ConfigurationBuilder mappingProvider(MappingProvider provider) {
         }
 
         public ConfigurationBuilder options(Option... flags) {
-            if(flags.length > 0) {
+            if (flags.length > 0) {
                 this.options.addAll(asList(flags));
             }
             return this;
@@ -209,39 +286,68 @@ public ConfigurationBuilder options(Set<Option> options) {
             return this;
         }
 
-        public ConfigurationBuilder evaluationListener(EvaluationListener... listener){
+        public ConfigurationBuilder evaluationListener(EvaluationListener... listener) {
             this.evaluationListener = Arrays.asList(listener);
             return this;
         }
 
-        public ConfigurationBuilder evaluationListener(Collection<EvaluationListener> listeners){
+        public ConfigurationBuilder evaluationListener(Collection<EvaluationListener> listeners) {
             this.evaluationListener = listeners == null ? Collections.<EvaluationListener>emptyList() : listeners;
             return this;
         }
 
+        public ConfigurationBuilder cache(Cache cache) {
+            this.cache = cache;
+            return this;
+        }
+
         public Configuration build() {
             if (jsonProvider == null || mappingProvider == null) {
                 final Defaults defaults = getEffectiveDefaults();
                 if (jsonProvider == null) {
                     jsonProvider = defaults.jsonProvider();
                 }
-                if (mappingProvider == null){
+                if (mappingProvider == null) {
                     mappingProvider = defaults.mappingProvider();
                 }
             }
-            return new Configuration(jsonProvider, mappingProvider, options, evaluationListener);
+            return new Configuration(
+                    jsonProvider,
+                    mappingProvider,
+                    options,
+                    evaluationListener,
+                    cache,
+                    functions == null ? FUNCTIONS : Collections.unmodifiableMap(functions)
+            );
+        }
+
+        public ConfigurationBuilder functions(Map<String, Class<? extends PathFunction>> functions) {
+            this.functions = functions;
+            return this;
+        }
+
+        public ConfigurationBuilder addFunction(
+                String functionName, Class<? extends PathFunction> functionClass) {
+            if (this.functions == null) {
+                this.functions = new HashMap<String, Class<? extends PathFunction>>();
+                this.functions.putAll(FUNCTIONS);
+            }
+            this.functions.put(functionName, functionClass);
+            return this;
         }
     }
 
     public interface Defaults {
         /**
          * Returns the default {@link com.jayway.jsonpath.spi.json.JsonProvider}
+         *
          * @return default json provider
          */
         JsonProvider jsonProvider();
 
         /**
          * Returns default setOptions
+         *
          * @return setOptions
          */
         Set<Option> options();

json-path/src/main/java/com/jayway/jsonpath/internal/JsonContext.java

@@ -215,7 +215,7 @@ public DocumentContext put(JsonPath path, String key, Object value) {
     }
 
     private JsonPath pathFromCache(String path, Predicate[] filters) {
-        Cache cache = CacheProvider.getCache();
+        Cache cache = configuration.getCache() != null ? configuration.getCache() : CacheProvider.getCache();
         String cacheKey = Utils.concat(path, new LinkedList<Predicate>(asList(filters)).toString());
         JsonPath jsonPath = cache.get(cacheKey);
         if (jsonPath == null) {