Skip to content

Commit 493e4d5

Browse files
hmottestadhmottestad
committed
wip
1 parent 5653929 commit 493e4d5

File tree

11 files changed

+21
-19
lines changed

11 files changed

+21
-19
lines changed

‎core/rio/jsonld-legacy/src/main/java/ndjsonld/legacy/NDJSONLDParser.java renamed to ‎core/rio/jsonld-legacy/src/main/java/org/eclipse/rdf4j/rio/ndjsonld/legacy/NDJSONLDParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*******************************************************************************
2-
* Copyright (c) 2021 Eclipse RDF4J contributors.
2+
* Copyright (c) 2024 Eclipse RDF4J contributors.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Distribution License v1.0
66
* which accompanies this distribution, and is available at
77
* http://www.eclipse.org/org/documents/edl-v10.php.
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
10-
*******************************************************************************/
11-
package ndjsonld.legacy;
10+
******************************************************************************/
11+
package org.eclipse.rdf4j.rio.ndjsonld.legacy;
1212

1313
import java.io.BufferedReader;
1414
import java.io.ByteArrayInputStream;

‎core/rio/jsonld-legacy/src/main/java/ndjsonld/legacy/NDJSONLDParserFactory.java renamed to ‎core/rio/jsonld-legacy/src/main/java/org/eclipse/rdf4j/rio/ndjsonld/legacy/NDJSONLDParserFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*******************************************************************************
2-
* Copyright (c) 2021 Eclipse RDF4J contributors.
2+
* Copyright (c) 2024 Eclipse RDF4J contributors.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Distribution License v1.0
66
* which accompanies this distribution, and is available at
77
* http://www.eclipse.org/org/documents/edl-v10.php.
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
10-
*******************************************************************************/
11-
package ndjsonld.legacy;
10+
******************************************************************************/
11+
package org.eclipse.rdf4j.rio.ndjsonld.legacy;
1212

1313
import org.eclipse.rdf4j.rio.RDFFormat;
1414
import org.eclipse.rdf4j.rio.RDFParser;

‎core/rio/jsonld-legacy/src/main/java/ndjsonld/legacy/NDJSONLDWriter.java renamed to ‎core/rio/jsonld-legacy/src/main/java/org/eclipse/rdf4j/rio/ndjsonld/legacy/NDJSONLDWriter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*******************************************************************************
2-
* Copyright (c) 2021 Eclipse RDF4J contributors.
2+
* Copyright (c) 2024 Eclipse RDF4J contributors.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Distribution License v1.0
66
* which accompanies this distribution, and is available at
77
* http://www.eclipse.org/org/documents/edl-v10.php.
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
10-
*******************************************************************************/
11-
package ndjsonld.legacy;
10+
******************************************************************************/
11+
package org.eclipse.rdf4j.rio.ndjsonld.legacy;
1212

1313
import java.io.BufferedWriter;
1414
import java.io.IOException;

‎core/rio/jsonld-legacy/src/main/java/ndjsonld/legacy/NDJSONLDWriterFactory.java renamed to ‎core/rio/jsonld-legacy/src/main/java/org/eclipse/rdf4j/rio/ndjsonld/legacy/NDJSONLDWriterFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/*******************************************************************************
2-
* Copyright (c) 2021 Eclipse RDF4J contributors.
2+
* Copyright (c) 2024 Eclipse RDF4J contributors.
33
*
44
* All rights reserved. This program and the accompanying materials
55
* are made available under the terms of the Eclipse Distribution License v1.0
66
* which accompanies this distribution, and is available at
77
* http://www.eclipse.org/org/documents/edl-v10.php.
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
10-
*******************************************************************************/
11-
package ndjsonld.legacy;
10+
******************************************************************************/
11+
package org.eclipse.rdf4j.rio.ndjsonld.legacy;
1212

1313
import java.io.OutputStream;
1414
import java.io.Writer;

‎core/rio/jsonld-legacy/src/test/java/ndjsonld/legacy/NDJSONLDParserHandlerTest.java renamed to ‎core/rio/jsonld-legacy/src/test/java/org/eclipse/rdf4j/rio/ndjsonld/legacy/NDJSONLDParserHandlerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
1010
******************************************************************************/
11-
package ndjsonld.legacy;
11+
package org.eclipse.rdf4j.rio.ndjsonld.legacy;
1212

