add some type hints to reduce reflection needs

Author: atomicptr

project.clj

@@ -15,6 +15,7 @@
   :omit-source true
   :source-paths ["src"]
   :target-path "target/%s"
+  :global-vars  {*warn-on-reflection* true}
   :profiles {:default
              {:main ^:skip-aot mobdap.main
               :set-version {:updates [{:path "src/mobdap/main.clj"
@@ -32,12 +33,14 @@
              :uberjar
              {:main mobdap.main
               :aot :all
-              :jvm-opts ["-Dclojure.compiler.direct-linking=true"]}
+              :jvm-opts ["-Dclojure.compiler.direct-linking=true"]
+              :global-vars {*warn-on-reflection* false}}
 
              :native-image
              {:main mobdap.main
               :aot :all
               :jvm-opts ["-Dclojure.compiler.direct-linking=true"]
+              :global-vars {*warn-on-reflection* false}
               :native-image {:opts ["-H:ReflectionConfigurationFiles=resources/reflection.json"
                                     "--verbose"
                                     "--no-fallback"

resources/reflection.json

@@ -1,40 +1,4 @@
 [ {
-  "name" : "java.io.BufferedReader",
-  "allDeclaredConstructors" : true,
-  "allPublicConstructors" : true,
-  "allDeclaredMethods" : true,
-  "allPublicMethods" : true
-}, {
-  "name" : "java.io.BufferedWriter",
-  "allDeclaredConstructors" : true,
-  "allPublicConstructors" : true,
-  "allDeclaredMethods" : true,
-  "allPublicMethods" : true
-}, {
-  "name" : "java.io.InputStreamReader",
-  "allDeclaredConstructors" : true,
-  "allPublicConstructors" : true,
-  "allDeclaredMethods" : true,
-  "allPublicMethods" : true
-}, {
-  "name" : "java.io.PrintWriter",
-  "allDeclaredConstructors" : true,
-  "allPublicConstructors" : true,
-  "allDeclaredMethods" : true,
-  "allPublicMethods" : true
-}, {
-  "name" : "java.net.ServerSocket",
-  "allDeclaredConstructors" : true,
-  "allPublicConstructors" : true,
-  "allDeclaredMethods" : true,
-  "allPublicMethods" : true
-}, {
-  "name" : "java.net.Socket",
-  "allDeclaredConstructors" : true,
-  "allPublicConstructors" : true,
-  "allDeclaredMethods" : true,
-  "allPublicMethods" : true
-}, {
   "name" : "org.luaj.vm2.Globals",
   "allDeclaredConstructors" : true,
   "allPublicConstructors" : true,

scripts/gen-reflection-file.clj

@@ -3,13 +3,7 @@
 (require '[cheshire.core :as json])
 
 (def classes
-  ["java.io.BufferedReader"
-   "java.io.BufferedWriter"
-   "java.io.InputStreamReader"
-   "java.io.PrintWriter"
-   "java.net.ServerSocket"
-   "java.net.Socket"
-   "org.luaj.vm2.Globals"
+  ["org.luaj.vm2.Globals"
    "org.luaj.vm2.LuaBoolean"
    "org.luaj.vm2.LuaClosure"
    "org.luaj.vm2.LuaDouble"

src/mobdap/adapter.clj

@@ -25,7 +25,7 @@
       (Integer/parseInt length))))
 
 (defn read-message! [adapter]
-  (let [reader (:reader adapter)
+  (let [^BufferedReader reader (:reader adapter)
         length (parse-content-length! reader)]
     (assert (and (some? reader) (instance? BufferedReader reader)))
     (when length
@@ -36,9 +36,9 @@
           message)))))
 
 (defn send-message! [adapter message]
-  (let [writer (:writer adapter)
-        json-str (json/generate-string message)
-        length   (count json-str)]
+  (let [^BufferedWriter writer (:writer adapter)
+        json-str               (json/generate-string message)
+        length                 (count json-str)]
     (assert (and (some? writer) (instance? BufferedWriter writer)))
     (log/debug "Adapter: Send Message:" message)
     (doto writer

src/mobdap/debug_server.clj

@@ -8,37 +8,38 @@
    [taoensso.timbre :as log])
   (:import
    [java.io BufferedReader InputStreamReader PrintWriter]
-   [java.net ServerSocket]))
+   [java.net ServerSocket Socket]))
 
 (def ^:private response-pattern-200 #"^200 OK\s+(.+)")
 (def ^:private response-pattern-202 #"^202 Paused\s+(.+)\s+([0-9]+)\s*$")
 (def ^:private response-pattern-203 #"^203 Paused\s+(.+)\s+([0-9]+)\s+([0-9]+)\s*$")
 (def ^:private response-pattern-204 #"^204 Output (\w+) (\d+)$")
 (def ^:private response-pattern-401 #"^401 Error in Execution (\d+)\s*$")
 
-(defn- send-line! [server line]
-  (let [writer (get-in server [:client :writer])]
+(defn- send-line! [server ^String line]
+  (let [^PrintWriter writer (get-in server [:client :writer])]
     (log/debug "Debug Server -> Debuggee" line)
     (doto writer
       (.write line)
       (.write "\n")
       (.flush))))
 
 (defn- read-response! [server]
-  (let [reader (get-in server [:client :reader])]
+  (let [^BufferedReader reader (get-in server [:client :reader])]
     (when-let [message (.readLine reader)]
       (log/debug "Debuggee -> Debug Server:" message)
       (string/trim message))))
 
 (defn- send-command! [server command]
-  (let [command (string/upper-case command)]
+  (let [^Socket socket (get-in server [:client :socket])
+        command (string/upper-case command)]
     (send-line! server command)
     (when (read-response! server)
       (loop []
         (let [breakpoint (read-response! server)]
           (if-not breakpoint
             (do (log/info "Program finished")
-                (.close (get-in server [:client :socket]))
+                (.close socket)
                 (System/exit 0))
             (let [[_ status] (re-find #"^(\d+)" breakpoint)
                   to-adapter (get-in server [:channels :to-adapter])]
@@ -87,7 +88,7 @@
     (lua/extract-table stack-code)
     nil))
 
-(defn- is-connected? [socket]
+(defn- is-connected? [^Socket socket]
   (and (not (.isClosed socket))
        (.isConnected socket)
        (not (.isOutputShutdown socket))))

src/mobdap/handler.clj

@@ -8,7 +8,8 @@
    [mobdap.adapter :as adapter]
    [mobdap.debug-server :as debug-server]
    [mobdap.utils :refer [float-to-string map-over-map to-int]]
-   [taoensso.timbre :as log]))
+   [taoensso.timbre :as log])
+  (:import [java.io File]))
 
 (def ^:private go-handler (atom nil))
 
@@ -56,8 +57,8 @@
       :else
       (->> (:source-dirs handler)
            (map #(io/file % filepath))
-           (filter #(.exists %))
-           (map #(.getCanonicalPath %))
+           (filter #(.exists ^File %))
+           (map #(.getCanonicalPath ^File %))
            (first)))))
 
 (defn- find-source-relative-file [handler filepath]

src/mobdap/lua.clj

@@ -4,26 +4,26 @@
    [clj-stacktrace.repl :refer [pst-str]]
    [taoensso.timbre :as log])
   (:import
-   [org.luaj.vm2 LuaTable]
+   [org.luaj.vm2 Globals LuaTable LuaValue]
    [org.luaj.vm2.lib.jse JsePlatform]))
 
 (declare lua->clojure)
 
 (defn- is-array? [^LuaTable table]
-  (every? #(.isint %) (.keys table)))
+  (every? #(.isint ^LuaValue %) (.keys table)))
 
 (defn- table->array [^LuaTable table]
   (let [keys (.keys table)]
-    (vec (map #(lua->clojure (.get table %)) keys))))
+    (vec (map #(lua->clojure (.get table ^LuaValue %)) keys))))
 
 (defn- table->map [^LuaTable table]
   (let [keys (.keys table)]
     (into {}
           (for [k keys]
             [(keyword (str k))
-             (lua->clojure (.get table k))]))))
+             (lua->clojure (.get table ^LuaValue k))]))))
 
-(defn- lua->clojure [value]
+(defn- lua->clojure [^LuaValue value]
   (cond
     (nil? value) nil
 
@@ -40,10 +40,10 @@
     (instance? org.luaj.vm2.LuaFunction value)
     :function))
 
-(defn extract-table [lua-code]
+(defn extract-table [^String lua-code]
   (try
-    (let [globals (JsePlatform/standardGlobals)
-          chunk (.load globals lua-code)]
+    (let [^Globals globals (JsePlatform/standardGlobals)
+          chunk            (.load globals lua-code)]
       (-> (.call chunk)
           (lua->clojure)))
     (catch Throwable t

src/mobdap/main.clj

@@ -7,8 +7,6 @@
    [taoensso.timbre.appenders.core :as appenders])
   (:gen-class))
 
-(set! *warn-on-reflection* true)
-
 (defn- cache-dir []
   (or
    (System/getenv "XDG_CACHE_HOME")