(jena) branch main updated: Improve JSON-LD handling

[andy]

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 5d9586fd2f Improve JSON-LD handling
5d9586fd2f is described below

commit 5d9586fd2ffe374ba9f640c57beefece7e037fd1
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Fri Mar 8 21:25:51 2024 +0000

    Improve JSON-LD handling
---
 jena-cmds/src/main/java/tdb/tdbloader.java  | 7 +++++--
 jena-cmds/src/main/java/tdb2/tdbloader.java | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jena-cmds/src/main/java/tdb/tdbloader.java 
b/jena-cmds/src/main/java/tdb/tdbloader.java
index a9af7b83b1..ff51b45d38 100644
--- a/jena-cmds/src/main/java/tdb/tdbloader.java
+++ b/jena-cmds/src/main/java/tdb/tdbloader.java
@@ -114,8 +114,11 @@ public class tdbloader extends CmdTDBGraph {
 
         for ( String url : urls ) {
             Lang lang = RDFLanguages.filenameToLang(url);
-            if ( lang != null && RDFLanguages.isQuads(lang) ) {
-                throw new CmdException("Warning: Quads format given - only the 
default graph is loaded into the graph for --graph");
+            if ( lang != null && ! Lang.JSONLD.equals(lang) && 
RDFLanguages.isQuads(lang) ) {
+                // People think JSONLD is a single graph format.
+                if ( RDFLanguages.isQuads(lang) ) {
+                    System.err.println("Warning: Quads format given - only the 
default graph from the data is loaded into the graph for --graph");
+                }
             }
         }
 
diff --git a/jena-cmds/src/main/java/tdb2/tdbloader.java 
b/jena-cmds/src/main/java/tdb2/tdbloader.java
index ad05909625..330a02420f 100644
--- a/jena-cmds/src/main/java/tdb2/tdbloader.java
+++ b/jena-cmds/src/main/java/tdb2/tdbloader.java
@@ -143,8 +143,11 @@ public class tdbloader extends CmdTDBGraph {
 
         for ( String url : urls ) {
             Lang lang = RDFLanguages.filenameToLang(url);
-            if ( lang != null && RDFLanguages.isQuads(lang) ) {
-                throw new CmdException("Warning: Quads format given - only the 
default graph is loaded into the graph for --graph");
+            if ( lang != null && ! Lang.JSONLD.equals(lang) && 
RDFLanguages.isQuads(lang) ) {
+                // People think JSONLD is a single graph format.
+                if ( RDFLanguages.isQuads(lang) ) {
+                    System.err.println("Warning: Quads format given - only the 
default graph from the data is loaded into the graph for --graph");
+                }
             }
         }