1313
import java.io.OutputStream;
1414

‎core/rio/jsonld-legacy/src/test/java/ndjsonld/legacy/NDJSONLDParserTest.java renamed to ‎core/rio/jsonld-legacy/src/test/java/org/eclipse/rdf4j/rio/ndjsonld/legacy/NDJSONLDParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
1010
******************************************************************************/
11-
package ndjsonld.legacy;
11+
package org.eclipse.rdf4j.rio.ndjsonld.legacy;
1212

1313
import static org.junit.jupiter.api.Assertions.assertTrue;
1414

‎core/rio/jsonld-legacy/src/test/java/ndjsonld/legacy/NDJSONLDWriterTest.java renamed to ‎core/rio/jsonld-legacy/src/test/java/org/eclipse/rdf4j/rio/ndjsonld/legacy/NDJSONLDWriterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
1010
******************************************************************************/
11-
package ndjsonld.legacy;
11+
package org.eclipse.rdf4j.rio.ndjsonld.legacy;
1212

1313
import org.eclipse.rdf4j.rio.ParserConfig;
1414
import org.eclipse.rdf4j.rio.RDFHandlerException;

‎core/rio/jsonld/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>no.hasmac</groupId>
3737
<artifactId>hasmac-json-ld</artifactId>
38-
<version>0.4.0</version>
38+
<version>0.5.0</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>jakarta.json</groupId>

‎core/rio/jsonld/src/main/java/org/eclipse/rdf4j/rio/jsonld/JSONLDParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private void parse(InputStream in, Reader reader, String baseURI)
129129
opts.setUriValidation(false);
130130
opts.setExceptionOnWarning(getParserConfig().get(JSONLDSettings.EXCEPTION_ON_WARNING));
131131

132-
JsonDocument context = getParserConfig().get(JSONLDSettings.EXPAND_CONTEXT);
132+
Document context = getParserConfig().get(JSONLDSettings.EXPAND_CONTEXT);
133133

134134
if (context != null) {
135135

‎core/rio/jsonld/src/main/java/org/eclipse/rdf4j/rio/jsonld/JSONLDSettings.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.eclipse.rdf4j.rio.helpers.ClassRioSetting;
1616
import org.eclipse.rdf4j.rio.helpers.RioSettingImpl;
1717

18+
import no.hasmac.jsonld.document.Document;
1819
import no.hasmac.jsonld.document.JsonDocument;
1920

2021
/**
@@ -46,7 +47,7 @@ public class JSONLDSettings {
4647
* @see <a href=
4748
* "https://www.w3.org/TR/json-ld11-api/#dom-jsonldoptions-expandcontext">https://www.w3.org/TR/json-ld11-api/#dom-jsonldoptions-expandcontext</a>.
4849
*/
49-
public static final RioSetting<JsonDocument> EXPAND_CONTEXT = new ClassRioSetting<>(
50+
public static final RioSetting<Document> EXPAND_CONTEXT = new ClassRioSetting<>(
5051
"org.eclipse.rdf4j.rio.jsonld.expand_context",
5152
"A no.hasmac.jsonld.document.JsonDocument that contains the expanded context as specified in https://www.w3.org/TR/json-ld11-api/#dom-jsonldoptions-expandcontext",
5253
null);

‎core/rio/jsonld/src/test/java/org/eclipse/rdf4j/rio/jsonld/JSONLDParserCustomTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.junit.jupiter.api.BeforeEach;
3535
import org.junit.jupiter.api.Test;
3636

37+
import no.hasmac.jsonld.document.Document;
3738
import no.hasmac.jsonld.document.JsonDocument;
3839

3940
/**
@@ -219,7 +220,7 @@ public void testStrictDuplicateDetectionDefault() throws Exception {
219220
@Test
220221
public void testContext() throws Exception {
221222

222-
JsonDocument jsonDocument = JsonDocument.of(new StringReader(LOADER_CONTEXT));
223+
Document jsonDocument = JsonDocument.of(new StringReader(LOADER_CONTEXT));
223224
jsonDocument.setDocumentUrl(URI.create("http://example.com/context.jsonld"));
224225

225226
parser.getParserConfig().set(JSONLDSettings.EXPAND_CONTEXT, jsonDocument);

0 commit comments

Comments
 (0)