Rename exception

UnknownNPC · Aug 29, 2019 · 70e46d9 · 70e46d9
1 parent ff75ba0
commit 70e46d9
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 35 deletions.
diff --git a/api/src/main/scala/com/github/unknownnpc/psw/api/APIException.scala b/api/src/main/scala/com/github/unknownnpc/psw/api/APIException.scala
@@ -11,5 +11,5 @@ class ExternalAPICallException(message: String = "External request error", cause
   extends APIException(message, cause)
 
 final case
-class ExternalAPIPayloadParseException(message: String = "Unable to parse payload", cause: Throwable)
+class APIParseException(message: String = "Unable to parse payload", cause: Throwable)
   extends APIException(message, cause)
diff --git a/api/src/main/scala/com/github/unknownnpc/psw/api/Serializer.scala b/api/src/main/scala/com/github/unknownnpc/psw/api/Serializer.scala
@@ -2,8 +2,8 @@ package com.github.unknownnpc.psw.api
 
 trait Serializer[IN, OUT, REQ, RES] {
 
-  def toReq(obj: IN): Either[ExternalAPIPayloadParseException, REQ]
+  def toReq(obj: IN): Either[APIParseException, REQ]
 
-  def fromRes(out: RES): Either[ExternalAPIPayloadParseException, OUT]
+  def fromRes(out: RES): Either[APIParseException, OUT]
 
 }
diff --git a/api/src/main/scala/com/github/unknownnpc/psw/api/Utils.scala b/api/src/main/scala/com/github/unknownnpc/psw/api/Utils.scala
@@ -2,9 +2,9 @@ package com.github.unknownnpc.psw.api
 
 object Utils {
 
-  def safeParse[T](fn: => T): Either[ExternalAPIPayloadParseException, T] = {
+  def safeParse[T](fn: => T): Either[APIParseException, T] = {
     import scala.util.control.Exception.allCatch
-    allCatch.either(fn).left.map(e => ExternalAPIPayloadParseException(cause = e))
+    allCatch.either(fn).left.map(e => APIParseException(cause = e))
   }
 
 }
diff --git a/...src/main/scala/com/github/unknownnpc/psw/p24/serializer/CardBalanceReqResSerializer.scala b/...src/main/scala/com/github/unknownnpc/psw/p24/serializer/CardBalanceReqResSerializer.scala
@@ -1,7 +1,7 @@
 package com.github.unknownnpc.psw.p24.serializer
 
 import com.github.unknownnpc.psw.api.Utils.safeParse
-import com.github.unknownnpc.psw.api.{ExternalAPIPayloadParseException, Serializer}
+import com.github.unknownnpc.psw.api.{APIParseException, Serializer}
 import com.github.unknownnpc.psw.p24.model._
 import org.apache.http.client.methods.HttpPost
 import org.apache.http.entity.{ContentType, StringEntity}
@@ -12,7 +12,7 @@ private[serializer] class CardBalanceReqResSerializer extends Serializer[Request
 
   private val urlTarget: String = "https://api.privatbank.ua/p24api/balance"
 
-  override def toReq(obj: Request): Either[ExternalAPIPayloadParseException, HttpPost] = {
+  override def toReq(obj: Request): Either[APIParseException, HttpPost] = {
     safeParse {
       def formHttpPostReq(payload: String): HttpPost = {
         val httpPost = new HttpPost(urlTarget)
@@ -26,7 +26,7 @@ private[serializer] class CardBalanceReqResSerializer extends Serializer[Request
     }
   }
 
-  override def fromRes(out: String): Either[ExternalAPIPayloadParseException, CardBalanceResponse] = {
+  override def fromRes(out: String): Either[APIParseException, CardBalanceResponse] = {
     safeParse {
       val responseXml = XML.loadString(unPrettyOut(out))
 

diff --git a/...c/main/scala/com/github/unknownnpc/psw/p24/serializer/WalletHistoryReqResSerializer.scala b/...c/main/scala/com/github/unknownnpc/psw/p24/serializer/WalletHistoryReqResSerializer.scala
@@ -1,7 +1,7 @@
 package com.github.unknownnpc.psw.p24.serializer
 
 import com.github.unknownnpc.psw.api.Utils.safeParse
-import com.github.unknownnpc.psw.api.{ExternalAPIPayloadParseException, Serializer}
+import com.github.unknownnpc.psw.api.{APIParseException, Serializer}
 import com.github.unknownnpc.psw.p24.model._
 import org.apache.http.client.methods.HttpPost
 import org.apache.http.entity.{ContentType, StringEntity}
@@ -22,7 +22,7 @@ private[serializer] class WalletHistoryReqResSerializer extends Serializer[Reque
     * @param walletHistoryReq the request entity.
     * @return the p24 request on the xml format.
     */
-  override def toReq(req: Request): Either[ExternalAPIPayloadParseException, HttpPost] = {
+  override def toReq(req: Request): Either[APIParseException, HttpPost] = {
     safeParse {
       def formHttpPostReq(payload: String): HttpPost = {
         val httpPost = new HttpPost(urlTarget)
@@ -36,7 +36,7 @@ private[serializer] class WalletHistoryReqResSerializer extends Serializer[Reque
     }
   }
 
-  override def fromRes(out: String): Either[ExternalAPIPayloadParseException, WalletHistoryResponse] = {
+  override def fromRes(out: String): Either[APIParseException, WalletHistoryResponse] = {
     safeParse {
       val responseXml = XML.loadString(unPrettyOut(out))
 

diff --git a/...test/scala/com/github/unknownnpc/psw/p24/serializer/CardBalanceReqResSerializerTest.scala b/...test/scala/com/github/unknownnpc/psw/p24/serializer/CardBalanceReqResSerializerTest.scala
@@ -1,6 +1,6 @@
 package com.github.unknownnpc.psw.p24.serializer
 
-import com.github.unknownnpc.psw.api.ExternalAPIPayloadParseException
+import com.github.unknownnpc.psw.api.APIParseException
 import com.github.unknownnpc.psw.p24.model._
 import org.apache.http.util.EntityUtils
 import org.scalatest.{FunSpec, Matchers}
@@ -94,7 +94,7 @@ class CardBalanceReqResSerializerTest extends FunSpec with Matchers {
 
   it("should return error when response is invalid") {
     val result = P24Serializer.cardBalanceReqResSerializer.fromRes("asdasda").left.get
-    result shouldBe a[ExternalAPIPayloadParseException]
+    result shouldBe a[APIParseException]
   }
 
 }
diff --git a/...st/scala/com/github/unknownnpc/psw/p24/serializer/WalletHistoryReqResSerializerTest.scala b/...st/scala/com/github/unknownnpc/psw/p24/serializer/WalletHistoryReqResSerializerTest.scala
@@ -1,6 +1,6 @@
 package com.github.unknownnpc.psw.p24.serializer
 
-import com.github.unknownnpc.psw.api.ExternalAPIPayloadParseException
+import com.github.unknownnpc.psw.api.APIParseException
 import com.github.unknownnpc.psw.p24.model._
 import org.apache.http.util.EntityUtils
 import org.scalatest.{FunSpec, Matchers}
@@ -107,7 +107,7 @@ class WalletHistoryReqResSerializerTest extends FunSpec with Matchers {
 
   it("should return error when response is invalid") {
     val result = P24Serializer.walletHistoryReqResSerializer.fromRes("asdasda").left.get
-    result shouldBe a[ExternalAPIPayloadParseException]
+    result shouldBe a[APIParseException]
   }
 
 }
diff --git a/...main/scala/com/github/unknownnpc/psw/qiwi/serializer/AccountBalanceReqResSerializer.scala b/...main/scala/com/github/unknownnpc/psw/qiwi/serializer/AccountBalanceReqResSerializer.scala
@@ -1,15 +1,15 @@
 package com.github.unknownnpc.psw.qiwi.serializer
 
 import com.github.unknownnpc.psw.api.Utils.safeParse
-import com.github.unknownnpc.psw.api.{ExternalAPIPayloadParseException, Serializer}
+import com.github.unknownnpc.psw.api.{APIParseException, Serializer}
 import com.github.unknownnpc.psw.qiwi.model.{AccountBalanceRequest, AccountBalanceResponse}
 import org.apache.http.client.methods.HttpGet
 
 private[serializer] class AccountBalanceReqResSerializer extends Serializer[AccountBalanceRequest, AccountBalanceResponse, HttpGet, String] {
 
   private val urlTarget: String = "https://edge.qiwi.com/funding-sources/v2/persons/%s/accounts"
 
-  override def toReq(req: AccountBalanceRequest): Either[ExternalAPIPayloadParseException, HttpGet] = {
+  override def toReq(req: AccountBalanceRequest): Either[APIParseException, HttpGet] = {
     safeParse {
       val fullRequestUrl = String.format(urlTarget, req.wallet)
       val httpGet = new HttpGet(fullRequestUrl)
@@ -20,7 +20,7 @@ private[serializer] class AccountBalanceReqResSerializer extends Serializer[Acco
     }
   }
 
-  override def fromRes(out: String): Either[ExternalAPIPayloadParseException, AccountBalanceResponse] = {
+  override def fromRes(out: String): Either[APIParseException, AccountBalanceResponse] = {
     import org.json4s._
     import org.json4s.native.Serialization
     import org.json4s.native.Serialization.read

diff --git a/.../main/scala/com/github/unknownnpc/psw/qiwi/serializer/WalletHistoryReqResSerializer.scala b/.../main/scala/com/github/unknownnpc/psw/qiwi/serializer/WalletHistoryReqResSerializer.scala
@@ -4,7 +4,7 @@ import java.text.SimpleDateFormat
 import java.util.{Date, TimeZone}
 
 import com.github.unknownnpc.psw.api.Utils.safeParse
-import com.github.unknownnpc.psw.api.{ExternalAPIPayloadParseException, Serializer}
+import com.github.unknownnpc.psw.api.{APIParseException, Serializer}
 import com.github.unknownnpc.psw.qiwi.model.{ResStatus, WalletHistoryRequest, WalletHistoryResponse}
 import org.apache.http.client.methods.HttpGet
 import org.json4s.CustomSerializer
@@ -25,7 +25,7 @@ private[serializer] class WalletHistoryReqResSerializer extends Serializer[Walle
     setTimeZone(TimeZone.getTimeZone("GMT"))
   }
 
-  override def toReq(req: WalletHistoryRequest): Either[ExternalAPIPayloadParseException, HttpGet] = {
+  override def toReq(req: WalletHistoryRequest): Either[APIParseException, HttpGet] = {
     safeParse {
       def queryParam(name: String, value: String): String = s"$name=$value"
 
@@ -53,7 +53,7 @@ private[serializer] class WalletHistoryReqResSerializer extends Serializer[Walle
     }
   }
 
-  override def fromRes(out: String): Either[ExternalAPIPayloadParseException, WalletHistoryResponse] = {
+  override def fromRes(out: String): Either[APIParseException, WalletHistoryResponse] = {
     import org.json4s._
     import org.json4s.native.Serialization
     import org.json4s.native.Serialization.read

diff --git a/.../scala/com/github/unknownnpc/psw/qiwi/serializer/AccountBalanceReqResSerializerTest.scala b/.../scala/com/github/unknownnpc/psw/qiwi/serializer/AccountBalanceReqResSerializerTest.scala
@@ -1,6 +1,6 @@
 package com.github.unknownnpc.psw.qiwi.serializer
 
-import com.github.unknownnpc.psw.api.ExternalAPIPayloadParseException
+import com.github.unknownnpc.psw.api.APIParseException
 import com.github.unknownnpc.psw.qiwi.model.AccountBalanceRequest
 import org.scalatest.{FunSpec, Matchers}
 
@@ -64,7 +64,7 @@ class AccountBalanceReqResSerializerTest extends FunSpec with Matchers {
 
   it("should return error when response is invalid") {
     val result = QiwiSerializer.accountBalanceReqResSerializer.fromRes("asdasda").left.get
-    result shouldBe a[ExternalAPIPayloadParseException]
+    result shouldBe a[APIParseException]
   }
 
 }
diff --git a/...t/scala/com/github/unknownnpc/psw/qiwi/serializer/WalletHistoryReqResSerializerTest.scala b/...t/scala/com/github/unknownnpc/psw/qiwi/serializer/WalletHistoryReqResSerializerTest.scala
@@ -2,7 +2,7 @@ package com.github.unknownnpc.psw.qiwi.serializer
 
 import java.util.Date
 
-import com.github.unknownnpc.psw.api.ExternalAPIPayloadParseException
+import com.github.unknownnpc.psw.api.APIParseException
 import com.github.unknownnpc.psw.qiwi.model.{ReqSources, ReqTransferType, ResStatus, WalletHistoryRequest}
 import org.scalatest.{FunSpec, Matchers}
 
@@ -135,7 +135,7 @@ class WalletHistoryReqResSerializerTest extends FunSpec with Matchers {
 
   it("should return error when response is invalid") {
     val result = QiwiSerializer.walletHistoryReqResSerializer.fromRes("asdasda").left.get
-    result shouldBe a[ExternalAPIPayloadParseException]
+    result shouldBe a[APIParseException]
   }
 
 }
diff --git a/webmoney/src/main/scala/com/github/unknownnpc/psw/wm/serializer/X3ReqResSerializer.scala b/webmoney/src/main/scala/com/github/unknownnpc/psw/wm/serializer/X3ReqResSerializer.scala
@@ -1,7 +1,7 @@
 package com.github.unknownnpc.psw.wm.serializer
 
 import com.github.unknownnpc.psw.api.Utils.safeParse
-import com.github.unknownnpc.psw.api.{ExternalAPIPayloadParseException, Serializer}
+import com.github.unknownnpc.psw.api.{APIParseException, Serializer}
 import com.github.unknownnpc.psw.wm.model._
 import org.apache.http.client.methods.HttpPost
 
@@ -11,7 +11,7 @@ private[serializer] class X3ReqResSerializer extends Serializer[X3Request, X3Res
 
   private val urlTarget: String = "https://w3s.webmoney.ru/asp/XMLOperations.asp"
 
-  override def toReq(obj: X3Request): Either[ExternalAPIPayloadParseException, HttpPost] = {
+  override def toReq(obj: X3Request): Either[APIParseException, HttpPost] = {
 
     def operation(op: X3RequestOperation): Elem = {
       scala.xml.XML.loadString(s"<${op.name}>${op.value}</${op.name}>")
@@ -37,7 +37,7 @@ private[serializer] class X3ReqResSerializer extends Serializer[X3Request, X3Res
     }
   }
 
-  override def fromRes(out: String): Either[ExternalAPIPayloadParseException, X3Response] = {
+  override def fromRes(out: String): Either[APIParseException, X3Response] = {
     safeParse {
       val unPrettyOut = out.replaceAll(">\\s+<", "><")
       val responseXml = XML.loadString(unPrettyOut)

diff --git a/webmoney/src/main/scala/com/github/unknownnpc/psw/wm/serializer/X9ReqResSerializer.scala b/webmoney/src/main/scala/com/github/unknownnpc/psw/wm/serializer/X9ReqResSerializer.scala
@@ -1,7 +1,7 @@
 package com.github.unknownnpc.psw.wm.serializer
 
 import com.github.unknownnpc.psw.api.Utils.safeParse
-import com.github.unknownnpc.psw.api.{ExternalAPIPayloadParseException, Serializer}
+import com.github.unknownnpc.psw.api.{APIParseException, Serializer}
 import com.github.unknownnpc.psw.wm.model._
 import org.apache.http.client.methods.HttpPost
 
@@ -11,7 +11,7 @@ private[serializer] class X9ReqResSerializer extends Serializer[X9Request, X9Res
 
   private val urlTarget: String = "https://w3s.webmoney.ru/asp/XMLPurses.asp"
 
-  override def toReq(obj: X9Request): Either[ExternalAPIPayloadParseException, HttpPost] = {
+  override def toReq(obj: X9Request): Either[APIParseException, HttpPost] = {
 
     def xmlReq(obj: X9Request): Elem = {
       <w3s.request>
@@ -29,7 +29,7 @@ private[serializer] class X9ReqResSerializer extends Serializer[X9Request, X9Res
     }
   }
 
-  override def fromRes(out: String): Either[ExternalAPIPayloadParseException, X9Response] = {
+  override def fromRes(out: String): Either[APIParseException, X9Response] = {
     safeParse {
       val unPrettyOut = out.replaceAll(">\\s+<", "><")
       val responseXml = XML.loadString(unPrettyOut)

diff --git a/webmoney/src/test/scala/com/github/unknownnpc/psw/wm/serializer/X3ReqResSerializerTest.scala b/webmoney/src/test/scala/com/github/unknownnpc/psw/wm/serializer/X3ReqResSerializerTest.scala
@@ -2,7 +2,7 @@ package com.github.unknownnpc.psw.wm.serializer
 
 import java.util.Date
 
-import com.github.unknownnpc.psw.api.ExternalAPIPayloadParseException
+import com.github.unknownnpc.psw.api.APIParseException
 import com.github.unknownnpc.psw.wm.Utils.WMDateFormatter
 import com.github.unknownnpc.psw.wm.model.{RetVal, X3Request, X3RequestOperation, X3ResponseOperationType}
 import org.apache.http.util.EntityUtils
@@ -91,7 +91,7 @@ class X3ReqResSerializerTest extends FunSpec with Matchers {
 
   it("should return error when response is invalid") {
     val result = WebMoneySerializer.x3ReqResSerializer.fromRes("asdasda").left.get
-    result shouldBe a[ExternalAPIPayloadParseException]
+    result shouldBe a[APIParseException]
   }
 
 }
diff --git a/webmoney/src/test/scala/com/github/unknownnpc/psw/wm/serializer/X9ReqResSerializerTest.scala b/webmoney/src/test/scala/com/github/unknownnpc/psw/wm/serializer/X9ReqResSerializerTest.scala
@@ -2,7 +2,7 @@ package com.github.unknownnpc.psw.wm.serializer
 
 import java.util.Date
 
-import com.github.unknownnpc.psw.api.ExternalAPIPayloadParseException
+import com.github.unknownnpc.psw.api.APIParseException
 import com.github.unknownnpc.psw.wm.model.{RetVal, X9Request}
 import org.apache.http.util.EntityUtils
 import org.scalatest.{FunSpec, Matchers}
@@ -66,7 +66,7 @@ class X9ReqResSerializerTest extends FunSpec with Matchers {
 
   it("should return error when response is invalid") {
     val result = WebMoneySerializer.x9ReqResSerializer.fromRes("asdasda").left.get
-    result shouldBe a[ExternalAPIPayloadParseException]
+    result shouldBe a[APIParseException]
   }
 
 }