Skip to content

Commit dfbe33a

Browse files
api-from-the-ionapi-from-the-ion
authoredFeb 26, 2024··
[#112]Corrected skip methods behavior of JsonParserImpl; (#113)
Signed-off-by: Anton Pinsky <[email protected]>
·
1.1.71.1.6
1 parent c64269c commit dfbe33a

File tree

5 files changed

+309
-179
lines changed

5 files changed

+309
-179
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ nbproject/
2626
*err_pid*.log
2727
/tck-impl/.gradle/
2828
/tck-impl/build/
29+
/.sdkmanrc

‎impl/src/main/java/org/eclipse/parsson/JsonParserImpl.java

+131-135
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.AbstractMap;
2626
import java.util.Map;
2727
import java.util.NoSuchElementException;
28+
import java.util.Objects;
2829
import java.util.Spliterator;
2930
import java.util.Spliterators;
3031
import java.util.function.Consumer;
@@ -190,25 +191,26 @@ public Stream<JsonValue> getArrayStream() {
190191
}
191192
Spliterator<JsonValue> spliterator =
192193
new Spliterators.AbstractSpliterator<JsonValue>(Long.MAX_VALUE, Spliterator.ORDERED) {
193-
@Override
194-
public Spliterator<JsonValue> trySplit() {
195-
return null;
196-
}
197-
@Override
198-
public boolean tryAdvance(Consumer<? super JsonValue> action) {
199-
if (action == null) {
200-
throw new NullPointerException();
201-
}
202-
if (! hasNext()) {
203-
return false;
204-
}
205-
if (next() == JsonParser.Event.END_ARRAY) {
206-
return false;
207-
}
208-
action.accept(getValue());
209-
return true;
210-
}
211-
};
194+
@Override
195+
public Spliterator<JsonValue> trySplit() {
196+
return null;
197+
}
198+
199+
@Override
200+
public boolean tryAdvance(Consumer<? super JsonValue> action) {
201+
if (action == null) {
202+
throw new NullPointerException();
203+
}
204+
if (!hasNext()) {
205+
return false;
206+
}
207+
if (next() == JsonParser.Event.END_ARRAY) {
208+
return false;
209+
}
210+
action.accept(getValue());
211+
return true;
212+
}
213+
};
212214
return StreamSupport.stream(spliterator, false);
213215
}
214216

@@ -220,35 +222,36 @@ public Stream<Map.Entry<String, JsonValue>> getObjectStream() {
220222
}
221223
Spliterator<Map.Entry<String, JsonValue>> spliterator =
222224
new Spliterators.AbstractSpliterator<Map.Entry<String, JsonValue>>(Long.MAX_VALUE, Spliterator.ORDERED) {
223-
@Override
224-
public Spliterator<Map.Entry<String,JsonValue>> trySplit() {
225-
return null;
226-
}
227-
@Override
228-
public boolean tryAdvance(Consumer<? super Map.Entry<String, JsonValue>> action) {
229-
if (action == null) {
230-
throw new NullPointerException();
231-
}
232-
if (! hasNext()) {
233-
return false;
234-
}
235-
JsonParser.Event e = next();
236-
if (e == JsonParser.Event.END_OBJECT) {
237-
return false;
238-
}
239-
if (e != JsonParser.Event.KEY_NAME) {
240-
throw new JsonException(JsonMessages.INTERNAL_ERROR());
241-
}
242-
String key = getString();
243-
if (! hasNext()) {
244-
throw new JsonException(JsonMessages.INTERNAL_ERROR());
245-
}
246-
next();
247-
JsonValue value = getValue();
248-
action.accept(new AbstractMap.SimpleImmutableEntry<>(key, value));
249-
return true;
250-
}
251-
};
225+
@Override
226+
public Spliterator<Map.Entry<String, JsonValue>> trySplit() {
227+
return null;
228+
}
229+
230+
@Override
231+
public boolean tryAdvance(Consumer<? super Map.Entry<String, JsonValue>> action) {
232+
if (action == null) {
233+
throw new NullPointerException();
234+
}
235+
if (!hasNext()) {
236+
return false;
237+
}
238+
JsonParser.Event e = next();
239+
if (e == JsonParser.Event.END_OBJECT) {
240+
return false;
241+
}
242+
if (e != JsonParser.Event.KEY_NAME) {
243+
throw new JsonException(JsonMessages.INTERNAL_ERROR());
244+
}
245+
String key = getString();
246+
if (!hasNext()) {
247+
throw new JsonException(JsonMessages.INTERNAL_ERROR());
248+
}
249+
next();
250+
JsonValue value = getValue();
251+
action.accept(new AbstractMap.SimpleImmutableEntry<>(key, value));
252+
return true;
253+
}
254+
};
252255
return StreamSupport.stream(spliterator, false);
253256
}
254257

