From a9fd55bd1d4f0decb3bcf37d5c4fa88152ad7fcf Mon Sep 17 00:00:00 2001
From: Alejandro Jimenez Martinez <sondrago@google.com>
Date: Fri, 16 Mar 2018 11:25:52 -0700
Subject: [PATCH 1/3] Allow the cache to be configurable in different contexts,
 and as well as which Functions are available on the library

---
 .gitignore                                    |  3 +
 .../com/jayway/jsonpath/Configuration.java    | 94 +++++++++++++++++--
 .../jayway/jsonpath/internal/JsonContext.java |  2 +-
 .../function/PathFunctionFactory.java         | 18 ++--
 .../internal/path/FunctionPathToken.java      |  2 +-
 .../jsonpath/ConfigurableFunctionTest.java    | 50 ++++++++++
 6 files changed, 155 insertions(+), 14 deletions(-)
 create mode 100644 json-path/src/test/java/com/jayway/jsonpath/ConfigurableFunctionTest.java

diff --git a/.gitignore b/.gitignore
index 7fd04a4c5..ec1c81db1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ TODO
 gradle.properties
 build
 bin/
+json-path-assert/out
+json-path-web-test/out
+json-path/out
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 1a591ea8d..9b3f3326e 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
@@ -15,6 +15,9 @@
 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.cache.CacheProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
@@ -23,9 +26,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
 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;
 
 /**
@@ -54,17 +60,28 @@ private static Defaults getEffectiveDefaults(){
     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;
     }
 
     /**
@@ -136,7 +153,13 @@ 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();
     }
 
     /**
@@ -145,7 +168,34 @@ public Configuration addOptions(Option... options) {
      * @return
      */
     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();
     }
 
     /**
@@ -155,7 +205,6 @@ public Configuration setOptions(Option... options) {
     public Set<Option> getOptions() {
         return options;
     }
-
     /**
      * Check if this configuration contains the given option
      * @param option option to check
@@ -182,6 +231,10 @@ public static ConfigurationBuilder builder() {
         return new ConfigurationBuilder();
     }
 
+    public Map<String, Class<? extends PathFunction>> getFunctions() {
+        return functions;
+    }
+
     /**
      * Configuration builder
      */
@@ -191,6 +244,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;
@@ -224,6 +279,11 @@ public ConfigurationBuilder evaluationListener(Collection<EvaluationListener> li
             return this;
         }
 
