fanruan
/
JsonPath
mirror of https://github.com/json-path/JsonPath.git
2
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Renamed token package to path.

pull/183/merge
Kalle Stenflo 9 years ago
parent
83c1acf193
commit
1eb47a23d7
24 changed files with 31 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
  2. 4
      json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
  3. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayIndexOperation.java
  4. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayPathToken.java
  5. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/ArraySliceOperation.java
  6. 8
      json-path/src/main/java/com/jayway/jsonpath/internal/path/CompiledPath.java
  7. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/EvaluationContextImpl.java
  8. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/FunctionPathToken.java
  9. 9
      json-path/src/main/java/com/jayway/jsonpath/internal/path/PathCompiler.java
  10. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/PathToken.java
  11. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenAppender.java
  12. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenFactory.java
  13. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicateContextImpl.java
  14. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicatePathToken.java
  15. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/PropertyPathToken.java
  16. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/RootPathToken.java
  17. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/ScanPathToken.java
  18. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/path/WildcardPathToken.java
  19. 2
      json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
  20. 2
      json-path/src/test/java/com/jayway/jsonpath/PathCompilerTest.java
  21. 2
      json-path/src/test/java/com/jayway/jsonpath/internal/path/PathTokenTest.java
  22. 2
      json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
  23. 2
      json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
  24. 2
      json-path/src/test/java/com/jayway/jsonpath/old/internal/TestInternal3.java

2
json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
Unescape View File

@ -18,9 +18,9 @@ package com.jayway.jsonpath;
import com.jayway.jsonpath.internal.EvaluationContext; import com.jayway.jsonpath.internal.EvaluationContext;
import com.jayway.jsonpath.internal.JsonContext; import com.jayway.jsonpath.internal.JsonContext;
import com.jayway.jsonpath.internal.Path; import com.jayway.jsonpath.internal.Path;
import com.jayway.jsonpath.internal.PathCompiler;
import com.jayway.jsonpath.internal.PathRef; import com.jayway.jsonpath.internal.PathRef;
import com.jayway.jsonpath.internal.Utils; import com.jayway.jsonpath.internal.Utils;
import com.jayway.jsonpath.internal.path.PathCompiler;
import com.jayway.jsonpath.spi.json.JsonProvider; import com.jayway.jsonpath.spi.json.JsonProvider;
import java.io.File; import java.io.File;

4
json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
Unescape View File

@ -7,9 +7,9 @@ import com.jayway.jsonpath.Option;
import com.jayway.jsonpath.PathNotFoundException; import com.jayway.jsonpath.PathNotFoundException;
import com.jayway.jsonpath.Predicate; import com.jayway.jsonpath.Predicate;
import com.jayway.jsonpath.internal.Path; import com.jayway.jsonpath.internal.Path;
import com.jayway.jsonpath.internal.PathCompiler;
import com.jayway.jsonpath.internal.Utils; 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 com.jayway.jsonpath.spi.json.JsonProvider;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayIndexOperation.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayIndexOperation.java
Unescape View File

@ -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.InvalidPathException;
import com.jayway.jsonpath.internal.Utils; import com.jayway.jsonpath.internal.Utils;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayPathToken.java
Unescape View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.InvalidPathException;
import com.jayway.jsonpath.PathNotFoundException; import com.jayway.jsonpath.PathNotFoundException;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/ArraySliceOperation.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/ArraySliceOperation.java
Unescape View File

@ -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.InvalidPathException;

8
json-path/src/main/java/com/jayway/jsonpath/internal/CompiledPath.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/CompiledPath.java
Unescape View File

@ -12,11 +12,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.jayway.jsonpath.internal; package com.jayway.jsonpath.internal.path;
import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.internal.token.EvaluationContextImpl; import com.jayway.jsonpath.internal.EvaluationAbortException;
import com.jayway.jsonpath.internal.token.RootPathToken; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/EvaluationContextImpl.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/EvaluationContextImpl.java
Unescape View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Configuration;
import com.jayway.jsonpath.EvaluationListener; import com.jayway.jsonpath.EvaluationListener;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/FunctionPathToken.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/FunctionPathToken.java
Unescape View File

@ -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.PathRef;
import com.jayway.jsonpath.internal.function.PathFunction; import com.jayway.jsonpath.internal.function.PathFunction;

9
json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/PathCompiler.java
Unescape View File