@@ -260,29 +263,30 @@ public Stream<JsonValue> getValueStream() {
260263
}
261264
Spliterator<JsonValue> spliterator =
262265
new Spliterators.AbstractSpliterator<JsonValue>(Long.MAX_VALUE, Spliterator.ORDERED) {
263-
@Override
264-
public Spliterator<JsonValue> trySplit() {
265-
return null;
266-
}
267-
@Override
268-
public boolean tryAdvance(Consumer<? super JsonValue> action) {
269-
if (action == null) {
270-
throw new NullPointerException();
271-
}
272-
if (! hasNext()) {
273-
return false;
274-
}
275-
next();
276-
action.accept(getValue());
277-
return true;
278-
}
279-
};
266+
@Override
267+
public Spliterator<JsonValue> trySplit() {
268+
return null;
269+
}
270+
271+
@Override
272+
public boolean tryAdvance(Consumer<? super JsonValue> action) {
273+
if (action == null) {
274+
throw new NullPointerException();
275+
}
276+
if (!hasNext()) {
277+
return false;
278+
}
279+
next();
280+
action.accept(getValue());
281+
return true;
282+
}
283+
};
280284
return StreamSupport.stream(spliterator, false);
281285
}
282286

283287
@Override
284288
public void skipArray() {
285-
if (currentEvent == Event.START_ARRAY) {
289+
if (currentContext instanceof ArrayContext) {
286290
currentContext.skip();
287291
currentContext = stack.pop();
288292
currentEvent = Event.END_ARRAY;
@@ -291,7 +295,7 @@ public void skipArray() {
291295

292296
@Override
293297
public void skipObject() {
294-
if (currentEvent == Event.START_OBJECT) {
298+
if (currentContext instanceof ObjectContext) {
295299
currentContext.skip();
296300
currentContext = stack.pop();
297301
currentEvent = Event.END_OBJECT;
@@ -418,27 +422,35 @@ private boolean isEmpty() {
418422
}
419423
}
420424

421-
private abstract static class Context {
425+
private abstract class Context {
422426
Context next;
423427
abstract Event getNextEvent();
424428
abstract void skip();
425-
}
426429

427-
private final class NoneContext extends Context {
428-
@Override
429-
public Event getNextEvent() {
430-
// Handle 1. { 2. [ 3. value
431-
JsonToken token = tokenizer.nextToken();
432-
if (token == JsonToken.CURLYOPEN) {
430+
protected Event nextEventIfValueOrObjectOrArrayStart(JsonToken token) {
431+
if (token.isValue()) {
432+
return token.getEvent();
433+
} else if (token == JsonToken.CURLYOPEN) {
433434
stack.push(currentContext);
434435
currentContext = new ObjectContext();
435436
return Event.START_OBJECT;
436437
} else if (token == JsonToken.SQUAREOPEN) {
437438
stack.push(currentContext);
438439
currentContext = new ArrayContext();
439440
return Event.START_ARRAY;
440-
} else if (token.isValue()) {
441-
return token.getEvent();
441+
}
442+
return null;
443+
}
444+
}
445+
446+
private final class NoneContext extends Context {
447+
@Override
448+
public Event getNextEvent() {
449+
// Handle 1. { 2. [ 3. value
450+
JsonToken token = tokenizer.nextToken();
451+
Event event = nextEventIfValueOrObjectOrArrayStart(token);
452+
if (event != null) {
453+
return event;
442454
}
443455
throw parsingException(token, "[CURLYOPEN, SQUAREOPEN, STRING, NUMBER, TRUE, FALSE, NULL]");
444456
}
@@ -455,9 +467,38 @@ private JsonParsingException parsingException(JsonToken token, String expectedTo
455467
JsonMessages.PARSER_INVALID_TOKEN(token, location, expectedTokens), location);
456468
}
457469

458-
private final class ObjectContext extends Context {
470+
private abstract class SkippingContext extends Context {
471+
private final JsonToken openToken;
472+
private final JsonToken closeToken;
473+
474+
private SkippingContext(JsonToken openToken, JsonToken closeToken) {
475+
this.openToken = Objects.requireNonNull(openToken);
476+
this.closeToken = Objects.requireNonNull(closeToken);
477+
}
478+
479+
@Override
480+
void skip() {
481+
JsonToken token;
482+
int depth = 1;
483+
do {
484+
token = tokenizer.nextToken();
485+
if (token == closeToken) {
486+
depth--;
487+
}
488+
if (token == openToken) {
489+
depth++;
490+
}
491+
} while (!(token == closeToken && depth == 0));
492+
}
493+
}
494+
495+
private final class ObjectContext extends SkippingContext {
459496
private boolean firstValue = true;
460497

498+
private ObjectContext() {
499+
super(JsonToken.CURLYOPEN, JsonToken.CURLYCLOSE);
500+
}
501+
461502
/*
462503
* Some more things could be optimized. For example, instead
463504
* tokenizer.nextToken(), one could use tokenizer.matchColonToken() to
@@ -484,16 +525,9 @@ public Event getNextEvent() {
484525
throw parsingException(token, "[COLON]");
485526
}
486527
token = tokenizer.nextToken();
487-
if (token.isValue()) {
488-
return token.getEvent();
489-
} else if (token == JsonToken.CURLYOPEN) {
490-
stack.push(currentContext);
491-
currentContext = new ObjectContext();
492-
return Event.START_OBJECT;
493-
} else if (token == JsonToken.SQUAREOPEN) {
494-
stack.push(currentContext);
495-
currentContext = new ArrayContext();
496-
return Event.START_ARRAY;
528+
Event event = nextEventIfValueOrObjectOrArrayStart(token);
529+
if (event != null) {
530+
return event;
497531
}
498532
throw parsingException(token, "[CURLYOPEN, SQUAREOPEN, STRING, NUMBER, TRUE, FALSE, NULL]");
499533
} else {
@@ -516,29 +550,15 @@ public Event getNextEvent() {
516550
throw parsingException(token, "[STRING]");
517551
}
518552
}
519-
520-
@Override
521-
void skip() {
522-
JsonToken token;
523-
int depth = 1;
524-
do {
525-
token = tokenizer.nextToken();
526-
switch (token) {
527-
case CURLYCLOSE:
528-
depth--;
529-
break;
530-
case CURLYOPEN:
531-
depth++;
532-
break;
533-
}
534-
} while (!(token == JsonToken.CURLYCLOSE && depth == 0));
535-
}
536-
537553
}
538554

539-
private final class ArrayContext extends Context {
555+
private final class ArrayContext extends SkippingContext {
540556
private boolean firstValue = true;
541557

558+
private ArrayContext() {
559+
super(JsonToken.SQUAREOPEN, JsonToken.SQUARECLOSE);
560+
}
561+
542562
// Handle 1. ] 2. value 3. ,value
543563
@Override
544564
public Event getNextEvent() {
@@ -563,36 +583,12 @@ public Event getNextEvent() {
563583
}
564584
token = tokenizer.nextToken();
565585
}
566-
if (token.isValue()) {
567-
return token.getEvent();
568-
} else if (token == JsonToken.CURLYOPEN) {
569-
stack.push(currentContext);
570-
currentContext = new ObjectContext();
571-
return Event.START_OBJECT;
572-
} else if (token == JsonToken.SQUAREOPEN) {
573-
stack.push(currentContext);
574-
currentContext = new ArrayContext();
575-
return Event.START_ARRAY;
586+
587+
Event event = nextEventIfValueOrObjectOrArrayStart(token);
588+
if (event != null) {
589+
return event;
576590
}
577591
throw parsingException(token, "[CURLYOPEN, SQUAREOPEN, STRING, NUMBER, TRUE, FALSE, NULL]");
578592
}
579-
580-
@Override
581-
void skip() {
582-
JsonToken token;
583-
int depth = 1;
584-
do {
585-
token = tokenizer.nextToken();
586-
switch (token) {
587-
case SQUARECLOSE:
588-
depth--;
589-
break;
590-
case SQUAREOPEN:
591-
depth++;
592-
break;
593-
}
594-
} while (!(token == JsonToken.SQUARECLOSE && depth == 0));
595-
}
596593
}
597-
598594
}

‎impl/src/test/java/org/eclipse/parsson/JsonParserFixture.java

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0, which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* This Source Code may also be made available under the following Secondary
9+
* Licenses when the conditions for such availability set forth in the
10+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
11+
* version 2 with the GNU Classpath Exception, which is available at
12+
* https://www.gnu.org/software/classpath/license.html.
13+
*
14+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15+
*/
16+
17+
package org.eclipse.parsson;
18+
19+
import java.io.StringReader;
20+
import java.util.function.Consumer;
21+
import java.util.function.Supplier;
22+
23+
import jakarta.json.Json;
24+
import jakarta.json.JsonArray;
25+
import jakarta.json.JsonObject;
26+
import jakarta.json.stream.JsonParser;
27+
28+
/**
29+
* Class with methods that creates JsonParser with different configuration from different sources and runs the test code with this parser
30+
*/
31+
public class JsonParserFixture {
32+
/**
33+
* Runs the test code with JsonParser created from the given JsonObject
34+
*
35+
* @param object JsonObject to create JsonParser from
36+
* @param parserConsumer test code to run with the created JsonParser
37+
*/
38+
public static void testWithCreateParserFromObject(JsonObject object, Consumer<JsonParser> parserConsumer) {
39+
testWithParser(() -> Json.createParserFactory(null).createParser(object), parserConsumer);
40+
}
41+
42+
/**
43+
* Runs the test code with JsonParser created from the given JsonArray
44+
*
45+
* @param array JsonArray to create JsonParser from
46+
* @param parserConsumer test code to run with the created JsonParser
47+
*/
48+
public static void testWithCreateParserFromArray(JsonArray array, Consumer<JsonParser> parserConsumer) {
49+
testWithParser(() -> Json.createParserFactory(null).createParser(array), parserConsumer);
50+
}
51+
52+
/**
53+
* Runs the test code with JsonParser created from the given String
54+
*
55+
* @param string String with JSON to create JsonParser from
56+
* @param parserConsumer test code to run with the created JsonParser
57+
*/
58+
public static void testWithCreateParserFromString(String string, Consumer<JsonParser> parserConsumer) {
59+
testWithParser(() -> Json.createParser(new StringReader(string)), parserConsumer);
60+
}
61+
62+
/**
63+
* Runs the test code with JsonParser created from the given String
64+
*
65+
* @param parserSupplier Supplier of JsonParser to create JsonParser from
66+
* @param parserConsumer test code to run with the created JsonParser
67+
*/
68+
private static void testWithParser(Supplier<JsonParser> parserSupplier, Consumer<JsonParser> parserConsumer) {
69+
try (JsonParser parser = parserSupplier.get()) {
70+
parserConsumer.accept(parser);
71+
}
72+
}
73+
}

‎impl/src/test/java/org/eclipse/parsson/tests/JsonParserSkipTest.java

+97-37
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,13 +16,13 @@
1616

1717
package org.eclipse.parsson.tests;
1818

19-
import java.io.StringReader;
2019
import jakarta.json.Json;
2120
import jakarta.json.stream.JsonParser;
2221
import junit.framework.TestCase;
23-
import static junit.framework.TestCase.assertEquals;
24-
import static junit.framework.TestCase.assertFalse;
25-
import static junit.framework.TestCase.assertTrue;
22+
23+
import static org.eclipse.parsson.JsonParserFixture.testWithCreateParserFromArray;
24+
import static org.eclipse.parsson.JsonParserFixture.testWithCreateParserFromObject;
25+
import static org.eclipse.parsson.JsonParserFixture.testWithCreateParserFromString;
2626

2727
/**
2828
*
@@ -31,44 +31,70 @@
3131
public class JsonParserSkipTest extends TestCase {
3232

3333
public void testSkipArrayReader() {
34-
try (JsonParser parser = Json.createParser(new StringReader("[[],[[]]]"))) {
35-
testSkipArray(parser);
36-
}
34+
testWithCreateParserFromString("[[],[[]]]", JsonParserSkipTest::testSkipArray);
3735
}
3836

3937
public void testSkipArrayStructure() {
40-
try (JsonParser parser = Json.createParserFactory(null).createParser(
41-
Json.createArrayBuilder()
42-
.add(Json.createArrayBuilder())
43-
.add(Json.createArrayBuilder()
44-
.add(Json.createArrayBuilder()))
45-
.build())) {
46-
testSkipArray(parser);
47-
}
38+
testWithCreateParserFromArray(Json.createArrayBuilder()
39+
.add(Json.createArrayBuilder())
40+
.add(Json.createArrayBuilder()
41+
.add(Json.createArrayBuilder()))
42+
.build(), JsonParserSkipTest::testSkipArray);
4843
}
4944

5045
private static void testSkipArray(JsonParser parser) {
5146
assertEquals(JsonParser.Event.START_ARRAY, parser.next());
5247
parser.skipArray();
53-
assertEquals(false, parser.hasNext());
48+
assertFalse(parser.hasNext());
49+
}
50+
51+
public void testSkipInsideArrayReader() {
52+
testWithCreateParserFromString("[\"test\"]", JsonParserSkipTest::testSkipInsideArray);
53+
}
54+
55+
public void testSkipInsideArrayStructure() {
56+
testWithCreateParserFromArray(Json.createArrayBuilder()
57+
.add("test")
58+
.build(), JsonParserSkipTest::testSkipInsideArray);
59+
}
60+
61+
private static void testSkipInsideArray(JsonParser parser) {
62+
assertEquals(JsonParser.Event.START_ARRAY, parser.next());
63+
assertEquals(JsonParser.Event.VALUE_STRING, parser.next());
64+
parser.skipArray();
65+
assertFalse(parser.hasNext());
66+
}
67+
68+
public void testNoSkipArrayReader() {
69+
testWithCreateParserFromString("{\"key\":\"value\"}", JsonParserSkipTest::testNoSkipArray);
70+
}
71+
72+
public void testNoSkipArrayStructure() {
73+
testWithCreateParserFromObject(Json.createObjectBuilder()
74+
.add("key","value")
75+
.build(), JsonParserSkipTest::testNoSkipArray);
76+
}
77+
78+
private static void testNoSkipArray(JsonParser parser) {
79+
assertEquals(JsonParser.Event.START_OBJECT, parser.next());
80+
assertEquals(JsonParser.Event.KEY_NAME, parser.next());
81+
parser.skipArray();
82+
assertEquals(JsonParser.Event.VALUE_STRING, parser.next());
83+
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
84+
assertFalse(parser.hasNext());
5485
}
5586

5687
public void testSkipArrayInObjectReader() {
57-
try (JsonParser parser = Json.createParser(new StringReader("{\"array\":[[],[[]]],\"object\":\"value2\"}"))) {
58-
testSkipArrayInObject(parser);
59-
}
88+
testWithCreateParserFromString("{\"array\":[[],[[]]],\"object\":\"value2\"}", JsonParserSkipTest::testSkipArrayInObject);
6089
}
6190

6291
public void testSkipArrayInObjectStructure() {
63-
try (JsonParser parser = Json.createParserFactory(null).createParser(
64-
Json.createObjectBuilder().add("array", Json.createArrayBuilder()
92+
testWithCreateParserFromObject(Json.createObjectBuilder().add("array", Json.createArrayBuilder()
6593
.add(Json.createArrayBuilder())
6694
.add(Json.createArrayBuilder()
6795
.add(Json.createArrayBuilder()))
6896
).add("object", "value2")
69-
.build())) {
70-
testSkipArrayInObject(parser);
71-
}
97+
.build(), JsonParserSkipTest::testSkipArrayInObject);
7298
}
7399

74100
private static void testSkipArrayInObject(JsonParser parser) {
@@ -84,20 +110,15 @@ private static void testSkipArrayInObject(JsonParser parser) {
84110
}
85111

86112
public void testSkipObjectReader() {
87-
try (JsonParser parser = Json.createParser(new StringReader("{\"array\":[],\"objectToSkip\":{\"huge key\":\"huge value\"},\"simple\":2}"))) {
88-
testSkipObject(parser);
89-
}
113+
testWithCreateParserFromString("{\"array\":[],\"objectToSkip\":{\"huge key\":\"huge value\"},\"simple\":2}", JsonParserSkipTest::testSkipObject);
90114
}
91115

92116
public void testSkipObjectStructure() {
93-
try (JsonParser parser = Json.createParserFactory(null).createParser(
94-
Json.createObjectBuilder()
95-
.add("array", Json.createArrayBuilder().build())
96-
.add("objectToSkip", Json.createObjectBuilder().add("huge key", "huge value"))
97-
.add("simple", 2)
98-
.build())) {
99-
testSkipObject(parser);
100-
}
117+
testWithCreateParserFromObject(Json.createObjectBuilder()
118+
.add("array", Json.createArrayBuilder().build())
119+
.add("objectToSkip", Json.createObjectBuilder().add("huge key", "huge value"))
120+
.add("simple", 2)
121+
.build(), JsonParserSkipTest::testSkipObject);
101122
}
102123

103124
private static void testSkipObject(JsonParser parser) {
@@ -111,6 +132,45 @@ private static void testSkipObject(JsonParser parser) {
111132
assertEquals(JsonParser.Event.KEY_NAME, parser.next());
112133
assertEquals(JsonParser.Event.VALUE_NUMBER, parser.next());
113134
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
114-
assertEquals(false, parser.hasNext());
135+
assertFalse(parser.hasNext());
136+
}
137+
138+
public void testSkipInsideObjectReader() {
139+
testWithCreateParserFromString("{\"objectToSkip\":{\"huge key\":\"huge value\"},\"simple\":2}", JsonParserSkipTest::testSkipInsideObject);
140+
}
141+
142+
public void testSkipInsideObjectStructure() {
143+
testWithCreateParserFromObject(Json.createObjectBuilder()
144+
.add("objectToSkip", Json.createObjectBuilder().add("huge key", "huge value"))
145+
.add("simple", 2)
146+
.build(), JsonParserSkipTest::testSkipInsideObject);
147+
}
148+
149+
private static void testSkipInsideObject(JsonParser parser) {
150+
assertEquals(JsonParser.Event.START_OBJECT, parser.next());
151+
assertEquals(JsonParser.Event.KEY_NAME, parser.next());
152+
assertEquals(JsonParser.Event.START_OBJECT, parser.next());
153+
parser.skipObject();
154+
assertEquals(JsonParser.Event.KEY_NAME, parser.next());
155+
assertEquals(JsonParser.Event.VALUE_NUMBER, parser.next());
156+
assertEquals(JsonParser.Event.END_OBJECT, parser.next());
157+
assertFalse(parser.hasNext());
158+
}
159+
160+
public void testNoSkipObjectReader() {
161+
testWithCreateParserFromString("{\"key\":\"value\"}", JsonParserSkipTest::testNoSkipObject);
162+
}
163+
164+
public void testNoSkipObjectStructure() {
165+
testWithCreateParserFromObject(Json.createObjectBuilder()
166+
.add("Key", "value")
167+
.build(), JsonParserSkipTest::testNoSkipObject);
168+
}
169+
170+
private static void testNoSkipObject(JsonParser parser) {
171+
assertEquals(JsonParser.Event.START_OBJECT, parser.next());
172+
assertEquals(JsonParser.Event.KEY_NAME, parser.next());
173+
parser.skipObject();
174+
assertFalse(parser.hasNext());
115175
}
116176
}

‎pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<spotbugs.exclude>${config.dir}/exclude.xml</spotbugs.exclude>
9595
<spotbugs.skip>false</spotbugs.skip>
9696
<spotbugs.threshold>Low</spotbugs.threshold>
97-
<spotbugs.version>4.7.3.6</spotbugs.version>
97+
<spotbugs.version>4.8.1.0</spotbugs.version>
9898

9999
<jakarta.json-api.version>2.1.3</jakarta.json-api.version>
100100

@@ -323,7 +323,7 @@
323323
<plugin>
324324
<groupId>org.apache.maven.plugins</groupId>
325325
<artifactId>maven-javadoc-plugin</artifactId>
326-
<version>3.6.0</version>
326+
<version>3.6.2</version>
327327
</plugin>
328328
<plugin>
329329
<groupId>org.apache.maven.plugins</groupId>
@@ -343,7 +343,7 @@
343343
<plugin>
344344
<groupId>org.apache.maven.plugins</groupId>
345345
<artifactId>maven-dependency-plugin</artifactId>
346-
<version>3.6.0</version>
346+
<version>3.6.1</version>
347347
</plugin>
348348
<plugin>
349349
<groupId>org.apache.maven.plugins</groupId>
@@ -353,7 +353,7 @@
353353
<plugin>
354354
<groupId>org.apache.maven.plugins</groupId>
355355
<artifactId>maven-clean-plugin</artifactId>
356-
<version>3.3.1</version>
356+
<version>3.3.2</version>
357357
</plugin>
358358
<plugin>
359359
<groupId>org.apache.maven.plugins</groupId>
@@ -368,7 +368,7 @@
368368
<plugin>
369369
<groupId>org.apache.maven.plugins</groupId>
370370
<artifactId>maven-surefire-plugin</artifactId>
371-
<version>3.1.2</version>
371+
<version>3.2.2</version>
372372
</plugin>
373373
<plugin>
374374
<groupId>org.apache.maven.plugins</groupId>
@@ -429,7 +429,7 @@
429429
<dependency>
430430
<groupId>org.hamcrest</groupId>
431431
<artifactId>hamcrest-core</artifactId>
432-
<version>1.3</version>
432+
<version>2.2</version>
433433
<scope>test</scope>
434434
</dependency>
435435
</dependencies>
@@ -458,7 +458,7 @@
458458
<dependency>
459459
<groupId>com.sun.xml.bind</groupId>
460460
<artifactId>jaxb-impl</artifactId>
461-
<version>3.0.1</version>
461+
<version>4.0.4</version>
462462
</dependency>
463463
</dependencies>
464464
</dependencyManagement>

0 commit comments

Comments
 (0)
Please sign in to comment.