Skip to content

Commit c4854f1

Browse files
aschwarte10aschwarte10
committed
GH-5744: Final polishing and migration of deprecated code
1 parent 1a7765d commit c4854f1

4 files changed

Lines changed: 36 additions & 37 deletions

File tree

‎core/queryresultio/sparqljson/src/main/java/org/eclipse/rdf4j/query/resultio/sparqljson/AbstractSPARQLJSONWriter.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,13 @@ public void startDocument() throws QueryResultHandlerException {
223223
} else {
224224
pp = null;
225225
}
226-
jg = JSON_FACTORY.createGenerator(new ObjectWriteContext.Base() {
227-
@Override
228-
public PrettyPrinter getPrettyPrinter() {
229-
return pp;
230-
}
231-
}, writer);
232-
233226
try {
227+
jg = JSON_FACTORY.createGenerator(new ObjectWriteContext.Base() {
228+
@Override
229+
public PrettyPrinter getPrettyPrinter() {
230+
return pp;
231+
}
232+
}, writer);
234233
if (getWriterConfig().isSet(BasicQueryWriterSettings.JSONP_CALLBACK)) {
235234
// SES-1019 : Write the callbackfunction name as a wrapper for
236235
// the results here

‎core/rio/rdfjson/src/main/java/org/eclipse/rdf4j/rio/rdfjson/RDFJSONParser.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import tools.jackson.core.JacksonException;
3636
import tools.jackson.core.JsonParser;
3737
import tools.jackson.core.JsonToken;
38+
import tools.jackson.core.ObjectReadContext;
3839
import tools.jackson.core.StreamReadFeature;
3940
import tools.jackson.core.StreamWriteFeature;
4041
import tools.jackson.core.TokenStreamFactory;
@@ -84,11 +85,11 @@ public void parse(final InputStream inputStream, final String baseUri)
8485
this.rdfHandler.startRDF();
8586
}
8687

87-
jp = configureNewJsonFactory().createParser(inputStream);
88+
jp = configureNewJsonFactory().createParser(ObjectReadContext.empty(), inputStream);
8889
rdfJsonToHandlerInternal(this.rdfHandler, this.valueFactory, jp);
8990
} catch (JacksonException e) {
9091
if (jp != null) {
91-
reportFatalError("Found IOException during parsing", e, jp.currentLocation());
92+
reportFatalError("Found exception during parsing", e, jp.currentLocation());
9293
} else {
9394
reportFatalError(e);
9495
}
@@ -154,11 +155,11 @@ public void parse(final Reader reader, final String baseUri)
154155
this.rdfHandler.startRDF();
155156
}
156157

