 
 (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-proxy-route!
  [context target path options]
  (let [defaults {:server-id :default}
        opts     (merge defaults options)
        server-id (:server-id opts)
        s         (get-server-context context server-id)
        state     (:state s)
        endpoint  {:type        :proxy


(schema/defn ^:always-validate add-servlet-handler!
  [context servlet path options :- ServletHandlerOptions]
  (let [defaults            {:servlet-init-params {}}
        opts                (merge defaults options)
        server-id           (:server-id opts)
        servlet-init-params (:servlet-init-params opts)
