Allow for user added javadoc sources

In order to do so, need to use clojure.java.javadoc/*remove-javadocs*
but we update it with a proper version of the javadoc root. Some
issues are that clojure 1.8 has an entry for java 7 and for java 8 so
running clojure 1.8 on java 11 can't use javadocs without this
hack. Clojure 1.10.1 doesn't have a javadoc source for java 13 so this
ensures a consistent presence across all versions.

Author: dpsutton

src/orchard/java.clj

@@ -358,35 +358,22 @@
    12 "https://docs.oracle.com/en/java/javase/12/docs/api/"
    13 "https://docs.oracle.com/en/java/javase/13/docs/api/"})
 
-(def remote-javadocs
-  (sorted-map
-   "com.google.common." "http://google.github.io/guava/releases/23.0/api/docs/"
-   "java." backported-javadoc-bases
-   "javax." backported-javadoc-bases
-   "org.ietf.jgss." backported-javadoc-bases
-   "org.omg." backported-javadoc-bases
-   "org.w3c.dom." backported-javadoc-bases
-   "org.xml.sax." backported-javadoc-bases
-   "org.apache.commons.codec." "http://commons.apache.org/proper/commons-codec/apidocs/"
-   "org.apache.commons.io." "http://commons.apache.org/proper/commons-io/javadocs/api-release/"
-   "org.apache.commons.lang." "http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"
-   "org.apache.commons.lang3." "http://commons.apache.org/proper/commons-lang/javadocs/api-release/"))
-
 (defn resolve-javadoc-path
   "Resolve a relative javadoc path to a URL and return as a map. Prefer javadoc
   resources on the classpath; then use online javadoc content for core API
   classes. If no source is available, return the relative path as is."
   [^String path]
   (or (resource/resource-full-path path)
       (some (let [classname (.replaceAll path "/" ".")]
-              (fn [[prefix url|version->url]]
+              (fn [[prefix url]]
                 (when (.startsWith classname prefix)
-                  (str (if (string? url|version->url)
-                         url|version->url
-                         (get url|version->url misc/java-api-version
-                              "https://docs.oracle.com/javase/8/docs/api/"))
-                       path))))
-            remote-javadocs)
+                  (str url path))))
+            (into @javadoc/*remote-javadocs*
+                  ;; clojure 1.8 has no javadoc for anything beyond java
+                  ;; 8. clojure 1.10.1 doesn't have 13. We just backport them
+                  ;; regardless of clojure version
+                  (zipmap ["java." "javax." "org.ietf.jgss." "org.omg." "org.w3c.dom." "org.xml.sax"]
+                          (repeat (backported-javadoc-bases misc/java-api-version)))))
       path))
 
 ;;; ## Initialization
@@ -400,4 +387,4 @@
 ;; TODO: Seems those were hardcoded here accidentally - we should
 ;; probably provide a simple API to register remote JavaDocs.
 (javadoc/add-remote-javadoc "com.amazonaws." "http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/")
-(javadoc/add-remote-javadoc "org.apache.kafka." "https://kafka.apache.org/090/javadoc/index.html?")
+(javadoc/add-remote-javadoc "org.apache.kafka." "https://kafka.apache.org/090/javadoc/")

test/orchard/java_test.clj

@@ -287,7 +287,14 @@
               "https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpClient.html#newHttpClient"
 
               ['java.net.http.HttpRequest 'newBuilder ['java.net.URI]]
-              "https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpRequest.html#newBuilder(java.net.URI)")))))))
+              "https://docs.oracle.com/en/java/javase/11/docs/api/java.net.http/java/net/http/HttpRequest.html#newBuilder(java.net.URI)")))))
+
+    (testing "Allows for added javadocs"
+      (with-redefs [cache (atom {})]
+        (is (= "http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/services/lambda/AWSLambdaClient.html"
+               (get-url ['com.amazonaws.services.lambda.AWSLambdaClient])))
+        (is (= "https://kafka.apache.org/090/javadoc/org/apache/kafka/clients/consumer/ConsumerConfig.html"
+               (get-url '[org.apache.kafka.clients.consumer.ConsumerConfig])))))))
 
 (deftest class-resolution-test
   (let [ns (ns-name *ns*)]