Fix deprecations in core

Author: rossabaker

…rc/main/scala/org/http4s/HttpRoute.scala …c/main/scala/org/http4s/HttpRoutes.scalacore/src/main/scala/org/http4s/HttpRoute.scala renamed to core/src/main/scala/org/http4s/HttpRoutes.scala core/src/main/scala/org/http4s/HttpRoute.scala renamed to core/src/main/scala/org/http4s/HttpRoutes.scala

@@ -56,4 +56,10 @@ object HttpRoutes {
     */
   def of[F[_]](pf: PartialFunction[Request[F], F[Response[F]]])(implicit F: Sync[F]): HttpRoutes[F] =
     Kleisli(req => OptionT(F.delay(pf.lift(req).sequence).flatten))
+
+  /** An empty set of routes.  Always responds with `pOptionT.none`.
+    * 
+    * @tparam F the base effect of the [[HttpRoutes]]
+    */
+  def empty[F[_]: Applicative]: HttpRoutes[F] = liftF(OptionT.none)
 }

core/src/main/scala/org/http4s/HttpService.scala

@@ -3,6 +3,7 @@ package org.http4s
 import cats._
 import cats.data._
 
+@deprecated("Replaced by HttpRoutes", "0.19")
 object HttpService extends Serializable {
 
   /**
@@ -14,14 +15,17 @@ object HttpService extends Serializable {
   def lift[F[_]: Functor](f: Request[F] => F[Response[F]]): HttpService[F] =
     Kleisli(f.andThen(OptionT.liftF(_)))
 
-  /** Lifts a partial function to an `HttpService`.
-    * Responds with `OptionT.none` for any request where `pf` is not defined.
+  /** Lifts a partial function to [[HttpRoutes]].  Responds with
+    * `OptionT.none` for any request where `pf` is not defined.
+    * 
+    * Unlike `HttpRoutes.of`, does not suspend the application of `pf`.
     */
+  @deprecated("Replaced by `HttpRoutes.of`", "0.19")
   def apply[F[_]](pf: PartialFunction[Request[F], F[Response[F]]])(
-      implicit F: Applicative[F]): HttpService[F] =
+      implicit F: Applicative[F]): HttpRoutes[F] =
     Kleisli(req => pf.andThen(OptionT.liftF(_)).applyOrElse(req, Function.const(OptionT.none)))
 
-  def empty[F[_]: Applicative]: HttpService[F] =
-    Kleisli.liftF(OptionT.none)
-
+  @deprecated("Replaced by `HttpRoutes.empty`", "0.19")
+  def empty[F[_]: Applicative]: HttpRoutes[F] =
+    HttpRoutes.empty
 }