diff --git a/jsurfer-all/pom.xml b/jsurfer-all/pom.xml index c47a372..cd57b6d 100644 --- a/jsurfer-all/pom.xml +++ b/jsurfer-all/pom.xml @@ -5,7 +5,7 @@ jsurfer com.github.jsurfer - 1.4.1 + 1.4.2 4.0.0 diff --git a/jsurfer-benchmark/pom.xml b/jsurfer-benchmark/pom.xml index aa6d405..cf4cc64 100644 --- a/jsurfer-benchmark/pom.xml +++ b/jsurfer-benchmark/pom.xml @@ -5,7 +5,7 @@ jsurfer com.github.jsurfer - 1.4.1 + 1.4.2 4.0.0 diff --git a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkCollectObject.java b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkCollectObject.java index 859cd77..de37970 100644 --- a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkCollectObject.java +++ b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkCollectObject.java @@ -39,7 +39,7 @@ import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -import java.nio.charset.StandardCharsets; +import java.nio.charset.Charset; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -68,12 +68,12 @@ public void setup() throws Exception { private Blackhole blackhole = new Blackhole(); @Override - public void onTypedValue(Object value, ParsingContext context) throws Exception { + public void onTypedValue(Object value, ParsingContext context) { blackhole.consume(value); } }; surfingConfiguration = SurfingConfiguration.builder().bind("$.store.book[*]", Map.class, collectOneListener).build(); - json = Resources.toString(Resources.getResource("sample.json"), StandardCharsets.UTF_8); + json = Resources.toString(Resources.getResource("sample.json"), Charset.forName("UTF-8")); } diff --git a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkCollectSingleValue.java b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkCollectSingleValue.java index 81d1c24..8154060 100644 --- a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkCollectSingleValue.java +++ b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkCollectSingleValue.java @@ -50,7 +50,7 @@ import java.io.IOException; import java.io.StringReader; -import java.nio.charset.StandardCharsets; +import java.nio.charset.Charset; import java.util.Iterator; import java.util.concurrent.TimeUnit; @@ -83,7 +83,7 @@ public void setup() throws Exception { fastjsonSurfer = JsonSurferFastJson.INSTANCE; collectOneListener = new CollectOneListener(true); surfingConfiguration = SurfingConfiguration.builder().bind("$.store.book[0].author", collectOneListener).build(); - json = Resources.toString(Resources.getResource("sample.json"), StandardCharsets.UTF_8); + json = Resources.toString(Resources.getResource("sample.json"), Charset.forName("UTF-8")); } @Benchmark diff --git a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLargeJson.java b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLargeJson.java index a85cd79..8022871 100644 --- a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLargeJson.java +++ b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLargeJson.java @@ -44,7 +44,7 @@ import profilers.FlightRecordingProfiler; import java.io.IOException; -import java.nio.charset.StandardCharsets; +import java.nio.charset.Charset; import java.util.concurrent.TimeUnit; @Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS) @@ -74,13 +74,13 @@ public void setup(final Blackhole blackhole) throws IOException { fastjsonSurfer = JsonSurferFastJson.INSTANCE; JsonPathListener blackHoleListener = new JsonPathListener() { @Override - public void onValue(Object value, ParsingContext context) throws Exception { + public void onValue(Object value, ParsingContext context) { LOGGER.trace("Properties: {}", value); blackhole.consume(value); } }; surfingConfiguration = SurfingConfiguration.builder().bind(jsonPath, blackHoleListener).skipOverlappedPath().build(); - json = Resources.toString(Resources.getResource("allthethings.json"), StandardCharsets.UTF_8); + json = Resources.toString(Resources.getResource("allthethings.json"), Charset.forName("UTF-8")); } @Benchmark diff --git a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLargeJsonWithoutStreaming.java b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLargeJsonWithoutStreaming.java index 5901d58..66d22b2 100644 --- a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLargeJsonWithoutStreaming.java +++ b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLargeJsonWithoutStreaming.java @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; -import java.nio.charset.StandardCharsets; +import java.nio.charset.Charset; import java.util.Iterator; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -70,7 +70,7 @@ public class BenchmarkParseLargeJsonWithoutStreaming { public void setup() throws IOException { gson = new GsonBuilder().create(); om = new ObjectMapper(); - json = Resources.toString(Resources.getResource("allthethings.json"), StandardCharsets.UTF_8); + json = Resources.toString(Resources.getResource("allthethings.json"), Charset.forName("UTF-8")); } @Benchmark diff --git a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLongText.java b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLongText.java index 8030430..9f7d95f 100644 --- a/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLongText.java +++ b/jsurfer-benchmark/src/main/java/org/jsfr/json/BenchmarkParseLongText.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; -import java.nio.charset.StandardCharsets; +import java.nio.charset.Charset; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -77,7 +77,7 @@ public void setup() throws Exception { surfingConfiguration = SurfingConfiguration.builder().bind("$.findMe", collectOneListener).build(); gson = new GsonBuilder().create(); om = new ObjectMapper(); - json = Resources.toString(Resources.getResource("longText.json"), StandardCharsets.UTF_8); + json = Resources.toString(Resources.getResource("longText.json"), Charset.forName("UTF-8")); } @Benchmark diff --git a/jsurfer-core/pom.xml b/jsurfer-core/pom.xml index 10b12ed..dd4f0c8 100644 --- a/jsurfer-core/pom.xml +++ b/jsurfer-core/pom.xml @@ -5,7 +5,7 @@ jsurfer com.github.jsurfer - 1.4.1 + 1.4.2 4.0.0 @@ -13,7 +13,7 @@ jsurfer-core - 4.7 + 4.7.1 diff --git a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPath.interp b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPath.interp new file mode 100644 index 0000000..5b493b7 --- /dev/null +++ b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPath.interp @@ -0,0 +1,74 @@ +token literal names: +null +'$' +'..' +'.*' +'[*]' +'*' +'[' +']' +',' +'.' +'[?(' +')]' +'@' +'>' +'<' +'==' +':' +'&&' +'||' +null +null +null +null + +token symbolic names: +null +null +null +null +null +null +null +null +null +null +null +null +null +null +null +null +COLON +AndOperator +OrOperator +NUM +QUOTED_STRING +KEY +WS + +rule names: +path +relativePath +searchChild +search +anyChild +anyIndex +any +index +indexes +slicing +childNode +childrenNode +filter +filterExpr +filterExist +filterGtNum +filterLtNum +filterEqualNum +filterEqualStr + + +atn: +[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 24, 180, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 3, 2, 3, 2, 7, 2, 43, 10, 2, 12, 2, 14, 2, 46, 11, 2, 3, 2, 5, 2, 49, 10, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 63, 10, 3, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 7, 10, 84, 10, 10, 12, 10, 14, 10, 87, 11, 10, 3, 10, 3, 10, 3, 11, 3, 11, 5, 11, 93, 10, 11, 3, 11, 3, 11, 5, 11, 97, 10, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 7, 13, 108, 10, 13, 12, 13, 14, 13, 111, 11, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 5, 15, 125, 10, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 7, 15, 133, 10, 15, 12, 15, 14, 15, 136, 11, 15, 3, 16, 3, 16, 6, 16, 140, 10, 16, 13, 16, 14, 16, 141, 3, 17, 3, 17, 6, 17, 146, 10, 17, 13, 17, 14, 17, 147, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 6, 18, 155, 10, 18, 13, 18, 14, 18, 156, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 6, 19, 164, 10, 19, 13, 19, 14, 19, 165, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 6, 20, 173, 10, 20, 13, 20, 14, 20, 174, 3, 20, 3, 20, 3, 20, 3, 20, 2, 3, 28, 21, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 2, 2, 2, 186, 2, 40, 3, 2, 2, 2, 4, 62, 3, 2, 2, 2, 6, 64, 3, 2, 2, 2, 8, 67, 3, 2, 2, 2, 10, 69, 3, 2, 2, 2, 12, 71, 3, 2, 2, 2, 14, 73, 3, 2, 2, 2, 16, 75, 3, 2, 2, 2, 18, 79, 3, 2, 2, 2, 20, 90, 3, 2, 2, 2, 22, 100, 3, 2, 2, 2, 24, 103, 3, 2, 2, 2, 26, 114, 3, 2, 2, 2, 28, 124, 3, 2, 2, 2, 30, 137, 3, 2, 2, 2, 32, 143, 3, 2, 2, 2, 34, 152, 3, 2, 2, 2, 36, 161, 3, 2, 2, 2, 38, 170, 3, 2, 2, 2, 40, 44, 7, 3, 2, 2, 41, 43, 5, 4, 3, 2, 42, 41, 3, 2, 2, 2, 43, 46, 3, 2, 2, 2, 44, 42, 3, 2, 2, 2, 44, 45, 3, 2, 2, 2, 45, 48, 3, 2, 2, 2, 46, 44, 3, 2, 2, 2, 47, 49, 5, 26, 14, 2, 48, 47, 3, 2, 2, 2, 48, 49, 3, 2, 2, 2, 49, 50, 3, 2, 2, 2, 50, 51, 7, 2, 2, 3, 51, 3, 3, 2, 2, 2, 52, 63, 5, 6, 4, 2, 53, 63, 5, 8, 5, 2, 54, 63, 5, 16, 9, 2, 55, 63, 5, 18, 10, 2, 56, 63, 5, 20, 11, 2, 57, 63, 5, 22, 12, 2, 58, 63, 5, 24, 13, 2, 59, 63, 5, 10, 6, 2, 60, 63, 5, 12, 7, 2, 61, 63, 5, 14, 8, 2, 62, 52, 3, 2, 2, 2, 62, 53, 3, 2, 2, 2, 62, 54, 3, 2, 2, 2, 62, 55, 3, 2, 2, 2, 62, 56, 3, 2, 2, 2, 62, 57, 3, 2, 2, 2, 62, 58, 3, 2, 2, 2, 62, 59, 3, 2, 2, 2, 62, 60, 3, 2, 2, 2, 62, 61, 3, 2, 2, 2, 63, 5, 3, 2, 2, 2, 64, 65, 7, 4, 2, 2, 65, 66, 7, 23, 2, 2, 66, 7, 3, 2, 2, 2, 67, 68, 7, 4, 2, 2, 68, 9, 3, 2, 2, 2, 69, 70, 7, 5, 2, 2, 70, 11, 3, 2, 2, 2, 71, 72, 7, 6, 2, 2, 72, 13, 3, 2, 2, 2, 73, 74, 7, 7, 2, 2, 74, 15, 3, 2, 2, 2, 75, 76, 7, 8, 2, 2, 76, 77, 7, 21, 2, 2, 77, 78, 7, 9, 2, 2, 78, 17, 3, 2, 2, 2, 79, 80, 7, 8, 2, 2, 80, 85, 7, 21, 2, 2, 81, 82, 7, 10, 2, 2, 82, 84, 7, 21, 2, 2, 83, 81, 3, 2, 2, 2, 84, 87, 3, 2, 2, 2, 85, 83, 3, 2, 2, 2, 85, 86, 3, 2, 2, 2, 86, 88, 3, 2, 2, 2, 87, 85, 3, 2, 2, 2, 88, 89, 7, 9, 2, 2, 89, 19, 3, 2, 2, 2, 90, 92, 7, 8, 2, 2, 91, 93, 7, 21, 2, 2, 92, 91, 3, 2, 2, 2, 92, 93, 3, 2, 2, 2, 93, 94, 3, 2, 2, 2, 94, 96, 7, 18, 2, 2, 95, 97, 7, 21, 2, 2, 96, 95, 3, 2, 2, 2, 96, 97, 3, 2, 2, 2, 97, 98, 3, 2, 2, 2, 98, 99, 7, 9, 2, 2, 99, 21, 3, 2, 2, 2, 100, 101, 7, 11, 2, 2, 101, 102, 7, 23, 2, 2, 102, 23, 3, 2, 2, 2, 103, 104, 7, 8, 2, 2, 104, 109, 7, 22, 2, 2, 105, 106, 7, 10, 2, 2, 106, 108, 7, 22, 2, 2, 107, 105, 3, 2, 2, 2, 108, 111, 3, 2, 2, 2, 109, 107, 3, 2, 2, 2, 109, 110, 3, 2, 2, 2, 110, 112, 3, 2, 2, 2, 111, 109, 3, 2, 2, 2, 112, 113, 7, 9, 2, 2, 113, 25, 3, 2, 2, 2, 114, 115, 7, 12, 2, 2, 115, 116, 5, 28, 15, 2, 116, 117, 7, 13, 2, 2, 117, 27, 3, 2, 2, 2, 118, 119, 8, 15, 1, 2, 119, 125, 5, 36, 19, 2, 120, 125, 5, 38, 20, 2, 121, 125, 5, 32, 17, 2, 122, 125, 5, 34, 18, 2, 123, 125, 5, 30, 16, 2, 124, 118, 3, 2, 2, 2, 124, 120, 3, 2, 2, 2, 124, 121, 3, 2, 2, 2, 124, 122, 3, 2, 2, 2, 124, 123, 3, 2, 2, 2, 125, 134, 3, 2, 2, 2, 126, 127, 12, 9, 2, 2, 127, 128, 7, 19, 2, 2, 128, 133, 5, 28, 15, 10, 129, 130, 12, 8, 2, 2, 130, 131, 7, 20, 2, 2, 131, 133, 5, 28, 15, 9, 132, 126, 3, 2, 2, 2, 132, 129, 3, 2, 2, 2, 133, 136, 3, 2, 2, 2, 134, 132, 3, 2, 2, 2, 134, 135, 3, 2, 2, 2, 135, 29, 3, 2, 2, 2, 136, 134, 3, 2, 2, 2, 137, 139, 7, 14, 2, 2, 138, 140, 5, 4, 3, 2, 139, 138, 3, 2, 2, 2, 140, 141, 3, 2, 2, 2, 141, 139, 3, 2, 2, 2, 141, 142, 3, 2, 2, 2, 142, 31, 3, 2, 2, 2, 143, 145, 7, 14, 2, 2, 144, 146, 5, 4, 3, 2, 145, 144, 3, 2, 2, 2, 146, 147, 3, 2, 2, 2, 147, 145, 3, 2, 2, 2, 147, 148, 3, 2, 2, 2, 148, 149, 3, 2, 2, 2, 149, 150, 7, 15, 2, 2, 150, 151, 7, 21, 2, 2, 151, 33, 3, 2, 2, 2, 152, 154, 7, 14, 2, 2, 153, 155, 5, 4, 3, 2, 154, 153, 3, 2, 2, 2, 155, 156, 3, 2, 2, 2, 156, 154, 3, 2, 2, 2, 156, 157, 3, 2, 2, 2, 157, 158, 3, 2, 2, 2, 158, 159, 7, 16, 2, 2, 159, 160, 7, 21, 2, 2, 160, 35, 3, 2, 2, 2, 161, 163, 7, 14, 2, 2, 162, 164, 5, 4, 3, 2, 163, 162, 3, 2, 2, 2, 164, 165, 3, 2, 2, 2, 165, 163, 3, 2, 2, 2, 165, 166, 3, 2, 2, 2, 166, 167, 3, 2, 2, 2, 167, 168, 7, 17, 2, 2, 168, 169, 7, 21, 2, 2, 169, 37, 3, 2, 2, 2, 170, 172, 7, 14, 2, 2, 171, 173, 5, 4, 3, 2, 172, 171, 3, 2, 2, 2, 173, 174, 3, 2, 2, 2, 174, 172, 3, 2, 2, 2, 174, 175, 3, 2, 2, 2, 175, 176, 3, 2, 2, 2, 176, 177, 7, 17, 2, 2, 177, 178, 7, 22, 2, 2, 178, 39, 3, 2, 2, 2, 17, 44, 48, 62, 85, 92, 96, 109, 124, 132, 134, 141, 147, 156, 165, 174] \ No newline at end of file diff --git a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathBaseVisitor.java b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathBaseVisitor.java index 1a8b643..f9c559a 100644 --- a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathBaseVisitor.java +++ b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathBaseVisitor.java @@ -1,4 +1,4 @@ -// Generated from JsonPath.g4 by ANTLR 4.7 +// Generated from JsonPath.g4 by ANTLR 4.7.1 package org.jsfr.json.compiler; diff --git a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathLexer.interp b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathLexer.interp new file mode 100644 index 0000000..4c6b731 --- /dev/null +++ b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathLexer.interp @@ -0,0 +1,88 @@ +token literal names: +null +'$' +'..' +'.*' +'[*]' +'*' +'[' +']' +',' +'.' +'[?(' +')]' +'@' +'>' +'<' +'==' +':' +'&&' +'||' +null +null +null +null + +token symbolic names: +null +null +null +null +null +null +null +null +null +null +null +null +null +null +null +null +COLON +AndOperator +OrOperator +NUM +QUOTED_STRING +KEY +WS + +rule names: +T__0 +T__1 +T__2 +T__3 +T__4 +T__5 +T__6 +T__7 +T__8 +T__9 +T__10 +T__11 +T__12 +T__13 +T__14 +COLON +AndOperator +OrOperator +NUM +INT +EXP +QUOTED_STRING +KEY +ESC +UNICODE +HEX +WS + +channel names: +DEFAULT_TOKEN_CHANNEL +HIDDEN + +mode names: +DEFAULT_MODE + +atn: +[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 24, 181, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 20, 5, 20, 105, 10, 20, 3, 20, 3, 20, 3, 20, 6, 20, 110, 10, 20, 13, 20, 14, 20, 111, 3, 20, 5, 20, 115, 10, 20, 3, 20, 5, 20, 118, 10, 20, 3, 20, 3, 20, 3, 20, 3, 20, 5, 20, 124, 10, 20, 3, 20, 5, 20, 127, 10, 20, 3, 21, 3, 21, 3, 21, 7, 21, 132, 10, 21, 12, 21, 14, 21, 135, 11, 21, 5, 21, 137, 10, 21, 3, 22, 3, 22, 5, 22, 141, 10, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 7, 23, 149, 10, 23, 12, 23, 14, 23, 152, 11, 23, 3, 23, 3, 23, 3, 24, 3, 24, 6, 24, 158, 10, 24, 13, 24, 14, 24, 159, 3, 25, 3, 25, 3, 25, 5, 25, 165, 10, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 28, 6, 28, 176, 10, 28, 13, 28, 14, 28, 177, 3, 28, 3, 28, 2, 2, 29, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 29, 16, 31, 17, 33, 18, 35, 19, 37, 20, 39, 21, 41, 2, 43, 2, 45, 22, 47, 23, 49, 2, 51, 2, 53, 2, 55, 24, 3, 2, 11, 3, 2, 50, 59, 3, 2, 51, 59, 4, 2, 71, 71, 103, 103, 4, 2, 45, 45, 47, 47, 4, 2, 41, 41, 94, 94, 13, 2, 11, 12, 15, 15, 34, 34, 36, 36, 40, 44, 46, 46, 48, 48, 60, 60, 62, 66, 93, 95, 126, 126, 10, 2, 36, 36, 49, 49, 94, 94, 100, 100, 104, 104, 112, 112, 116, 116, 118, 118, 5, 2, 50, 59, 67, 72, 99, 104, 5, 2, 11, 12, 15, 15, 34, 34, 2, 191, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 3, 57, 3, 2, 2, 2, 5, 59, 3, 2, 2, 2, 7, 62, 3, 2, 2, 2, 9, 65, 3, 2, 2, 2, 11, 69, 3, 2, 2, 2, 13, 71, 3, 2, 2, 2, 15, 73, 3, 2, 2, 2, 17, 75, 3, 2, 2, 2, 19, 77, 3, 2, 2, 2, 21, 79, 3, 2, 2, 2, 23, 83, 3, 2, 2, 2, 25, 86, 3, 2, 2, 2, 27, 88, 3, 2, 2, 2, 29, 90, 3, 2, 2, 2, 31, 92, 3, 2, 2, 2, 33, 95, 3, 2, 2, 2, 35, 97, 3, 2, 2, 2, 37, 100, 3, 2, 2, 2, 39, 126, 3, 2, 2, 2, 41, 136, 3, 2, 2, 2, 43, 138, 3, 2, 2, 2, 45, 144, 3, 2, 2, 2, 47, 157, 3, 2, 2, 2, 49, 161, 3, 2, 2, 2, 51, 166, 3, 2, 2, 2, 53, 172, 3, 2, 2, 2, 55, 175, 3, 2, 2, 2, 57, 58, 7, 38, 2, 2, 58, 4, 3, 2, 2, 2, 59, 60, 7, 48, 2, 2, 60, 61, 7, 48, 2, 2, 61, 6, 3, 2, 2, 2, 62, 63, 7, 48, 2, 2, 63, 64, 7, 44, 2, 2, 64, 8, 3, 2, 2, 2, 65, 66, 7, 93, 2, 2, 66, 67, 7, 44, 2, 2, 67, 68, 7, 95, 2, 2, 68, 10, 3, 2, 2, 2, 69, 70, 7, 44, 2, 2, 70, 12, 3, 2, 2, 2, 71, 72, 7, 93, 2, 2, 72, 14, 3, 2, 2, 2, 73, 74, 7, 95, 2, 2, 74, 16, 3, 2, 2, 2, 75, 76, 7, 46, 2, 2, 76, 18, 3, 2, 2, 2, 77, 78, 7, 48, 2, 2, 78, 20, 3, 2, 2, 2, 79, 80, 7, 93, 2, 2, 80, 81, 7, 65, 2, 2, 81, 82, 7, 42, 2, 2, 82, 22, 3, 2, 2, 2, 83, 84, 7, 43, 2, 2, 84, 85, 7, 95, 2, 2, 85, 24, 3, 2, 2, 2, 86, 87, 7, 66, 2, 2, 87, 26, 3, 2, 2, 2, 88, 89, 7, 64, 2, 2, 89, 28, 3, 2, 2, 2, 90, 91, 7, 62, 2, 2, 91, 30, 3, 2, 2, 2, 92, 93, 7, 63, 2, 2, 93, 94, 7, 63, 2, 2, 94, 32, 3, 2, 2, 2, 95, 96, 7, 60, 2, 2, 96, 34, 3, 2, 2, 2, 97, 98, 7, 40, 2, 2, 98, 99, 7, 40, 2, 2, 99, 36, 3, 2, 2, 2, 100, 101, 7, 126, 2, 2, 101, 102, 7, 126, 2, 2, 102, 38, 3, 2, 2, 2, 103, 105, 7, 47, 2, 2, 104, 103, 3, 2, 2, 2, 104, 105, 3, 2, 2, 2, 105, 106, 3, 2, 2, 2, 106, 107, 5, 41, 21, 2, 107, 109, 7, 48, 2, 2, 108, 110, 9, 2, 2, 2, 109, 108, 3, 2, 2, 2, 110, 111, 3, 2, 2, 2, 111, 109, 3, 2, 2, 2, 111, 112, 3, 2, 2, 2, 112, 114, 3, 2, 2, 2, 113, 115, 5, 43, 22, 2, 114, 113, 3, 2, 2, 2, 114, 115, 3, 2, 2, 2, 115, 127, 3, 2, 2, 2, 116, 118, 7, 47, 2, 2, 117, 116, 3, 2, 2, 2, 117, 118, 3, 2, 2, 2, 118, 119, 3, 2, 2, 2, 119, 120, 5, 41, 21, 2, 120, 121, 5, 43, 22, 2, 121, 127, 3, 2, 2, 2, 122, 124, 7, 47, 2, 2, 123, 122, 3, 2, 2, 2, 123, 124, 3, 2, 2, 2, 124, 125, 3, 2, 2, 2, 125, 127, 5, 41, 21, 2, 126, 104, 3, 2, 2, 2, 126, 117, 3, 2, 2, 2, 126, 123, 3, 2, 2, 2, 127, 40, 3, 2, 2, 2, 128, 137, 7, 50, 2, 2, 129, 133, 9, 3, 2, 2, 130, 132, 9, 2, 2, 2, 131, 130, 3, 2, 2, 2, 132, 135, 3, 2, 2, 2, 133, 131, 3, 2, 2, 2, 133, 134, 3, 2, 2, 2, 134, 137, 3, 2, 2, 2, 135, 133, 3, 2, 2, 2, 136, 128, 3, 2, 2, 2, 136, 129, 3, 2, 2, 2, 137, 42, 3, 2, 2, 2, 138, 140, 9, 4, 2, 2, 139, 141, 9, 5, 2, 2, 140, 139, 3, 2, 2, 2, 140, 141, 3, 2, 2, 2, 141, 142, 3, 2, 2, 2, 142, 143, 5, 41, 21, 2, 143, 44, 3, 2, 2, 2, 144, 150, 7, 41, 2, 2, 145, 149, 10, 6, 2, 2, 146, 147, 7, 94, 2, 2, 147, 149, 11, 2, 2, 2, 148, 145, 3, 2, 2, 2, 148, 146, 3, 2, 2, 2, 149, 152, 3, 2, 2, 2, 150, 148, 3, 2, 2, 2, 150, 151, 3, 2, 2, 2, 151, 153, 3, 2, 2, 2, 152, 150, 3, 2, 2, 2, 153, 154, 7, 41, 2, 2, 154, 46, 3, 2, 2, 2, 155, 158, 5, 49, 25, 2, 156, 158, 10, 7, 2, 2, 157, 155, 3, 2, 2, 2, 157, 156, 3, 2, 2, 2, 158, 159, 3, 2, 2, 2, 159, 157, 3, 2, 2, 2, 159, 160, 3, 2, 2, 2, 160, 48, 3, 2, 2, 2, 161, 164, 7, 94, 2, 2, 162, 165, 9, 8, 2, 2, 163, 165, 5, 51, 26, 2, 164, 162, 3, 2, 2, 2, 164, 163, 3, 2, 2, 2, 165, 50, 3, 2, 2, 2, 166, 167, 7, 119, 2, 2, 167, 168, 5, 53, 27, 2, 168, 169, 5, 53, 27, 2, 169, 170, 5, 53, 27, 2, 170, 171, 5, 53, 27, 2, 171, 52, 3, 2, 2, 2, 172, 173, 9, 9, 2, 2, 173, 54, 3, 2, 2, 2, 174, 176, 9, 10, 2, 2, 175, 174, 3, 2, 2, 2, 176, 177, 3, 2, 2, 2, 177, 175, 3, 2, 2, 2, 177, 178, 3, 2, 2, 2, 178, 179, 3, 2, 2, 2, 179, 180, 8, 28, 2, 2, 180, 56, 3, 2, 2, 2, 18, 2, 104, 111, 114, 117, 123, 126, 133, 136, 140, 148, 150, 157, 159, 164, 177, 3, 8, 2, 2] \ No newline at end of file diff --git a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathLexer.java b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathLexer.java index 3e6e2a5..629f7a9 100644 --- a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathLexer.java +++ b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathLexer.java @@ -1,4 +1,4 @@ -// Generated from JsonPath.g4 by ANTLR 4.7 +// Generated from JsonPath.g4 by ANTLR 4.7.1 package org.jsfr.json.compiler; @@ -13,7 +13,7 @@ @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JsonPathLexer extends Lexer { - static { RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION); } + static { RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION); } protected static final DFA[] _decisionToDFA; protected static final PredictionContextCache _sharedContextCache = diff --git a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathParser.java b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathParser.java index 2a8f9ac..e2a1bfd 100644 --- a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathParser.java +++ b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathParser.java @@ -1,4 +1,4 @@ -// Generated from JsonPath.g4 by ANTLR 4.7 +// Generated from JsonPath.g4 by ANTLR 4.7.1 package org.jsfr.json.compiler; @@ -13,7 +13,7 @@ @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) public class JsonPathParser extends Parser { - static { RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION); } + static { RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION); } protected static final DFA[] _decisionToDFA; protected static final PredictionContextCache _sharedContextCache = diff --git a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathVisitor.java b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathVisitor.java index 6609fd6..00e5c1b 100644 --- a/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathVisitor.java +++ b/jsurfer-core/src/main/java/org/jsfr/json/compiler/JsonPathVisitor.java @@ -1,4 +1,4 @@ -// Generated from JsonPath.g4 by ANTLR 4.7 +// Generated from JsonPath.g4 by ANTLR 4.7.1 package org.jsfr.json.compiler; diff --git a/jsurfer-fastjson/pom.xml b/jsurfer-fastjson/pom.xml index b2b5f95..6bfd838 100644 --- a/jsurfer-fastjson/pom.xml +++ b/jsurfer-fastjson/pom.xml @@ -5,7 +5,7 @@ jsurfer com.github.jsurfer - 1.4.1 + 1.4.2 4.0.0 @@ -61,7 +61,7 @@ com.alibaba fastjson - 1.2.11 + 1.2.46 diff --git a/jsurfer-gson/pom.xml b/jsurfer-gson/pom.xml index ae25348..6769b26 100644 --- a/jsurfer-gson/pom.xml +++ b/jsurfer-gson/pom.xml @@ -5,7 +5,7 @@ jsurfer com.github.jsurfer - 1.4.1 + 1.4.2 4.0.0 @@ -56,7 +56,7 @@ com.google.code.gson gson - 2.7 + 2.8.2 com.github.jsurfer diff --git a/jsurfer-jackson/pom.xml b/jsurfer-jackson/pom.xml index 7ed695f..c8b5084 100644 --- a/jsurfer-jackson/pom.xml +++ b/jsurfer-jackson/pom.xml @@ -5,7 +5,7 @@ jsurfer com.github.jsurfer - 1.4.1 + 1.4.2 4.0.0 @@ -61,7 +61,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.0 + 2.9.4 diff --git a/jsurfer-jsonsimple/pom.xml b/jsurfer-jsonsimple/pom.xml index 63915c8..b153161 100644 --- a/jsurfer-jsonsimple/pom.xml +++ b/jsurfer-jsonsimple/pom.xml @@ -5,7 +5,7 @@ jsurfer com.github.jsurfer - 1.4.1 + 1.4.2 4.0.0 diff --git a/pom.xml b/pom.xml index 17d6502..8b4d48b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.github.jsurfer jsurfer - 1.4.1 + 1.4.2 pom JsonSurfer Let's surf on json