Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to RDF4J #46

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Port to RDF4J #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0755c4a
Ported from Sesame to RDF4J
radkovo Jul 25, 2017
29ee4b1
Update plugin version in pom
radkovo Jul 26, 2017
425c425
Deprecated functions replaced
radkovo Jul 26, 2017
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
64 changes: 32 additions & 32 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<jackson.version>2.3.3</jackson.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sesame.version>2.7.11</sesame.version>
<slf4j.version>1.7.7</slf4j.version>
<rdf4j.version>2.2.2</rdf4j.version>
<slf4j.version>1.7.25</slf4j.version>
</properties>

<prerequisites>
Expand All @@ -68,8 +68,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -116,14 +116,14 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-model</artifactId>
<version>${sesame.version}</version>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
<version>${rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-api</artifactId>
<version>${sesame.version}</version>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-api</artifactId>
<version>${rdf4j.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand Down Expand Up @@ -151,51 +151,51 @@
<version>4.3.3</version>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-rdfxml</artifactId>
<version>${sesame.version}</version>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-rdfxml</artifactId>
<version>${rdf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-ntriples</artifactId>
<version>${sesame.version}</version>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-ntriples</artifactId>
<version>${rdf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-nquads</artifactId>
<version>${sesame.version}</version>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-nquads</artifactId>
<version>${rdf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-turtle</artifactId>
<version>${sesame.version}</version>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-turtle</artifactId>
<version>${rdf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-trig</artifactId>
<version>${sesame.version}</version>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-trig</artifactId>
<version>${rdf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-rdfjson</artifactId>
<version>${sesame.version}</version>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-rdfjson</artifactId>
<version>${rdf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java-sesame</artifactId>
<version>0.3</version>
<artifactId>jsonld-java-tools</artifactId>
<version>0.10.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.semarglproject</groupId>
<artifactId>semargl-sesame</artifactId>
<version>0.6.1</version>
<artifactId>semargl-rdf4j</artifactId>
<version>0.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
28 changes: 14 additions & 14 deletions vocab-builder-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,43 +121,43 @@

<!-- RDF Formats -->
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-rdfxml</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-rdfxml</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-ntriples</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-ntriples</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-nquads</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-nquads</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-turtle</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-turtle</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-trig</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-trig</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-rdfjson</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-rdfjson</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java-sesame</artifactId>
<artifactId>jsonld-java-tools</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.semarglproject</groupId>
<artifactId>semargl-sesame</artifactId>
<artifactId>semargl-rdf4j</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down
16 changes: 9 additions & 7 deletions vocab-builder-cli/src/main/java/com/github/tkurz/sesame/vocab/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.openrdf.model.util.GraphUtilException;
import org.openrdf.rio.*;
import org.eclipse.rdf4j.rio.RDFFormat;
import org.eclipse.rdf4j.rio.RDFParseException;
import org.eclipse.rdf4j.rio.RDFParserRegistry;
import org.eclipse.rdf4j.rio.Rio;
import org.eclipse.rdf4j.rio.UnsupportedRDFormatException;

import com.google.common.base.CaseFormat;

Expand Down Expand Up @@ -67,14 +70,15 @@ public static void main(String[] args) {
throw new ParseException("too many arguments");
}

RDFFormat format = Rio.getParserFormatForMIMEType(cli.getOptionValue('f', null));
RDFFormat format = Rio.getParserFormatForMIMEType(cli.getOptionValue('f', null)).orElse(null);

final VocabBuilder builder;
if (input.startsWith("http://")) {
URL url = new URL(input);

//try to guess format
format = RDFFormat.forFileName(url.getFile());
//format = RDFFormat.forFileName(url.getFile());
format = Rio.getParserFormatForMIMEType(url.getFile()).orElse(null);

tempFile = Files.createTempFile("vocab-builder", "." + (format != null ? format.getDefaultFileExtension() : "cache"));

Expand Down Expand Up @@ -172,8 +176,6 @@ public static void main(String[] args) {
System.err.println("Could not read input-file: " + e.getMessage());
} catch (IOException e) {
System.err.println("Error during file-access: " + e.getMessage());
} catch (GraphUtilException e) {
e.printStackTrace();
} catch (GenerationException e) {
System.err.println(e.getMessage());
} finally {
Expand Down Expand Up @@ -206,7 +208,7 @@ private static void printHelp(String error) {
w.close();
}

@SuppressWarnings({"AccessStaticViaInstance", "static-access"})
@SuppressWarnings({"static-access"})
private static Options getCliOpts() {
Options o = new Options();

Expand Down
36 changes: 18 additions & 18 deletions vocab-builder-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

<dependencies>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-model</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-api</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -59,43 +59,43 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-rdfxml</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-rdfxml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-ntriples</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-ntriples</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-nquads</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-nquads</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-turtle</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-turtle</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-trig</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-trig</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-rio-rdfjson</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-rdfjson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java-sesame</artifactId>
<artifactId>jsonld-java-tools</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.semarglproject</groupId>
<artifactId>semargl-sesame</artifactId>
<artifactId>semargl-rdf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading