Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

MARMOTTA-646: update marmotta-util-rdfpatch to RDF4J #21

Open
gloseto wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

MARMOTTA-646: update marmotta-util-rdfpatch to RDF4J #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions commons/marmotta-sesame-tools/marmotta-util-rdfpatch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<version>3.4.0-SNAPSHOT</version>
<version>3.3.0</version>
<relativePath>../../../parent/</relativePath>
</parent>

Expand Down Expand Up @@ -80,27 +80,30 @@
</build>

<dependencies>
<!-- data model -->
<!-- RDF4J data model -->
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-model</artifactId>
</dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
<version>2.0M2</version>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-repository-api</artifactId>
</dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-api</artifactId>
<version>2.0M2</version>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-turtle</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-turtle</artifactId>
<version>2.0M2</version>
<!-- rdf-patch only uses a single Util-Class from the turtle module -->
<exclusions>
<exclusion>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-datatypes</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-datatypes</artifactId>
</exclusion>
<exclusion>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-languages</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-languages</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -138,13 +141,15 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-sail-memory</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail-memory</artifactId>
<version>2.0M2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-repository-sail</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-sail</artifactId>
<version>2.0M2</version>
<scope>test</scope>
</dependency>

Expand Down
10 changes: 5 additions & 5 deletions ...rmotta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/RdfPatchIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import org.apache.commons.io.output.StringBuilderWriter;
import org.apache.marmotta.platform.ldp.patch.model.PatchLine;
import org.openrdf.model.*;
import org.openrdf.rio.turtle.TurtleUtil;
import org.eclipse.rdf4j.model.*;
import org.eclipse.rdf4j.rio.turtle.TurtleUtil;

