diff --git a/.gitignore b/.gitignore index e84b3bc..91333ce 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ resources/public/js/out .rebel_readline_history /elm-stuff *.*~ +*# +.#* diff --git a/project.clj b/project.clj index 1abd4aa..086eeef 100644 --- a/project.clj +++ b/project.clj @@ -29,9 +29,12 @@ ;; neo4j [gorillalabs/neo4j-clj "2.0.1" - :exclusions [org.bouncycastle/bcprov-jdk15on - org.bouncycastle/bcpkix-jdk15on - com.github.ben-manes.caffeine/caffeine]] + :exclusions [com.github.ben-manes.caffeine/caffeine]] + ;; neo4j-clj 2.0.1 uses version 1.7.2 of neo4j-java-driver + ;; this seems to be too old because there's a class + ;; missing, so we use a newer version of the + ;; transitive dependency + [org.neo4j.driver/neo4j-java-driver "4.2.0"] ;; additional server side libs [buddy/buddy-hashers "1.4.0" diff --git a/src/wanijo/infrastructure/neo4j.clj b/src/wanijo/infrastructure/neo4j.clj index 77103f8..5724640 100644 --- a/src/wanijo/infrastructure/neo4j.clj +++ b/src/wanijo/infrastructure/neo4j.clj @@ -5,7 +5,8 @@ [clj-time.local :as time-local] [clojure.spec.alpha :as spec] [clojure.string :as cljs]) - (:import (java.util UUID))) + (:import (java.util UUID) + (java.net URI))) (spec/def ::date-str #(re-matches #"\d{4}\d{2}\d{2}T\d{2}\d{2}\d{2}\.\d{3}Z" %)) @@ -29,7 +30,7 @@ (create-conn! port host user pass))) ([port host user pass] (db/connect - (str "bolt://" host ":" port) + (URI. (str "bolt://" host ":" port)) user pass))) @@ -65,7 +66,7 @@ (str (butiful-query qry) "
---Params---
" params)) - (qry session params)))) + (doall (qry session params))))) (spec/def ::tuple-query-list (spec/coll-of