tests: bump ring-jetty-adapter (#29)

Closes #27

Author: lread

deps.edn

@@ -13,7 +13,7 @@
   {:extra-paths ["test" "test-resources"]
    :extra-deps {io.github.cognitect-labs/test-runner
                 {:git/tag "v0.5.1" :git/sha "dfb30dd"}
-                ring/ring-jetty-adapter {:mvn/version "1.3.2"}
+                ring/ring-jetty-adapter {:mvn/version "1.9.5"}
                 ch.qos.logback/logback-classic {:mvn/version "1.2.11"
                                                 :exclusions [org.slf4j/slf4j-api]}
                 org.slf4j/jcl-over-slf4j {:mvn/version "1.7.36"}

test/clj_http/test/core.clj

@@ -4,11 +4,12 @@
             [clojure.pprint :as pp]
             [clojure.java.io :refer [file]]
             [clojure.test :refer [deftest is use-fixtures]]
+            [clojure.string :as str]
             [ring.adapter.jetty :as ring])
   (:import (java.io ByteArrayInputStream)
-           (org.eclipse.jetty.server Server)
-           (org.eclipse.jetty.server.nio SelectChannelConnector)
-           (org.eclipse.jetty.server.ssl SslSelectChannelConnector)))
+           (org.eclipse.jetty.server Server ServerConnector)))
+
+(set! *warn-on-reflection* true)
 
 (defn handler [req]
   (condp = [(:request-method req) (:uri req)]
@@ -42,21 +43,18 @@
 
 (def ^:dynamic *server* nil)
 
-(defn current-port []
+(defn- port-for-protocol [p]
   (let [^Server s *server*]
-    (->> s
-         .getConnectors
-         (filter (comp #{SelectChannelConnector} class))
-         ^SelectChannelConnector (first)
-         .getLocalPort)))
+    (some (fn [^ServerConnector c]
+            (when (str/starts-with? (str/lower-case (.getDefaultProtocol c)) p)
+              (.getLocalPort c)))
+          (.getConnectors s))))
+
+(defn current-port []
+  (port-for-protocol "http/"))
 
 (defn current-https-port []
-  (let [^Server s *server*]
-    (->> s
-         .getConnectors
-         (filter (comp #{SslSelectChannelConnector} class))
-         ^SslSelectChannelConnector (first)
-         .getLocalPort)))
+  (port-for-protocol "ssl"))
 
 (defn with-server [t]
   (let [s (make-server)]