+        public ConfigurationBuilder cache(Cache cache) {
+            this.cache = cache;
+            return this;
+        }
+
         public Configuration build() {
             if (jsonProvider == null || mappingProvider == null) {
                 final Defaults defaults = getEffectiveDefaults();
@@ -234,7 +294,29 @@ public Configuration build() {
                     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;
         }
     }
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/JsonContext.java b/json-path/src/main/java/com/jayway/jsonpath/internal/JsonContext.java
index 731473348..0858af4e0 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/JsonContext.java
+++ b/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) {
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunctionFactory.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunctionFactory.java
index 6beda0e24..d59ec496b 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunctionFactory.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunctionFactory.java
@@ -1,5 +1,6 @@
 package com.jayway.jsonpath.internal.function;
 
+import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.internal.function.json.Append;
 import com.jayway.jsonpath.internal.function.numeric.Average;
@@ -10,6 +11,7 @@
 import com.jayway.jsonpath.internal.function.text.Concatenate;
 import com.jayway.jsonpath.internal.function.text.Length;
 
+import java.lang.reflect.Constructor;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,14 +26,14 @@
  */
 public class PathFunctionFactory {
 
-    public static final Map<String, Class> FUNCTIONS;
+    public static final Map<String, Class<? extends PathFunction>> FUNCTIONS;
 
     static {
         // New functions should be added here and ensure the name is not overridden
-        Map<String, Class> map = new HashMap<String, Class>();
+        Map<String, Class<? extends PathFunction>> map = new HashMap<String, Class<? extends PathFunction>>();
 
         // Math Functions
-        map.put("avg", Average.class);
+        map.put("avg",  Average.class);
         map.put("stddev", StandardDeviation.class);
         map.put("sum", Sum.class);
         map.put("min", Min.class);
@@ -58,18 +60,22 @@ public class PathFunctionFactory {
      * @param name
      *      The name of the function
      *
+     * @param configuration
      * @return
      *      The implementation of a function
      *
      * @throws InvalidPathException
      */
-    public static PathFunction newFunction(String name) throws InvalidPathException {
-        Class functionClazz = FUNCTIONS.get(name);
+    public static PathFunction newFunction(
+        String name,
+        Configuration configuration) throws InvalidPathException {
+        Class<? extends PathFunction> functionClazz = configuration.getFunctions().get(name);
         if(functionClazz == null){
             throw new InvalidPathException("Function with name: " + name + " does not exist.");
         } else {
             try {
-                return (PathFunction)functionClazz.newInstance();
+                Constructor<? extends PathFunction> constructor = functionClazz.getConstructor();
+                return constructor.newInstance();
             } catch (Exception e) {
                 throw new InvalidPathException("Function of name: " + name + " cannot be created", e);
             }
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/path/FunctionPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/path/FunctionPathToken.java
index ee6b86913..1653a6a95 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/path/FunctionPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/FunctionPathToken.java
@@ -35,7 +35,7 @@ public FunctionPathToken(String pathFragment, List<Parameter> parameters) {
 
     @Override
     public void evaluate(String currentPath, PathRef parent, Object model, EvaluationContextImpl ctx) {
-        PathFunction pathFunction = PathFunctionFactory.newFunction(functionName);
+        PathFunction pathFunction = PathFunctionFactory.newFunction(functionName, ctx.configuration());
         evaluateParameters(currentPath, parent, model, ctx);
         Object result = pathFunction.invoke(currentPath, parent, model, ctx, functionParams);
         ctx.addResult(currentPath + "." + functionName, parent, result);
diff --git a/json-path/src/test/java/com/jayway/jsonpath/ConfigurableFunctionTest.java b/json-path/src/test/java/com/jayway/jsonpath/ConfigurableFunctionTest.java
new file mode 100644
index 000000000..291226a5d
--- /dev/null
+++ b/json-path/src/test/java/com/jayway/jsonpath/ConfigurableFunctionTest.java
@@ -0,0 +1,50 @@
+package com.jayway.jsonpath;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+import com.jayway.jsonpath.internal.EvaluationContext;
+import com.jayway.jsonpath.internal.PathRef;
+import com.jayway.jsonpath.internal.function.Parameter;
+import com.jayway.jsonpath.internal.function.PathFunction;
+import com.jayway.jsonpath.spi.json.JsonOrgJsonProvider;
+import com.jayway.jsonpath.spi.mapper.JsonOrgMappingProvider;
+import java.util.List;
+import org.junit.Test;
+
+public class ConfigurableFunctionTest {
+  private static String CONSTANT = "A constant value";
+  public static class MyFunction implements PathFunction {
+
+    @Override
+    public Object invoke(String currentPath, PathRef parent, Object model, EvaluationContext ctx,
+        List<Parameter> parameters) {
+      return CONSTANT;
+    }
+  }
+
+  @Test
+  public void testConfigurableCustomFunction() {
+    Configuration withoutFunction = Configuration
+        .builder()
+        .mappingProvider(new JsonOrgMappingProvider())
+        .jsonProvider(new JsonOrgJsonProvider())
+        .build();
+
+    Configuration withFunction = Configuration
+        .builder()
+        .mappingProvider(new JsonOrgMappingProvider())
+        .addFunction("constant", MyFunction.class)
+        .jsonProvider(new JsonOrgJsonProvider())
+        .build();
+    assertThat(JsonPath.using(withFunction).parse("{}")
+        .read("$.constant()")).isEqualTo(CONSTANT);
+    try {
+      JsonPath.using(withoutFunction).parse("{}")
+          .read("$.constant()");
+      failBecauseExceptionWasNotThrown(InvalidPathException.class);
+    } catch (InvalidPathException e) {
+      assertThat(e.getMessage()).isEqualTo("Function with name: constant does not exist.");
+    }
+  }
+}

From bbba36777c4ca5576284a6c72ba9ea12489bdb12 Mon Sep 17 00:00:00 2001
From: Alejandro Jimenez Martinez <alex@felpi.com>
Date: Thu, 30 Sep 2021 17:17:58 -0500
Subject: [PATCH 2/3] Merge conflict

---
 .../com/jayway/jsonpath/Configuration.java    | 123 ++++++++++--------
 .../jsonpath/ConfigurableFunctionTest.java    |   2 +-
 2 files changed, 68 insertions(+), 57 deletions(-)

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 b83575cf7..ceff44c56 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
@@ -17,18 +17,10 @@
 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.cache.CacheProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
-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.Set;
+import java.util.*;
 
 import static com.jayway.jsonpath.internal.Utils.notNull;
 import static com.jayway.jsonpath.internal.function.PathFunctionFactory.FUNCTIONS;
@@ -43,17 +35,18 @@ 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;
         }
     }
 
@@ -65,12 +58,12 @@ private static Defaults getEffectiveDefaults(){
     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) {
+            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");
@@ -86,32 +79,36 @@ private Configuration(
 
     /**
      * 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
      */
@@ -121,6 +118,7 @@ public Configuration jsonProvider(JsonProvider newJsonProvider) {
 
     /**
      * Returns {@link com.jayway.jsonpath.spi.json.JsonProvider} used by this configuration
+     *
      * @return jsonProvider used
      */
     public JsonProvider jsonProvider() {
@@ -129,6 +127,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
      */
@@ -138,6 +137,7 @@ public Configuration mappingProvider(MappingProvider newMappingProvider) {
 
     /**
      * Returns {@link com.jayway.jsonpath.spi.mapper.MappingProvider} used by this configuration
+     *
      * @return mappingProvider used
      */
     public MappingProvider mappingProvider() {
@@ -146,6 +146,7 @@ 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
      */
@@ -154,30 +155,32 @@ public Configuration addOptions(Option... options) {
         opts.addAll(this.options);
         opts.addAll(asList(options));
         return Configuration.builder()
-            .jsonProvider(jsonProvider)
-            .mappingProvider(mappingProvider)
-            .cache(cache)
-            .functions(functions)
-            .options(opts)
-            .evaluationListener(evaluationListeners).build();
+                .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)
-            .cache(cache)
-            .options(options)
-            .evaluationListener(evaluationListeners).build();
+                .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() {
@@ -186,36 +189,41 @@ public Cache getCache() {
 
     /**
      * 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();
+                .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() {
         return options;
     }
+
     /**
      * 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() {
@@ -225,6 +233,7 @@ public static Configuration defaultConfiguration() {
 
     /**
      * Returns a new ConfigurationBuilder
+     *
      * @return a builder
      */
     public static ConfigurationBuilder builder() {
@@ -258,7 +267,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;
@@ -269,12 +278,12 @@ 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;
         }
@@ -290,17 +299,17 @@ public Configuration build() {
                 if (jsonProvider == null) {
                     jsonProvider = defaults.jsonProvider();
                 }
-                if (mappingProvider == null){
+                if (mappingProvider == null) {
                     mappingProvider = defaults.mappingProvider();
                 }
             }
             return new Configuration(
-                jsonProvider,
-                mappingProvider,
-                options,
-                evaluationListener,
-                cache,
-                functions == null ? FUNCTIONS : Collections.unmodifiableMap(functions)
+                    jsonProvider,
+                    mappingProvider,
+                    options,
+                    evaluationListener,
+                    cache,
+                    functions == null ? FUNCTIONS : Collections.unmodifiableMap(functions)
             );
         }
 
@@ -310,25 +319,27 @@ public ConfigurationBuilder functions(Map<String, Class<? extends PathFunction>>
         }
 
         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;
+                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();
diff --git a/json-path/src/test/java/com/jayway/jsonpath/ConfigurableFunctionTest.java b/json-path/src/test/java/com/jayway/jsonpath/ConfigurableFunctionTest.java
index 291226a5d..7f612b3bf 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/ConfigurableFunctionTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/ConfigurableFunctionTest.java
@@ -37,7 +37,7 @@ public void testConfigurableCustomFunction() {
         .addFunction("constant", MyFunction.class)
         .jsonProvider(new JsonOrgJsonProvider())
         .build();
-    assertThat(JsonPath.using(withFunction).parse("{}")
+    assertThat((String) JsonPath.using(withFunction).parse("{}")
         .read("$.constant()")).isEqualTo(CONSTANT);
     try {
       JsonPath.using(withoutFunction).parse("{}")

From 9d1adb402e0182e70cc994f931adeb2ddca2cba3 Mon Sep 17 00:00:00 2001
From: Alejandro Jimenez Martinez <alex@felpi.com>
Date: Thu, 30 Sep 2021 17:19:45 -0500
Subject: [PATCH 3/3] Fix merge conflict

---
 .../main/java/com/jayway/jsonpath/Configuration.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 ceff44c56..0a93a0e04 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
@@ -20,7 +20,15 @@
 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;