Skip to content

Commit 297e9ad

Browse files
authored
Merge pull request #268 from neo4j-labs/4402-jackson
4402 jackson
2 parents c8e235a + bc2349b commit 297e9ad

19 files changed

+52
-39
lines changed

docs/modules/ROOT/examples/documentation.csv

Lines changed: 19 additions & 9 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
¦signature
2-
¦n10s.rdf.collect(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?) :: (STRING?)
2+
¦n10s.rdf.collect(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, sspo = null :: LIST? OF STRING?) :: (STRING?)
33
¦n10s.rdf.fullUriFromShortForm(short :: STRING?) :: (STRING?)
44
¦n10s.rdf.getDataType(literal :: ANY?) :: (STRING?)
55
¦n10s.rdf.getIRILocalName(url :: STRING?) :: (STRING?)
@@ -8,4 +8,5 @@
88
¦n10s.rdf.getLangValue(lang :: STRING?, values :: ANY?) :: (STRING?)
99
¦n10s.rdf.getValue(literal :: STRING?) :: (STRING?)
1010
¦n10s.rdf.hasLangTag(lang :: STRING?, value :: ANY?) :: (BOOLEAN?)
11+
¦n10s.rdf.isIRI(str :: STRING?) :: (BOOLEAN?)
1112
¦n10s.rdf.shortFormFromFullUri(uri :: STRING?) :: (STRING?)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦signature
2-
¦n10s.rdf.collect(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?) :: (STRING?)
2+
¦n10s.rdf.collect(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, sspo = null :: LIST? OF STRING?) :: (STRING?)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦type¦qualified name¦signature¦description
2-
¦function¦n10s.rdf.collect¦n10s.rdf.collect(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?) :: (STRING?)¦n10s.rdf.collect(subject,predicate,object,isLiteral,literalType,literalLang) - collects a set of triples as returned by n10s.rdf.export.* or n10s.rdf.stream.* and returns them serialised as N-triples
2+
¦function¦n10s.rdf.collect¦n10s.rdf.collect(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, sspo = null :: LIST? OF STRING?) :: (STRING?)¦n10s.rdf.collect(subject,predicate,object,isLiteral,literalType,literalLang) - collects a set of triples as returned by n10s.rdf.export.* or n10s.rdf.stream.* and returns them serialised as N-triples
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
¦type¦qualified name¦signature¦description
2-
¦function¦n10s.rdf.collect¦n10s.rdf.collect(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?) :: (STRING?)¦n10s.rdf.collect(subject,predicate,object,isLiteral,literalType,literalLang) - collects a set of triples as returned by n10s.rdf.export.* or n10s.rdf.stream.* and returns them serialised as N-triples
2+
¦function¦n10s.rdf.collect¦n10s.rdf.collect(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, sspo = null :: LIST? OF STRING?) :: (STRING?)¦n10s.rdf.collect(subject,predicate,object,isLiteral,literalType,literalLang) - collects a set of triples as returned by n10s.rdf.export.* or n10s.rdf.stream.* and returns them serialised as N-triples
33
¦function¦n10s.rdf.fullUriFromShortForm¦n10s.rdf.fullUriFromShortForm(short :: STRING?) :: (STRING?)¦Returns the expanded (full) IRI given a shortened one created in the load process with semantics.importRDF
44
¦function¦n10s.rdf.getDataType¦n10s.rdf.getDataType(literal :: ANY?) :: (STRING?)¦Returns the XMLSchema or custom datatype of a property when present
55
¦function¦n10s.rdf.getIRILocalName¦n10s.rdf.getIRILocalName(url :: STRING?) :: (STRING?)¦Returns the local part of an IRI
@@ -8,4 +8,5 @@
88
¦function¦n10s.rdf.getLangValue¦n10s.rdf.getLangValue(lang :: STRING?, values :: ANY?) :: (STRING?)¦Returns the first value with the language tag passed as first argument or null if there's not a value for the provided tag
99
¦function¦n10s.rdf.getValue¦n10s.rdf.getValue(literal :: STRING?) :: (STRING?)¦Returns the value of a datatype of a property after stripping out the datatype information when present
1010
¦function¦n10s.rdf.hasLangTag¦n10s.rdf.hasLangTag(lang :: STRING?, value :: ANY?) :: (BOOLEAN?)¦Returns false if the value is not a string or if the string is not tagged with the given language tag
11+
¦function¦n10s.rdf.isIRI¦n10s.rdf.isIRI(str :: STRING?) :: (BOOLEAN?)¦Returns the true if string is a valid IRI
1112
¦function¦n10s.rdf.shortFormFromFullUri¦n10s.rdf.shortFormFromFullUri(uri :: STRING?) :: (STRING?)¦Returns the shortened version of an IRI using the existing namespace definitions
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
¦signature
2-
¦n10s.rdf.export.cypher(cypher :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)
3-
¦n10s.rdf.export.spo(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral = false :: BOOLEAN?, literalType = http://www.w3.org/2001/XMLSchema#string :: STRING?, literalLang = null :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)
2+
¦n10s.rdf.export.cypher(cypher :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)
3+
¦n10s.rdf.export.spo(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral = false :: BOOLEAN?, literalType = http://www.w3.org/2001/XMLSchema#string :: STRING?, literalLang = null :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
¦type¦qualified name¦signature¦description
2-
¦procedure¦n10s.rdf.export.cypher¦n10s.rdf.export.cypher(cypher :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)¦Executes a cypher query returning graph elements (nodes,rels) and serialises the output as triples.
3-
¦procedure¦n10s.rdf.export.spo¦n10s.rdf.export.spo(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral = false :: BOOLEAN?, literalType = http://www.w3.org/2001/XMLSchema#string :: STRING?, literalLang = null :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)¦Returns the triples matching the spo pattern passed as parameter.
2+
¦procedure¦n10s.rdf.export.cypher¦n10s.rdf.export.cypher(cypher :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)¦Executes a cypher query returning graph elements (nodes,rels) and serialises the output as triples.
3+
¦procedure¦n10s.rdf.export.spo¦n10s.rdf.export.spo(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral = false :: BOOLEAN?, literalType = http://www.w3.org/2001/XMLSchema#string :: STRING?, literalLang = null :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)¦Returns the triples matching the spo pattern passed as parameter.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦signature
2-
¦n10s.rdf.export.cypher(cypher :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)
2+
¦n10s.rdf.export.cypher(cypher :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦type¦qualified name¦signature¦description
2-
¦procedure¦n10s.rdf.export.cypher¦n10s.rdf.export.cypher(cypher :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)¦Executes a cypher query returning graph elements (nodes,rels) and serialises the output as triples.
2+
¦procedure¦n10s.rdf.export.cypher¦n10s.rdf.export.cypher(cypher :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)¦Executes a cypher query returning graph elements (nodes,rels) and serialises the output as triples.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦signature
2-
¦n10s.rdf.export.spo(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral = false :: BOOLEAN?, literalType = http://www.w3.org/2001/XMLSchema#string :: STRING?, literalLang = null :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)
2+
¦n10s.rdf.export.spo(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral = false :: BOOLEAN?, literalType = http://www.w3.org/2001/XMLSchema#string :: STRING?, literalLang = null :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦type¦qualified name¦signature¦description
2-
¦procedure¦n10s.rdf.export.spo¦n10s.rdf.export.spo(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral = false :: BOOLEAN?, literalType = http://www.w3.org/2001/XMLSchema#string :: STRING?, literalLang = null :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)¦Returns the triples matching the spo pattern passed as parameter.
2+
¦procedure¦n10s.rdf.export.spo¦n10s.rdf.export.spo(subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral = false :: BOOLEAN?, literalType = http://www.w3.org/2001/XMLSchema#string :: STRING?, literalLang = null :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)¦Returns the triples matching the spo pattern passed as parameter.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
¦signature
2-
¦n10s.rdf.stream.fetch(url :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)
3-
¦n10s.rdf.stream.inline(rdf :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)
2+
¦n10s.rdf.stream.fetch(url :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)
3+
¦n10s.rdf.stream.inline(rdf :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
¦type¦qualified name¦signature¦description
2-
¦procedure¦n10s.rdf.stream.fetch¦n10s.rdf.stream.fetch(url :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)¦Parses RDF and streams each triple as a record with <S,P,O> along with datatype and language tag for Literal values. No writing to the DB.
3-
¦procedure¦n10s.rdf.stream.inline¦n10s.rdf.stream.inline(rdf :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)¦Parses RDF passed as a string and streams each triple as a record with <S,P,O> along with datatype and language tag for Literal values. No writing to the DB.
2+
¦procedure¦n10s.rdf.stream.fetch¦n10s.rdf.stream.fetch(url :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)¦Parses RDF and streams each triple as a record with <S,P,O> along with datatype and language tag for Literal values. No writing to the DB.
3+
¦procedure¦n10s.rdf.stream.inline¦n10s.rdf.stream.inline(rdf :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)¦Parses RDF passed as a string and streams each triple as a record with <S,P,O> along with datatype and language tag for Literal values. No writing to the DB.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦signature
2-
¦n10s.rdf.stream.fetch(url :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)
2+
¦n10s.rdf.stream.fetch(url :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦type¦qualified name¦signature¦description
2-
¦procedure¦n10s.rdf.stream.fetch¦n10s.rdf.stream.fetch(url :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)¦Parses RDF and streams each triple as a record with <S,P,O> along with datatype and language tag for Literal values. No writing to the DB.
2+
¦procedure¦n10s.rdf.stream.fetch¦n10s.rdf.stream.fetch(url :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)¦Parses RDF and streams each triple as a record with <S,P,O> along with datatype and language tag for Literal values. No writing to the DB.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦signature
2-
¦n10s.rdf.stream.inline(rdf :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)
2+
¦n10s.rdf.stream.inline(rdf :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
¦type¦qualified name¦signature¦description
2-
¦procedure¦n10s.rdf.stream.inline¦n10s.rdf.stream.inline(rdf :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?)¦Parses RDF passed as a string and streams each triple as a record with <S,P,O> along with datatype and language tag for Literal values. No writing to the DB.
2+
¦procedure¦n10s.rdf.stream.inline¦n10s.rdf.stream.inline(rdf :: STRING?, format :: STRING?, params = {} :: MAP?) :: (subject :: STRING?, predicate :: STRING?, object :: STRING?, isLiteral :: BOOLEAN?, literalType :: STRING?, literalLang :: STRING?, subjectSPO :: LIST? OF STRING?)¦Parses RDF passed as a string and streams each triple as a record with <S,P,O> along with datatype and language tag for Literal values. No writing to the DB.

pom.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.neo4j</groupId>
77
<artifactId>neosemantics</artifactId>
8-
<version>4.4.0.1</version>
8+
<version>4.4.0.2</version>
99
<packaging>jar</packaging>
1010
<name>neosemantics (n10s)</name>
1111
<description>n10s is a plugin that enables the use of RDF in Neo4j</description>
@@ -93,12 +93,6 @@
9393
<version>${sesame.version}</version>
9494
</dependency>
9595

96-
<dependency>
97-
<groupId>org.codehaus.jackson</groupId>
98-
<artifactId>jackson-mapper-asl</artifactId>
99-
<version>1.9.7</version>
100-
</dependency>
101-
10296
<dependency>
10397
<groupId>com.google.guava</groupId>
10498
<artifactId>guava</artifactId>
@@ -113,10 +107,17 @@
113107
<scope>provided</scope>
114108
</dependency>
115109

110+
<dependency>
111+
<groupId>com.fasterxml.jackson.core</groupId>
112+
<artifactId>jackson-core</artifactId>
113+
<version>2.13.3</version>
114+
<scope>provided</scope>
115+
</dependency>
116+
116117
<dependency>
117118
<groupId>com.fasterxml.jackson.core</groupId>
118119
<artifactId>jackson-databind</artifactId>
119-
<version>2.9.10.4</version>
120+
<version>2.13.3</version>
120121
<scope>provided</scope>
121122
</dependency>
122123

src/main/java/n10s/endpoint/RDFEndpoint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import n10s.rdf.export.ExportProcessor;
2525
import n10s.rdf.export.LPGRDFToRDFProcesssor;
2626
import n10s.rdf.export.LPGToRDFProcesssor;
27-
import org.codehaus.jackson.map.ObjectMapper;
28-
import org.codehaus.jackson.type.TypeReference;
27+
import com.fasterxml.jackson.databind.ObjectMapper;
28+
import com.fasterxml.jackson.core.type.TypeReference;
2929
import org.eclipse.rdf4j.model.vocabulary.OWL;
3030
import org.eclipse.rdf4j.model.vocabulary.RDFS;
3131
import org.eclipse.rdf4j.rio.RDFFormat;

0 commit comments

Comments
 (0)