[misc] Replace require-and-resolve with requiring-resolve where suitable

Author: alexander-yakushev

src/orchard/java.clj

@@ -49,7 +49,7 @@
 (def ^:private parser-next-source-info
   (delay
     (when (>= misc/java-api-version 11)
-      (try (let [f (misc/require-and-resolve 'orchard.java.parser-next/source-info)]
+      (try (let [f (requiring-resolve 'orchard.java.parser-next/source-info)]
              ;; We try parsing LruMap.java as a litmus test for whether the
              ;; parser works. We can be sure that LruMap.java is on the
              ;; classpath because we pack it into the final Orchard jar.
@@ -87,7 +87,7 @@
   "On JDK11+, return module name from the class if present; otherwise return nil"
   [class-or-sym]
   (when (>= misc/java-api-version 11)
-    ((misc/require-and-resolve 'orchard.java.modules/module-name) class-or-sym)))
+    ((requiring-resolve 'orchard.java.modules/module-name) class-or-sym)))
 
 (defn javadoc-url
   "Return the relative `.html` javadoc path and member fragment."

src/orchard/misc.clj

@@ -137,14 +137,12 @@
   [ns]
   (instance? clojure.lang.Namespace ns))
 
-;; Drop this in favor of clojure.core/requiring-resolve at some point?
-
 (defn require-and-resolve
-  "Try to require the namespace and get a var for the symbol, return the var's
-  value if successful, nil if not."
+  "Like `clojure.core/requiring-resolve`, but doesn't throw exception if namespace
+  was not found or failed to load. Also, returns derefs the resolved var."
   {:added "0.5"}
   [sym]
-  (try (require (-> sym namespace symbol))
+  (try (some-> sym requiring-resolve var-get)
        (var-get (resolve sym))
        (catch Exception _)))
 

test/orchard/java/parser_next_test.clj

@@ -17,11 +17,11 @@
 
 (def source-info
   (when jdk11+?
-    (misc/require-and-resolve 'orchard.java.parser-next/source-info)))
+    (requiring-resolve 'orchard.java.parser-next/source-info)))
 
 (def parse-java
   (when jdk11+?
-    (misc/require-and-resolve 'orchard.java.parser-next/parse-java)))
+    (requiring-resolve 'orchard.java.parser-next/parse-java)))
 
 (when jdk11+?
   (deftest parse-java-test