Downgrading clojure version to 1.5

project.clj

@@ -1,21 +1,34 @@
 (def es-client-version "5.4.2")
-(defproject cc.qbits/spandex "0.5.1"
+(defproject cc.qbits/spandex "0.5.2-SNAPSHOT"
   :description "Clojure Wrapper of the new/official ElasticSearch REST client"
-  :url "https://github.com/mpenet/spandex"
+  :aot :all
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.9.0-alpha17"]
+  :dependencies [[org.clojure/clojure "1.5.1"]
+                 ;;[org.clojure/clojure "1.9.0-alpha17"]
                  [org.clojure/core.async "0.3.443"]
                  [org.elasticsearch.client/rest ~es-client-version]
-                 [org.elasticsearch.client/sniffer ~es-client-version]
+;;                 [org.elasticsearch.client/sniffer ~es-client-version]
                  [cc.qbits/commons "0.4.6"]
                  [cheshire "5.7.1"]]
   :source-paths ["src/clj"]
   :global-vars {*warn-on-reflection* true}
-  :codox {:source-uri "https://github.com/mpenet/spandex/blob/master/{filepath}#L{line}"
-          :metadata {:doc/format :markdown}
-          :output-path "docs"
-          :doc-files ["docs/quickstart.md"]
-          :source-paths ["src/clj"]}
+  ;; :codox {:source-uri "https://github.com/mpenet/spandex/blob/master/{filepath}#L{line}"
+  ;;         :metadata {:doc/format :markdown}
+  ;;         :output-path "docs"
+  ;;         :doc-files ["docs/quickstart.md"]
+  ;;         :source-paths ["src/clj"]}
   :profiles {:dev {:plugins [[lein-cljfmt "0.5.6"]
-                             [codox "0.10.3"]]}})
+                             [codox "0.10.3"]]}}
+
+  :plugins [[lein-modules "0.3.9"]
+            [s3-wagon-private "1.1.2"]]
+  :repositories [["releases"
+                  {:url "s3p://shareablee-jar-repo/releases"
+                   :username :env/shareablee_aws_access_key
+                   :passphrase :env/shareablee_aws_secret_access_key
+                   :sign-releases false}]
+                 ["snapshots"
+                  {:url "s3p://shareablee-jar-repo/snapshots"
+                   :username :env/shareablee_aws_access_key
+                   :passphrase :env/shareablee_aws_secret_access_key}]])

src/clj/qbits/spandex.clj

@@ -9,11 +9,11 @@
    [clojure.string :as str]
    [clojure.java.io :as io])
   (:import
-   (org.elasticsearch.client.sniff
-    Sniffer
-    ElasticsearchHostsSniffer
-    ElasticsearchHostsSniffer$Scheme
-    SniffOnFailureListener)
+   ;; (org.elasticsearch.client.sniff
+   ;;  Sniffer
+   ;;  ElasticsearchHostsSniffer
+   ;;  ElasticsearchHostsSniffer$Scheme
+   ;;  SniffOnFailureListener)
    (org.elasticsearch.client
     RestClient
     ResponseListener
@@ -82,7 +82,7 @@
   ([options]
    (client-options/builder options)))
 
-(def ^:no-doc sniffer-scheme (enum/enum->fn ElasticsearchHostsSniffer$Scheme))
+(def ^:no-doc sniffer-scheme nil); (enum/enum->fn ElasticsearchHostsSniffer$Scheme))
 
 (defn sniffer
   "Takes a Client instance (and possible sniffer options) and returns
@@ -102,29 +102,30 @@
   extending the multimethod
   `qbits.spandex.sniffer-options/set-option!`"
   ([client]
-   (sniffer client nil))
-  ([client {:as options
-            :keys [scheme timeout]
-            :or {scheme :http
-                 timeout ElasticsearchHostsSniffer/DEFAULT_SNIFF_REQUEST_TIMEOUT}}]
-   (let [sniffer (ElasticsearchHostsSniffer. client
-                                             timeout
-                                             (sniffer-scheme scheme))]
-     (sniffer-options/builder client sniffer options))))
-
-(defn set-sniff-on-failure!
-  "Register a SniffOnFailureListener that allows to perform sniffing
-  on failure."
-  [^Sniffer sniffer]
-  (doto (SniffOnFailureListener.)
-    (.setSniffer sniffer)))
+   nil))
+  ;;  (sniffer client nil))
+  ;; ([client {:as options
+  ;;           :keys [scheme timeout]
+  ;;           :or {scheme :http
+  ;;                timeout ElasticsearchHostsSniffer/DEFAULT_SNIFF_REQUEST_TIMEOUT}}]
+  ;;  (let [sniffer (ElasticsearchHostsSniffer. client
+  ;;                                            timeout
+  ;;                                            (sniffer-scheme scheme))]
+  ;;    (sniffer-options/builder client sniffer options))))
+
+;; (defn set-sniff-on-failure!
+;;   "Register a SniffOnFailureListener that allows to perform sniffing
+;;   on failure."
+;;   [^Sniffer sniffer]
+;;   (doto (SniffOnFailureListener.)
+;;     (.setSniffer sniffer)))
 
 (defprotocol Closable
   (close! [this]))
 
 (extend-protocol Closable
-  Sniffer
-  (close! [sniffer] (.close sniffer))
+  ;; Sniffer
+  ;; (close! [sniffer] (.close sniffer))
   RestClient
   (close! [client] (.close client)))
 
@@ -182,12 +183,22 @@
              {}
              qs))
 
