 
 (schema/defn ^:always-validate add-ring-handler!
   [context handler path options :- ServerIDOption]
-  (let [defaults {:server-id :default}
-        opts     (merge defaults options)
-        server-id (:server-id opts)
+  (let [server-id (:server-id options)
         s         (get-server-context context server-id)
         state     (:state s)
         endpoint  {:type     :ring


(schema/defn ^:always-validate add-context-handler!
  [context base-path context-path options :- ContextHandlerOptions]
  (let [defaults          {:server-id         :default
                           :context-listeners []}
        opts              (merge defaults options)
        server-id         (:server-id opts)
        context-listeners (:context-listeners opts)


(schema/defn ^:always-validate add-war-handler!
  [context war path options :- ServerIDOption]
  (let [server-id (:server-id options)
        s         (get-server-context context server-id)
        state     (:state s)
        endpoint  {:type     :war
