Merge pull request #33 from geotrellis/feature/http4s-0.19

Bump http4s for cats compatibility

Author: moradology

README.md

@@ -15,9 +15,11 @@ responsive layers whose transformations can be described in MAML
 ### Including Geotrellis Server
 
 Current version:
- - 0.0.2
+ - 0.0.4
 
-`libraryDependencies += "com.azavea" %% "geotrellis-server-core" % "0.0.2"`
+Add the geotrellis-server dependency by declaring it within your
+project's `build.sbt`:
+`libraryDependencies += "com.azavea" %% "geotrellis-server-core" % "0.0.4"`
 
 
 ### Running an example

build.sbt

@@ -6,7 +6,7 @@ scalaVersion in ThisBuild := scalaVer
 
 lazy val commonSettings = Seq(
   organization := "com.azavea",
-  version := "0.0.3",
+  version := "0.0.4",
   licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
   cancelable in Global := true,
   scalaVersion := scalaVer,

example/src/main/scala/geotrellis/server/example/ndvi/NdviServer.scala

@@ -11,7 +11,6 @@ import cats.effect._
 import io.circe._
 import io.circe.syntax._
 import fs2._
-import fs2.StreamApp.ExitCode
 import org.http4s.circe._
 import org.http4s._
 import org.http4s.dsl.Http4sDsl
@@ -28,7 +27,7 @@ import scala.collection.mutable
 import java.util.UUID
 
 
-object NdviServer extends StreamApp[IO] with LazyLogging with Http4sDsl[IO] {
+object NdviServer extends LazyLogging with Http4sDsl[IO] {
 
   implicit val contextShift: ContextShift[IO] = IO.contextShift(global)
 

example/src/main/scala/geotrellis/server/example/ndvi/NdviService.scala

@@ -66,7 +66,7 @@ class NdviService[Param](
 
   final val eval = MamlTms.curried(ndvi, interpreter)
 
-  def routes: HttpService[IO] = HttpService[IO] {
+  def routes: HttpRoutes[IO] = HttpRoutes.of {
     // Matching json in the query parameter is a bad idea.
     case req @ GET -> Root / IntVar(z) / IntVar(x) / IntVar(y) ~ "png" :? RedQueryParamMatcher(red) +& NirQueryParamMatcher(nir) =>
       val paramMap = Map("red" -> red, "nir" -> nir)

example/src/main/scala/geotrellis/server/example/overlay/WeightedOverlayServer.scala

@@ -11,7 +11,6 @@ import cats.effect._
 import io.circe._
 import io.circe.syntax._
 import fs2._
-import fs2.StreamApp.ExitCode
 import org.http4s.circe._
 import org.http4s._
 import org.http4s.dsl.Http4sDsl
@@ -29,7 +28,7 @@ import scala.collection.mutable
 import java.util.UUID
 
 
-object WeightedOverlayServer extends StreamApp[IO] with LazyLogging with Http4sDsl[IO] {
+object WeightedOverlayServer extends LazyLogging with Http4sDsl[IO] {
 
   implicit val contextShift: ContextShift[IO] = IO.contextShift(global)
 

example/src/main/scala/geotrellis/server/example/overlay/WeightedOverlayService.scala

@@ -32,6 +32,7 @@ import java.net.URI
 import java.util.{UUID, NoSuchElementException}
 import scala.util.Try
 import scala.collection.mutable
+import scala.concurrent.ExecutionContext
 
 
 class WeightedOverlayService(
@@ -91,13 +92,13 @@ class WeightedOverlayService(
       }
   }
 
-  def routes: HttpService[IO] = HttpService[IO] {
+  def routes: HttpRoutes[IO] = HttpRoutes.of {
     // Handle the static files for this demo
     case request @ GET -> Root =>
-      StaticFile.fromResource("/overlay-demo/index.html", Some(request)).getOrElseF(NotFound())
+      StaticFile.fromResource("/overlay-demo/index.html", ExecutionContext.global, Some(request)).getOrElseF(NotFound())
 
     case request @ GET -> Root / path if List(".js", ".css", ".map", ".html", ".webm").exists(path.endsWith) =>
-      StaticFile.fromResource("/overlay-demo/" + path, Some(request)).getOrElseF(NotFound())
+      StaticFile.fromResource("/overlay-demo/" + path, ExecutionContext.global, Some(request)).getOrElseF(NotFound())
 
     case req @ POST -> Root / IdVar(key) =>
       (for {

example/src/main/scala/geotrellis/server/example/persistence/PersistenceServer.scala

@@ -11,7 +11,6 @@ import cats.effect._
 import io.circe._
 import io.circe.syntax._
 import fs2._
-import fs2.StreamApp.ExitCode
 import org.http4s.circe._
 import org.http4s._
 import org.http4s.dsl.Http4sDsl
@@ -29,7 +28,7 @@ import scala.collection.mutable
 import java.util.UUID
 
 
-object PersistenceServer extends StreamApp[IO] with LazyLogging with Http4sDsl[IO] {
+object PersistenceServer extends LazyLogging with Http4sDsl[IO] {
 
   implicit val contextShift: ContextShift[IO] = IO.contextShift(global)
 

example/src/main/scala/geotrellis/server/example/persistence/PersistenceService.scala

@@ -56,7 +56,7 @@ class PersistenceService[Store, Param](
 
   implicit val expressionDecoder = jsonOf[IO, Expression]
 
-  def routes = HttpService[IO] {
+  def routes: HttpRoutes[IO] = HttpRoutes.of {
     case req @ POST -> Root / IdVar(key) =>
       (for {
          expr <- req.as[Expression]

project/Dependencies.scala

@@ -4,7 +4,7 @@ object Dependencies {
 
   val circeVer         = "0.10.0"
   val gtVer            = "2.0.0"
-  val http4sVer        = "0.18.12"
+  val http4sVer        = "0.19.0-M3"
   val scalaVer         = "2.11.12"
   val tsecV            = "0.0.1-M11"