-(defn ^:no-doc json-entity?
+;; (defn ^:no-doc json-entity?
+;;   [^HttpEntity entity]
+;;   (some-> entity
+;;            .getContentType
+;;            .getValue
+;;            (str/index-of "application/json")))
+
+(defn ^:no-doc json-entity-new?
   [^HttpEntity entity]
-  (some-> entity
-          .getContentType
-          .getValue
-          (str/index-of "application/json")))
+  (when-let [idx (some-> entity
+                         .getContentType
+                         .getValue
+                         (.indexOf "application/json"))]
+    (if (< idx 0)
+      nil
+      idx)))
 
 (defn ^:no-doc response-status
   [^org.elasticsearch.client.Response response]
@@ -200,7 +211,7 @@
   (let [entity (.getEntity response)
         content (when entity (.getContent entity))]
     (Response. (when entity
-                 (if (json-entity? entity)
+                 (if (json-entity-new? entity)
                    (-> content io/reader (json/parse-stream keywordize?))
                    (slurp content)))
                (response-status response)
@@ -373,15 +384,29 @@
         (async/close! ch)))
     ch))
 
+;; (defn chunks->body
+;;   "Utility function to create _bulk/_msearch bodies. It takes a
+;;   sequence of clj fragments and returns a newline delimited string of
+;;   JSON fragments"
+;;   [chunks]
+;;   (let [sb (StringBuilder.)]
+;;     (run! #(do (.append sb (json/generate-string %))
+;;                (.append sb "\n"))
+;;           chunks)
+;;     (-> sb .toString Raw.)))
+
 (defn chunks->body
   "Utility function to create _bulk/_msearch bodies. It takes a
   sequence of clj fragments and returns a newline delimited string of
   JSON fragments"
   [chunks]
   (let [sb (StringBuilder.)]
-    (run! #(do (.append sb (json/generate-string %))
-               (.append sb "\n"))
-          chunks)
+    (doseq [c chunks]
+      (.append sb (json/generate-string c))
+      (.append sb "\n"))
+    ;; (run! #(do (.append sb (json/generate-string %))
+    ;;            (.append sb "\n"))
+    ;;      chunks)
     (-> sb .toString Raw.)))
 
 (def bulk-chan

src/clj/qbits/spandex/client_options.clj

@@ -18,9 +18,9 @@
     RestClient
     RestClientBuilder
     RestClientBuilder$RequestConfigCallback
-    RestClientBuilder$HttpClientConfigCallback)
-   (org.elasticsearch.client.sniff
-    SniffOnFailureListener)))
+    RestClientBuilder$HttpClientConfigCallback)))
+   ;; (org.elasticsearch.client.sniff
+   ;;  SniffOnFailureListener)))
 
 ;; request opts
 (defmulti set-request-option! (fn [k builder option] k))
@@ -168,12 +168,12 @@
                    builder
                    options))))))
 
-(defmethod set-option! :sniff-on-failure
-  [_ ^RestClientBuilder builder sniffer]
-  (let [listener (SniffOnFailureListener.)]
-    (set-option! :failure-listener builder listener)
-    (.setSniffer listener sniffer))
-  builder)
+;; (defmethod set-option! :sniff-on-failure
+;;   [_ ^RestClientBuilder builder sniffer]
+;;   (let [listener (SniffOnFailureListener.)]
+;;     (set-option! :failure-listener builder listener)
+;;     (.setSniffer listener sniffer))
+;;   builder)
 
 (defmethod set-option! :failure-listener
   [_ ^RestClientBuilder builder failure-listener]

src/clj/qbits/spandex/sniffer_options.clj

@@ -1,32 +1,32 @@
-(ns qbits.spandex.sniffer-options
-  (:import
-   (org.elasticsearch.client.sniff
-    SnifferBuilder
-    Sniffer)))
+(ns qbits.spandex.sniffer-options)
+;;   (:import
+;;    (org.elasticsearch.client.sniff
+;;     SnifferBuilder
+;;     Sniffer)))
 
-(defmulti ^:no-doc set-option! (fn [k builder option] k))
+;; (defmulti ^:no-doc set-option! (fn [k builder option] k))
 
-(defmethod set-option! :sniff-interval
-  [_ ^SnifferBuilder builder interval]
-  (-> builder (.setSniffIntervalMillis (int interval))))
+;; (defmethod set-option! :sniff-interval
+;;   [_ ^SnifferBuilder builder interval]
+;;   (-> builder (.setSniffIntervalMillis (int interval))))
 
-(defmethod set-option! :sniff-after-failure-delay
-  [_ ^SnifferBuilder builder delay]
-  (-> builder (.setSniffAfterFailureDelayMillis (int delay))))
+;; (defmethod set-option! :sniff-after-failure-delay
+;;   [_ ^SnifferBuilder builder delay]
+;;   (-> builder (.setSniffAfterFailureDelayMillis (int delay))))
 
-(defmethod set-option! :default
-  [_ ^SnifferBuilder b x]
-  b)
+;; (defmethod set-option! :default
+;;   [_ ^SnifferBuilder b x]
+;;   b)
 
-(defn ^:no-doc set-options! ^SnifferBuilder
-  [^SnifferBuilder builder options]
-  (reduce (fn [builder [k option]]
-            (set-option! k builder option))
-          builder
-          options))
+;; (defn ^:no-doc set-options! ^SnifferBuilder
+;;   [^SnifferBuilder builder options]
+;;   (reduce (fn [builder [k option]]
+;;             (set-option! k builder option))
+;;           builder
+;;           options))
 
-(defn builder [client sniffer options]
-  (-> (Sniffer/builder client)
-      (.setHostsSniffer sniffer)
-      (set-options! options)
-      .build))
+;; (defn builder [client sniffer options]
+;;   (-> (Sniffer/builder client)
+;;       (.setHostsSniffer sniffer)
+;;       (set-options! options)
+;;       .build))