Handle error validating

Author: labra

modules/server/src/main/scala/es/weso/server/APIService.scala

@@ -21,7 +21,7 @@ import org.http4s.client.Client
 import org.http4s.dsl.Http4sDsl
 import org.http4s.headers._
 import org.http4s.multipart.Multipart
-import org.http4s.server.staticcontent.{ResourceService, resourceService}
+import org.http4s.server.staticcontent.{ResourceService, resourceServiceBuilder}
 import org.log4s.getLogger
 
 import scala.concurrent.duration._
@@ -44,7 +44,7 @@ class APIService[F[_]:ConcurrentEffect: Timer](blocker: Blocker,
   private val logger = getLogger
 
   private val swagger =
-    resourceService[F](ResourceService.Config("/swagger", blocker))
+    resourceServiceBuilder[F]("/swagger", blocker) // ResourceService.Config())
 
   val routes = HttpRoutes.of[F] {
 
@@ -62,9 +62,8 @@ class APIService[F[_]:ConcurrentEffect: Timer](blocker: Blocker,
       resp <- eitherOutgoing.fold((s: String) => errJson(s"Error: $s"), (outgoing: Outgoing) => Ok(outgoing.toJson))
     } yield resp
 
-
     // Contents on /swagger are directly mapped to /swagger
-    case r @ GET -> _ if r.pathInfo.startsWith(UriPath.fromString("/swagger/")) => swagger(r).getOrElseF(NotFound())
+    // case r @ GET -> _ if r.pathInfo.startsWith(UriPath.fromString("/swagger/")) => swagger.toRoutes. // getOrElseF(NotFound())
 
   }
 

modules/server/src/main/scala/es/weso/server/ApiHelper.scala

@@ -105,14 +105,20 @@ private[server] def validate(rdf: RDFReasoner,
          pm, schema.pm) match {
          case Left(msg) =>
             err(s"Cannot obtain trigger: $triggerMode\nshapeMap: $optShapeMapStr\nmsg: $msg")
-         case Right(trigger) => for {
+         case Right(trigger) => { 
+           val run = for {
              startTime <- IO { System.nanoTime() }
              result <- schema.validate(rdf, trigger,builder)
              endTime <- IO { System.nanoTime() }
              time: Long = endTime - startTime
-         } yield (result,Some(trigger),time)
+           } yield (result,Some(trigger),time)
+          run.handleErrorWith(e => {
+            pprint.log(e,"Error validating")
+            err(s"Error validating: ${e.getMessage}")
+          }) 
+         }
         }
-    } yield pair
+      } yield pair
   }
 
   private[server] def validateStr(data: String,

modules/server/src/main/scala/es/weso/server/utils/Http4sUtils.scala

@@ -15,9 +15,9 @@ object Http4sUtils {
   def mkClient[F[_]:Concurrent](c: Client[F]): Client[F] =
     withRedirect(withLogging(c))
 
-  def getBody[F[_]:Monad](uri: Uri, r: Response[F]): F[Either[String,Stream[F,String]]] =
-    Monad[F].pure(if (r.status.isSuccess) Right(r.bodyAsText)
-    else Left(s"Status error fetching $uri: ${r.status}"))
+  def getBody[F[_]:Monad: Concurrent](uri: Uri, r: Response[F]): F[Either[String,Stream[F,String]]] =
+    if (r.status.isSuccess) r.bodyText.asRight.pure[F]
+    else s"Status error fetching $uri: ${r.status}".asLeft.pure[F]
 
   def resolveStream[F[_]:Monad: Concurrent](uri: Uri,
                                             client: Client[F]): F[Either[String,Stream[F,String]]] = {