Merge pull request #398 from kachayev/fix-cleanup-2

Cleanups

Author: ztellman

src/aleph/http/core.clj

@@ -193,22 +193,22 @@
          (if (neg? idx)
            (.getUri req)
            (.substring (.getUri req) 0 idx)))
-  :query-string (let [uri (.getUri req)]
+  :query-string (let [uri (.uri req)]
                   (if (neg? question-mark-index)
                     nil
                     (.substring uri (unchecked-inc question-mark-index))))
   :headers (-> req .headers headers->map)
-  :request-method (-> req .getMethod .name str/lower-case keyword)
+  :request-method (-> req .method .name str/lower-case keyword)
   :body body
   :scheme (if ssl? :https :http)
-  :aleph/keep-alive? (HttpHeaders/isKeepAlive req)
+  :aleph/keep-alive? (HttpUtil/isKeepAlive req)
   :server-name (netty/channel-server-name ch)
   :server-port (netty/channel-server-port ch)
   :remote-addr (netty/channel-remote-address ch))
 
 (p/def-derived-map NettyResponse [^HttpResponse rsp complete body]
-  :status (-> rsp .getStatus .code)
-  :aleph/keep-alive? (HttpHeaders/isKeepAlive rsp)
+  :status (-> rsp .status .code)
+  :aleph/keep-alive? (HttpUtil/isKeepAlive rsp)
   :headers (-> rsp .headers headers->map)
   :aleph/complete complete
   :body body)
@@ -220,7 +220,7 @@
       ssl?
       ch
       (AtomicBoolean. false)
-      (-> req .getUri (.indexOf (int 63))) body)
+      (-> req .uri (.indexOf (int 63))) body)
     :aleph/request-arrived (System/nanoTime)))
 
 (defn netty-response->ring-response [rsp complete body]
@@ -238,7 +238,7 @@
 (def empty-last-content LastHttpContent/EMPTY_LAST_CONTENT)
 
 (let [ary-class (class (byte-array 0))]
-  (defn coerce-element [ch x]
+  (defn coerce-element [x]
     (if (or
           (instance? String x)
           (instance? ary-class x)
@@ -259,7 +259,7 @@
 
                    (let [buf (netty/allocate ch)
                          pending? (instance? clojure.lang.IPending body)]
-                     (loop [s (map (partial coerce-element ch) body)]
+                     (loop [s (map coerce-element body)]
                        (cond
 
                          (and pending? (not (realized? s)))
@@ -368,7 +368,7 @@
 
     (when-not omitted?
       (if (instance? HttpResponse msg)
-        (let [code (-> ^HttpResponse msg .getStatus .code)]
+        (let [code (-> ^HttpResponse msg .status .code)]
           (when-not (or (<= 100 code 199) (= 204 code))
             (try-set-content-length! msg length)))
         (try-set-content-length! msg length)))

src/aleph/http/server.clj

@@ -31,7 +31,7 @@
     [io.netty.handler.stream ChunkedWriteHandler]
     [io.netty.handler.codec.http
      DefaultFullHttpResponse
-     HttpContent HttpHeaders
+     HttpContent HttpHeaders HttpUtil
      HttpContentCompressor
      HttpRequest HttpResponse
      HttpResponseStatus DefaultHttpHeaders
@@ -358,7 +358,7 @@
               req
               @previous-response
               body
-              (HttpHeaders/isKeepAlive req))))]
+              (HttpUtil/isKeepAlive req))))]
     (netty/channel-inbound-handler
 
       :exception-caught

src/aleph/netty.clj

@@ -627,7 +627,7 @@
         (.write ctx msg promise)))))
 
 (defn pipeline-initializer [pipeline-builder]
-  (channel-handler
+  (channel-inbound-handler
 
     :channel-registered
     ([this ctx]
@@ -638,8 +638,7 @@
           (.fireChannelRegistered ctx)
           (catch Throwable e
             (log/warn e "Failed to initialize channel")
-            (.close ctx))))
-      (.fireChannelRegistered ctx))))
+            (.close ctx)))))))
 
 (defn instrument!
   [stream]
@@ -656,61 +655,6 @@
 
 ;;;
 
-(potemkin/def-map-type HeaderMap
-  [^Headers headers
-   added
-   removed
-   mta]
-  (meta [_]
-    mta)
-  (with-meta [_ m]
-    (HeaderMap.
-      headers
-      added
-      removed
-      m))
-  (keys [_]
-    (set/difference
-      (set/union
-        (set (map str/lower-case (.names headers)))
-        (set (keys added)))
-      (set removed)))
-  (assoc [_ k v]
-    (HeaderMap.
-      headers
-      (assoc added k v)
-      (disj removed k)
-      mta))
-  (dissoc [_ k]
-    (HeaderMap.
-      headers
-      (dissoc added k)
-      (conj (or removed #{}) k)
-      mta))
-  (get [_ k default-value]
-    (if (contains? removed k)
-      default-value
-      (if-let [e (find added k)]
-        (val e)
-        (let [k' (str/lower-case (name k))
-              vs (.getAll headers k')]
-          (if (.isEmpty vs)
-            default-value
-            (if (p/== 1 (.size vs))
-              (.get vs 0)
-              (reduce
-                (fn [v s]
-                  (if v
-                    (str v "," s)
-                    s)
-                  vs)
-                nil))))))))
-
-(defn headers [^Headers h]
-  (HeaderMap. h nil nil nil))
-
-;;;
-
 (defn self-signed-ssl-context
   "A self-signed SSL context for servers."
   []

test/aleph/http_test.clj

@@ -189,7 +189,7 @@
 
 (deftest test-response-formats
   (with-handler basic-handler
-    (doseq [[index [path result]] (map vector (iterate inc 0) expected-results)]
+    (doseq [[index [path result]] (map-indexed vector expected-results)]
       (is
         (= result
           (bs/to-string
@@ -198,7 +198,7 @@
 
 (deftest test-compressed-response
   (with-compressed-handler basic-handler
-    (doseq [[index [path result]] (map vector (iterate inc 0) expected-results)
+    (doseq [[index [path result]] (map-indexed vector expected-results)
             :let [resp @(http-get (str "http://localhost:" port "/" path)
                           {:headers {:accept-encoding "gzip"}})
                   unzipped (try
@@ -210,7 +210,7 @@
 
 (deftest test-ssl-response-formats
   (with-ssl-handler basic-handler
-    (doseq [[index [path result]] (map vector (iterate inc 0) expected-results)]
+    (doseq [[index [path result]] (map-indexed vector expected-results)]
       (is
         (= result
           (bs/to-string