 
 (schema/defn ^:always-validate add-war-handler!
   [context war 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     :war


(defn get-server-context
  [service-context server-id]
  (server-id (:jetty9-servers service-context)))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Service Function Implementations


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