move handling of incoming response to DocileConnection

Author: reinierl

core/src/main/scala/chargepoint/docile/dsl/CoreOps.scala

@@ -59,27 +59,7 @@ trait CoreOps[
    * @tparam Q
    */
   def send[Q <: OutReq](req: Q)(implicit reqRes: OutReqRes[Q, _ <: InRes]): Unit =
-    connection.ocppClient match {
-      case None =>
-        throw ExpectationFailed("Trying to send an OCPP message while not connected")
-      case Some (client) =>
-        outgoingLogger.info(s"$req")
-        client.send(req)(reqRes) onComplete {
-          case Success(res) =>
-            incomingLogger.info(s"$res")
-            connection.receivedMsgManager.enqueue(
-              IncomingMessage(res)
-            )
-          case Failure(OcppException(ocppError)) =>
-            incomingLogger.info(s"$ocppError")
-            connection.receivedMsgManager.enqueue(
-              IncomingMessage(ocppError)
-            )
-          case Failure(e) =>
-            opsLogger.error(s"Failed to get response to outgoing OCPP request $req: ${e.getMessage}\n\t${e.getStackTrace.mkString("\n\t")}")
-            throw ExecutionError(e)
-    }
-  }
+    connection.sendRequestAndManageResponse(req)
 
   // WIP an operation to add a default handler for a certain subset of incoming messages
   def handlingIncomingMessages[T](proc: IncomingMessageProcessor[_])(f: => T): T = {

core/src/main/scala/chargepoint/docile/dsl/GenericIncomingMessage.scala

@@ -22,8 +22,7 @@ object GenericIncomingMessage {
     InReq <: Request,
     OutRes <: Response,
     InReqRes[_ <: InReq, _ <: OutRes] <: ReqRes[_, _]
-  ](res: InRes)(
-  ): IncomingResponse[
+  ](res: InRes): IncomingResponse[
     OutReq,
     InRes,
     OutReqRes,

core/src/main/scala/chargepoint/docile/dsl/OcppTest.scala

@@ -9,6 +9,7 @@ import javax.net.ssl.SSLContext
 import scala.language.higherKinds
 import scala.concurrent.{Await, ExecutionContext, Future, Promise}
 import scala.concurrent.duration.DurationInt
+import scala.util.{Failure, Success}
 import com.thenewmotion.ocpp.{Version, Version1X, VersionFamily}
 import com.thenewmotion.ocpp.json.api._
 import com.thenewmotion.ocpp.messages.{ReqRes, Request, Response}
@@ -17,6 +18,7 @@ import com.thenewmotion.ocpp.messages.v20._
 import com.typesafe.scalalogging.Logger
 import org.slf4j.LoggerFactory
 
+
 trait OcppTest[VFam <: VersionFamily] {
 
   // these type variables are filled in differently for OCPP 1.X and OCPP 2.0
@@ -240,6 +242,32 @@ trait DocileConnection[
     ocppClient = Some(connection)
   }
 
+  def sendRequestAndManageResponse[REQ <: OutgoingReqBound](req: REQ)(
+    implicit reqRes: OutgoingReqRes[REQ, _ <: IncomingResBound],
+    executionContext: ExecutionContext
+  ): Unit =
+    ocppClient match {
+      case None =>
+        throw ExpectationFailed("Trying to send an OCPP message while not connected")
+      case Some(client) =>
+        outgoingLogger.info(s"$req")
+        client.send(req)(reqRes) onComplete {
+          case Success(res) =>
+            incomingLogger.info(s"$res")
+            receivedMsgManager.enqueue(
+              GenericIncomingMessage[OutgoingReqBound, IncomingResBound, OutgoingReqRes, IncomingReqBound, OutgoingResBound, IncomingReqRes](res)
+            )
+          case Failure(OcppException(ocppError)) =>
+            incomingLogger.info(s"$ocppError")
+            receivedMsgManager.enqueue(
+              GenericIncomingMessage[OutgoingReqBound, IncomingResBound, OutgoingReqRes, IncomingReqBound, OutgoingResBound, IncomingReqRes](ocppError)
+            )
+          case Failure(e) =>
+            connectionLogger.error(s"Failed to get response to outgoing OCPP request $req: ${e.getMessage}\n\t${e.getStackTrace.mkString("\n\t")}")
+            throw ExecutionError(e)
+        }
+    }
+
   /** Template method to be implemented by version-specific extending classes to establish a connection for that
    * version of OCPP */
   protected def createClient(