Merge pull request #2754 from constantine2nd/develop

Readyness of the v7.0.0

Author: simonredfern

obp-api/pom.xml

@@ -521,7 +521,7 @@
             <junitxml>.</junitxml>
             <filereports>WDF TestSuite.txt</filereports>
             <argLine>-Drun.mode=test -XX:MaxMetaspaceSize=1g -Xms1g -Xmx2g --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.jar=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED</argLine>
-            <tagsToExclude>code.external</tagsToExclude>
+            <tagsToExclude>code.external,GetBanksPerf</tagsToExclude>
             <testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore>
         </configuration>
         <executions>

obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala

@@ -3,6 +3,7 @@ package code.api.util.http4s
 import cats.data.{Kleisli, OptionT}
 import cats.effect.IO
 import org.http4s._
+import org.typelevel.ci.CIString
 
 /**
  * Shared HTTP4S Application Builder
@@ -24,11 +25,37 @@ object Http4sApp {
 
   type HttpF[A] = OptionT[IO, A]
 
+  // Handles all OPTIONS (CORS preflight) requests before they reach the Lift bridge.
+  //
+  // Without this, OPTIONS falls through the Kleisli chain to Http4sLiftWebBridge →
+  // OBPAPI6_0_0's `this.serve({case OPTIONS => corsResponse})`, which pays full Lift
+  // overhead (body buffering, S.init) for every preflight. More critically, when the
+  // Lift bridge is eventually removed, CORS would break silently. Headers match the
+  // corsResponse defined in v4/v5/v6 Lift endpoints.
+  private val corsHandler: HttpRoutes[IO] = HttpRoutes[IO] { req =>
+    if (req.method == Method.OPTIONS) {
+      OptionT.liftF(
+        IO.pure(
+          Response[IO](Status.NoContent)
+            .putHeaders(
+              Header.Raw(CIString("Access-Control-Allow-Origin"), "*"),
+              Header.Raw(CIString("Access-Control-Allow-Methods"), "GET, POST, OPTIONS, PUT, PATCH, DELETE"),
+              Header.Raw(CIString("Access-Control-Allow-Headers"), "*"),
+              Header.Raw(CIString("Access-Control-Allow-Credentials"), "true")
+            )
+        )
+      )
+    } else {
+      OptionT.none
+    }
+  }
+
   /**
    * Build the base HTTP4S routes with priority-based routing
    */
   private def baseServices: HttpRoutes[IO] = Kleisli[HttpF, Request[IO], Response[IO]] { req: Request[IO] =>
-    StatusPage.routes.run(req)
+    corsHandler.run(req)
+      .orElse(StatusPage.routes.run(req))
       .orElse(code.api.v5_0_0.Http4s500.wrappedRoutesV500Services.run(req))
       .orElse(code.api.v7_0_0.Http4s700.wrappedRoutesV700Services.run(req))
       .orElse(code.api.berlin.group.v2.Http4sBGv2.wrappedRoutes.run(req))

obp-api/src/main/scala/code/api/util/http4s/Http4sSupport.scala

@@ -85,14 +85,16 @@ object ResourceDocMiddleware extends MdcLoggable {
    * Finds the matching ResourceDoc, validates the request, and enriches CallContext.
    */
   def apply(resourceDocs: ArrayBuffer[ResourceDoc]): HttpRoutes[IO] => HttpRoutes[IO] = { routes =>
+    // Build the lookup index once per middleware instance (at startup), not per request.
+    val resourceDocIndex = ResourceDocMatcher.buildIndex(resourceDocs)
     Kleisli[HttpF, Request[IO], Response[IO]] { req: Request[IO] =>
       val apiVersionFromPath = req.uri.path.segments.map(_.encoded).toList match {
         case apiPathZero :: version :: _ if apiPathZero == APIUtil.getPropsValue("apiPathZero", "obp") => version
         case _ => ApiShortVersions.`v7.0.0`.toString
       }
       // Build initial CallContext from request
       OptionT.liftF(Http4sCallContextBuilder.fromRequest(req, apiVersionFromPath)).flatMap { cc =>
-        ResourceDocMatcher.findResourceDoc(req.method.name, req.uri.path, resourceDocs) match {
+        ResourceDocMatcher.findResourceDoc(req.method.name, req.uri.path, resourceDocIndex) match {
           case Some(resourceDoc) =>
             val ccWithDoc = ResourceDocMatcher.attachToCallContext(cc, resourceDoc)
             val pathParams = ResourceDocMatcher.extractPathParams(req.uri.path, resourceDoc)