feature/added RabbitMQ -tweaked code--step15

OpenBankProject · Oct 15, 2024 · 5192eef · 5192eef
1 parent 3cbe6c0
commit 5192eef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnector.scala
@@ -460,10 +460,8 @@ object LocalMappedConnector extends Connector with MdcLoggable {
     hashOfSuppliedAnswer: String,
     callContext: Option[CallContext]
   ) = Future {
-    Future {
-      val userId = callContext.map(_.user.map(_.userId).openOrThrowException(s"$UserNotLoggedIn Can not find the userId here."))
-      (Challenges.ChallengeProvider.vend.validateChallenge(challengeId, hashOfSuppliedAnswer, userId), callContext)
-    }
+    val userId = callContext.map(_.user.map(_.userId).openOrThrowException(s"$UserNotLoggedIn Can not find the userId here."))
+    (Challenges.ChallengeProvider.vend.validateChallenge(challengeId, hashOfSuppliedAnswer, userId), callContext)
   }
   override def validateChallengeAnswerC3(
     transactionRequestId: Option[String],
@@ -488,10 +486,8 @@ object LocalMappedConnector extends Connector with MdcLoggable {
     suppliedAnswerType: SuppliedAnswerType.Value,
     callContext: Option[CallContext]
   ) = Future {
-    Future {
-      val userId = callContext.map(_.user.map(_.userId).openOrThrowException(s"$UserNotLoggedIn Can not find the userId here."))
-      (Challenges.ChallengeProvider.vend.validateChallenge(challengeId, suppliedAnswer, userId), callContext)
-    }
+    val userId = callContext.map(_.user.map(_.userId).openOrThrowException(s"$UserNotLoggedIn Can not find the userId here."))
+    (Challenges.ChallengeProvider.vend.validateChallenge(challengeId, suppliedAnswer, userId), callContext)
   }
 
   override def validateChallengeAnswerC5(
@@ -503,10 +499,8 @@ object LocalMappedConnector extends Connector with MdcLoggable {
     suppliedAnswerType: SuppliedAnswerType.Value,
     callContext: Option[CallContext]
   ) = Future {
-    Future {
-      val userId = callContext.map(_.user.map(_.userId).openOrThrowException(s"$UserNotLoggedIn Can not find the userId here."))
-      (Challenges.ChallengeProvider.vend.validateChallenge(challengeId, suppliedAnswer, userId), callContext)
-    }
+    val userId = callContext.map(_.user.map(_.userId).openOrThrowException(s"$UserNotLoggedIn Can not find the userId here."))
+    (Challenges.ChallengeProvider.vend.validateChallenge(challengeId, suppliedAnswer, userId), callContext)
   }
 
   override def getChallengesByTransactionRequestId(transactionRequestId: String, callContext:  Option[CallContext]): OBPReturnType[Box[List[ChallengeTrait]]] =

diff --git a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/Adapter/AdapterStubBuilder.scala b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/Adapter/AdapterStubBuilder.scala
@@ -19,7 +19,7 @@ import java.util.{Date, TimeZone}
 import scala.collection.mutable.ArrayBuffer
 
 /**
- * create ms sql server stored procedure according messageDocs.
+ * create the adapter side, using obp mapped connector to return the value
  */
 object AdapterStubBuilder {
   specialMethods // this line just for modify "MappedWebUiPropsProvider"

diff --git a/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnectionPool.scala b/obp-api/src/main/scala/code/bankconnectors/rabbitmq/RabbitMQConnectionPool.scala
@@ -81,7 +81,7 @@ object RabbitMQConnectionPoolTest extends App {
     } finally {
       // Close the channel and return the connection to the pool
       channel.close()
-//      RabbitMQConnectionPool.returnConnection(connection)
+      RabbitMQConnectionPool.returnConnection(connection)
     }
   }