import java.io.*;
import java.util.Collections;
Expand Down Expand Up @@ -122,7 +122,7 @@ public static void writePatch(Writer writer, List<PatchLine> patch, Map<String,
private static String io(Value v, Map<String, String> inverseNamespaceMap) {
if (v == null) {
return "R";
} else if (v instanceof URI) {
} else if (v instanceof IRI) {
final String uri = v.stringValue();
String prefix = null;

Expand All @@ -148,8 +148,8 @@ private static String io(Value v, Map<String, String> inverseNamespaceMap) {
} else {
sb.append("\"").append(TurtleUtil.encodeString(label)).append("\"");
}
if (l.getLanguage() != null) {
sb.append("@").append(l.getLanguage());
if (l.getLanguage() != null && l.getLanguage().isPresent()) {
sb.append("@").append(l.getLanguage().get());
} else if (l.getDatatype() != null) {
sb.append("^^").append(io(l.getDatatype(), inverseNamespaceMap));
}
Expand Down
10 changes: 5 additions & 5 deletions ...otta-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/RdfPatchUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
import org.apache.marmotta.platform.ldp.patch.parser.ParseException;
import org.apache.marmotta.platform.ldp.patch.parser.RdfPatchParser;
import org.apache.marmotta.platform.ldp.patch.parser.RdfPatchParserImpl;
import org.openrdf.model.*;
import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
import org.openrdf.repository.RepositoryResult;
import org.eclipse.rdf4j.model.*;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.RepositoryConnection;
import org.eclipse.rdf4j.repository.RepositoryException;
import org.eclipse.rdf4j.repository.RepositoryResult;

import java.io.IOException;
import java.io.InputStream;
Expand Down
4 changes: 2 additions & 2 deletions ...a-util-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/model/PatchLine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
package org.apache.marmotta.platform.ldp.patch.model;

import org.openrdf.model.Statement;
import org.openrdf.model.vocabulary.RDFS;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.model.vocabulary.RDFS;

/**
* A single PatchLine, i.e. a operation of a Patch.
Expand Down
17 changes: 11 additions & 6 deletions ...dfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/model/WildcardStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@
package org.apache.marmotta.platform.ldp.patch.model;

import org.apache.commons.lang3.ObjectUtils;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
import org.openrdf.model.URI;
import org.openrdf.model.Value;
import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.model.Resource;
import org.eclipse.rdf4j.model.Statement;
import org.eclipse.rdf4j.model.URI;
import org.eclipse.rdf4j.model.Value;
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;

/**
* The Statement in a RdfPatch.
Expand All @@ -46,8 +48,11 @@ public Resource getSubject() {
}

@Override
public URI getPredicate() {
return predicate;
public IRI getPredicate() {
if (predicate != null)
return SimpleValueFactory.getInstance().createIRI(predicate.toString());
else
return null;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...-rdfpatch/src/main/java/org/apache/marmotta/platform/ldp/patch/parser/RdfPatchParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.marmotta.platform.ldp.patch.parser;

import org.apache.marmotta.platform.ldp.patch.model.PatchLine;
import org.openrdf.model.ValueFactory;
import org.eclipse.rdf4j.model.ValueFactory;

import java.util.List;

Expand Down
24 changes: 12 additions & 12 deletions commons/marmotta-sesame-tools/marmotta-util-rdfpatch/src/main/javacc/rdf-patch.jj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ package org.apache.marmotta.platform.ldp.patch.parser;

import org.apache.marmotta.platform.ldp.patch.model.PatchLine;
import org.apache.marmotta.platform.ldp.patch.model.WildcardStatement;
import org.openrdf.model.*;
import org.openrdf.model.impl.ValueFactoryImpl;
import org.openrdf.rio.turtle.TurtleUtil;
import org.eclipse.rdf4j.model.*;
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
import org.eclipse.rdf4j.rio.turtle.TurtleUtil;

import java.io.InputStream;
import java.util.HashMap;
Expand All @@ -43,7 +43,7 @@ import java.util.List;
public class RdfPatchParserImpl implements RdfPatchParser {

private HashMap<String, String> namespaces = new HashMap<String, String>();
private ValueFactory valueFactory = ValueFactoryImpl.getInstance();
private ValueFactory valueFactory = SimpleValueFactory.getInstance();

public RdfPatchParserImpl(ValueFactory vf, InputStream is) {
this(is);
Expand All @@ -67,17 +67,17 @@ public class RdfPatchParserImpl implements RdfPatchParser {
}


private URI createURI(String uri) {
return this.valueFactory.createURI(unwrapUri(uri));
private IRI createIRI(String uri) {
return this.valueFactory.createIRI(unwrapUri(uri));
}

private URI createURI(String prefix, String local) {
return this.valueFactory.createURI(namespaces.get(prefix)+local);
private IRI createIRI(String prefix, String local) {
return this.valueFactory.createIRI(namespaces.get(prefix)+local);
}

private URI createURIfromQname(String qname) {
private IRI createIRIfromQname(String qname) {
final String[] split = qname.split(":", 2);
return createURI(split[0], split[1]);
return createIRI(split[0], split[1]);
}

private BNode createBNode(String id) {
Expand Down Expand Up @@ -216,6 +216,6 @@ private URI parseURI() : {
Token u;
}
{
u = <URI> { return createURI(u.image); } |
u = <QNAME> { return createURIfromQname(u.image); }
u = <URI> { return createIRI(u.image); } |
u = <QNAME> { return createIRIfromQname(u.image); }
}
2 changes: 1 addition & 1 deletion ...ta-util-rdfpatch/src/test/java/org/apache/marmotta/platform/ldp/patch/RdfPatchIOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.marmotta.platform.ldp.patch.parser.RdfPatchParserImpl;
import org.junit.Assert;
import org.junit.Test;
import org.openrdf.model.vocabulary.DCTERMS;
import org.eclipse.rdf4j.model.vocabulary.DCTERMS;

import java.io.StringReader;
import java.util.Collections;
Expand Down
18 changes: 9 additions & 9 deletions ...-util-rdfpatch/src/test/java/org/apache/marmotta/platform/ldp/patch/RdfPatchUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.openrdf.model.Literal;
import org.openrdf.model.URI;
import org.openrdf.model.vocabulary.FOAF;
import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
import org.openrdf.repository.sail.SailRepository;
import org.openrdf.rio.RDFFormat;
import org.openrdf.sail.memory.MemoryStore;
import org.eclipse.rdf4j.model.Literal;
import org.eclipse.rdf4j.model.URI;
import org.eclipse.rdf4j.model.vocabulary.FOAF;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.RepositoryConnection;
import org.eclipse.rdf4j.repository.RepositoryException;
import org.eclipse.rdf4j.repository.sail.SailRepository;
import org.eclipse.rdf4j.rio.RDFFormat;
import org.eclipse.rdf4j.sail.memory.MemoryStore;

import java.util.List;

Expand Down
23 changes: 12 additions & 11 deletions ...h/src/test/java/org/apache/marmotta/platform/ldp/patch/parser/RdfPatchParserImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.openrdf.model.*;
import org.openrdf.model.impl.LiteralImpl;
import org.openrdf.model.impl.URIImpl;
import org.openrdf.model.vocabulary.FOAF;
import org.eclipse.rdf4j.model.*;
import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
import org.eclipse.rdf4j.model.vocabulary.FOAF;

import java.util.Iterator;
import java.util.List;
Expand All @@ -39,19 +38,21 @@ public class RdfPatchParserImplTest {


private RdfPatchParserImpl parser;
private URI alice, bob, charlie;
private IRI alice, bob, charlie;
private Literal lcBob, ucBob;

@Before
public void setUp() {
parser = new RdfPatchParserImpl(this.getClass().getResourceAsStream("/illustrative.rdfp"));

ValueFactory f = SimpleValueFactory.getInstance();

alice = new URIImpl("http://example/alice");
bob = new URIImpl("http://example/bob");
charlie = new URIImpl("http://example/charlie");
alice = f.createIRI("http://example/alice");
bob = f.createIRI("http://example/bob");
charlie = f.createIRI("http://example/charlie");

lcBob = new LiteralImpl("bob");
ucBob = new LiteralImpl("Bob");
lcBob = f.createLiteral("bob");
ucBob = f.createLiteral("Bob");
}

@After
Expand Down Expand Up @@ -79,7 +80,7 @@ public void testParsing() throws ParseException {
checkPatchLine(it.next(), PatchLine.Operator.DELETE, null, null, charlie);
}

private void checkPatchLine(PatchLine line, PatchLine.Operator operator, Resource subejct, URI predicate, Value object) {
private void checkPatchLine(PatchLine line, PatchLine.Operator operator, Resource subejct, IRI predicate, Value object) {
Assert.assertEquals("Wrong patch operation", operator, line.getOperator());

Statement statement = line.getStatement();
Expand Down