Exposes more methods to utils and removes exposed methods from config

Author: mjayprateek

src/ziggurat/config.clj

@@ -6,8 +6,7 @@
   (:gen-class
    :name tech.gojek.ziggurat.Config
    :methods [^{:static true} [get [clojure.lang.Keyword] Object]
-             ^{:static true} [getIn [java.lang.Iterable] Object]
-             ^{:static true} [getIn ["[Ljava.lang.String;"] Object]]))
+             ^{:static true} [get [clojure.lang.APersistentVector] Object]]))
 
 (def config-file "config.edn")
 
@@ -81,13 +80,9 @@
 (defn channel-retry-config [topic-entity channel]
   (get-in (ziggurat-config) [:stream-router topic-entity :channels channel :retry]))
 
-(defn- list-of-keywords [java-list]
-  (map keyword (seq java-list)))
+(defn -get [^clojure.lang.APersistentVector keys]
+  (get-in config keys))
 
-(defn -getIn [keys]
-  (let [keys-in-seq (list-of-keywords keys)]
-    (get-in config keys-in-seq)))
-
-(defn -get [key]
-  (-getIn [key]))
+(defn -get [^clojure.lang.Keyword key]
+  (get-in config [key]))
 

src/ziggurat/java/utils/ziggurat_util.clj

@@ -3,7 +3,9 @@
   (:import (java.util Map Arrays))
   (:gen-class
    :name tech.gojek.ziggurat.ZigguratUtil
-   :methods [^{:static true} [createClojureHashMap [java.util.Map] clojure.lang.APersistentMap]]))
+   :methods [^{:static true} [createClojureHashMap [java.util.Map] clojure.lang.APersistentMap]
+             ^{:static true} [createClojureList [java.lang.Iterable] clojure.lang.APersistentVector]
+             ^{:static true} [createClojureListFromArray ["[Ljava.lang.Object;"] clojure.lang.APersistentVector]]))
 
 (declare create-clojure-hash-map)
 (declare create-clojure-vector)
@@ -16,12 +18,12 @@
 (defn create-clojure-vector
   [^java.lang.Iterable java-list]
   (let [cloj-seq (seq java-list)]
-    (map (fn [x]
-           (cond
-             (instance? java.util.Map x) (create-clojure-hash-map x)
-             (instance? java.lang.Iterable x) (create-clojure-vector x)
-             :else x))
-         cloj-seq)))
+    (vec (map (fn [x]
+                (cond
+                  (instance? java.util.Map x) (create-clojure-hash-map x)
+                  (instance? java.lang.Iterable x) (create-clojure-vector x)
+                  :else x))
+              cloj-seq))))
 
 (defn create-clojure-vector-from-array
   [java-array]
@@ -60,3 +62,11 @@
 (defn -createClojureHashMap
   [java-map]
   (create-clojure-hash-map java-map))
+
+(defn -createClojureList
+  [java-list]
+  (create-clojure-vector java-list))
+
+(defn -createClojureListFromArray
+  [java-array]
+  (create-clojure-vector-from-array java-array))

test/tech/gojek/ziggurat/config_test.clj

@@ -33,8 +33,8 @@
             java-array-val (get val-hash-map "third")
             inner-val-fourth (get val-hash-map "fourth")]
         (is (= "first value" inner-val))
-        (is (seq? java-iterable-val))
-        (is (seq? java-array-val))
+        (is (vector? java-iterable-val))
+        (is (vector? java-array-val))
         (is (= "just-another-value" inner-val-fourth))))))
 
 (defn ultra-simple-java-hash-map []
@@ -50,12 +50,12 @@
 
 (deftest converts-java-list-to-clojure-vector-test
   (testing "Should convert a complex java list to a clojure vector"
-    (let [clojure-vector (doall (create-clojure-vector (create-complex-java-list)))
+    (let [clojure-vector (create-clojure-vector (create-complex-java-list))
           first (first clojure-vector)
           second (doall (second clojure-vector))
           third (nth clojure-vector 2)]
       (is (= "ping" first))
-      (is (and (seq? second) (some #(= % "123") second)))
+      (is (and (vector? second) (some #(= % "123") second)))
       (is (and (map? third) (= "first value" (get third "first-key")))))))