157-
jp = configureNewJsonFactory().createParser(reader);
158+
jp = configureNewJsonFactory().createParser(ObjectReadContext.empty(), reader);
158159
rdfJsonToHandlerInternal(rdfHandler, valueFactory, jp);
159160
} catch (JacksonException e) {
160161
if (jp != null) {
161-
reportFatalError("Found IOException during parsing", e, jp.currentLocation());
162+
reportFatalError("Found exception during parsing", e, jp.currentLocation());
162163
} else {
163164
reportFatalError(e);
164165
}
@@ -229,7 +230,7 @@ private void rdfJsonToHandlerInternal(final RDFHandler handler, final ValueFacto
229230

230231
jp.nextToken();
231232

232-
nextValue = jp.getText();
233+
nextValue = jp.getString();
233234
} else if (RDFJSONUtility.TYPE.equals(fieldName)) {
234235
if (nextType != null) {
235236
reportError(
@@ -240,7 +241,7 @@ private void rdfJsonToHandlerInternal(final RDFHandler handler, final ValueFacto
240241

241242
jp.nextToken();
242243

243-
nextType = jp.getText();
244+
nextType = jp.getString();
244245
} else if (RDFJSONUtility.LANG.equals(fieldName)) {
245246
if (nextLanguage != null) {
246247
reportError(
@@ -252,7 +253,7 @@ private void rdfJsonToHandlerInternal(final RDFHandler handler, final ValueFacto
252253

253254
jp.nextToken();
254255

255-
nextLanguage = jp.getText();
256+
nextLanguage = jp.getString();
256257
} else if (RDFJSONUtility.DATATYPE.equals(fieldName)) {
257258
if (nextDatatype != null) {
258259
reportError(
@@ -264,15 +265,15 @@ private void rdfJsonToHandlerInternal(final RDFHandler handler, final ValueFacto
264265

265266
jp.nextToken();
266267

267-
nextDatatype = jp.getText();
268+
nextDatatype = jp.getString();
268269
} else if (RDFJSONUtility.GRAPHS.equals(fieldName)) {
269270
if (jp.nextToken() != JsonToken.START_ARRAY) {
270271
reportError("Expected graphs to start with an array", jp.currentLocation(),
271272
RDFJSONParserSettings.SUPPORT_GRAPHS_EXTENSION);
272273
}
273274

274275
while (jp.nextToken() != JsonToken.END_ARRAY) {
275-
final String nextGraph = jp.getText();
276+
final String nextGraph = jp.getString();
276277
nextContexts.add(nextGraph);
277278
}
278279
} else {

‎core/rio/rdfjson/src/main/java/org/eclipse/rdf4j/rio/rdfjson/RDFJSONWriter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ public void consumeStatement(final Statement statement) throws RDFHandlerExcepti
184184
* @param object The RDF value to serialise
185185
* @param contexts The set of contexts that are relevant to this object, including null contexts as they are found.
186186
* @param jg the {@link JsonGenerator} to write to.
187-
* @throws IOException
188-
* @throws JsonGenerationException
187+
* @throws JacksonException
189188
*/
190189
protected static void writeObject(final Value object, final Set<Resource> contexts, final JsonGenerator jg) {
191190
jg.writeStartObject();

‎core/rio/rdfjson/src/test/java/org/eclipse/rdf4j/rio/rdfjson/RDFJSONParserCustomTest.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void testSupportedSettings() {
148148
public void testAllowBackslashEscapingAnyCharacterDefault() {
149149
assertThatThrownBy(() -> parser.parse(new StringReader(BACKSLASH_ESCAPED_TEST_STRING), ""))
150150
.isInstanceOf(RDFParseException.class)
151-
.hasMessage("Found IOException during parsing [line 1, column 5]");
151+
.hasMessage("Found exception during parsing [line 1, column 5]");
152152
}
153153

154154
@Test
@@ -163,14 +163,14 @@ public void testAllowBackslashEscapingAnyCharacterDisabled() {
163163
parser.set(JSONSettings.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER, false);
164164
assertThatThrownBy(() -> parser.parse(new StringReader(BACKSLASH_ESCAPED_TEST_STRING), ""))
165165
.isInstanceOf(RDFParseException.class)
166-
.hasMessage("Found IOException during parsing [line 1, column 5]");
166+
.hasMessage("Found exception during parsing [line 1, column 5]");
167167
}
168168

169169
@Test
170170
public void testAllowCommentsDefault() {
171171
assertThatThrownBy(() -> parser.parse(new StringReader(COMMENTS_TEST_STRING), ""))
172172
.isInstanceOf(RDFParseException.class)
173-
.hasMessage("Found IOException during parsing [line 1, column 3]");
173+
.hasMessage("Found exception during parsing [line 1, column 3]");
174174
}
175175

176176
@Test
@@ -185,14 +185,14 @@ public void testAllowCommentsDisabled() {
185185
parser.set(JSONSettings.ALLOW_COMMENTS, false);
186186
assertThatThrownBy(() -> parser.parse(new StringReader(COMMENTS_TEST_STRING), ""))
187187
.isInstanceOf(RDFParseException.class)
188-
.hasMessage("Found IOException during parsing [line 1, column 3]");
188+
.hasMessage("Found exception during parsing [line 1, column 3]");
189189
}
190190

191191
@Test
192192
public void testAllowNonNumericNumbersDefault() {
193193
assertThatThrownBy(() -> parser.parse(new StringReader(NON_NUMERIC_NUMBERS_TEST_STRING), ""))
194194
.isInstanceOf(RDFParseException.class)
195-
.hasMessage("Found IOException during parsing [line 1, column 74]");
195+
.hasMessage("Found exception during parsing [line 1, column 74]");
196196
}
197197

198198
@Test
@@ -207,14 +207,14 @@ public void testAllowNonNumericNumbersDisabled() {
207207
parser.set(JSONSettings.ALLOW_NON_NUMERIC_NUMBERS, false);
208208
assertThatThrownBy(() -> parser.parse(new StringReader(NON_NUMERIC_NUMBERS_TEST_STRING), ""))
209209
.isInstanceOf(RDFParseException.class)
210-
.hasMessage("Found IOException during parsing [line 1, column 74]");
210+
.hasMessage("Found exception during parsing [line 1, column 74]");
211211
}
212212

213213
@Test
214214
public void testAllowNumericLeadingZeroesDefault() {
215215
assertThatThrownBy(() -> parser.parse(new StringReader(NUMERIC_LEADING_ZEROES_TEST_STRING), ""))
216216
.isInstanceOf(RDFParseException.class)
217-
.hasMessage("Found IOException during parsing [line 1, column 72]");
217+
.hasMessage("Found exception during parsing [line 1, column 72]");
218218
}
219219

220220
@Test
@@ -229,14 +229,14 @@ public void testAllowNumericLeadingZeroesDisabled() {
229229
parser.set(JSONSettings.ALLOW_NUMERIC_LEADING_ZEROS, false);
230230
assertThatThrownBy(() -> parser.parse(new StringReader(NUMERIC_LEADING_ZEROES_TEST_STRING), ""))
231231
.isInstanceOf(RDFParseException.class)
232-
.hasMessage("Found IOException during parsing [line 1, column 72]");
232+
.hasMessage("Found exception during parsing [line 1, column 72]");
233233
}
234234

235235
@Test
236236
public void testAllowSingleQuotesDefault() {
237237
assertThatThrownBy(() -> parser.parse(new StringReader(SINGLE_QUOTES_TEST_STRING), ""))
238238
.isInstanceOf(RDFParseException.class)
239-
.hasMessage("Found IOException during parsing [line 1, column 3]");
239+
.hasMessage("Found exception during parsing [line 1, column 3]");
240240
}
241241

242242
@Test
@@ -251,14 +251,14 @@ public void testAllowSingleQuotesDisabled() {
251251
parser.set(JSONSettings.ALLOW_SINGLE_QUOTES, false);
252252
assertThatThrownBy(() -> parser.parse(new StringReader(SINGLE_QUOTES_TEST_STRING), ""))
253253
.isInstanceOf(RDFParseException.class)
254-
.hasMessage("Found IOException during parsing [line 1, column 3]");
254+
.hasMessage("Found exception during parsing [line 1, column 3]");
255255
}
256256

257257
@Test
258258
public void testAllowUnquotedControlCharactersDefault() {
259259
assertThatThrownBy(() -> parser.parse(new StringReader(UNQUOTED_CONTROL_CHARS_TEST_STRING), ""))
260260
.isInstanceOf(RDFParseException.class)
261-
.hasMessage("Found IOException during parsing [line 1, column 75]");
261+
.hasMessage("Found exception during parsing [line 1, column 75]");
262262
}
263263

264264
@Test
@@ -273,14 +273,14 @@ public void testAllowUnquotedControlCharactersDisabled() {
273273
parser.set(JSONSettings.ALLOW_UNQUOTED_CONTROL_CHARS, false);
274274
assertThatThrownBy(() -> parser.parse(new StringReader(UNQUOTED_CONTROL_CHARS_TEST_STRING), ""))
275275
.isInstanceOf(RDFParseException.class)
276-
.hasMessage("Found IOException during parsing [line 1, column 75]");
276+
.hasMessage("Found exception during parsing [line 1, column 75]");
277277
}
278278

279279
@Test
280280
public void testAllowUnquotedFieldNamesDefault() {
281281
assertThatThrownBy(() -> parser.parse(new StringReader(UNQUOTED_FIELD_NAMES_TEST_STRING), ""))
282282
.isInstanceOf(RDFParseException.class)
283-
.hasMessage("Found IOException during parsing [line 1, column 63]");
283+
.hasMessage("Found exception during parsing [line 1, column 63]");
284284
}
285285

286286
@Test
@@ -295,14 +295,14 @@ public void testAllowUnquotedFieldNamesDisabled() {
295295
parser.set(JSONSettings.ALLOW_UNQUOTED_FIELD_NAMES, false);
296296
assertThatThrownBy(() -> parser.parse(new StringReader(UNQUOTED_FIELD_NAMES_TEST_STRING), ""))
297297
.isInstanceOf(RDFParseException.class)
298-
.hasMessage("Found IOException during parsing [line 1, column 63]");
298+
.hasMessage("Found exception during parsing [line 1, column 63]");
299299
}
300300

301301
@Test
302302
public void testAllowYamlCommentsDefault() {
303303
assertThatThrownBy(() -> parser.parse(new StringReader(YAML_COMMENTS_TEST_STRING), ""))
304304
.isInstanceOf(RDFParseException.class)
305-
.hasMessage("Found IOException during parsing [line 2, column 2]");
305+
.hasMessage("Found exception during parsing [line 2, column 2]");
306306
}
307307

308308
@Test
@@ -317,14 +317,14 @@ public void testAllowYamlCommentsDisabled() {
317317
parser.set(JSONSettings.ALLOW_YAML_COMMENTS, false);
318318
assertThatThrownBy(() -> parser.parse(new StringReader(YAML_COMMENTS_TEST_STRING), ""))
319319
.isInstanceOf(RDFParseException.class)
320-
.hasMessage("Found IOException during parsing [line 2, column 2]");
320+
.hasMessage("Found exception during parsing [line 2, column 2]");
321321
}
322322

323323
@Test
324324
public void testAllowTrailingCommaDefault() {
325325
assertThatThrownBy(() -> parser.parse(new StringReader(TRAILING_COMMA_TEST_STRING), ""))
326326
.isInstanceOf(RDFParseException.class)
327-
.hasMessage("Found IOException during parsing [line 1, column 113]");
327+
.hasMessage("Found exception during parsing [line 1, column 113]");
328328
}
329329

330330
@Test
@@ -339,7 +339,7 @@ public void testAllowTrailingCommaDisabled() {
339339
parser.set(JSONSettings.ALLOW_TRAILING_COMMA, false);
340340
assertThatThrownBy(() -> parser.parse(new StringReader(TRAILING_COMMA_TEST_STRING), ""))
341341
.isInstanceOf(RDFParseException.class)
342-
.hasMessage("Found IOException during parsing [line 1, column 113]");
342+
.hasMessage("Found exception during parsing [line 1, column 113]");
343343
}
344344

345345
@Test
@@ -408,7 +408,7 @@ public void testStrictDuplicateDetectionEnabled() {
408408
parser.set(JSONSettings.STRICT_DUPLICATE_DETECTION, true);
409409
assertThatThrownBy(() -> parser.parse(new StringReader(STRICT_DUPLICATE_DETECTION_TEST_STRING), ""))
410410
.isInstanceOf(RDFParseException.class)
411-
.hasMessage("Found IOException during parsing [line 1, column 119]");
411+
.hasMessage("Found exception during parsing [line 1, column 119]");
412412
}
413413

414414
@Test

0 commit comments

Comments
 (0)