This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 49379be0c5 GH-1921: Deprecate JSON-LD 1.0
new d57d2138d2 Merge pull request #1922 from afs/jsonld10
49379be0c5 is described below
commit 49379be0c57c0b7ed6ecea75947f57eb172b04ee
Author: Andy Seaborne <[email protected]>
AuthorDate: Fri Jun 23 14:17:04 2023 +0100
GH-1921: Deprecate JSON-LD 1.0
---
.../org/apache/jena/riot/JsonLDReadContext.java | 4 ++-
.../org/apache/jena/riot/JsonLDWriteContext.java | 2 ++
.../src/main/java/org/apache/jena/riot/Lang.java | 6 +++-
.../main/java/org/apache/jena/riot/RDFFormat.java | 22 +++++++++++++++
.../java/org/apache/jena/riot/RDFLanguages.java | 10 +++++++
.../org/apache/jena/riot/RDFParserRegistry.java | 8 ++++--
.../org/apache/jena/riot/RDFWriterRegistry.java | 1 +
.../main/java/org/apache/jena/riot/SysRIOT.java | 1 +
.../org/apache/jena/riot/lang/LangJSONLD10.java | 33 ++++++++++++----------
.../apache/jena/riot/writer/JsonLD10Writer.java | 3 ++
.../org/apache/jena/riot/TestJsonLDReader.java | 14 +++++++--
.../jena/riot/writer/TestJsonLD10Writer.java | 1 +
.../jena/riot/writer/TestRiotWriterDataset.java | 1 +
.../jena/riot/writer/TestRiotWriterGraph.java | 1 +
.../java/arq/examples/riot/Ex_WriteJsonLD.java | 7 +++--
15 files changed, 89 insertions(+), 25 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/JsonLDReadContext.java
b/jena-arq/src/main/java/org/apache/jena/riot/JsonLDReadContext.java
index 1b809b68d7..83be09734c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/JsonLDReadContext.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/JsonLDReadContext.java
@@ -29,14 +29,16 @@ import java.io.InputStream;
/**
* Set of parameters that can be used to control the reading of JSON-LD.
*
- * This class provides setters to define a "Context" suitable to be passed as
+ * This class provides setters to define a "Context" suitable to be passed as
* last argument to {@link ReaderRIOT#read(InputStream, String, ContentType,
StreamRDF, Context)}
* when the ReaderRIOT has been created with one of the JSON-LD RDFFormat
variants (that is, when it is
* an instance of {@link LangJSONLD10})
*
* Parameters that are actually useful are ''documentLoader'' and
''produceGeneralizedRdf''.
*
+ * @deprecated Migrate to JSON-LD 1.1
*/
+@Deprecated
public class JsonLDReadContext extends Context {
/**
* Set the value of the JSON-LD "@context" node, used when reading a
jsonld (overriding the actual @context in the jsonld). "Compact" and
"Flattened" JSON-LD outputs.
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/JsonLDWriteContext.java
b/jena-arq/src/main/java/org/apache/jena/riot/JsonLDWriteContext.java
index f7720464c6..8abe7928f0 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/JsonLDWriteContext.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/JsonLDWriteContext.java
@@ -40,7 +40,9 @@ import com.github.jsonldjava.core.JsonLdOptions;
* None of them is required (default values being used), except for the
"frame" one,
* when outputting using JSON-LD "frame" output variant.
*
+ * @deprecated Migrate to JSON-LD 1.1
*/
+@Deprecated
public class JsonLDWriteContext extends Context {
/**
* Set the JSON-LD java API's options
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
b/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
index 68735d91e6..5b2e204529 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
@@ -62,7 +62,11 @@ public class Lang
*/
public static Lang JSONLD ;
- /** JSONLD 1.0 */
+ /**
+ * JSONLD 1.0
+ * @deprecated use JSON-LD 1.1
+ */
+ @Deprecated
public static Lang JSONLD10 ;
/** JSONLD 1.1 */
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
index 615a670b75..858ee5d55d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
@@ -141,13 +141,29 @@ public class RDFFormat {
private static final RDFFormatVariant FRAME_PRETTY = new
JSONLDVariant("frame pretty", true, JSONLDVariant.JSONLD_FORMAT.FRAME) ;
private static final RDFFormatVariant FRAME_FLAT = new
JSONLDVariant("frame flat", false, JSONLDVariant.JSONLD_FORMAT.FRAME) ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_EXPAND_PRETTY = new
RDFFormat(Lang.JSONLD10, EXPAND_PRETTY) ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_EXPAND_FLAT = new
RDFFormat(Lang.JSONLD10, EXPAND_FLAT) ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_COMPACT_PRETTY = new
RDFFormat(Lang.JSONLD10, COMPACT_PRETTY) ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_COMPACT_FLAT = new
RDFFormat(Lang.JSONLD10, COMPACT_FLAT) ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_FLATTEN_PRETTY = new
RDFFormat(Lang.JSONLD10, FLATTEN_PRETTY) ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_FLATTEN_FLAT = new
RDFFormat(Lang.JSONLD10, FLATTEN_FLAT) ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_FRAME_PRETTY = new
RDFFormat(Lang.JSONLD10, FRAME_PRETTY) ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_FRAME_FLAT = new
RDFFormat(Lang.JSONLD10, FRAME_FLAT) ;
/** Use {@link #JSONLD10_EXPAND_PRETTY} */
@@ -182,8 +198,14 @@ public class RDFFormat {
@Deprecated
public static final RDFFormat JSONLD_FRAME_FLAT =
JSONLD10_FRAME_FLAT;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10 =
JSONLD10_COMPACT_PRETTY ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_PRETTY =
JSONLD10_COMPACT_PRETTY ;
+ /** @deprecated Use JSON-LD 1.1 */
+ @Deprecated
public static final RDFFormat JSONLD10_FLAT =
JSONLD10_COMPACT_FLAT ;
// JSON-LD 1.0
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
index 38b2d624df..0a50b4ac87 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
@@ -112,8 +112,17 @@ public class RDFLanguages
* Override for JSON-LD 1.0 - requires an explicit language name
* {@code RDFParser.forceLang(Lang.JSONLD10)...}
* or use of the file extensions {@code .jsonld10}
+ * @deprecated use JSON-LD 1.1
*/
+ /**
+ * @deprecated use JSON-LD 1.1
+ */
+ @Deprecated
public static final String strLangJSONLD10 = "JSON-LD-10";
+ /**
+ * @deprecated use JSON-LD 1.1
+ */
+ @Deprecated
public static final Lang JSONLD10 = LangBuilder.create(strLangJSONLD10,
"x/ld-json-10")
.addAltNames("JSONLD10")
.addFileExtensions("jsonld10")
@@ -197,6 +206,7 @@ public class RDFLanguages
public static void init() {}
static { init$(); }
+ @SuppressWarnings("deprecation")
private static synchronized void init$() {
initStandard();
// Needed to avoid a class initialization loop.
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
index 2869604cae..e16e04df6f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
@@ -69,6 +69,7 @@ public class RDFParserRegistry
initStandard();
}
+ @SuppressWarnings("deprecation")
private static void initStandard() {
// Make sure the constants are initialized.
RDFLanguages.init();
@@ -98,10 +99,10 @@ public class RDFParserRegistry
ReaderRIOTFactory parserFactoryJsonLD11 = new
ReaderRIOTFactoryJSONLD11();
// ==== JSON-LD system default for parsing.
- ReaderRIOTFactory jsonldReadDefault = parserFactoryJsonLD11;
+ ReaderRIOTFactory jsonldParserDefault = parserFactoryJsonLD11;
// Register default JSON-LD here.
- registerLangTriples(JSONLD, jsonldReadDefault);
+ registerLangTriples(JSONLD, jsonldParserDefault);
registerLangTriples(JSONLD10, parserFactoryJsonLD10);
registerLangTriples(JSONLD11, parserFactoryJsonLD11);
@@ -112,7 +113,7 @@ public class RDFParserRegistry
registerLangQuads(TRIX, parserFactoryTriX);
registerLangQuads(RDFNULL, parserFactoryRDFNULL);
- registerLangQuads(JSONLD, jsonldReadDefault);
+ registerLangQuads(JSONLD, jsonldParserDefault);
registerLangQuads(JSONLD10, parserFactoryJsonLD10);
registerLangQuads(JSONLD11, parserFactoryJsonLD11);
@@ -211,6 +212,7 @@ public class RDFParserRegistry
}
private static class ReaderRIOTFactoryJSONLD10 implements
ReaderRIOTFactory {
+ @SuppressWarnings("deprecation")
@Override
public ReaderRIOT create(Lang language, ParserProfile profile) {
if ( !Lang.JSONLD.equals(language) &&
!Lang.JSONLD10.equals(language) )
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
index 5f9253e7ac..a3206471a1 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
@@ -109,6 +109,7 @@ public class RDFWriterRegistry
public static void init() {}
static { init$() ; }
+ @SuppressWarnings("deprecation")
private static void init$()
{
WriterGraphRIOTFactory wgfactory = createWriterGraphFactory();
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
b/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
index c3420a13ca..aa3fbfad77 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
@@ -146,6 +146,7 @@ public class SysRIOT
*
* @param version A string that is either "1.1" or "1.0" or "" (reset to
system installation default)
*/
+ @SuppressWarnings("deprecation")
public static void setDefaultJSONLD(String version) {
Objects.requireNonNull(version, "Argument 'version' must be \"1.1\",
\"1.0\" or \"\" (empty string)");
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangJSONLD10.java
b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangJSONLD10.java
index 683519b051..30df0bfcd7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangJSONLD10.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangJSONLD10.java
@@ -70,7 +70,10 @@ import org.apache.jena.sparql.util.Symbol;
* Note: it is possible to override jsonld's "@context" value by providing one,
* using a {@link org.apache.jena.sparql.util.Context}, and setting the {@link
LangJSONLD10#JSONLD_CONTEXT} Symbol's value
* to the data expected by JSON-LD java API (a {@link Map}).
+ *
+ * @deprecated Migrate to JSON-LD 1.1
*/
+@Deprecated
public class LangJSONLD10 implements ReaderRIOT
{
private static final String SYMBOLS_NS =
"http://jena.apache.org/riot/jsonld#";;
@@ -84,27 +87,27 @@ public class LangJSONLD10 implements ReaderRIOT
public static final Symbol JSONLD_OPTIONS =
SystemARQ.allocSymbol(SYMBOLS_NS, "JSONLD_OPTIONS");
private /*final*/ ErrorHandler errorHandler =
ErrorHandlerFactory.getDefaultErrorHandler() ;
private /*final*/ ParserProfile profile;
-
+
public LangJSONLD10(Lang lang, ParserProfile profile, ErrorHandler
errorHandler) {
this.profile = profile;
this.errorHandler = errorHandler;
}
-
+
@Override
public void read(Reader reader, String baseURI, ContentType ct, StreamRDF
output, Context context) {
try {
Object jsonObject = JsonUtils.fromReader(reader) ;
readWithJsonLDCtxOptions(jsonObject, baseURI, output, context) ;
}
- catch (JsonProcessingException ex) {
+ catch (JsonProcessingException ex) {
// includes JsonParseException
// The Jackson JSON parser, or addition JSON-level check, throws
up something.
JsonLocation loc = ex.getLocation() ;
- errorHandler.error(ex.getOriginalMessage(), loc.getLineNr(),
loc.getColumnNr());
+ errorHandler.error(ex.getOriginalMessage(), loc.getLineNr(),
loc.getColumnNr());
throw new RiotException(ex.getOriginalMessage()) ;
}
catch (IOException e) {
- errorHandler.error(e.getMessage(), -1, -1);
+ errorHandler.error(e.getMessage(), -1, -1);
IO.exception(e) ;
}
}
@@ -115,15 +118,15 @@ public class LangJSONLD10 implements ReaderRIOT
Object jsonObject = JsonUtils.fromInputStream(in) ;
readWithJsonLDCtxOptions(jsonObject, baseURI, output, context) ;
}
- catch (JsonProcessingException ex) {
+ catch (JsonProcessingException ex) {
// includes JsonParseException
// The Jackson JSON parser, or addition JSON-level check, throws
up something.
JsonLocation loc = ex.getLocation() ;
- errorHandler.error(ex.getOriginalMessage(), loc.getLineNr(),
loc.getColumnNr());
+ errorHandler.error(ex.getOriginalMessage(), loc.getLineNr(),
loc.getColumnNr());
throw new RiotException(ex.getOriginalMessage()) ;
}
catch (IOException e) {
- errorHandler.error(e.getMessage(), -1, -1);
+ errorHandler.error(e.getMessage(), -1, -1);
IO.exception(e) ;
}
}
@@ -144,16 +147,16 @@ public class LangJSONLD10 implements ReaderRIOT
private void read$(Object jsonObject, JsonLdOptions options, final
StreamRDF output) {
output.start() ;
- try {
+ try {
JsonLdTripleCallback callback = new JsonLdTripleCallback() {
@Override
public Object call(RDFDataset dataset) {
-
+
// Copy across namespaces
for (Entry<String, String> namespace :
dataset.getNamespaces().entrySet()) {
output.prefix(namespace.getKey(),
namespace.getValue());
}
-
+
// Copy triples and quads
for ( String gn : dataset.keySet() ) {
Object x = dataset.get(gn) ;
@@ -170,7 +173,7 @@ public class LangJSONLD10 implements ReaderRIOT
} else {
@SuppressWarnings("unchecked")
List<Map<String, Object>> quads =
(List<Map<String, Object>>)x ;
- Node g = createURI(gn) ;
+ Node g = createURI(gn) ;
for ( Map<String, Object> q : quads ) {
Node s = createNode(q, "subject") ;
Node p = createNode(q, "predicate") ;
@@ -186,7 +189,7 @@ public class LangJSONLD10 implements ReaderRIOT
JsonLdProcessor.toRDF(jsonObject, callback, options) ;
}
catch (JsonLdError e) {
- errorHandler.error(e.getMessage(), -1, -1);
+ errorHandler.error(e.getMessage(), -1, -1);
throw new RiotException(e) ;
}
output.finish() ;
@@ -235,7 +238,7 @@ public class LangJSONLD10 implements ReaderRIOT
}
private static final String xsdString = XSDDatatype.XSDstring.getURI() ;
-
+
private Node createNode(Map<String, Object> map) {
String type = (String)map.get("type") ;
String lex = (String)map.get("value") ;
@@ -248,7 +251,7 @@ public class LangJSONLD10 implements ReaderRIOT
String datatype = (String)map.get("datatype") ;
if ( Objects.equals(xsdString, datatype) )
// In RDF 1.1, simple literals and xsd:string are the same.
- // During migration, we prefer simple literals to xsd:strings.
+ // During migration, we prefer simple literals to xsd:strings.
datatype = null ;
if ( lang == null && datatype == null )
return profile.createStringLiteral(lex,-1, -1) ;
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/writer/JsonLD10Writer.java
b/jena-arq/src/main/java/org/apache/jena/riot/writer/JsonLD10Writer.java
index e5c7df0d18..20b5671d26 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/JsonLD10Writer.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/JsonLD10Writer.java
@@ -86,7 +86,10 @@ import org.apache.jena.vocabulary.RDF ;
*
* Note that this class also provides a static method to convert jena RDF data
to the corresponding object in JsonLD API:
* {@link #toJsonLDJavaAPI(org.apache.jena.riot.RDFFormat.JSONLDVariant,
DatasetGraph, PrefixMap, String, Context)}
+ *
+ * @deprecated Migrate to JSON-LD 1.1
*/
+@Deprecated
public class JsonLD10Writer extends WriterDatasetRIOTBase
{
private static final String SYMBOLS_NS =
"http://jena.apache.org/riot/jsonld#"; ;
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java
b/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java
index e1b6966628..fee142d3a7 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java
@@ -41,8 +41,11 @@ import org.apache.jena.sparql.util.Context;
import org.apache.jena.vocabulary.RDF;
import org.junit.Test;
+@SuppressWarnings("deprecation")
public class TestJsonLDReader {
+ // [JSONLD 1.0]
+
// These tests fail under some java11 (but not java17)
// for RIOT default JSON-LD 1.1 because Titanium contacts schema.org
// with java.net.http/HTTP2 (default version setting)
@@ -60,12 +63,15 @@ public class TestJsonLDReader {
*/
@Test
public final void overrideAtContextTest() throws JsonGenerationException,
IOException {
+
// some jsonld using schema.org's URI as "@context"
String jsonld = someSchemaDotOrgJsonld();
// pass the jsonldContext to the read using a jena Context
- JsonLDReadContext jenaCtx = new JsonLDReadContext();
- jenaCtx.setJsonLDContext(schemaOrgResolvedContext());
+ // [JSONLD 1.0]
+// JsonLDReadContext jenaCtx = new JsonLDReadContext();
+// jenaCtx.setJsonLDContext(schemaOrgResolvedContext());
+ JsonLDReadContext jenaCtx = null;
// read the jsonld, replacing its "@context"
Dataset ds = jsonld2dataset(jsonld, jenaCtx, Lang.JSONLD);
@@ -74,6 +80,7 @@ public class TestJsonLDReader {
assertJohnDoeIsOK(ds.getDefaultModel());
}
+ // [JSONLD 1.0]
@Test
public final void overrideJsonLdOptions() throws JsonGenerationException,
IOException {
// some jsonld using a (fake) http://pseudo.schema.org's URI as
"@context"
@@ -84,6 +91,7 @@ public class TestJsonLDReader {
dl.addInjectedDoc("http://pseudo.schema.org";, String.format("{
\"@context\": %s }", schemaOrgResolvedContext()));
options.setDocumentLoader(dl);
+ // [JSONLD 1.0]
// pass the jsonldContext and JsonLdOptions to the read using a jena
Context
JsonLDReadContext jenaCtx = new JsonLDReadContext();
jenaCtx.setOptions(options);
@@ -125,6 +133,8 @@ public class TestJsonLDReader {
.fromString(jsonld)
.errorHandler(ErrorHandlerFactory.errorHandlerNoLogging)
.lang(lang)
+ // Only needed for JSON-LD 1.0 (jsonld-java) usage.
+ // [JSONLD 1.0] Remove
.context(jenaCtx)
.parse(ds.asDatasetGraph());
return ds;
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJsonLD10Writer.java
b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJsonLD10Writer.java
index 132eb649f5..2f7cfa8244 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJsonLD10Writer.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJsonLD10Writer.java
@@ -47,6 +47,7 @@ import org.apache.jena.sparql.vocabulary.FOAF;
import org.apache.jena.vocabulary.RDF;
import org.junit.Test;
+@SuppressWarnings("deprecation")
public class TestJsonLD10Writer {
/**
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java
b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java
index 872a56a4b7..46533e062a 100644
---
a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java
+++
b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterDataset.java
@@ -35,6 +35,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@SuppressWarnings("deprecation")
@RunWith(Parameterized.class)
public class TestRiotWriterDataset extends AbstractWriterTest
{
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java
b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java
index 954c905c2a..6660d0a621 100644
---
a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java
+++
b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRiotWriterGraph.java
@@ -35,6 +35,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+@SuppressWarnings("deprecation")
@RunWith(Parameterized.class)
public class TestRiotWriterGraph extends AbstractWriterTest
{
diff --git a/jena-examples/src/main/java/arq/examples/riot/Ex_WriteJsonLD.java
b/jena-examples/src/main/java/arq/examples/riot/Ex_WriteJsonLD.java
index b6c0b3c125..a8ff1f14d2 100644
--- a/jena-examples/src/main/java/arq/examples/riot/Ex_WriteJsonLD.java
+++ b/jena-examples/src/main/java/arq/examples/riot/Ex_WriteJsonLD.java
@@ -36,9 +36,10 @@ import org.apache.jena.vocabulary.RDF;
import org.apache.jena.vocabulary.RDFS;
/**
- * Example writing as JSON-LD using jsonlkd-java (JSON-LD 1.0)
- * sNote the use of "JSONLD10"
- */
+ * Example writing as JSON-LD using jsonld-java (JSON-LD 1.0)
+ * Note the use of "JSONLD10"
+ */
+@SuppressWarnings("deprecation")
public class Ex_WriteJsonLD
{
public static void main(String[] args) {
