Skip to content

Commit

Permalink
Revert "Update to RDF4j 3.2.3"
Browse files Browse the repository at this point in the history 
This reverts commit 2e197cc.
  • Loading branch information
@RickMoynihan
RickMoynihan committed Jul 21, 2020
1 parent 94370db commit 4201feb
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 65 deletions.
48 changes: 24 additions & 24 deletions project.clj
View file
Expand Up @@ -17,30 +17,30 @@
;; you can include:

;; [org.eclipse.rdf4j/rdf4j-runtime "2.5.0" :exclusions [ch.qos.logback/logback-classic]]
[org.eclipse.rdf4j/rdf4j-rio-api "3.2.3"]
[org.eclipse.rdf4j/rdf4j-rio-binary "3.2.3"]
[org.eclipse.rdf4j/rdf4j-rio-jsonld "3.2.3"]
[org.eclipse.rdf4j/rdf4j-rio-n3 "3.2.3"]
[org.eclipse.rdf4j/rdf4j-rio-nquads "3.2.3"]
[org.eclipse.rdf4j/rdf4j-rio-rdfjson "3.2.3"]
[org.eclipse.rdf4j/rdf4j-rio-rdfxml "3.2.3"]
[org.eclipse.rdf4j/rdf4j-rio-trig "3.2.3"]
[org.eclipse.rdf4j/rdf4j-rio-trix "3.2.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-api "3.2.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-binary "3.2.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-binary "3.2.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-sparqljson "3.2.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-sparqlxml "3.2.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-text "3.2.3"]

[org.eclipse.rdf4j/rdf4j-repository-api "3.2.3"]
[org.eclipse.rdf4j/rdf4j-repository-http "3.2.3"]
[org.eclipse.rdf4j/rdf4j-repository-sail "3.2.3"]
[org.eclipse.rdf4j/rdf4j-repository-dataset "3.2.3"]
[org.eclipse.rdf4j/rdf4j-sail-memory "3.2.3"]
[org.eclipse.rdf4j/rdf4j-sail-inferencer "3.2.3"]
[org.eclipse.rdf4j/rdf4j-sail-nativerdf "3.2.3"]
[org.eclipse.rdf4j/rdf4j-repository-manager "3.2.3"]
[org.eclipse.rdf4j/rdf4j-rio-api "3.0.3"]
[org.eclipse.rdf4j/rdf4j-rio-binary "3.0.3"]
[org.eclipse.rdf4j/rdf4j-rio-jsonld "3.0.3"]
[org.eclipse.rdf4j/rdf4j-rio-n3 "3.0.3"]
[org.eclipse.rdf4j/rdf4j-rio-nquads "3.0.3"]
[org.eclipse.rdf4j/rdf4j-rio-rdfjson "3.0.3"]
[org.eclipse.rdf4j/rdf4j-rio-rdfxml "3.0.3"]
[org.eclipse.rdf4j/rdf4j-rio-trig "3.0.3"]
[org.eclipse.rdf4j/rdf4j-rio-trix "3.0.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-api "3.0.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-binary "3.0.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-binary "3.0.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-sparqljson "3.0.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-sparqlxml "3.0.3"]
[org.eclipse.rdf4j/rdf4j-queryresultio-text "3.0.3"]

[org.eclipse.rdf4j/rdf4j-repository-api "3.0.3"]
[org.eclipse.rdf4j/rdf4j-repository-http "3.0.3"]
[org.eclipse.rdf4j/rdf4j-repository-sail "3.0.3"]
[org.eclipse.rdf4j/rdf4j-repository-dataset "3.0.3"]
[org.eclipse.rdf4j/rdf4j-sail-memory "3.0.3"]
[org.eclipse.rdf4j/rdf4j-sail-inferencer "3.0.3"]
[org.eclipse.rdf4j/rdf4j-sail-nativerdf "3.0.3"]
[org.eclipse.rdf4j/rdf4j-repository-manager "3.0.3"]

[grafter/url "0.2.5"]
[grafter/vocabularies "0.3.5"]
Expand Down
35 changes: 0 additions & 35 deletions src/grafter_2/rdf4j/formats.clj
View file
Expand Up @@ -184,38 +184,3 @@
(throw (ex-info (str "Unsupported format: " (pr-str format)) {:error :unsupported-format})))
(let [^RDFParserFactory factory (.newInstance parser-class)]
(.getParser factory))))

(defmulti supports-prefixes?
"Returns true if the given format supports prefixes"
(fn [fmt]
(->rdf-format fmt)))

(defmethod supports-prefixes? RDFFormat/BINARY [_]
false)

(defmethod supports-prefixes? RDFFormat/JSONLD [_]
true)

(defmethod supports-prefixes? RDFFormat/RDFJSON [_]
true)

(defmethod supports-prefixes? RDFFormat/N3 [_]
true)

(defmethod supports-prefixes? RDFFormat/NQUADS [_]
false)

(defmethod supports-prefixes? RDFFormat/NTRIPLES [_]
false)

(defmethod supports-prefixes? RDFFormat/TURTLE [_]
true)

(defmethod supports-prefixes? RDFFormat/TRIG [_]
true)

(defmethod supports-prefixes? RDFFormat/TRIX [_]
true)

(defmethod supports-prefixes? RDFFormat/RDFXML [_]
true)
9 changes: 4 additions & 5 deletions src/grafter_2/rdf4j/io.clj
View file
Expand Up @@ -519,11 +519,10 @@
(iowriter destination
:append append
:encoding encoding))]
(if (fmt/supports-prefixes? format)
(reduce (fn [writer [name prefix]]
(doto writer
(.handleNamespace name (str prefix)))) writer prefixes)
writer))))

(reduce (fn [writer [name prefix]]
(doto writer
(.handleNamespace name (str prefix)))) writer prefixes))))

(def ^:no-doc format-supports-graphs #{RDFFormat/NQUADS
RDFFormat/TRIX
Expand Down
2 changes: 1 addition & 1 deletion test/grafter_2/rdf4j/io_test.clj
View file
Expand Up @@ -211,7 +211,6 @@
[(url/->java-uri "http://test/subj") [(url/->java-uri "http://test/pred") (url/->java-uri "http://test/obj")]])
string-wtr (java.io.StringWriter.)
serializer (sut/rdf-writer string-wtr :format :nq)]

(add serializer quad)

(let [output-str (str string-wtr)]
Expand All @@ -224,6 +223,7 @@
(let [baos (java.io.ByteArrayOutputStream. 8192)
quads (graph (url/->java-uri "http://example.org/test/graph")
[(url/->java-uri "http://test/subj") [(url/->java-uri "http://test/pred") (url/->java-uri "http://test/obj")]])]

(add (sut/rdf-writer baos :format :brf) quads)

(let [bais (java.io.ByteArrayInputStream. (.toByteArray baos))]
Expand Down

0 comments on commit 4201feb

Please sign in to comment.