GH-5744: Final polishing and migration of deprecated code

Author: aschwarte10

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

@@ -223,14 +223,13 @@ public void startDocument() throws QueryResultHandlerException {
 			} else {
 				pp = null;
 			}
-			jg = JSON_FACTORY.createGenerator(new ObjectWriteContext.Base() {
-				@Override
-				public PrettyPrinter getPrettyPrinter() {
-					return pp;
-				}
-			}, writer);
-
 			try {
+				jg = JSON_FACTORY.createGenerator(new ObjectWriteContext.Base() {
+					@Override
+					public PrettyPrinter getPrettyPrinter() {
+						return pp;
+					}
+				}, writer);
 				if (getWriterConfig().isSet(BasicQueryWriterSettings.JSONP_CALLBACK)) {
 					// SES-1019 : Write the callbackfunction name as a wrapper for
 					// the results here

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

@@ -35,6 +35,7 @@
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.JsonToken;
+import tools.jackson.core.ObjectReadContext;
 import tools.jackson.core.StreamReadFeature;
 import tools.jackson.core.StreamWriteFeature;
 import tools.jackson.core.TokenStreamFactory;
@@ -84,11 +85,11 @@ public void parse(final InputStream inputStream, final String baseUri)
 				this.rdfHandler.startRDF();
 			}
 
-			jp = configureNewJsonFactory().createParser(inputStream);
+			jp = configureNewJsonFactory().createParser(ObjectReadContext.empty(), inputStream);
 			rdfJsonToHandlerInternal(this.rdfHandler, this.valueFactory, jp);
 		} catch (JacksonException e) {
 			if (jp != null) {
-				reportFatalError("Found IOException during parsing", e, jp.currentLocation());
+				reportFatalError("Found exception during parsing", e, jp.currentLocation());
 			} else {
 				reportFatalError(e);
 			}
@@ -154,11 +155,11 @@ public void parse(final Reader reader, final String baseUri)
 				this.rdfHandler.startRDF();
 			}
 
-			jp = configureNewJsonFactory().createParser(reader);
+			jp = configureNewJsonFactory().createParser(ObjectReadContext.empty(), reader);
 			rdfJsonToHandlerInternal(rdfHandler, valueFactory, jp);
 		} catch (JacksonException e) {
 			if (jp != null) {
-				reportFatalError("Found IOException during parsing", e, jp.currentLocation());
+				reportFatalError("Found exception during parsing", e, jp.currentLocation());
 			} else {
 				reportFatalError(e);
 			}
@@ -229,7 +230,7 @@ private void rdfJsonToHandlerInternal(final RDFHandler handler, final ValueFacto
 
 							jp.nextToken();
 
-							nextValue = jp.getText();
+							nextValue = jp.getString();
 						} else if (RDFJSONUtility.TYPE.equals(fieldName)) {
 							if (nextType != null) {
 								reportError(
@@ -240,7 +241,7 @@ private void rdfJsonToHandlerInternal(final RDFHandler handler, final ValueFacto
 
 							jp.nextToken();
 
-							nextType = jp.getText();
+							nextType = jp.getString();
 						} else if (RDFJSONUtility.LANG.equals(fieldName)) {
 							if (nextLanguage != null) {
 								reportError(
@@ -252,7 +253,7 @@ private void rdfJsonToHandlerInternal(final RDFHandler handler, final ValueFacto
 
 							jp.nextToken();
 
-							nextLanguage = jp.getText();
+							nextLanguage = jp.getString();
 						} else if (RDFJSONUtility.DATATYPE.equals(fieldName)) {
 							if (nextDatatype != null) {
 								reportError(
@@ -264,15 +265,15 @@ private void rdfJsonToHandlerInternal(final RDFHandler handler, final ValueFacto
 
 							jp.nextToken();
 
-							nextDatatype = jp.getText();
+							nextDatatype = jp.getString();
 						} else if (RDFJSONUtility.GRAPHS.equals(fieldName)) {
 							if (jp.nextToken() != JsonToken.START_ARRAY) {
 								reportError("Expected graphs to start with an array", jp.currentLocation(),
 										RDFJSONParserSettings.SUPPORT_GRAPHS_EXTENSION);
 							}
 
 							while (jp.nextToken() != JsonToken.END_ARRAY) {
-								final String nextGraph = jp.getText();
+								final String nextGraph = jp.getString();
 								nextContexts.add(nextGraph);
 							}
 						} else {

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

@@ -184,8 +184,7 @@ public void consumeStatement(final Statement statement) throws RDFHandlerExcepti
 	 * @param object   The RDF value to serialise
 	 * @param contexts The set of contexts that are relevant to this object, including null contexts as they are found.
 	 * @param jg       the {@link JsonGenerator} to write to.
-	 * @throws IOException
-	 * @throws JsonGenerationException
+	 * @throws JacksonException
 	 */
 	protected static void writeObject(final Value object, final Set<Resource> contexts, final JsonGenerator jg) {
 		jg.writeStartObject();