From 4201feb5d71e71d0ceaba9d9d6b54ec6df19a221 Mon Sep 17 00:00:00 2001 From: Rick Moynihan Date: Tue, 21 Jul 2020 10:57:56 +0100 Subject: [PATCH] Revert "Update to RDF4j 3.2.3" This reverts commit 2e197cc2f7348a649551460ab0fc4fe5130cdfbc. --- project.clj | 48 ++++++++++++++++---------------- src/grafter_2/rdf4j/formats.clj | 35 ----------------------- src/grafter_2/rdf4j/io.clj | 9 +++--- test/grafter_2/rdf4j/io_test.clj | 2 +- 4 files changed, 29 insertions(+), 65 deletions(-) diff --git a/project.clj b/project.clj index a5d13255..e1f1c2c0 100644 --- a/project.clj +++ b/project.clj @@ -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"] diff --git a/src/grafter_2/rdf4j/formats.clj b/src/grafter_2/rdf4j/formats.clj index fdb76e29..68c8173c 100644 --- a/src/grafter_2/rdf4j/formats.clj +++ b/src/grafter_2/rdf4j/formats.clj @@ -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) diff --git a/src/grafter_2/rdf4j/io.clj b/src/grafter_2/rdf4j/io.clj index 677fa97f..d548e930 100644 --- a/src/grafter_2/rdf4j/io.clj +++ b/src/grafter_2/rdf4j/io.clj @@ -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 diff --git a/test/grafter_2/rdf4j/io_test.clj b/test/grafter_2/rdf4j/io_test.clj index 52b77489..5feff458 100644 --- a/test/grafter_2/rdf4j/io_test.clj +++ b/test/grafter_2/rdf4j/io_test.clj @@ -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)] @@ -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))]