GH-3654 Support for JSON-LD 1.1 (#4852)

eclipse-rdf4j · Mar 18, 2024 · c9f6b06 · c9f6b06
2 parents 4608419 + c396d12
commit c9f6b06
Show file tree

Hide file tree

Showing 76 changed files with 4,310 additions and 1,049 deletions.
diff --git a/...ory/sail/src/main/java/org/eclipse/rdf4j/repository/sail/config/SailRepositorySchema.java b/...ory/sail/src/main/java/org/eclipse/rdf4j/repository/sail/config/SailRepositorySchema.java
@@ -32,7 +32,7 @@ public class SailRepositorySchema {
  public static final String NAMESPACE = "http://www.openrdf.org/config/repository/sail#";
 
  /**
- * @deprecated use {@link CONFIG#impl} instead.
+ * @deprecated use {@link CONFIG.Sail#impl} instead.
  */
  public final static IRI SAILIMPL = iri(NAMESPACE, "sailImpl");
 }
diff --git a/core/rio/api/src/test/java/org/eclipse/rdf4j/rio/AbstractParserHandlingTest.java b/core/rio/api/src/test/java/org/eclipse/rdf4j/rio/AbstractParserHandlingTest.java
diff --git a/core/rio/api/src/test/java/org/eclipse/rdf4j/rio/RDFWriterTest.java b/core/rio/api/src/test/java/org/eclipse/rdf4j/rio/RDFWriterTest.java
@@ -66,7 +66,6 @@
 import org.eclipse.rdf4j.model.vocabulary.SPIN;
 import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
 import org.eclipse.rdf4j.rio.helpers.BasicWriterSettings;
-import org.eclipse.rdf4j.rio.helpers.JSONLDMode;
 import org.eclipse.rdf4j.rio.helpers.StatementCollector;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;

diff --git a/core/rio/jsonld-legacy/pom.xml b/core/rio/jsonld-legacy/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.rdf4j</groupId>
+ <artifactId>rdf4j-rio</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>rdf4j-rio-jsonld-legacy</artifactId>
+ <name>RDF4J: Rio - JSON-LD 1.0 (legacy)</name>
+ <description>Rio parser and writer implementation for the JSON-LD file format.</description>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rdf4j-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rdf4j-rio-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rdf4j-rio-datatypes</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rdf4j-rio-languages</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ </dependency>
+ <!-- httpclient pulls in commons-logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rdf4j-rio-api</artifactId>
+ <classifier>tests</classifier>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rdf4j-query</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/...o/jsonld/JSONLDHierarchicalProcessor.java → ...d/legacy/JSONLDHierarchicalProcessor.java b/...o/jsonld/JSONLDHierarchicalProcessor.java → ...d/legacy/JSONLDHierarchicalProcessor.java
@@ -1,16 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2018 Eclipse RDF4J contributors.
+ * Copyright (c) 2023 Eclipse RDF4J contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Distribution License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
  * SPDX-License-Identifier: BSD-3-Clause
- *******************************************************************************/
-package org.eclipse.rdf4j.rio.jsonld;
-
-import java.util.*;
+ ******************************************************************************/
+package org.eclipse.rdf4j.rio.jsonld.legacy;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**

diff --git a/...j/rio/jsonld/JSONLDInternalRDFParser.java → ...sonld/legacy/JSONLDInternalRDFParser.java b/...j/rio/jsonld/JSONLDInternalRDFParser.java → ...sonld/legacy/JSONLDInternalRDFParser.java
@@ -1,14 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2015 Eclipse RDF4J contributors, Aduna, and others.
+ * Copyright (c) 2023 Eclipse RDF4J contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Distribution License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
  * SPDX-License-Identifier: BSD-3-Clause
- *******************************************************************************/
-package org.eclipse.rdf4j.rio.jsonld;
+ ******************************************************************************/
+package org.eclipse.rdf4j.rio.jsonld.legacy;
 
 import java.util.Set;
 

diff --git a/.../jsonld/JSONLDInternalTripleCallback.java → .../legacy/JSONLDInternalTripleCallback.java b/.../jsonld/JSONLDInternalTripleCallback.java → .../legacy/JSONLDInternalTripleCallback.java
@@ -1,14 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2015 Eclipse RDF4J contributors, Aduna, and others.
+ * Copyright (c) 2023 Eclipse RDF4J contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Distribution License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
  *
  * SPDX-License-Identifier: BSD-3-Clause
- *******************************************************************************/
-package org.eclipse.rdf4j.rio.jsonld;
+ ******************************************************************************/
+package org.eclipse.rdf4j.rio.jsonld.legacy;
 
 import java.util.List;
 import java.util.Map.Entry;

diff --git a/...eclipse/rdf4j/rio/helpers/JSONLDMode.java → ...e/rdf4j/rio/jsonld/legacy/JSONLDMode.java b/...eclipse/rdf4j/rio/helpers/JSONLDMode.java → ...e/rdf4j/rio/jsonld/legacy/JSONLDMode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 Eclipse RDF4J contributors, Aduna, and others.
+ * Copyright (c) 2022 Eclipse RDF4J contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Distribution License v1.0
@@ -8,16 +8,16 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *******************************************************************************/
-package org.eclipse.rdf4j.rio.helpers;
+package org.eclipse.rdf4j.rio.jsonld.legacy;
 
 /**
  * Specifies constants to identify various modes that are relevant to JSONLD documents.
  *
  * @author Peter Ansell
  * @see <a href="http://json-ld.org/spec/latest/json-ld-api/#features">JSONLD Features</a>
  *
+ * @since 4.3.0
  */
-@Deprecated(since = "4.3.0", forRemoval = true)
 public enum JSONLDMode {
 
  EXPAND("Expansion", "http://json-ld.org/spec/latest/json-ld-api/index.html#expansion"),