Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add type hints to servlet and Jetty adapter #295

Merged
merged 2 commits into from Jun 24, 2017
Merged

Add type hints to servlet and Jetty adapter #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
011560c
Remove reflection in servlet
MichaelBlume Jun 22, 2017
a48ede9
Remove reflection in Jetty adapter
jeaye Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ring-jetty-adapter/src/ring/adapter/jetty.clj
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@

(defn- ^AbstractHandler async-proxy-handler [handler]
(proxy [AbstractHandler] []
(handle [_ ^Request base-request request ^HttpServletResponse response]
(handle [_ ^Request base-request ^HttpServletRequest request ^HttpServletResponse response]
(let [^AsyncContext context (.startAsync request)]
(handler
(servlet/build-request-map request)
Expand All @@ -40,7 +40,7 @@
(.complete context)))
(.setHandled base-request true)))))

(defn- ^ServerConnector server-connector [server & factories]
(defn- ^ServerConnector server-connector [^Server server & factories]
(ServerConnector. server (into-array ConnectionFactory factories)))

(defn- ^HttpConfiguration http-config [options]
Expand Down
15 changes: 8 additions & 7 deletions ring-servlet/src/ring/util/servlet.clj
View file
Open in desktop
Expand Up @@ -80,12 +80,13 @@

(defn- make-output-stream
[^HttpServletResponse response ^AsyncContext context]
(if (nil? context)
(.getOutputStream response)
(proxy [java.io.FilterOutputStream] [(.getOutputStream response)]
(close []
(proxy-super close)
(.complete context)))))
(let [os (.getOutputStream response)]
(if (nil? context)
os
(proxy [java.io.FilterOutputStream] [os]
(close []
(.close os)
(.complete context))))))

(defn update-servlet-response
"Update the HttpServletResponse using a response map. Takes an optional
Expand Down Expand Up @@ -113,7 +114,7 @@
(->> (update-servlet-response response)))))

(defn- make-async-service-method [handler]
(fn [servlet request ^HttpServletResponse response]
(fn [servlet ^HttpServletRequest request ^HttpServletResponse response]
(let [^AsyncContext context (.startAsync request)]
(handler
(-> request
Expand Down