Return a try type

FlorianDoublet · FlorianDoublet · commit 556563656faa · 2019-11-19T18:14:44.000+01:00
diff --git a/src/main/scala/com/colisweb/jrubyscaladistances/DistanceTravelMode.scala b/src/main/scala/com/colisweb/jrubyscaladistances/DistanceTravelMode.scala
@@ -0,0 +1,13 @@
+package com.colisweb.jrubyscaladistances
+
+import com.colisweb.distances.TravelMode
+
+object DistanceTravelMode {
+
+  def drivingMode: TravelMode   = TravelMode.Driving
+  def bicyclingMode: TravelMode = TravelMode.Bicycling
+  def walkingMode: TravelMode   = TravelMode.Walking
+  def transitMode: TravelMode   = TravelMode.Transit
+  def unknownMode: TravelMode   = TravelMode.Unknown
+
+}
diff --git a/src/main/scala/com/colisweb/jrubyscaladistances/JRubyScalaDistance.scala b/src/main/scala/com/colisweb/jrubyscaladistances/JRubyScalaDistance.scala
@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration.{Duration, FiniteDuration}
+import scala.util.Try
 
 final class JRubyScalaDistance(googleApiConfig: GoogleApiConfiguration, redisConfig: RedisConfiguration) {
 
@@ -47,17 +48,24 @@ final class JRubyScalaDistance(googleApiConfig: GoogleApiConfiguration, redisCon
     )
   }
 
-  def getDrivingDistance(
+  def getDistance(
       origin: LatLong,
       destination: LatLong,
-      travelMode: TravelMode = TravelMode.Driving
-  ): Either[GoogleDistanceProviderError, Types.Distance] = {
+      travelMode: TravelMode
+  ): Try[Types.Distance] = {
 
     distanceApi
       .distance(origin, destination, List(travelMode))
       .unsafeRunSync()
-      .getOrElse(travelMode, throw new RuntimeException("Unknown travelMode exception happened"))
+      .getOrElse(travelMode, Left(new RuntimeException("Unknown travelMode exception happened")))
+      .toTry
   }
+
+  def getDrivingDistance(
+      origin: LatLong,
+      destination: LatLong
+  ): Try[Types.Distance] = getDistance(origin, destination, TravelMode.Driving)
+
 }
 
 object JRubyScalaDistance {
