Renamed token package to path.

9 years ago · 1eb47a23d7
24 changed files with 31 additions and 32 deletions
--- a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
@ -18,9 +18,9 @@ package com.jayway.jsonpath;
 import com.jayway.jsonpath.internal.EvaluationContext;
 import com.jayway.jsonpath.internal.JsonContext;
 import com.jayway.jsonpath.internal.Path;
-import com.jayway.jsonpath.internal.PathCompiler;
 import com.jayway.jsonpath.internal.PathRef;
 import com.jayway.jsonpath.internal.Utils;
+import com.jayway.jsonpath.internal.path.PathCompiler;
 import com.jayway.jsonpath.spi.json.JsonProvider;

 import java.io.File;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
@ -7,9 +7,9 @@ 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.internal.PathCompiler;
 import com.jayway.jsonpath.internal.Utils;
-import com.jayway.jsonpath.internal.token.PredicateContextImpl;
+import com.jayway.jsonpath.internal.path.PathCompiler;
+import com.jayway.jsonpath.internal.path.PredicateContextImpl;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayIndexOperation.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayIndexOperation.java
@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.internal.Utils;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java
@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.PathNotFoundException;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArraySliceOperation.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/ArraySliceOperation.java
@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.InvalidPathException;

--- a/json-path/src/main/java/com/jayway/jsonpath/internal/path/CompiledPath.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/CompiledPath.java
@ -12,11 +12,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.internal.token.EvaluationContextImpl;
-import com.jayway.jsonpath.internal.token.RootPathToken;
+import com.jayway.jsonpath.internal.EvaluationAbortException;
+import com.jayway.jsonpath.internal.EvaluationContext;
+import com.jayway.jsonpath.internal.Path;
+import com.jayway.jsonpath.internal.PathRef;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/EvaluationContextImpl.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/EvaluationContextImpl.java
@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.EvaluationListener;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/FunctionPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/FunctionPathToken.java
@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.internal.PathRef;
 import com.jayway.jsonpath.internal.function.PathFunction;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathCompiler.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/path/PathCompiler.java
@ -1,13 +1,10 @@
-package com.jayway.jsonpath.internal;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.Predicate;
+import com.jayway.jsonpath.internal.CharacterIndex;
+import com.jayway.jsonpath.internal.Path;
 import com.jayway.jsonpath.internal.filter.FilterCompiler;
-import com.jayway.jsonpath.internal.token.ArrayIndexOperation;
-import com.jayway.jsonpath.internal.token.ArraySliceOperation;
-import com.jayway.jsonpath.internal.token.PathTokenAppender;
-import com.jayway.jsonpath.internal.token.PathTokenFactory;
-import com.jayway.jsonpath.internal.token.RootPathToken;

 import java.util.ArrayList;
 import java.util.Collection;
--- 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
@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenAppender.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenAppender.java
@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 public interface PathTokenAppender {
    PathTokenAppender appendPathToken(PathToken next);
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenFactory.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenFactory.java
@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.Predicate;

--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java
@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.Predicate;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicatePathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicatePathToken.java
@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.InvalidPathException;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/PropertyPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/PropertyPathToken.java
@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.PathNotFoundException;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/RootPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/RootPathToken.java
@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.internal.PathRef;

--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/ScanPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/ScanPathToken.java
@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.internal.PathRef;
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/token/WildcardPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/token/WildcardPathToken.java
@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
--- a/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
@ -1,7 +1,7 @@
 package com.jayway.jsonpath;

 import com.jayway.jsonpath.internal.Path;
-import com.jayway.jsonpath.internal.token.PredicateContextImpl;
+import com.jayway.jsonpath.internal.path.PredicateContextImpl;
 import com.jayway.jsonpath.spi.json.GsonJsonProvider;
 import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;
 import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
--- a/json-path/src/test/java/com/jayway/jsonpath/PathCompilerTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/PathCompilerTest.java
@ -5,7 +5,7 @@ import org.junit.Test;

 import java.util.List;

-import static com.jayway.jsonpath.internal.PathCompiler.compile;
+import static com.jayway.jsonpath.internal.path.PathCompiler.compile;
 import static org.assertj.core.api.Assertions.assertThat;

 public class PathCompilerTest {
--- a/json-path/src/test/java/com/jayway/jsonpath/internal/token/PathTokenTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/internal/token/PathTokenTest.java
@ -1,4 +1,4 @@
-package com.jayway.jsonpath.internal.token;
+package com.jayway.jsonpath.internal.path;

 import com.jayway.jsonpath.BaseTest;
 import org.junit.Test;
--- a/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
@ -6,7 +6,7 @@ import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
-import com.jayway.jsonpath.internal.PathCompiler;
+import com.jayway.jsonpath.internal.path.PathCompiler;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;

--- a/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
@ -1,7 +1,7 @@
 package com.jayway.jsonpath.old.internal;

 import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.internal.PathCompiler;
+import com.jayway.jsonpath.internal.path.PathCompiler;
 import org.junit.Test;

 import java.util.List;
--- a/json-path/src/test/java/com/jayway/jsonpath/old/internal/TestInternal3.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/old/internal/TestInternal3.java
@ -5,7 +5,7 @@ import org.junit.Test;
 import java.util.List;
 import java.util.Map;

-import static com.jayway.jsonpath.internal.PathCompiler.compile;
+import static com.jayway.jsonpath.internal.path.PathCompiler.compile;
 import static org.assertj.core.api.Assertions.assertThat;

 /**