   [{:keys [uri user password content-base]} & [content-source]]
   (let [cs (if (instance? ContentSource content-source)
              content-source
-             (ContentSourceFactory/newContentSource (URI. uri)))]
+             (make-uri-content-source (URI. uri)))]
     (cond
       (and (nil? content-base)
            (or (nil? user)

                              :preemptive-auth preemptive-auth})))

(defn make-hosted-content-source
  "Returna a ContentSource object according to the given `host` String
  and integer `port`, and optionally a configuration map defining the
  `user` and `password`, `content-base`, `security-options`, and/or
  default Logger object and boolean flag for whether basic

  info URI."
  ([db-info]
   (create-session* db-info))

  ([db-info {:keys [default-request-options logger user-object
                    transaction-mode transaction-timeout]
             :as config-options}]
