Merge remote-tracking branch 'upstream/develop' into develop

OpenBankProject · Aug 25, 2023 · 9456178 · 9456178
2 parents 2003b80 + 3d9e7d0
commit 9456178
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/obp-api/src/main/scala/code/api/util/FutureUtil.scala b/obp-api/src/main/scala/code/api/util/FutureUtil.scala
@@ -70,25 +70,17 @@ object FutureUtil {
   }
 
   def futureWithLimits[T](future: Future[T], serviceName: String)(implicit ec: ExecutionContext): Future[T] = {
-
     incrementFutureCounter(serviceName)
-
-    // Promise will be fulfilled with either the callers Future
-    val p = Promise[T]
-
-    future.map {
-      result =>
-        if (p.trySuccess(result)) {
+    future
+      .map(
+        value => {
           decrementFutureCounter(serviceName)
-        }
-    }.recover {
-      case e: Exception =>
-        if (p.tryFailure(e)) {
+          value
+      }).recover{
+        case exception: Throwable =>
           decrementFutureCounter(serviceName)
-        }
-    }
-
-    p.future
+          throw exception
+      }
   }
 
 }
diff --git a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala
@@ -27,7 +27,7 @@ import code.scope.Scope
 import code.search.elasticsearchWarehouse
 import code.users.Users
 import code.util.Helper
-import code.util.Helper.booleanToBox
+import code.util.Helper.{booleanToBox, booleanToFuture}
 import code.views.Views
 import code.views.system.ViewDefinition
 import com.github.dwickern.macros.NameOf.nameOf
@@ -2386,13 +2386,10 @@ trait APIMethods300 {
         cc => implicit val ec = EndpointContext(Some(cc))
           for {
             (_, callContext) <- anonymousAccess(cc)
-            (banks, callContext) <- if(canOpenFuture("NewStyle.function.getBanks")) {
-              FutureUtil.futureWithLimits(NewStyle.function.getBanks(callContext), "NewStyle.function.getBanks")
-            } else {
-              Future {
-                throw new RuntimeException(ServiceIsTooBusy +"Current Service(NewStyle.function.getBanks) ")
-              }
+            _ <- booleanToFuture(ServiceIsTooBusy +"Current Service(NewStyle.function.getBanks)", 503, callContext) {
+              canOpenFuture("NewStyle.function.getBanks")
             }
+            (banks, callContext) <- FutureUtil.futureWithLimits(NewStyle.function.getBanks(callContext), "NewStyle.function.getBanks")
           } yield 
             (JSONFactory300.createBanksJson(banks), HttpCode.`200`(callContext))
       }