Cleanup PaginationToken companion object

stac-utils · May 20, 2021 · 7c238b1 · 7c238b1
1 parent 23a050e
commit 7c238b1
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/modules/client/shared/src/main/scala/com/azavea/stac4s/api/client/PaginationToken.scala b/modules/client/shared/src/main/scala/com/azavea/stac4s/api/client/PaginationToken.scala
@@ -2,12 +2,11 @@ package com.azavea.stac4s.api.client
 
 import cats.syntax.either._
 import eu.timepit.refined.types.numeric.PosInt
-import io.circe
 import io.circe.generic.semiauto._
 import io.circe.parser.parse
 import io.circe.refined._
 import io.circe.syntax._
-import io.circe.{Decoder, Encoder}
+import io.circe.{Decoder, Encoder, Error}
 
 import java.time.Instant
 import java.util.Base64
@@ -18,26 +17,26 @@ final case class PaginationToken(timestampAtLeast: Instant, serialIdGreaterThan:
   * https://github.com/azavea/franklin/blob/f5be8ddf48661c5bc43cbd22cb7277e961641803/application/src/main/scala/com/azavea/franklin/api/schemas/package.scala#L84-L85
   */
 object PaginationToken {
-  val b64Encoder = Base64.getEncoder
-  val b64Decoder = Base64.getDecoder
-
   val defaultDecoder: Decoder[PaginationToken] = deriveDecoder
   val defaultEncoder: Encoder[PaginationToken] = deriveEncoder
 
+  val b64Encoder: Base64.Encoder = Base64.getEncoder
+  val b64Decoder: Base64.Decoder = Base64.getDecoder
+
   def encPaginationToken(token: PaginationToken): String = b64Encoder.encodeToString(
     token.asJson(defaultEncoder).noSpaces.getBytes
   )
 
-  def decPaginationToken(encoded: String): Either[circe.Error, PaginationToken] = {
+  def decPaginationTokenEither(encoded: String): Either[Error, PaginationToken] = {
     val jsonString = new String(b64Decoder.decode(encoded))
     for {
       js      <- parse(jsonString)
       decoded <- js.as[PaginationToken](defaultDecoder)
     } yield decoded
   }
 
-  implicit val dec: Decoder[PaginationToken] =
-    Decoder.decodeString.emap(str => decPaginationToken(str).leftMap(_.getMessage))
+  implicit val paginationTokenDecoder: Decoder[PaginationToken] =
+    Decoder.decodeString.emap(str => decPaginationTokenEither(str).leftMap(_.getMessage))
 
-  implicit val enc: Encoder[PaginationToken] = { encPaginationToken(_).asJson }
+  implicit val paginationTokenEncoder: Encoder[PaginationToken] = { encPaginationToken(_).asJson }
 }