Fix reflection warnings JDBC-152

seancorfield · seancorfield · commit 877e4e1050e8 · 2017-07-03T10:47:46.000-07:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+Changes coming in 0.7.0
+
+* Reflection warnings removed in `reducible-result-set` [JDBC-152](https://dev.clojure.org/jira/browse/JDBC-152).
+
 Changes in 0.7.0-beta2
 
 * Support for Clojure 1.6.0 and earlier has been dropped -- breaking change.
diff --git a/project.clj b/project.clj
@@ -38,6 +38,5 @@
   :repositories {"sonatype-oss-public" "https://oss.sonatype.org/content/groups/public/"
                  "ws-archiva" "https://d259tvauhnips9.cloudfront.net/archiva/repository/internal/"}
   ;; include dev profile with 1.9 to pull in test.check
-  :aliases {"test-all" ["with-profile" "test,1.7:test,1.8:dev,test,1.9" "test"]
-            "check-all" ["with-profile" "1.7:1.8:1.9" "check"]}
+  :aliases {"test-all" ["with-profile" "test,1.7:test,1.8:dev,test,1.9" "test"]}
   :min-lein-version "2.0.0")
diff --git a/src/main/clojure/clojure/java/jdbc.clj b/src/main/clojure/clojure/java/jdbc.clj
@@ -45,7 +45,8 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
             [clojure.walk :as walk])
   (:import (java.net URI)
            (java.sql BatchUpdateException DriverManager
-                     PreparedStatement ResultSet SQLException Statement Types)
+                     PreparedStatement ResultSet ResultSetMetaData
+                     SQLException Statement Types)
            (java.util Hashtable Map Properties)
            (javax.sql DataSource)))
 
@@ -975,12 +976,12 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
   (let [identifier-fn (if qualifier
                         (comp (partial keyword qualifier) identifiers)
                         (comp keyword identifiers))
-        make-keys (fn [idxs rsmeta]
+        make-keys (fn [idxs ^ResultSetMetaData rsmeta]
                     (->> idxs
                          (mapv (fn [^Integer i] (.getColumnLabel rsmeta i)))
                          (make-cols-unique)
                          (mapv identifier-fn)))
-        init-reduce (fn [keys rs rsmeta idxs f init]
+        init-reduce (fn [keys ^ResultSet rs rsmeta idxs f init]
                       (loop [init' init]
                         (if (.next rs)
                           (let [result (f init' (zipmap keys (read-columns rs rsmeta idxs)))]
