Move classes that might be used for custom path functions out of internal

Author: movabo

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

@@ -15,11 +15,10 @@
 package com.jayway.jsonpath;
 
 import com.jayway.jsonpath.internal.DefaultsImpl;
-import com.jayway.jsonpath.spi.pathFunction.DefaultPathFunctionProvider;
-import com.jayway.jsonpath.spi.pathFunction.PathFunction;
+import com.jayway.jsonpath.spi.function.DefaultPathFunctionProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
-import com.jayway.jsonpath.spi.pathFunction.PathFunctionProvider;
+import com.jayway.jsonpath.spi.function.PathFunctionProvider;
 
 import java.util.*;
 

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

@@ -14,7 +14,6 @@
  */
 package com.jayway.jsonpath;
 
-import com.jayway.jsonpath.internal.Path;
 import com.jayway.jsonpath.internal.Utils;
 import com.jayway.jsonpath.internal.filter.RelationalExpressionNode;
 import com.jayway.jsonpath.internal.filter.RelationalOperator;

…jsonpath/internal/EvaluationContext.java …m/jayway/jsonpath/EvaluationContext.javajson-path/src/main/java/com/jayway/jsonpath/internal/EvaluationContext.java renamed to json-path/src/main/java/com/jayway/jsonpath/EvaluationContext.java json-path/src/main/java/com/jayway/jsonpath/internal/EvaluationContext.java renamed to json-path/src/main/java/com/jayway/jsonpath/EvaluationContext.java

@@ -12,9 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal;
-
-import com.jayway.jsonpath.Configuration;
+package com.jayway.jsonpath;
 
 import java.util.Collection;
 import java.util.List;
@@ -44,7 +42,7 @@ public interface EvaluationContext {
     <T> T getValue();
 
     /**
-     * See {@link com.jayway.jsonpath.internal.EvaluationContext#getValue()}
+     * See {@link EvaluationContext#getValue()}
      *
      * @param unwrap tells th underlying json provider if primitives should be unwrapped
      * @param <T> expected return type

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

@@ -18,7 +18,6 @@
 import com.jayway.jsonpath.internal.*;
 import com.jayway.jsonpath.internal.path.PathCompiler;
 import com.jayway.jsonpath.spi.json.JsonProvider;
-import com.jayway.jsonpath.spi.pathFunction.PathFunctionProvider;
 
 import java.io.File;
 import java.io.FileInputStream;

…a/com/jayway/jsonpath/internal/Path.java …/main/java/com/jayway/jsonpath/Path.javajson-path/src/main/java/com/jayway/jsonpath/internal/Path.java renamed to json-path/src/main/java/com/jayway/jsonpath/Path.java json-path/src/main/java/com/jayway/jsonpath/internal/Path.java renamed to json-path/src/main/java/com/jayway/jsonpath/Path.java

@@ -12,9 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jayway.jsonpath.internal;
-
-import com.jayway.jsonpath.Configuration;
+package com.jayway.jsonpath;
 
 /**
  *

…om/jayway/jsonpath/internal/PathRef.java …in/java/com/jayway/jsonpath/PathRef.javajson-path/src/main/java/com/jayway/jsonpath/internal/PathRef.java renamed to json-path/src/main/java/com/jayway/jsonpath/PathRef.java json-path/src/main/java/com/jayway/jsonpath/internal/PathRef.java renamed to json-path/src/main/java/com/jayway/jsonpath/PathRef.java

@@ -1,9 +1,6 @@
-package com.jayway.jsonpath.internal;
+package com.jayway.jsonpath;
 
-import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.InvalidModificationException;
-import com.jayway.jsonpath.MapFunction;
-import com.jayway.jsonpath.PathNotFoundException;
+import com.jayway.jsonpath.internal.Utils;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 
 import java.util.Collection;

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

@@ -3,7 +3,7 @@
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.JsonPathException;
 import com.jayway.jsonpath.Predicate;
-import com.jayway.jsonpath.internal.Path;
+import com.jayway.jsonpath.Path;
 import com.jayway.jsonpath.internal.path.PathCompiler;
 import net.minidev.json.parser.JSONParser;
 

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

@@ -10,7 +10,7 @@
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
 import com.jayway.jsonpath.Predicate;
-import com.jayway.jsonpath.internal.Path;
+import com.jayway.jsonpath.Path;
 import com.jayway.jsonpath.internal.Utils;
 import com.jayway.jsonpath.internal.path.PathCompiler;
 import com.jayway.jsonpath.internal.path.PredicateContextImpl;

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

@@ -1,8 +1,9 @@
 package com.jayway.jsonpath.internal.function;
 
-import com.jayway.jsonpath.internal.EvaluationContext;
-import com.jayway.jsonpath.internal.PathRef;
-import com.jayway.jsonpath.spi.pathFunction.PathFunction;
+import com.jayway.jsonpath.EvaluationContext;
+import com.jayway.jsonpath.PathRef;
+import com.jayway.jsonpath.spi.function.Parameter;
+import com.jayway.jsonpath.spi.function.PathFunction;
 
 import java.util.List;
 

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

@@ -1,9 +1,9 @@
 package com.jayway.jsonpath.internal.function.json;
 
-import com.jayway.jsonpath.internal.EvaluationContext;
-import com.jayway.jsonpath.internal.PathRef;
-import com.jayway.jsonpath.internal.function.Parameter;
-import com.jayway.jsonpath.spi.pathFunction.PathFunction;
+import com.jayway.jsonpath.EvaluationContext;
+import com.jayway.jsonpath.PathRef;
+import com.jayway.jsonpath.spi.function.Parameter;
+import com.jayway.jsonpath.spi.function.PathFunction;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 
 import java.util.List;