@ -1,13 +1,10 @@
package com.jayway.jsonpath.internal; package com.jayway.jsonpath.internal.path;
import com.jayway.jsonpath.InvalidPathException; import com.jayway.jsonpath.InvalidPathException;
import com.jayway.jsonpath.Predicate; 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.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.ArrayList;
import java.util.Collection; import java.util.Collection;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/PathToken.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/PathToken.java
Unescape View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Option;
import com.jayway.jsonpath.PathNotFoundException; import com.jayway.jsonpath.PathNotFoundException;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenAppender.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenAppender.java
Unescape View File

@ -1,4 +1,4 @@
package com.jayway.jsonpath.internal.token; package com.jayway.jsonpath.internal.path;
public interface PathTokenAppender { public interface PathTokenAppender {
PathTokenAppender appendPathToken(PathToken next); PathTokenAppender appendPathToken(PathToken next);

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/PathTokenFactory.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/PathTokenFactory.java
Unescape View File

@ -1,4 +1,4 @@
package com.jayway.jsonpath.internal.token; package com.jayway.jsonpath.internal.path;
import com.jayway.jsonpath.Predicate; import com.jayway.jsonpath.Predicate;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicateContextImpl.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicateContextImpl.java
Unescape View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Configuration;
import com.jayway.jsonpath.Predicate; import com.jayway.jsonpath.Predicate;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/PredicatePathToken.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/PredicatePathToken.java
Unescape View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Configuration;
import com.jayway.jsonpath.InvalidPathException; import com.jayway.jsonpath.InvalidPathException;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/PropertyPathToken.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/PropertyPathToken.java
Unescape View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.InvalidPathException;
import com.jayway.jsonpath.PathNotFoundException; import com.jayway.jsonpath.PathNotFoundException;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/RootPathToken.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/RootPathToken.java
Unescape View File

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

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/ScanPathToken.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/ScanPathToken.java
Unescape View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Option;
import com.jayway.jsonpath.internal.PathRef; import com.jayway.jsonpath.internal.PathRef;

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/WildcardPathToken.java → json-path/src/main/java/com/jayway/jsonpath/internal/path/WildcardPathToken.java
Unescape View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.Option;
import com.jayway.jsonpath.PathNotFoundException; import com.jayway.jsonpath.PathNotFoundException;

2
json-path/src/test/java/com/jayway/jsonpath/BaseTest.java
Unescape View File

@ -1,7 +1,7 @@
package com.jayway.jsonpath; package com.jayway.jsonpath;
import com.jayway.jsonpath.internal.Path; 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.GsonJsonProvider;
import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider; import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;
import com.jayway.jsonpath.spi.json.JacksonJsonProvider; import com.jayway.jsonpath.spi.json.JacksonJsonProvider;

2
json-path/src/test/java/com/jayway/jsonpath/PathCompilerTest.java
Unescape View File

@ -5,7 +5,7 @@ import org.junit.Test;
import java.util.List; 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; import static org.assertj.core.api.Assertions.assertThat;
public class PathCompilerTest { public class PathCompilerTest {

2
json-path/src/test/java/com/jayway/jsonpath/internal/token/PathTokenTest.java → json-path/src/test/java/com/jayway/jsonpath/internal/path/PathTokenTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.jayway.jsonpath.internal.token; package com.jayway.jsonpath.internal.path;
import com.jayway.jsonpath.BaseTest; import com.jayway.jsonpath.BaseTest;
import org.junit.Test; import org.junit.Test;

2
json-path/src/test/java/com/jayway/jsonpath/old/JsonPathTest.java
Unescape View File

@ -6,7 +6,7 @@ import com.jayway.jsonpath.InvalidPathException;
import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.Option; import com.jayway.jsonpath.Option;
import com.jayway.jsonpath.PathNotFoundException; 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.assertj.core.api.Assertions;
import org.junit.Test; import org.junit.Test;

2
json-path/src/test/java/com/jayway/jsonpath/old/internal/ScanPathTokenTest.java
Unescape View File

@ -1,7 +1,7 @@
package com.jayway.jsonpath.old.internal; package com.jayway.jsonpath.old.internal;
import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.internal.PathCompiler; import com.jayway.jsonpath.internal.path.PathCompiler;
import org.junit.Test; import org.junit.Test;
import java.util.List; import java.util.List;

2
json-path/src/test/java/com/jayway/jsonpath/old/internal/TestInternal3.java
Unescape View File

@ -5,7 +5,7 @@ import org.junit.Test;
import java.util.List; import java.util.List;
import java.util.Map; 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; import static org.assertj.core.api.Assertions.assertThat;
/** /**

Write Preview
Loading…
Cancel
Save