From c35897b8c8553c26c6fe486e968f200738bd2d2a Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Wed, 29 Dec 2021 17:54:43 -0500
Subject: [PATCH] minor cleanups, mostly formatting

---
 src/aging_session/memory.clj      | 18 ++++++++++--------
 test/aging_session/event_test.clj |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/aging_session/memory.clj b/src/aging_session/memory.clj
index 0abbb18..3ccc900 100644
--- a/src/aging_session/memory.clj
+++ b/src/aging_session/memory.clj
@@ -1,7 +1,9 @@
 (ns aging-session.memory
   "In-memory session storage with mortality."
-  (:require [ring.middleware.session.store :refer :all])
-  (:import java.util.UUID))
+  (:require
+    [ring.middleware.session.store :refer :all])
+  (:import
+    [java.util UUID]))
 
 (defrecord SessionEntry [timestamp value])
 
@@ -45,7 +47,7 @@
 
 (defprotocol AgingStore
   (read-timestamp [store key]
-                  "Read a session from the store and return its timestamp. If no key exists, returns nil."))
+    "Read a session from the store and return its timestamp. If no key exists, returns nil."))
 
 (defrecord MemoryAgingStore [session-map refresh-on-write refresh-on-read req-count req-limit event-fns]
   AgingStore
@@ -61,8 +63,8 @@
 
   (write-session [_ key data]
     (let [key (or key (str (UUID/randomUUID)))]
-      (swap! req-count inc)	  ; Increase the request count
-      (if refresh-on-write    ; Write key and and update timestamp.
+      (swap! req-count inc)                                 ; Increase the request count
+      (if refresh-on-write                                  ; Write key and and update timestamp.
         (swap! session-map assoc key (new-entry data))
         (swap! session-map write-entry key data))
       key))
@@ -78,13 +80,13 @@
     (when (>= @req-count req-limit)
       (swap! session-map sweep-session event-fns)
       (reset! req-count 0))
-    (. Thread (sleep sweep-delay))  ;; sleep for 30s
+    (. Thread (sleep sweep-delay))                          ;; sleep for 30s
     (recur)))
 
 (defn in-thread
   "Run a function in a thread."
-  [afn]
-  (.start (Thread. afn)))
+  [f]
+  (.start (Thread. ^Runnable f)))
 
 (defn aging-memory-store
   "Creates an in-memory session storage engine."
diff --git a/test/aging_session/event_test.clj b/test/aging_session/event_test.clj
index 8d1c6ea..25af007 100644
--- a/test/aging_session/event_test.clj
+++ b/test/aging_session/event_test.clj
@@ -1,8 +1,8 @@
 (ns aging-session.event_test
   (:require
-    [aging-session.event :as event]
     [clojure.test :refer :all]
     [ring.middleware.session.store :refer :all]
+    [aging-session.event :as event]
     [aging-session.memory :refer :all]))
 
 (deftest session-expiry
@@ -15,7 +15,7 @@
 (deftest session-expiry-by-sweep
   (testing "Test session expiry sweep."
     (let [as (aging-memory-store
-               :events      [(event/expires-after 1)]
+               :events [(event/expires-after 1)]
                :sweep-every 5
                :sweep-delay 1000)]
       (write-session as "mykey" {:foo 1})