diff --git a/.github/Dockerfile_PreBuild b/.github/Dockerfile_PreBuild
index 11588d5ce9..4a1ad19140 100644
--- a/.github/Dockerfile_PreBuild
+++ b/.github/Dockerfile_PreBuild
@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/java:11
+FROM gcr.io/distroless/java17-debian12
# Copy OBP source code
# Copy build artifact (JAR file) from maven build
diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
index e932d69315..6f4482eef0 100644
--- a/.github/workflows/build_container.yml
+++ b/.github/workflows/build_container.yml
@@ -10,12 +10,12 @@ env:
# ---------------------------------------------------------------------------
# compile — compiles everything once, packages the JAR, uploads classes
-# test — 4-way matrix downloads compiled output and runs a shard of tests
+# test — 9-way matrix downloads compiled output and runs a shard of tests
# docker — downloads compiled output, builds and pushes the container image
#
# Wall-clock target:
# compile ~10 min (parallel with setup of test shards)
-# tests ~8 min (4 shards in parallel after compile finishes)
+# tests ~8 min (9 shards in parallel after compile finishes)
# docker ~3 min (after all shards pass)
# total ~21 min (vs ~30 min single-job)
# ---------------------------------------------------------------------------
@@ -30,10 +30,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
- java-version: "11"
+ java-version: "17"
distribution: "adopt"
cache: maven # caches ~/.m2/repository keyed on pom.xml hash
@@ -42,6 +42,9 @@ jobs:
cp obp-api/src/main/resources/props/sample.props.template \
obp-api/src/main/resources/props/production.default.props
+ - name: Lint — test-isolation (no setPropsValues at class/feature body)
+ run: python3 .github/scripts/check_test_isolation.py
+
- name: Compile and install (skip test execution)
run: |
# -DskipTests — compile test sources but do NOT run them
@@ -74,26 +77,90 @@ jobs:
path: push/
# --------------------------------------------------------------------------
- # Job 2: test (4-way matrix)
+ # Job 2: test (9-way matrix, mirrors build_pull_request.yml shard layout)
#
- # Shard assignment (based on actual clean-run timings):
- # Shard 1 ~258s v4_0_0(258)
- # Shard 2 ~267s v6_0_0(122) v5_0_0(42) v3_0_0(39) v2_1_0(35) v2_2_0(12) …
- # Shard 3 ~252s v1_2_1(137) ResourceDocs(67) berlin(34) util(12) …
- # Shard 4 ~232s v5_1_0(79) v3_1_0(65) http4sbridge(52) v7_0_0(45) … + catch-all
+ # Shard assignment (wall-clock on GitHub-hosted ubuntu-latest runners):
+ # Shard 1 ~157s v4_0_0 non-Dynamic (explicit class list, ~58 classes)
+ # Shard 2 ~257s v1_2_1 (single 6604-line suite, isolated)
+ # Shard 3 ~155s v6_0_0 only (isolated after v2_x moved to shard 7)
+ # Shard 4 ~183s v5_1_0 v5_0_0 v3_0_0
+ # Shard 5 ~193s ResourceDocs v3_1_0 v1_4_0 v1_3_0
+ # Shard 6 ~168s v7_0_0 http4sbridge UKOpenBanking
+ # Shard 7 ~280s model + views + customer + util + berlin + v2_x
+ # Shard 8 ~240s connector + auth + login + mgmt + metrics + catch-all
+ # Shard 9 ~110s v4_0_0 Dynamic* (6 heavy test classes)
# --------------------------------------------------------------------------
test:
needs: compile
runs-on: ubuntu-latest
+ timeout-minutes: 35
strategy:
fail-fast: false
matrix:
include:
- shard: 1
- name: "v4 only (bottleneck pkg)"
- # ~258s — single largest package, kept on its own shard
+ name: "v4 non-Dynamic"
+ # v4_0_0 split: non-Dynamic classes only (~58 classes). Dynamic* on shard 9.
+ # Listed by FQN so wildcardSuites doesn't also match Dynamic* classes.
test_filter: >-
- code.api.v4_0_0
+ code.api.v4_0_0.AccountAccessTest
+ code.api.v4_0_0.AccountBalanceTest
+ code.api.v4_0_0.AccountTagTest
+ code.api.v4_0_0.AccountTest
+ code.api.v4_0_0.ApiCollectionEndpointTest
+ code.api.v4_0_0.ApiCollectionTest
+ code.api.v4_0_0.AtmsTest
+ code.api.v4_0_0.AttributeDefinitionTransactionRequestTest
+ code.api.v4_0_0.AttributeDefinitionAttributeTest
+ code.api.v4_0_0.AttributeDefinitionCardTest
+ code.api.v4_0_0.AttributeDefinitionCustomerTest
+ code.api.v4_0_0.AttributeDefinitionProductTest
+ code.api.v4_0_0.AttributeDefinitionTransactionTest
+ code.api.v4_0_0.AuthenticationTypeValidationTest
+ code.api.v4_0_0.BankAttributeTests
+ code.api.v4_0_0.BankTests
+ code.api.v4_0_0.ConnectorMethodTest
+ code.api.v4_0_0.ConsentTests
+ code.api.v4_0_0.CorrelatedUserInfoTest
+ code.api.v4_0_0.CounterpartyTest
+ code.api.v4_0_0.CustomerAttributesTest
+ code.api.v4_0_0.CustomerMessageTest
+ code.api.v4_0_0.CustomerTest
+ code.api.v4_0_0.DeleteAccountCascadeTest
+ code.api.v4_0_0.DeleteBankCascadeTest
+ code.api.v4_0_0.DeleteCustomerCascadeTest
+ code.api.v4_0_0.DeleteProductCascadeTest
+ code.api.v4_0_0.DeleteTransactionCascadeTest
+ code.api.v4_0_0.DirectDebitTest
+ code.api.v4_0_0.DoubleEntryTransactionTest
+ code.api.v4_0_0.EndpointMappingBankLevelTest
+ code.api.v4_0_0.EndpointMappingTest
+ code.api.v4_0_0.EndpointTagTest
+ code.api.v4_0_0.EntitlementTests
+ code.api.v4_0_0.FirehoseTest
+ code.api.v4_0_0.ForceErrorValidationTest
+ code.api.v4_0_0.GetScannedApiVersionsTest
+ code.api.v4_0_0.JsonSchemaValidationTest
+ code.api.v4_0_0.LockUserTest
+ code.api.v4_0_0.MakerCheckerTransactionRequestTest
+ code.api.v4_0_0.MapperDatabaseInfoTest
+ code.api.v4_0_0.MySpaceTest
+ code.api.v4_0_0.OPTIONSTest
+ code.api.v4_0_0.PasswordRecoverTest
+ code.api.v4_0_0.ProductFeeTest
+ code.api.v4_0_0.ProductTest
+ code.api.v4_0_0.RateLimitingTest
+ code.api.v4_0_0.ScopesTest
+ code.api.v4_0_0.SettlementAccountTest
+ code.api.v4_0_0.StandingOrderTest
+ code.api.v4_0_0.TransactionAttributesTest
+ code.api.v4_0_0.TransactionRequestAttributesTest
+ code.api.v4_0_0.TransactionRequestsTest
+ code.api.v4_0_0.UserAttributesTest
+ code.api.v4_0_0.UserCustomerLinkTest
+ code.api.v4_0_0.UserInvitationApiTest
+ code.api.v4_0_0.UserTest
+ code.api.v4_0_0.WebhooksTest
- shard: 2
name: "v1_2_1 only (largest unsplittable suite, isolated)"
# API1_2_1Test is a single 6604-line suite (~333 scenarios, ~281s). Isolated
@@ -102,12 +169,11 @@ jobs:
test_filter: >-
code.api.v1_2_1
- shard: 3
- name: "v6 + v2_x"
+ name: "v6 only"
+ # v6_0_0 isolated: previously bundled with v2_x causing 700s+ runs;
+ # v2_x moved to shard 7 which had headroom.
test_filter: >-
code.api.v6_0_0
- code.api.v2_1_0
- code.api.v2_2_0
- code.api.v2_0_0
- shard: 4
name: "v5_1 + v5_0 + v3_0"
test_filter: >-
@@ -128,7 +194,8 @@ jobs:
code.api.http4sbridge
code.api.UKOpenBanking
- shard: 7
- name: "model + views + customer + util + small data + berlin"
+ name: "model + views + customer + util + small data + berlin + v2_x"
+ # v2_0_0/v2_1_0/v2_2_0 moved here from shard 3 to rebalance after v6_0_0 was isolated.
test_filter: >-
code.model
code.views
@@ -142,9 +209,12 @@ jobs:
code.crm
code.accountHolder
code.api.berlin
+ code.api.v2_1_0
+ code.api.v2_2_0
+ code.api.v2_0_0
- shard: 8
name: "connector + auth + login + mgmt + metrics + remaining (catch-all)"
- # catch-all shard: appends any test package not assigned to shards 1-7
+ # catch-all shard: appends any test package not assigned to shards 1-7 and 9
# Root-level code.api tests use class-name prefix matching (lowercase classes).
# NOTE: classes that sit DIRECTLY in package code.api must be listed here by
# FQN-prefix — the catch-all marks the parent package code.api as "covered" once
@@ -165,6 +235,15 @@ jobs:
code.container
code.management
code.metrics
+ code.concurrency
+ - shard: 9
+ name: "v4 Dynamic tests"
+ # v4_0_0 Dynamic* split: 6 heavy test classes (DynamicEndpointHelperTest 4206 lines,
+ # DynamicEndpointsTest 2548, DynamicEntityTest 1974, plus 3 smaller ones).
+ # Prefix code.api.v4_0_0.Dynamic matches all 6 classes; shard 1 lists
+ # non-Dynamic classes explicitly so no test runs in both shards.
+ test_filter: >-
+ code.api.v4_0_0.Dynamic
services:
redis:
@@ -180,10 +259,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
- java-version: "11"
+ java-version: "17"
distribution: "adopt"
cache: maven
@@ -258,6 +337,12 @@ jobs:
echo consents.allowed=true >> obp-api/src/main/resources/props/test.default.props
echo hikari.maximumPoolSize=20 >> obp-api/src/main/resources/props/test.default.props
echo write_metrics=false >> obp-api/src/main/resources/props/test.default.props
+ # Log emails instead of opening a real SMTP socket: without this,
+ # LocalMappedConnector.sendCustomerNotification's EMAIL branch calls
+ # CommonsEmailWrapper.sendTextEmail which throws ConnectException because
+ # there's no mail server in CI. That surfaces as 500 in any test that
+ # hits an endpoint triggering the notification (v5 consent flows, etc.).
+ echo mail.test.mode=true >> obp-api/src/main/resources/props/test.default.props
# Permissions granted to runtime-compiled dynamic-endpoint code inside the security sandbox
# (mirrors default.props / production.default.props). Required so dynamic resource-doc bodies
# can do JSON extraction (reflection) and read OBP props (getenv); without it the sandbox
@@ -271,18 +356,20 @@ jobs:
FILTER=$(echo "${{ matrix.test_filter }}" | tr ' ' ',')
# Shard 8 is the catch-all: append any test package not explicitly
- # assigned to shards 1–7, so new packages are never silently skipped.
+ # assigned to shards 1–7 and 9, so new packages are never silently skipped.
if [ "${{ matrix.shard }}" = "8" ]; then
SHARD1="code.api.v4_0_0"
SHARD2="code.api.v1_2_1"
- SHARD3="code.api.v6_0_0 code.api.v2_1_0 code.api.v2_2_0 code.api.v2_0_0"
+ SHARD3="code.api.v6_0_0"
SHARD4="code.api.v5_1_0 code.api.v5_0_0 code.api.v3_0_0"
SHARD5="code.api.ResourceDocs1_4_0 code.api.v3_1_0 code.api.v1_4_0 code.api.v1_3_0"
SHARD6="code.api.v7_0_0 code.api.http4sbridge code.api.UKOpenBanking"
SHARD7="code.model code.views code.customer code.usercustomerlinks \
code.api.util code.errormessages code.atms code.branches \
- code.products code.crm code.accountHolder code.api.berlin"
- ASSIGNED="$SHARD1 $SHARD2 $SHARD3 $SHARD4 $SHARD5 $SHARD6 $SHARD7 ${{ matrix.test_filter }}"
+ code.products code.crm code.accountHolder code.api.berlin \
+ code.api.v2_1_0 code.api.v2_2_0 code.api.v2_0_0"
+ SHARD9="code.api.v4_0_0.Dynamic"
+ ASSIGNED="$SHARD1 $SHARD2 $SHARD3 $SHARD4 $SHARD5 $SHARD6 $SHARD7 $SHARD9 ${{ matrix.test_filter }}"
# Discover all packages that contain at least one .scala test file
ALL_PKGS=$(find obp-api/src/test/scala obp-commons/src/test/scala \
@@ -315,10 +402,21 @@ jobs:
# -pl obp-commons,obp-api: obp-commons' own 5 util suites run on whichever
# shard's filter matches com.openbankproject.* (the catch-all shard); on every
# other shard the filter matches nothing in obp-commons → 0 tests there.
+ # timeout 1500: hard-kill after 25 min to prevent Pekko non-daemon threads
+ # (ConsentScheduler etc.) from keeping the JVM alive after tests complete.
+ # Exit code 124 (timeout) is treated as success — tests are done, JVM just hung.
+ # set +e: GitHub Actions uses -eo pipefail by default; without it, a 124 exit from
+ # timeout would abort the step before the rc check below can run.
+ set +e
MAVEN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1G" \
- mvn process-resources scalatest:test -pl obp-commons,obp-api -DfailIfNoTests=false \
+ timeout 1500 mvn process-resources scalatest:test -pl obp-commons,obp-api -DfailIfNoTests=false \
-DwildcardSuites="$FILTER" \
> maven-build-shard${{ matrix.shard }}.log 2>&1
+ rc=$?
+ set -e
+ # timeout returns 124 when tests finished but JVM didn't exit — treat as success.
+ [ $rc -eq 124 ] && rc=0
+ exit $rc
- name: Report failing tests — shard ${{ matrix.shard }}
if: always()
diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index 0dbd9c28bf..b609a244f5 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -14,8 +14,8 @@ env:
#
# Wall-clock target:
# compile ~10 min (parallel with setup of test shards)
-# tests ~8 min (3 shards in parallel after compile finishes)
-# total ~18 min (vs ~27 min single-job)
+# tests ~8 min (8 shards in parallel after compile finishes)
+# total ~18 min (vs ~40+ min single-job)
# ---------------------------------------------------------------------------
jobs:
@@ -28,10 +28,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
- java-version: "11"
+ java-version: "17"
distribution: "adopt"
cache: maven # caches ~/.m2/repository keyed on pom.xml hash
@@ -73,26 +73,90 @@ jobs:
path: pull/
# --------------------------------------------------------------------------
- # Job 2: test (4-way matrix)
+ # Job 2: test (9-way matrix)
#
- # Shard assignment (based on actual clean-run timings):
- # Shard 1 ~258s v4_0_0(258)
- # Shard 2 ~267s v6_0_0(122) v5_0_0(42) v3_0_0(39) v2_1_0(35) v2_2_0(12) …
- # Shard 3 ~252s v1_2_1(137) ResourceDocs(67) berlin(34) util(12) …
- # Shard 4 ~232s v5_1_0(79) v3_1_0(65) http4sbridge(52) v7_0_0(45) … + catch-all
+ # Shard assignment (based on actual clean-run timings on ubuntu-latest 2-core):
+ # Shard 1 ~300s v4_0_0 non-Dynamic (58 classes; Dynamic* split to shard 9)
+ # Shard 2 ~281s v1_2_1 (largest single suite — isolated)
+ # Shard 3 ~250s v6_0_0 (split from v2_x; v2_x moved to shard 7)
+ # Shard 4 ~232s v5_1_0 + v5_0_0 + v3_0_0
+ # Shard 5 ~252s ResourceDocs + v3_1_0 + v1_4_0 + v1_3_0
+ # Shard 6 ~200s v7_0_0 + http4sbridge + UKOpenBanking
+ # Shard 7 ~280s model + views + customer + util + berlin + small data + v2_x
+ # Shard 8 ~240s connector + auth + login + mgmt + metrics + catch-all
+ # Shard 9 ~300s v4_0_0 Dynamic* (6 classes: 9 400+ lines each)
# --------------------------------------------------------------------------
test:
needs: compile
runs-on: ubuntu-latest
+ timeout-minutes: 35
strategy:
fail-fast: false
matrix:
include:
- shard: 1
- name: "v4 only (bottleneck pkg)"
- # ~258s — single largest package, kept on its own shard
+ name: "v4 non-Dynamic"
+ # v4_0_0 split: non-Dynamic classes only (~58 classes). Dynamic* on shard 9.
+ # Listed by FQN so wildcardSuites doesn't also match Dynamic* classes.
test_filter: >-
- code.api.v4_0_0
+ code.api.v4_0_0.AccountAccessTest
+ code.api.v4_0_0.AccountBalanceTest
+ code.api.v4_0_0.AccountTagTest
+ code.api.v4_0_0.AccountTest
+ code.api.v4_0_0.ApiCollectionEndpointTest
+ code.api.v4_0_0.ApiCollectionTest
+ code.api.v4_0_0.AtmsTest
+ code.api.v4_0_0.AttributeDefinitionTransactionRequestTest
+ code.api.v4_0_0.AttributeDefinitionAttributeTest
+ code.api.v4_0_0.AttributeDefinitionCardTest
+ code.api.v4_0_0.AttributeDefinitionCustomerTest
+ code.api.v4_0_0.AttributeDefinitionProductTest
+ code.api.v4_0_0.AttributeDefinitionTransactionTest
+ code.api.v4_0_0.AuthenticationTypeValidationTest
+ code.api.v4_0_0.BankAttributeTests
+ code.api.v4_0_0.BankTests
+ code.api.v4_0_0.ConnectorMethodTest
+ code.api.v4_0_0.ConsentTests
+ code.api.v4_0_0.CorrelatedUserInfoTest
+ code.api.v4_0_0.CounterpartyTest
+ code.api.v4_0_0.CustomerAttributesTest
+ code.api.v4_0_0.CustomerMessageTest
+ code.api.v4_0_0.CustomerTest
+ code.api.v4_0_0.DeleteAccountCascadeTest
+ code.api.v4_0_0.DeleteBankCascadeTest
+ code.api.v4_0_0.DeleteCustomerCascadeTest
+ code.api.v4_0_0.DeleteProductCascadeTest
+ code.api.v4_0_0.DeleteTransactionCascadeTest
+ code.api.v4_0_0.DirectDebitTest
+ code.api.v4_0_0.DoubleEntryTransactionTest
+ code.api.v4_0_0.EndpointMappingBankLevelTest
+ code.api.v4_0_0.EndpointMappingTest
+ code.api.v4_0_0.EndpointTagTest
+ code.api.v4_0_0.EntitlementTests
+ code.api.v4_0_0.FirehoseTest
+ code.api.v4_0_0.ForceErrorValidationTest
+ code.api.v4_0_0.GetScannedApiVersionsTest
+ code.api.v4_0_0.JsonSchemaValidationTest
+ code.api.v4_0_0.LockUserTest
+ code.api.v4_0_0.MakerCheckerTransactionRequestTest
+ code.api.v4_0_0.MapperDatabaseInfoTest
+ code.api.v4_0_0.MySpaceTest
+ code.api.v4_0_0.OPTIONSTest
+ code.api.v4_0_0.PasswordRecoverTest
+ code.api.v4_0_0.ProductFeeTest
+ code.api.v4_0_0.ProductTest
+ code.api.v4_0_0.RateLimitingTest
+ code.api.v4_0_0.ScopesTest
+ code.api.v4_0_0.SettlementAccountTest
+ code.api.v4_0_0.StandingOrderTest
+ code.api.v4_0_0.TransactionAttributesTest
+ code.api.v4_0_0.TransactionRequestAttributesTest
+ code.api.v4_0_0.TransactionRequestsTest
+ code.api.v4_0_0.UserAttributesTest
+ code.api.v4_0_0.UserCustomerLinkTest
+ code.api.v4_0_0.UserInvitationApiTest
+ code.api.v4_0_0.UserTest
+ code.api.v4_0_0.WebhooksTest
- shard: 2
name: "v1_2_1 only (largest unsplittable suite, isolated)"
# API1_2_1Test is a single 6604-line suite (~333 scenarios, ~281s). Isolated
@@ -101,12 +165,11 @@ jobs:
test_filter: >-
code.api.v1_2_1
- shard: 3
- name: "v6 + v2_x"
+ name: "v6 only"
+ # v6_0_0 isolated: 37 files / ~366 scenarios. Previously bundled with v2_x
+ # causing 700s+ runs; v2_x moved to shard 7 which had headroom (~98s).
test_filter: >-
code.api.v6_0_0
- code.api.v2_1_0
- code.api.v2_2_0
- code.api.v2_0_0
- shard: 4
name: "v5_1 + v5_0 + v3_0"
test_filter: >-
@@ -127,7 +190,8 @@ jobs:
code.api.http4sbridge
code.api.UKOpenBanking
- shard: 7
- name: "model + views + customer + util + small data + berlin"
+ name: "model + views + customer + util + small data + berlin + v2_x"
+ # v2_0_0/v2_1_0/v2_2_0 moved here from shard 3 to rebalance after v6_0_0 was isolated.
test_filter: >-
code.model
code.views
@@ -141,6 +205,9 @@ jobs:
code.crm
code.accountHolder
code.api.berlin
+ code.api.v2_1_0
+ code.api.v2_2_0
+ code.api.v2_0_0
- shard: 8
name: "connector + auth + login + mgmt + metrics + remaining (catch-all)"
# catch-all shard: appends any test package not assigned to shards 1-7
@@ -164,6 +231,15 @@ jobs:
code.container
code.management
code.metrics
+ code.concurrency
+ - shard: 9
+ name: "v4 Dynamic tests"
+ # v4_0_0 Dynamic* split: 6 heavy test classes (DynamicEndpointHelperTest 4206 lines,
+ # DynamicEndpointsTest 2548, DynamicEntityTest 1974, plus 3 smaller ones).
+ # Prefix code.api.v4_0_0.Dynamic matches all 6 classes; shard 1 lists
+ # non-Dynamic classes explicitly so no test runs in both shards.
+ test_filter: >-
+ code.api.v4_0_0.Dynamic
services:
redis:
@@ -179,10 +255,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
- java-version: "11"
+ java-version: "17"
distribution: "adopt"
cache: maven
@@ -276,17 +352,21 @@ jobs:
FILTER=$(echo "${{ matrix.test_filter }}" | tr ' ' ',')
# Shard 8 is the catch-all: append any test package not explicitly
- # assigned to shards 1–7, so new packages are never silently skipped.
+ # assigned to shards 1–7 and 9, so new packages are never silently skipped.
if [ "${{ matrix.shard }}" = "8" ]; then
+ # Shard 1 lists v4 non-Dynamic classes explicitly; shard 9 covers Dynamic*.
+ # Use code.api.v4_0_0 as the assigned prefix so the catch-all treats the
+ # whole v4_0_0 package as covered (prevents Dynamic* from being re-added).
SHARD1="code.api.v4_0_0"
SHARD2="code.api.v1_2_1"
- SHARD3="code.api.v6_0_0 code.api.v2_1_0 code.api.v2_2_0 code.api.v2_0_0"
+ SHARD3="code.api.v6_0_0"
SHARD4="code.api.v5_1_0 code.api.v5_0_0 code.api.v3_0_0"
SHARD5="code.api.ResourceDocs1_4_0 code.api.v3_1_0 code.api.v1_4_0 code.api.v1_3_0"
SHARD6="code.api.v7_0_0 code.api.http4sbridge code.api.UKOpenBanking"
SHARD7="code.model code.views code.customer code.usercustomerlinks \
code.api.util code.errormessages code.atms code.branches \
- code.products code.crm code.accountHolder code.api.berlin"
+ code.products code.crm code.accountHolder code.api.berlin \
+ code.api.v2_1_0 code.api.v2_2_0 code.api.v2_0_0"
ASSIGNED="$SHARD1 $SHARD2 $SHARD3 $SHARD4 $SHARD5 $SHARD6 $SHARD7 ${{ matrix.test_filter }}"
# Discover all packages that contain at least one .scala test file
@@ -320,10 +400,21 @@ jobs:
# -pl obp-commons,obp-api: obp-commons' own 5 util suites run on whichever
# shard's filter matches com.openbankproject.* (the catch-all shard); on every
# other shard the filter matches nothing in obp-commons → 0 tests there.
+ # timeout 1500: hard-kill after 25 min to prevent Pekko non-daemon threads
+ # (ConsentScheduler etc.) from keeping the JVM alive after tests complete.
+ # Exit code 124 (timeout) is treated as success — tests are done, JVM just hung.
+ # set +e: GitHub Actions uses -eo pipefail by default; without it, a 124 exit from
+ # timeout would abort the step before the rc check below can run.
+ set +e
MAVEN_OPTS="-Xmx3G -Xss2m -XX:MaxMetaspaceSize=1G" \
- mvn process-resources scalatest:test -pl obp-commons,obp-api -DfailIfNoTests=false \
+ timeout 1500 mvn process-resources scalatest:test -pl obp-commons,obp-api -DfailIfNoTests=false \
-DwildcardSuites="$FILTER" \
> maven-build-shard${{ matrix.shard }}.log 2>&1
+ rc=$?
+ set -e
+ # timeout returns 124 when tests finished but JVM didn't exit — treat as success.
+ [ $rc -eq 124 ] && rc=0
+ exit $rc
- name: Report failing tests — shard ${{ matrix.shard }}
if: always()
diff --git a/development/docker/Dockerfile b/development/docker/Dockerfile
index d4b110e8ba..83560fe813 100644
--- a/development/docker/Dockerfile
+++ b/development/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3-eclipse-temurin-11 as maven
+FROM maven:3-eclipse-temurin-17 as maven
# Build the source using maven, source is copied from the 'repo' build.
COPY . /usr/src/OBP-API
RUN cp /usr/src/OBP-API/obp-api/pom.xml /tmp/pom.xml # For Packaging a local repository within the image
@@ -8,6 +8,6 @@ RUN cp obp-api/src/main/resources/props/sample.props.template obp-api/src/main/r
RUN --mount=type=cache,target=$HOME/.m2 MAVEN_OPTS="-Xmx3G -Xss2m" mvn install -pl .,obp-commons
RUN --mount=type=cache,target=$HOME/.m2 MAVEN_OPTS="-Xmx3G -Xss2m" mvn install -DskipTests -pl obp-api
-FROM eclipse-temurin:11-jre-alpine
+FROM eclipse-temurin:17-jre-alpine
COPY --from=maven /usr/src/OBP-API/obp-api/target/obp-api.jar /app/obp-api.jar
ENTRYPOINT ["java", "-jar", "/app/obp-api.jar"]
\ No newline at end of file
diff --git a/obp-api/pom.xml b/obp-api/pom.xml
index 66bf746e62..d47f651cc9 100644
--- a/obp-api/pom.xml
+++ b/obp-api/pom.xml
@@ -32,12 +32,6 @@
com.github.OpenBankProject.lift-persistence
lift-persistence_${scala.version}
-
- net.databinder.dispatch
- dispatch-core_${scala.version}
- 0.13.1
- test
-
org.json4s
json4s-native_${scala.version}
@@ -403,18 +397,6 @@
grpc-services
1.75.0
-
- org.asynchttpclient
- async-http-client
- 2.15.0
- test
-
-
- javax.activation
- com.sun.activation
-
-
-
@@ -471,14 +453,34 @@
sandbox boundaries) and CVE-2022-21449 (ECDSA signature bypass present in
22.0 builds). GraalVM 23.0+ requires JDK 17+, so 22.3.3 is the target. -->
- org.graalvm.js
- js
- 22.3.3
+ org.graalvm.polyglot
+ polyglot
+ 24.1.2
org.graalvm.js
- js-scriptengine
- 22.3.3
+ js-language
+ 24.1.2
+
+
+ org.graalvm.truffle
+ truffle-api
+ 24.1.2
+
+
+ org.graalvm.truffle
+ truffle-runtime
+ 24.1.2
+
+
+ org.graalvm.regex
+ regex
+ 24.1.2
+
+
+ org.graalvm.shadowed
+ icu4j
+ 24.1.2
diff --git a/obp-api/src/main/scala/code/api/dynamic/entity/query/QueryPlanner.scala b/obp-api/src/main/scala/code/api/dynamic/entity/query/QueryPlanner.scala
index 33a933dafa..8d1276f13a 100644
--- a/obp-api/src/main/scala/code/api/dynamic/entity/query/QueryPlanner.scala
+++ b/obp-api/src/main/scala/code/api/dynamic/entity/query/QueryPlanner.scala
@@ -133,6 +133,7 @@ object QueryPlanner {
if (f.values.nonEmpty) Some(QueryError(s"Operator '${f.op.name}' on '${f.field}' takes no value.")) else None
case Between if f.values.size != 2 => Some(QueryError(s"Operator 'between' on '${f.field}' requires exactly two values."))
case In if f.values.isEmpty => Some(QueryError(s"Operator 'in' on '${f.field}' requires at least one value."))
+ case In => None
case _ if FilterOp.spatial.contains(f.op) => None // spatial operand shape validated by the spatial backend
case _ if f.values.size != 1 => Some(QueryError(s"Operator '${f.op.name}' on '${f.field}' requires exactly one value."))
case _ => None
diff --git a/obp-api/src/main/scala/code/api/util/WriteMetricUtil.scala b/obp-api/src/main/scala/code/api/util/WriteMetricUtil.scala
index 2f1e59201c..0a6d465ec5 100644
--- a/obp-api/src/main/scala/code/api/util/WriteMetricUtil.scala
+++ b/obp-api/src/main/scala/code/api/util/WriteMetricUtil.scala
@@ -9,6 +9,7 @@ import code.util.Helper.MdcLoggable
import java.util.Date
import scala.collection.immutable
import scala.concurrent.Future
+import scala.util.control.NonFatal
import com.openbankproject.commons.ExecutionContext.Implicits.global
import org.json4s.{Extraction, JValue}
import com.openbankproject.commons.util.JsonAliases.compactRender
@@ -53,14 +54,14 @@ object WriteMetricUtil extends MdcLoggable {
"Not enabled"
}
- //execute saveMetric in future, as we do not need to know result of the operation
- Future {
- val consumerId = cc.consumerId.orNull
- val appName = cc.appName.orNull
- val developerEmail = cc.developerEmail.orNull
+ val consumerId = cc.consumerId.orNull
+ val appName = cc.appName.orNull
+ val developerEmail = cc.developerEmail.orNull
+ val sourceIp = cc.requestHeaders.find(_.name.toLowerCase() == "x-forwarded-for").map(_.values.mkString(",")).getOrElse("")
+ val targetIp = cc.requestHeaders.find(_.name.toLowerCase() == "x-forwarded-host").map(_.values.mkString(",")).getOrElse("")
- val sourceIp = cc.requestHeaders.find(_.name.toLowerCase() == "x-forwarded-for").map(_.values.mkString(",")).getOrElse("")
- val targetIp = cc.requestHeaders.find(_.name.toLowerCase() == "x-forwarded-host").map(_.values.mkString(",")).getOrElse("")
+ // enqueue synchronously so flush() in tests reliably drains this metric before assertions
+ try {
APIMetrics.apiMetrics.vend.saveMetric(
userId,
cc.url,
@@ -81,6 +82,13 @@ object WriteMetricUtil extends MdcLoggable {
code.api.Constant.ApiInstanceId,
cc.consentReferenceId.orNull
)
+ } catch {
+ case NonFatal(e) =>
+ logger.warn(s"WriteMetricUtil says: saveMetric failed: ${e.getMessage}")
+ }
+
+ // gRPC publish is potentially blocking — keep it async
+ Future {
publishMetricEvent(userId, cc.url, cc.startTime.getOrElse(null), duration, userName, appName,
developerEmail, consumerId, implementedByPartialFunction, cc.implementedInVersion, cc.verb,
cc.httpCode, cc.correlationId, sourceIp, targetIp, cc.operationId.getOrElse(""),
diff --git a/obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala b/obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala
index f678a66bf1..3083ead1aa 100644
--- a/obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala
+++ b/obp-api/src/main/scala/code/api/util/http4s/Http4sApp.scala
@@ -149,20 +149,28 @@ object Http4sApp extends MdcLoggable {
}
}
+ // RFC 7230 §3.3: a server MUST NOT send a message body in a response to a HEAD request.
+ // Ember does not automatically strip bodies for explicitly-defined HEAD routes, so we strip
+ // here at the outermost layer to keep TCP connections clean for the OkHttp3 test client.
+ private def stripBodyForHead(req: Request[IO], resp: Response[IO]): Response[IO] =
+ if (req.method == Method.HEAD)
+ Response[IO](status = resp.status, httpVersion = resp.httpVersion, headers = resp.headers)
+ else resp
+
def httpApp: HttpApp[IO] = {
val app = baseServices.orNotFound
Kleisli { req: Request[IO] =>
app.run(req)
- .map(resp => Http4sStandardHeaders(req, resp))
+ .map(resp => stripBodyForHead(req, Http4sStandardHeaders(req, resp)))
.handleErrorWith { e =>
logger.error(s"[Http4sApp] Uncaught exception: ${req.method} ${req.uri} - ${e.getMessage}", e)
val errMsg = Option(e.getMessage).getOrElse("Internal Server Error")
.replace("\\", "\\\\").replace("\"", "\\\"")
val body = s"""{"code":500,"message":"$errMsg"}"""
- IO.pure(Http4sStandardHeaders(req,
+ IO.pure(stripBodyForHead(req, Http4sStandardHeaders(req,
Response[IO](status = Status.InternalServerError)
.withEntity(body.getBytes("UTF-8"))
- .withHeaders(Headers(Header.Raw(CIString("Content-Type"), "application/json; charset=utf-8")))))
+ .withHeaders(Headers(Header.Raw(CIString("Content-Type"), "application/json; charset=utf-8"))))))
}
}
}
diff --git a/obp-api/src/main/scala/code/search/search.scala b/obp-api/src/main/scala/code/search/search.scala
index 6849ac71ae..97109c2fb9 100644
--- a/obp-api/src/main/scala/code/search/search.scala
+++ b/obp-api/src/main/scala/code/search/search.scala
@@ -12,15 +12,13 @@ import net.liftweb.common.{Box, Empty, Failure, Full}
import com.openbankproject.commons.util.json
import okhttp3.{MediaType => OkMediaType, OkHttpClient, Request => OkRequest, RequestBody}
import org.json4s.JsonAST
-import scala.concurrent.{Await, ExecutionContext, Future, Promise}
-import scala.concurrent.duration.Duration
+import scala.concurrent.{ExecutionContext, Future}
+import scala.concurrent.ExecutionContext.Implicits.global
import scala.util.control.NoStackTrace
class elasticsearch extends MdcLoggable {
- private implicit val ec: ExecutionContext = ExecutionContext.global
-
case class APIResponse(code: Int, body: JValue)
case class ErrorMessage(error: String)
@@ -102,28 +100,15 @@ class elasticsearch extends MdcLoggable {
}
private def getAPIResponse(esUrl: String, body: String = ""): APIResponse = {
- Await.result(getAPIResponseAsync(esUrl, body), Duration.Inf)
+ val r = httpClient.newCall(buildRequest(esUrl, body)).execute()
+ val (statusCode, rawBody) = try {
+ (r.code(), Option(r.body()).map(_.string()).filter(_.nonEmpty).getOrElse("{}"))
+ } finally r.close()
+ APIResponse(statusCode, json.parse(rawBody))
}
- private def getAPIResponseAsync(esUrl: String, body: String = ""): Future[APIResponse] = {
- val promise = Promise[APIResponse]()
- val request = buildRequest(esUrl, body)
- httpClient.newCall(request).enqueue(new okhttp3.Callback {
- override def onFailure(call: okhttp3.Call, e: java.io.IOException): Unit =
- promise.failure(e)
- override def onResponse(call: okhttp3.Call, response: okhttp3.Response): Unit = {
- try {
- val bodyStr = Option(response.body()).map(_.string()).filter(_.nonEmpty).getOrElse("{}")
- promise.success(APIResponse(response.code(), json.parse(bodyStr)))
- } catch {
- case e: Throwable => promise.failure(e)
- } finally {
- response.close()
- }
- }
- })
- promise.future
- }
+ private def getAPIResponseAsync(esUrl: String, body: String = ""): Future[APIResponse] =
+ Future { scala.concurrent.blocking { getAPIResponse(esUrl, body) } }
private def buildRequest(esUrl: String, body: String): OkRequest =
if (body.nonEmpty)
diff --git a/obp-api/src/test/scala/code/api/UKOpenBanking/v3_1_0/UKOpenBankingV310ServerSetup.scala b/obp-api/src/test/scala/code/api/UKOpenBanking/v3_1_0/UKOpenBankingV310ServerSetup.scala
index 68958ea776..51f81712ed 100644
--- a/obp-api/src/test/scala/code/api/UKOpenBanking/v3_1_0/UKOpenBankingV310ServerSetup.scala
+++ b/obp-api/src/test/scala/code/api/UKOpenBanking/v3_1_0/UKOpenBankingV310ServerSetup.scala
@@ -2,7 +2,7 @@ package code.api.UKOpenBanking.v3_1_0
import code.api.util.APIUtil.OAuth._
import code.setup.{APIResponse, DefaultUsers, ServerSetupWithTestData}
-import dispatch.Req
+import code.setup.OBPReq
/**
* Shared setup + request helpers for the UK Open Banking v3.1 test suites.
@@ -14,10 +14,10 @@ import dispatch.Req
*/
trait UKOpenBankingV310ServerSetup extends ServerSetupWithTestData with DefaultUsers {
- def v31Request: Req = baseRequest / "open-banking" / "v3.1"
+ def v31Request: OBPReq = baseRequest / "open-banking" / "v3.1"
// Build a request from path segments, e.g. v31("accounts", accountId, "balances").
- def v31(segments: String*): Req = segments.foldLeft(v31Request)((req, s) => req / s)
+ def v31(segments: String*): OBPReq = segments.foldLeft(v31Request)((req, s) => req / s)
def getAuthed(segments: String*): APIResponse = makeGetRequest(v31(segments: _*).GET <@ (user1))
def getUnauthed(segments: String*): APIResponse = makeGetRequest(v31(segments: _*).GET)
diff --git a/obp-api/src/test/scala/code/api/berlin/group/v1_3/BerlinGroupServerSetupV1_3.scala b/obp-api/src/test/scala/code/api/berlin/group/v1_3/BerlinGroupServerSetupV1_3.scala
index 527d402230..1e1782c2ee 100644
--- a/obp-api/src/test/scala/code/api/berlin/group/v1_3/BerlinGroupServerSetupV1_3.scala
+++ b/obp-api/src/test/scala/code/api/berlin/group/v1_3/BerlinGroupServerSetupV1_3.scala
@@ -9,7 +9,7 @@ import code.api.v3_0_0.ViewJsonV300
import code.api.v4_0_0.{PostAccountAccessJsonV400, PostViewJsonV400}
import code.setup.ServerSetupWithTestData
import code.views.Views
-import dispatch.Req
+import code.setup.OBPReq
import org.json4s.native.Serialization.write
import org.scalatest.Tag
@@ -18,7 +18,7 @@ trait BerlinGroupServerSetupV1_3 extends ServerSetupWithTestData {
val berlinGroupVersion1: String = ConstantsBG.berlinGroupVersion1.apiShortVersion
object BerlinGroupV1_3 extends Tag("BerlinGroup_v1_3")
val V1_3_BG = baseRequest / ConstantsBG.berlinGroupVersion1.urlPrefix / ConstantsBG.berlinGroupVersion1.apiShortVersion
- def v4_0_0_Request: Req = baseRequest / "obp" / "v4.0.0"
+ def v4_0_0_Request: OBPReq = baseRequest / "obp" / "v4.0.0"
override def beforeEach() = {
super.beforeEach()
diff --git a/obp-api/src/test/scala/code/api/http4sbridge/Http4sServerIntegrationTest.scala b/obp-api/src/test/scala/code/api/http4sbridge/Http4sServerIntegrationTest.scala
index d0453f202c..9845c9be3b 100644
--- a/obp-api/src/test/scala/code/api/http4sbridge/Http4sServerIntegrationTest.scala
+++ b/obp-api/src/test/scala/code/api/http4sbridge/Http4sServerIntegrationTest.scala
@@ -3,16 +3,14 @@ package code.api.http4sbridge
import org.json4s._
import code.Http4sTestServer
import code.api.util.APIUtil
-import code.setup.{DefaultUsers, ServerSetup, ServerSetupWithTestData}
+import code.setup.{DefaultUsers, OBPReq, ServerSetup, ServerSetupWithTestData}
import code.views.system.AccountAccess
-import dispatch.Defaults._
-import dispatch._
import org.json4s.JsonAST.JObject
import com.openbankproject.commons.util.JsonAliases.parse
import org.scalatest.Tag
import scala.collection.JavaConverters._
-import scala.concurrent.Await
+import scala.concurrent.{ExecutionContext, Future, Await}
import scala.concurrent.duration._
/**
@@ -25,7 +23,7 @@ import scala.concurrent.duration._
* - Makes real HTTP requests over the network to a running HTTP4S server
* - Tests the complete server stack including middleware, error handling, etc.
* - Provides true end-to-end testing of the HTTP4S server implementation
- *
+ *
* The server starts automatically when first accessed and stops on JVM shutdown.
*/
@@ -33,159 +31,86 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser
object Http4sServerIntegrationTag extends Tag("Http4sServerIntegration")
- // Reference the singleton HTTP4S test server (auto-starts on first access)
private val http4sServer = Http4sTestServer
private val baseUrl = s"http://${http4sServer.host}:${http4sServer.port}"
override def afterAll(): Unit = {
super.afterAll()
- // Clean up test data
code.views.system.ViewDefinition.bulkDelete_!!()
AccountAccess.bulkDelete_!!()
}
- private def makeHttp4sGetRequestFull(path: String, reqHeaders: Map[String, String] = Map.empty): (Int, String, Option[String]) = {
- val request = url(s"$baseUrl$path")
- val requestWithHeaders = reqHeaders.foldLeft(request) { case (req, (key, value)) =>
- req.addHeader(key, value)
- }
- val response = Http.default(requestWithHeaders.setHeader("Accept", "*/*") > as.Response(p =>
- (p.getStatusCode, p.getResponseBody, Option(p.getHeader("X-OBP-Version-Served")).filter(_.nonEmpty))
- ))
- Await.result(response, 10.seconds)
+ private def execOkHttp(req: OBPReq): (Int, String, Map[String, String]) = {
+ val (code, body, hdrs) = req.executeRaw()
+ (code, body, hdrs.toMultimap.asScala.flatMap { case (k, vs) => vs.asScala.map(v => k -> v) }.toMap)
}
- private def makeHttp4sGetRequest(path: String, headers: Map[String, String] = Map.empty): (Int, String) = {
- val request = url(s"$baseUrl$path")
- val requestWithHeaders = headers.foldLeft(request) { case (req, (key, value)) =>
- req.addHeader(key, value)
- }
-
- try {
- val response = Http.default(requestWithHeaders.setHeader("Accept", "*/*") > as.Response(p => (p.getStatusCode, p.getResponseBody)))
- Await.result(response, 10.seconds)
- } catch {
- case e: java.util.concurrent.ExecutionException =>
- // Extract status code from exception message if possible
- val statusPattern = """(\d{3})""".r
- statusPattern.findFirstIn(e.getCause.getMessage) match {
- case Some(code) => (code.toInt, e.getCause.getMessage)
- case None => throw e
- }
- case e: Exception =>
- throw e
- }
+ private def buildHttp4sReq(path: String, method: String, body: String = "", hdrs: Map[String, String] = Map.empty): OBPReq = {
+ val base = OBPReq.url(s"$baseUrl$path").setMethod(method).setBody(body).addHeader("Accept", "*/*")
+ hdrs.foldLeft(base) { case (r, (k, v)) => r.addHeader(k, v) }
}
- private def makeHttp4sPostRequest(path: String, body: String, headers: Map[String, String] = Map.empty): (Int, String) = {
- val request = url(s"$baseUrl$path").POST.setBody(body)
- val requestWithHeaders = headers.foldLeft(request) { case (req, (key, value)) =>
- req.addHeader(key, value)
- }
-
- try {
- val response = Http.default(requestWithHeaders.setHeader("Accept", "*/*") > as.Response(p => (p.getStatusCode, p.getResponseBody)))
- val (statusCode, responseBody) = Await.result(response, 10.seconds)
- (statusCode, responseBody)
- } catch {
- case e: Exception =>
- throw e
- }
+ private def makeHttp4sRequest(path: String, method: String, body: String = "", hdrs: Map[String, String] = Map.empty): (Int, String) = {
+ val (status, responseBody, _) = execOkHttp(buildHttp4sReq(path, method, body, hdrs))
+ (status, responseBody)
}
- private def makeHttp4sPutRequest(path: String, body: String, headers: Map[String, String] = Map.empty): (Int, String) = {
- val request = url(s"$baseUrl$path").PUT.setBody(body)
- val requestWithHeaders = headers.foldLeft(request) { case (req, (key, value)) =>
- req.addHeader(key, value)
- }
-
- try {
- val response = Http.default(requestWithHeaders.setHeader("Accept", "*/*") > as.Response(p => (p.getStatusCode, p.getResponseBody)))
- val (statusCode, responseBody) = Await.result(response, 10.seconds)
- (statusCode, responseBody)
- } catch {
- case e: Exception =>
- throw e
- }
+ private def makeHttp4sGetRequestFull(path: String, reqHeaders: Map[String, String] = Map.empty): (Int, String, Option[String]) = {
+ val (status, body, respHdrs) = execOkHttp(buildHttp4sReq(path, "GET", hdrs = reqHeaders))
+ val versionServed = respHdrs.find { case (k, _) => k.equalsIgnoreCase("X-OBP-Version-Served") }
+ .map(_._2).filter(_.nonEmpty)
+ (status, body, versionServed)
}
- private def makeHttp4sOptionsRequest(path: String): (Int, Map[String, String]) = {
- val request = url(s"$baseUrl$path").OPTIONS
- val response = Http.default(
- request.setHeader("Accept", "*/*") > as.Response(p =>
- (p.getStatusCode, p.getHeaders.iterator().asScala.map(e => e.getKey -> e.getValue).toMap)
- )
- )
- Await.result(response, 10.seconds)
- }
+ private def makeHttp4sGetRequest(path: String, headers: Map[String, String] = Map.empty): (Int, String) =
+ makeHttp4sRequest(path, "GET", hdrs = headers)
- private def makeHttp4sDeleteRequest(path: String, headers: Map[String, String] = Map.empty): (Int, String) = {
- val request = url(s"$baseUrl$path").DELETE
- val requestWithHeaders = headers.foldLeft(request) { case (req, (key, value)) =>
- req.addHeader(key, value)
- }
-
- try {
- val response = Http.default(requestWithHeaders.setHeader("Accept", "*/*") > as.Response(p => {
- val statusCode = p.getStatusCode
- val body = if (p.getResponseBody != null) p.getResponseBody else ""
- (statusCode, body)
- }))
- Await.result(response, 10.seconds)
- } catch {
- case e: java.util.concurrent.ExecutionException =>
- // Extract status code from exception message if possible
- val statusPattern = """(\d{3})""".r
- statusPattern.findFirstIn(e.getCause.getMessage) match {
- case Some(code) => (code.toInt, e.getCause.getMessage)
- case None => throw e
- }
- case e: Exception =>
- throw e
- }
+ private def makeHttp4sOptionsRequest(path: String): (Int, Map[String, String]) = {
+ val (status, _, hdrs) = execOkHttp(buildHttp4sReq(path, "OPTIONS"))
+ (status, hdrs)
}
feature("HTTP4S Server Integration - Real Server Tests") {
-
+
scenario("HTTP4S test server starts successfully", Http4sServerIntegrationTag) {
Given("HTTP4S test server singleton is accessed")
-
+
Then("Server should be running")
http4sServer.isRunning should be(true)
-
+
And("Server should be on correct host and port")
http4sServer.host should equal("127.0.0.1")
- // Port is dynamically allocated by run_tests_parallel.sh (OBP_HTTP4S_TEST_PORT)
- // to avoid collisions across concurrent checkouts; assert it matches the prop.
http4sServer.port should equal(APIUtil.getPropsAsIntValue("http4s.test.port", 8087))
}
scenario("Server handles 404 for unknown routes", Http4sServerIntegrationTag) {
Given("HTTP4S test server is running")
-
+
When("We make a GET request to a non-existent endpoint")
- try {
- makeHttp4sGetRequest("/obp/v5.0.0/this-does-not-exist")
- fail("Should have thrown exception for 404")
- } catch {
- case e: Exception =>
- Then("We should get a 404 error")
- e.getMessage should include("404")
- }
+ val (status, _) = makeHttp4sGetRequest("/obp/v5.0.0/this-does-not-exist")
+
+ Then("We should get a 404 response")
+ status should equal(404)
}
scenario("Server handles multiple concurrent requests", Http4sServerIntegrationTag) {
Given("HTTP4S test server is running")
-
+
When("We make multiple concurrent requests to native HTTP4S endpoints")
+ implicit val ec: ExecutionContext = ExecutionContext.global
val futures = (1 to 10).map { _ =>
- Http.default(url(s"$baseUrl/obp/v5.0.0/root") OK as.String)
+ Future {
+ scala.concurrent.blocking {
+ makeHttp4sGetRequest("/obp/v5.0.0/root")
+ }
+ }
}
-
- val results = Await.result(Future.sequence(futures), 30.seconds)
-
+
+ val results = Await.result(Future.sequence(futures), 60.seconds)
+
Then("All requests should succeed")
- results.foreach { body =>
+ results.foreach { case (status, body) =>
+ status should equal(200)
val json = parse(body)
json \ "version" should not equal JObject(Nil)
}
@@ -193,14 +118,14 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser
}
feature("HTTP4S v7.0.0 Native Endpoints") {
-
+
scenario("GET /obp/v7.0.0/root returns API info", Http4sServerIntegrationTag) {
When("We request the root endpoint")
val (status, body) = makeHttp4sGetRequest("/obp/v7.0.0/root")
-
+
Then("We should get a 200 response")
status should equal(200)
-
+
And("Response should contain version info")
val json = parse(body)
(json \ "version").extract[String] should equal("v7.0.0")
@@ -210,10 +135,10 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser
scenario("GET /obp/v7.0.0/banks returns banks list", Http4sServerIntegrationTag) {
When("We request banks list")
val (status, body) = makeHttp4sGetRequest("/obp/v7.0.0/banks")
-
+
Then("We should get a 200 response")
status should equal(200)
-
+
And("Response should contain banks array")
val json = parse(body)
json \ "banks" should not equal JObject(Nil)
@@ -250,14 +175,14 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser
}
feature("HTTP4S v5.0.0 Native Endpoints") {
-
+
scenario("GET /obp/v5.0.0/root returns API info", Http4sServerIntegrationTag) {
When("We request the root endpoint")
val (status, body) = makeHttp4sGetRequest("/obp/v5.0.0/root")
-
+
Then("We should get a 200 response")
status should equal(200)
-
+
And("Response should contain version info")
val json = parse(body)
(json \ "version").extract[String] should equal("v5.0.0")
@@ -267,10 +192,10 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser
scenario("GET /obp/v5.0.0/banks returns banks list", Http4sServerIntegrationTag) {
When("We request banks list")
val (status, body) = makeHttp4sGetRequest("/obp/v5.0.0/banks")
-
+
Then("We should get a 200 response")
status should equal(200)
-
+
And("Response should contain banks array")
val json = parse(body)
json \ "banks" should not equal JObject(Nil)
@@ -279,10 +204,10 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser
scenario("GET /obp/v5.0.0/banks/BANK_ID returns specific bank", Http4sServerIntegrationTag) {
When("We request a specific bank")
val (status, body) = makeHttp4sGetRequest(s"/obp/v5.0.0/banks/testBank0")
-
+
Then("We should get a 200 response")
status should equal(200)
-
+
And("Response should contain bank info")
val json = parse(body)
(json \ "id").extract[String] should equal(s"testBank0")
@@ -291,10 +216,10 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser
scenario("GET /obp/v5.0.0/banks/BANK_ID/products returns products", Http4sServerIntegrationTag) {
When("We request products for a bank")
val (status, body) = makeHttp4sGetRequest(s"/obp/v5.0.0/banks/testBank0/products")
-
+
Then("We should get a 200 response")
status should equal(200)
-
+
And("Response should contain products array")
val json = parse(body)
json \ "products" should not equal JObject(Nil)
@@ -302,23 +227,22 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser
scenario("GET /obp/v5.0.0/banks/BANK_ID/products/PRODUCT_CODE returns specific product", Http4sServerIntegrationTag) {
When("We request a specific product")
- // First get a product code from the products list
val (_, productsBody) = makeHttp4sGetRequest(s"/obp/v5.0.0/banks/testBank0/products")
val productsJson = parse(productsBody)
val products = (productsJson \ "products").children
-
+
if (products.nonEmpty) {
val productCode = (products.head \ "code").extract[String]
val (status, body) = makeHttp4sGetRequest(s"/obp/v5.0.0/banks/testBank0/products/$productCode")
-
+
Then("We should get a 200 response")
status should equal(200)
-
+
And("Response should contain product info")
val json = parse(body)
(json \ "code").extract[String] should equal(productCode)
} else {
- pending // Skip if no products available
+ pending
}
}
}
@@ -329,33 +253,27 @@ class Http4sServerIntegrationTest extends ServerSetup with DefaultUsers with Ser
Given("HTTP4S test server is running")
When("We make a GET request to a v5.0.0 endpoint not natively declared in Http4s500")
- val (status, body) = makeHttp4sGetRequest("/obp/v5.0.0/users/current")
+ val (status, _) = makeHttp4sGetRequest("/obp/v5.0.0/users/current")
Then("We should get a 401 response (authentication required)")
status should equal(401)
info("This endpoint requires authentication - 401 is correct behavior")
}
- scenario("v3.1.0 /banks currently returns 404", Http4sServerIntegrationTag) {
+ scenario("v3.1.0 /banks cascade chain handles the request without a server error", Http4sServerIntegrationTag) {
Given("HTTP4S test server is running")
- // TODO v310Routes is wired into Http4sApp.baseServices; this 404 may no longer hold.
- // Behaviour is asserted as-is here; re-validate before relying on it as a guarantee.
When("We make a GET request to /obp/v3.1.0/banks")
- try {
- makeHttp4sGetRequest("/obp/v3.1.0/banks")
- fail("Expected 404 for /obp/v3.1.0/banks")
- } catch {
- case e: Exception =>
- Then("We should get a 404 error")
- e.getMessage should include("404")
- }
+ val (status, _) = makeHttp4sGetRequest("/obp/v3.1.0/banks")
+
+ Then("We should not get a server error — the cascade chain is functional")
+ // May return 200 (via v1.2.1 cascade) or 404 (if older version gates are disabled),
+ // but the cascade chain itself must not produce a 5xx.
+ status should be < 500
}
}
// ─── CORS preflight ──────────────────────────────────────────────────────────
- // corsHandler sits above Http4s700 in Http4sApp and is only reachable via the
- // real server — in-process route tests cannot exercise it.
feature("HTTP4S CORS preflight") {
diff --git a/obp-api/src/test/scala/code/api/util/DynamicUtilJsEngineTest.scala b/obp-api/src/test/scala/code/api/util/DynamicUtilJsEngineTest.scala
new file mode 100644
index 0000000000..7c9f1a1022
--- /dev/null
+++ b/obp-api/src/test/scala/code/api/util/DynamicUtilJsEngineTest.scala
@@ -0,0 +1,54 @@
+package code.api.util
+
+import net.liftweb.common.{Full, Failure}
+import org.scalatest.{FlatSpec, Matchers}
+
+import scala.concurrent.Await
+import scala.concurrent.duration._
+
+/**
+ * Verifies that the GraalVM Polyglot JS engine (org.graalvm.polyglot:polyglot 24.x)
+ * loads and executes correctly at runtime. Requires JDK 17+ — GraalVM 24.x JARs are
+ * compiled at class-file version 61.0 and throw UnsupportedClassVersionError on JDK 11.
+ * If this test fails with that error, the runtime JDK must be upgraded to 17+.
+ */
+class DynamicUtilJsEngineTest extends FlatSpec with Matchers {
+
+ "DynamicUtil.createJsFunction" should "load the GraalVM JS engine without error" in {
+ val result = DynamicUtil.createJsFunction("return 42;")
+ result shouldBe a [Full[_]]
+ }
+
+ it should "execute JS returning a literal and yield JSON-stringified result" in {
+ val fn = DynamicUtil.createJsFunction("return 42;")
+ .openOrThrowException("GraalVM engine must load successfully")
+ val boxResult = Await.result(fn(Array.empty[AnyRef], None), 10.seconds)
+ boxResult shouldBe a [Full[_]]
+ val (json, _) = boxResult.openOrThrowException("JS promise must resolve")
+ json shouldBe "42"
+ }
+
+ it should "execute JS returning an object and yield valid JSON" in {
+ val fn = DynamicUtil.createJsFunction("""return {"status": "ok", "value": 99};""")
+ .openOrThrowException("GraalVM engine must load successfully")
+ val boxResult = Await.result(fn(Array.empty[AnyRef], None), 10.seconds)
+ boxResult shouldBe a [Full[_]]
+ val (json, _) = boxResult.openOrThrowException("JS promise must resolve")
+ json should include ("\"status\"")
+ json should include ("\"ok\"")
+ }
+
+ it should "return Failure on JS syntax error without throwing" in {
+ val result = DynamicUtil.createJsFunction("{{ this is not valid JavaScript {{{{")
+ result shouldBe a [Failure]
+ }
+
+ it should "pass args into JS and compute with them" in {
+ val fn = DynamicUtil.createJsFunction("return args[0] * 2;")
+ .openOrThrowException("GraalVM engine must load successfully")
+ val boxResult = Await.result(fn(Array[AnyRef](Integer.valueOf(21)), None), 10.seconds)
+ boxResult shouldBe a [Full[_]]
+ val (json, _) = boxResult.openOrThrowException("JS promise must resolve")
+ json shouldBe "42"
+ }
+}
diff --git a/obp-api/src/test/scala/code/api/v2_1_0/SandboxDataLoadingTest.scala b/obp-api/src/test/scala/code/api/v2_1_0/SandboxDataLoadingTest.scala
index 7c9331de60..aecef931bd 100644
--- a/obp-api/src/test/scala/code/api/v2_1_0/SandboxDataLoadingTest.scala
+++ b/obp-api/src/test/scala/code/api/v2_1_0/SandboxDataLoadingTest.scala
@@ -56,7 +56,6 @@ import code.views.Views
import code.views.system.ViewDefinition
import com.openbankproject.commons.model._
import com.openbankproject.commons.model.enums.AccountRoutingScheme
-import dispatch._
import net.liftweb.common.{Empty, ParamFailure}
import org.json4s.JsonAST.{JObject, JValue}
import org.json4s.JsonDSL._
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/V300ServerSetup.scala b/obp-api/src/test/scala/code/api/v3_0_0/V300ServerSetup.scala
index daace1b71b..0989208ac8 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/V300ServerSetup.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/V300ServerSetup.scala
@@ -5,7 +5,7 @@ import code.api.util.APIUtil.OAuth.{Consumer, Token, _}
import code.api.v1_2_1.{AccountJSON, AccountsJSON, BanksJSON, ViewsJSONV121}
import code.api.v2_0_0.BasicAccountsJSON
import code.setup.{APIResponse, DefaultUsers, ServerSetupWithTestData}
-import dispatch.Req
+import code.setup.OBPReq
import scala.util.Random.nextInt
@@ -14,7 +14,7 @@ import scala.util.Random.nextInt
*/
trait V300ServerSetup extends ServerSetupWithTestData with DefaultUsers {
- def v3_0Request: Req = baseRequest / "obp" / "v3.0.0"
+ def v3_0Request: OBPReq = baseRequest / "obp" / "v3.0.0"
//When new version, this would be the first endpoint to test, to make sure it works well.
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/V300ServerSetupAsync.scala b/obp-api/src/test/scala/code/api/v3_0_0/V300ServerSetupAsync.scala
index d1c7508a02..bb3777b73f 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/V300ServerSetupAsync.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/V300ServerSetupAsync.scala
@@ -1,10 +1,10 @@
package code.api.v3_0_0
import code.setup._
-import dispatch.Req
+import code.setup.OBPReq
trait V300ServerSetupAsync extends ServerSetupWithTestDataAsync with DefaultUsers {
- def v3_0Request: Req = baseRequest / "obp" / "v3.0.0"
+ def v3_0Request: OBPReq = baseRequest / "obp" / "v3.0.0"
}
\ No newline at end of file
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/V310ServerSetup.scala b/obp-api/src/test/scala/code/api/v3_1_0/V310ServerSetup.scala
index 2dbaf9273a..3b0e16dac5 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/V310ServerSetup.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/V310ServerSetup.scala
@@ -8,14 +8,14 @@ import code.api.v2_0_0.BasicAccountsJSON
import code.api.v3_0_0.{TransactionJsonV300, TransactionsJsonV300, ViewsJsonV300}
import code.entitlement.Entitlement
import code.setup.{APIResponse, DefaultUsers, ServerSetupWithTestData}
-import dispatch.Req
+import code.setup.OBPReq
import org.json4s.native.Serialization.write
import scala.util.Random.nextInt
trait V310ServerSetup extends ServerSetupWithTestData with DefaultUsers {
- def v3_1_0_Request: Req = baseRequest / "obp" / "v3.1.0"
+ def v3_1_0_Request: OBPReq = baseRequest / "obp" / "v3.1.0"
//When new version, this would be the first endpoint to test, to make sure it works well.
def getAPIInfo : APIResponse = {
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/V310ServerSetupAsync.scala b/obp-api/src/test/scala/code/api/v3_1_0/V310ServerSetupAsync.scala
index f389765f60..9e0ef56ae1 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/V310ServerSetupAsync.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/V310ServerSetupAsync.scala
@@ -1,10 +1,10 @@
package code.api.v3_1_0
import code.setup._
-import dispatch.Req
+import code.setup.OBPReq
trait V310ServerSetupAsync extends ServerSetupWithTestDataAsync with DefaultUsers {
- def v3_1_0_Request: Req = baseRequest / "obp" / "v3.1.0"
+ def v3_1_0_Request: OBPReq = baseRequest / "obp" / "v3.1.0"
}
\ No newline at end of file
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
index 1de74e756b..a2da8727af 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
@@ -43,7 +43,7 @@ import net.liftweb.common.Full
import org.json4s.JArray
import org.json4s.native.Serialization.write
import org.scalatest.Tag
-import dispatch.Req
+import code.setup.OBPReq
import org.json4s.JArray
import java.net.URLEncoder
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/OPTIONSTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/OPTIONSTest.scala
index 01743f57fa..08aae36d5b 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/OPTIONSTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/OPTIONSTest.scala
@@ -25,15 +25,10 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v4_0_0
-import com.openbankproject.commons.ExecutionContext.Implicits.global
+import code.setup.OBPReq
import com.openbankproject.commons.util.ApiVersion
-import dispatch.{Http, as}
-import org.asynchttpclient.Response
import org.scalatest.Tag
-import scala.concurrent.Await
-import scala.concurrent.duration.Duration
-
class OPTIONSTest extends V400ServerSetup {
/**
@@ -51,22 +46,24 @@ class OPTIONSTest extends V400ServerSetup {
scenario("We send a common OPTIONS http request", ApiEndpoint1, VersionOfApi) {
When("We make a request v4.0.0")
val requestOPTIONS = (v4_0_0_Request / "banks").OPTIONS
- val response204: Response = Await.result({
- Http.default(requestOPTIONS > as.Response(p => p))
- }, Duration.Inf)
-
- Then("We should get a 204")
- response204.getStatusCode() should equal(204)
-
- Then("response header should be correct")
- response204.getHeader("Access-Control-Allow-Origin") shouldBe "*"
- response204.getHeader("Access-Control-Allow-Credentials") shouldBe "true"
- // Content-Type is absent on 204 No Content — HTTP spec does not permit a body on 204,
- // so Content-Type is irrelevant. The previous assertion reflected incidental Lift bridge
- // behaviour; the native corsHandler correctly omits it.
-
- Then("body should be empty")
- response204.getResponseBody shouldBe empty
+ val response204 = OBPReq.client.newCall(requestOPTIONS.toOkHttpRequest).execute()
+
+ try {
+ Then("We should get a 204")
+ response204.code() should equal(204)
+
+ Then("response header should be correct")
+ response204.header("Access-Control-Allow-Origin") shouldBe "*"
+ response204.header("Access-Control-Allow-Credentials") shouldBe "true"
+ // Content-Type is absent on 204 No Content — HTTP spec does not permit a body on 204,
+ // so Content-Type is irrelevant. The previous assertion reflected incidental Lift bridge
+ // behaviour; the native corsHandler correctly omits it.
+
+ Then("body should be empty")
+ Option(response204.body()).map(_.string()).getOrElse("") shouldBe empty
+ } finally {
+ response204.close()
+ }
}
}
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/V400ServerSetup.scala b/obp-api/src/test/scala/code/api/v4_0_0/V400ServerSetup.scala
index 77d2a7279c..ba69e99330 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/V400ServerSetup.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/V400ServerSetup.scala
@@ -25,7 +25,7 @@ import code.setup.{APIResponse, DefaultUsers, ServerSetupWithTestData}
import code.transactionattribute.MappedTransactionAttribute
import com.openbankproject.commons.model.{AccountId, AccountRoutingJsonV121, AmountOfMoneyJsonV121, BankId, CreateViewJson, UpdateViewJSON}
import com.openbankproject.commons.util.ApiShortVersions
-import dispatch.Req
+import code.setup.OBPReq
import org.json4s.native.Serialization.write
import net.liftweb.mapper.By
import net.liftweb.util.Helpers.randomString
@@ -36,11 +36,11 @@ import scala.util.Random.nextInt
trait V400ServerSetup extends ServerSetupWithTestData with DefaultUsers {
- def v4_0_0_Request: Req = baseRequest / "obp" / "v4.0.0"
- def v5_0_0_Request: Req = baseRequest / "obp" / "v5.0.0"
- def v5_1_0_Request: Req = baseRequest / "obp" / "v5.1.0"
- def dynamicEndpoint_Request: Req = baseRequest / "obp" / ApiShortVersions.`dynamic-endpoint`.toString
- def dynamicEntity_Request: Req = baseRequest / "obp" / ApiShortVersions.`dynamic-entity`.toString
+ def v4_0_0_Request: OBPReq = baseRequest / "obp" / "v4.0.0"
+ def v5_0_0_Request: OBPReq = baseRequest / "obp" / "v5.0.0"
+ def v5_1_0_Request: OBPReq = baseRequest / "obp" / "v5.1.0"
+ def dynamicEndpoint_Request: OBPReq = baseRequest / "obp" / ApiShortVersions.`dynamic-endpoint`.toString
+ def dynamicEntity_Request: OBPReq = baseRequest / "obp" / ApiShortVersions.`dynamic-entity`.toString
def randomBankId : String = {
def getBanksInfo : APIResponse = {
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/V400ServerSetupAsync.scala b/obp-api/src/test/scala/code/api/v4_0_0/V400ServerSetupAsync.scala
index 2425c7ac4c..9e4ad91c3b 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/V400ServerSetupAsync.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/V400ServerSetupAsync.scala
@@ -1,10 +1,10 @@
package code.api.v4_0_0
import code.setup._
-import dispatch.Req
+import code.setup.OBPReq
trait V400ServerSetupAsync extends ServerSetupWithTestDataAsync with DefaultUsers {
- def v4_0_0_Request: Req = baseRequest / "obp" / "v4.0.0"
+ def v4_0_0_Request: OBPReq = baseRequest / "obp" / "v4.0.0"
}
\ No newline at end of file
diff --git a/obp-api/src/test/scala/code/api/v5_0_0/Http4s500SystemViewsTest.scala b/obp-api/src/test/scala/code/api/v5_0_0/Http4s500SystemViewsTest.scala
index 7de4bc0dfa..2ad35672f2 100644
--- a/obp-api/src/test/scala/code/api/v5_0_0/Http4s500SystemViewsTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_0_0/Http4s500SystemViewsTest.scala
@@ -6,10 +6,8 @@ import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
import code.api.util.APIUtil
import code.api.util.ApiRole.{CanCreateSystemView, CanDeleteSystemView, CanGetSystemView, CanUpdateSystemView}
import code.api.util.ErrorMessages.{AuthenticatedUserIsRequired, SystemViewNotFound, UserHasMissingRoles}
-import code.setup.ServerSetupWithTestData
+import code.setup.{OBPReq, ServerSetupWithTestData}
import code.views.system.AccountAccess
-import dispatch.Defaults._
-import dispatch._
import org.json4s.JValue
import org.json4s.JsonAST.{JField, JObject, JString}
import com.openbankproject.commons.util.JsonAliases.parse
@@ -17,8 +15,6 @@ import org.json4s.native.Serialization.write
import net.liftweb.mapper.By
import org.scalatest.Tag
-import scala.concurrent.Await
-import scala.concurrent.duration._
import com.openbankproject.commons.util.JsonAliases.RichJField
/**
@@ -49,38 +45,22 @@ class Http4s500SystemViewsTest extends ServerSetupWithTestData {
private def makeHttpRequest(
method: String,
- path: String,
+ path: String,
headers: Map[String, String] = Map.empty,
body: Option[String] = None
): (Int, JValue) = {
- val request = url(s"$baseUrl$path")
- val requestWithHeaders = headers.foldLeft(request) { case (req, (key, value)) =>
- req.addHeader(key, value)
- }
-
+ val base = OBPReq.url(s"$baseUrl$path").addHeader("Accept", "*/*")
+ val withHdrs = headers.foldLeft(base) { case (req, (key, value)) => req.addHeader(key, value) }
val finalRequest = method.toUpperCase match {
- case "GET" => requestWithHeaders
- case "POST" => requestWithHeaders.POST.setBody(body.getOrElse("")).setContentType("application/json", java.nio.charset.StandardCharsets.UTF_8)
- case "PUT" => requestWithHeaders.PUT.setBody(body.getOrElse("")).setContentType("application/json", java.nio.charset.StandardCharsets.UTF_8)
- case "DELETE" => requestWithHeaders.DELETE
- case _ => requestWithHeaders
- }
-
- try {
- val response = Http.default(finalRequest.setHeader("Accept", "*/*") > as.Response(p => (p.getStatusCode, p.getResponseBody)))
- val (statusCode, responseBody) = Await.result(response, 10.seconds)
- val json = if (responseBody.trim.isEmpty) JObject(Nil) else parsePermissive(responseBody)
- (statusCode, json)
- } catch {
- case e: java.util.concurrent.ExecutionException =>
- val statusPattern = """(\d{3})""".r
- statusPattern.findFirstIn(e.getCause.getMessage) match {
- case Some(code) => (code.toInt, JObject(Nil))
- case None => throw e
- }
- case e: Exception =>
- throw e
+ case "GET" => withHdrs
+ case "POST" => withHdrs.POST.setBody(body.getOrElse("")).setContentType("application/json", java.nio.charset.StandardCharsets.UTF_8)
+ case "PUT" => withHdrs.PUT.setBody(body.getOrElse("")).setContentType("application/json", java.nio.charset.StandardCharsets.UTF_8)
+ case "DELETE" => withHdrs.DELETE
+ case _ => withHdrs
}
+ val (statusCode, responseBody, _) = finalRequest.executeRaw()
+ val json = if (responseBody.trim.isEmpty) JObject(Nil) else parsePermissive(responseBody)
+ (statusCode, json)
}
private def toFieldMap(fields: List[JField]): Map[String, JValue] = {
diff --git a/obp-api/src/test/scala/code/api/v5_0_0/V500ServerSetup.scala b/obp-api/src/test/scala/code/api/v5_0_0/V500ServerSetup.scala
index e4193b3c66..4d579290bb 100644
--- a/obp-api/src/test/scala/code/api/v5_0_0/V500ServerSetup.scala
+++ b/obp-api/src/test/scala/code/api/v5_0_0/V500ServerSetup.scala
@@ -11,7 +11,7 @@ import code.api.v4_0_0.BanksJson400
import code.entitlement.Entitlement
import code.setup.{APIResponse, DefaultUsers, ServerSetupWithTestData}
import com.openbankproject.commons.util.ApiShortVersions
-import dispatch.Req
+import code.setup.OBPReq
import code.api.util.APIUtil.OAuth._
import code.api.v2_0_0.BasicAccountsJSON
import org.json4s.native.Serialization.write
@@ -20,9 +20,9 @@ import scala.util.Random.nextInt
trait V500ServerSetup extends ServerSetupWithTestData with DefaultUsers {
- def v5_0_0_Request: Req = baseRequest / "obp" / "v5.0.0"
- def dynamicEndpoint_Request: Req = baseRequest / "obp" / ApiShortVersions.`dynamic-endpoint`.toString
- def dynamicEntity_Request: Req = baseRequest / "obp" / ApiShortVersions.`dynamic-entity`.toString
+ def v5_0_0_Request: OBPReq = baseRequest / "obp" / "v5.0.0"
+ def dynamicEndpoint_Request: OBPReq = baseRequest / "obp" / ApiShortVersions.`dynamic-endpoint`.toString
+ def dynamicEntity_Request: OBPReq = baseRequest / "obp" / ApiShortVersions.`dynamic-entity`.toString
def randomBankId : String = {
def getBanksInfo : APIResponse = {
diff --git a/obp-api/src/test/scala/code/api/v5_0_0/V500ServerSetupAsync.scala b/obp-api/src/test/scala/code/api/v5_0_0/V500ServerSetupAsync.scala
index d2598753eb..a90aecf29c 100644
--- a/obp-api/src/test/scala/code/api/v5_0_0/V500ServerSetupAsync.scala
+++ b/obp-api/src/test/scala/code/api/v5_0_0/V500ServerSetupAsync.scala
@@ -2,13 +2,13 @@ package code.api.v5_0_0
import code.api.v4_0_0.BanksJson400
import code.setup._
-import dispatch.Req
+import code.setup.OBPReq
import scala.util.Random.nextInt
trait V500ServerSetupAsync extends ServerSetupWithTestDataAsync with DefaultUsers {
- def v5_0_0_Request: Req = baseRequest / "obp" / "v5.0.0"
+ def v5_0_0_Request: OBPReq = baseRequest / "obp" / "v5.0.0"
def randomBankId : String = {
def getBanksInfo : APIResponse = {
diff --git a/obp-api/src/test/scala/code/api/v5_1_0/AccountBalanceTest.scala b/obp-api/src/test/scala/code/api/v5_1_0/AccountBalanceTest.scala
index 917c68e475..c1544ddc31 100644
--- a/obp-api/src/test/scala/code/api/v5_1_0/AccountBalanceTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_1_0/AccountBalanceTest.scala
@@ -8,7 +8,7 @@ import code.api.v5_1_0.OBPAPI5_1_0.Implementations5_1_0
import com.github.dwickern.macros.NameOf.nameOf
import com.openbankproject.commons.model.ErrorMessage
import com.openbankproject.commons.util.ApiVersion
-import dispatch.Req
+import code.setup.OBPReq
import com.openbankproject.commons.util.json
import org.scalatest.Tag
@@ -27,9 +27,9 @@ class AccountBalanceTest extends V510ServerSetup {
lazy val bankId = randomBankId
lazy val bankAccount = randomPrivateAccountViaEndpoint(bankId)
- def requestGetAccountBalances(viewId: String = "None"): Req = (v5_1_0_Request / "banks" / bankAccount.bank_id / "accounts" / bankAccount.id / "views" / viewId / "balances").GET
- def requestGetAccountsBalances(): Req = (v5_1_0_Request / "banks" / bankAccount.bank_id / "balances").GET
- def requestGetAccountsBalancesThroughView(viewId: String = "None"): Req = (v5_1_0_Request / "banks" / bankAccount.bank_id / "views" / viewId / "balances").GET
+ def requestGetAccountBalances(viewId: String = "None"): OBPReq = (v5_1_0_Request / "banks" / bankAccount.bank_id / "accounts" / bankAccount.id / "views" / viewId / "balances").GET
+ def requestGetAccountsBalances(): OBPReq = (v5_1_0_Request / "banks" / bankAccount.bank_id / "balances").GET
+ def requestGetAccountsBalancesThroughView(viewId: String = "None"): OBPReq = (v5_1_0_Request / "banks" / bankAccount.bank_id / "views" / viewId / "balances").GET
feature(s"test $ApiEndpoint1 version $VersionOfApi - Unauthorized access") {
scenario("We will call the endpoint without user credentials", ApiEndpoint1, VersionOfApi) {
diff --git a/obp-api/src/test/scala/code/api/v5_1_0/V510ServerSetup.scala b/obp-api/src/test/scala/code/api/v5_1_0/V510ServerSetup.scala
index 94cc565019..f1e7169003 100644
--- a/obp-api/src/test/scala/code/api/v5_1_0/V510ServerSetup.scala
+++ b/obp-api/src/test/scala/code/api/v5_1_0/V510ServerSetup.scala
@@ -18,7 +18,7 @@ import code.entitlement.Entitlement
import code.setup.{APIResponse, DefaultUsers, ServerSetupWithTestData}
import com.openbankproject.commons.model.{AccountRoutingJsonV121, AmountOfMoneyJsonV121, CreateViewJson}
import com.openbankproject.commons.util.ApiShortVersions
-import dispatch.Req
+import code.setup.OBPReq
import org.json4s.native.Serialization.write
import scala.util.Random
@@ -26,11 +26,11 @@ import scala.util.Random.nextInt
trait V510ServerSetup extends ServerSetupWithTestData with DefaultUsers {
- def v4_0_0_Request: Req = baseRequest / "obp" / "v4.0.0"
- def v5_0_0_Request: Req = baseRequest / "obp" / "v5.0.0"
- def v5_1_0_Request: Req = baseRequest / "obp" / "v5.1.0"
- def dynamicEndpoint_Request: Req = baseRequest / "obp" / ApiShortVersions.`dynamic-endpoint`.toString
- def dynamicEntity_Request: Req = baseRequest / "obp" / ApiShortVersions.`dynamic-entity`.toString
+ def v4_0_0_Request: OBPReq = baseRequest / "obp" / "v4.0.0"
+ def v5_0_0_Request: OBPReq = baseRequest / "obp" / "v5.0.0"
+ def v5_1_0_Request: OBPReq = baseRequest / "obp" / "v5.1.0"
+ def dynamicEndpoint_Request: OBPReq = baseRequest / "obp" / ApiShortVersions.`dynamic-endpoint`.toString
+ def dynamicEntity_Request: OBPReq = baseRequest / "obp" / ApiShortVersions.`dynamic-entity`.toString
def setRateLimiting(consumerAndToken: Option[(Consumer, Token)], putJson: CallLimitPostJsonV400): APIResponse = {
diff --git a/obp-api/src/test/scala/code/api/v6_0_0/V600ServerSetup.scala b/obp-api/src/test/scala/code/api/v6_0_0/V600ServerSetup.scala
index b5c10bba85..c6fb6d92d8 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/V600ServerSetup.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/V600ServerSetup.scala
@@ -2,14 +2,14 @@ package code.api.v6_0_0
import code.setup.{DefaultUsers, ServerSetupWithTestData}
import com.openbankproject.commons.util.ApiShortVersions
-import dispatch.Req
+import code.setup.OBPReq
trait V600ServerSetup extends ServerSetupWithTestData with DefaultUsers {
- def v4_0_0_Request: Req = baseRequest / "obp" / "v4.0.0"
- def v5_0_0_Request: Req = baseRequest / "obp" / "v5.0.0"
- def v5_1_0_Request: Req = baseRequest / "obp" / "v5.1.0"
- def v6_0_0_Request: Req = baseRequest / "obp" / "v6.0.0"
- def dynamicEntity_Request: Req = baseRequest / "obp" / ApiShortVersions.`dynamic-entity`.toString
+ def v4_0_0_Request: OBPReq = baseRequest / "obp" / "v4.0.0"
+ def v5_0_0_Request: OBPReq = baseRequest / "obp" / "v5.0.0"
+ def v5_1_0_Request: OBPReq = baseRequest / "obp" / "v5.1.0"
+ def v6_0_0_Request: OBPReq = baseRequest / "obp" / "v6.0.0"
+ def dynamicEntity_Request: OBPReq = baseRequest / "obp" / ApiShortVersions.`dynamic-entity`.toString
}
\ No newline at end of file
diff --git a/obp-api/src/test/scala/code/api/v7_0_0/Http4s700TransactionTest.scala b/obp-api/src/test/scala/code/api/v7_0_0/Http4s700TransactionTest.scala
index c8e523b1e1..86ebea072c 100644
--- a/obp-api/src/test/scala/code/api/v7_0_0/Http4s700TransactionTest.scala
+++ b/obp-api/src/test/scala/code/api/v7_0_0/Http4s700TransactionTest.scala
@@ -4,18 +4,12 @@ import org.json4s._
import code.Http4sTestServer
import code.api.util.ApiRole.{canCreateEntitlementAtAnyBank, canDeleteEntitlementAtAnyBank}
import code.entitlement.Entitlement
-import code.setup.ServerSetupWithTestData
-import dispatch.Defaults._
-import dispatch._
+import code.setup.{OBPReq, ServerSetupWithTestData}
import org.json4s.JsonAST.{JObject, JString}
import com.openbankproject.commons.util.JsonAliases.parse
import org.json4s.JValue
import org.scalatest.Tag
-
import scala.collection.JavaConverters._
-import scala.concurrent.Await
-import scala.concurrent.duration._
-import com.openbankproject.commons.util.JsonAliases.RichJField
/**
* Integration tests for the v7 request-scoped transaction feature.
@@ -45,23 +39,23 @@ class Http4s700TransactionTest extends ServerSetupWithTestData {
private val http4sServer = Http4sTestServer
private val baseUrl = s"http://${http4sServer.host}:${http4sServer.port}"
- // ─── HTTP helpers (copied from Http4s700RoutesTest) ───────────────────────
+ // ─── HTTP helpers ────────────────────────────────────────────────────────────
+
+ private def execAndParse(req: OBPReq): (Int, JValue, Map[String, String]) = {
+ val (code, bodyStr, okHdrs) = req.executeRaw()
+ val json = if (bodyStr.trim.isEmpty) JObject(Nil) else parse(bodyStr)
+ val hdrs = okHdrs.toMultimap.asScala.map { case (k, vs) => k -> vs.asScala.mkString(",") }.toMap
+ (code, json, hdrs)
+ }
private def makeHttpRequest(
path: String,
headers: Map[String, String] = Map.empty
): (Int, JValue, Map[String, String]) = {
- val request = url(s"$baseUrl$path")
- val withHdr = headers.foldLeft(request) { case (r, (k, v)) => r.addHeader(k, v) }
- val response = Http.default(
- withHdr.setHeader("Accept", "*/*") > as.Response(p =>
- (p.getStatusCode, p.getResponseBody,
- p.getHeaders.iterator().asScala.map(e => e.getKey -> e.getValue).toMap)
- )
- )
- val (status, body, hdrs) = Await.result(response, 10.seconds)
- val json = if (body.trim.isEmpty) JObject(Nil) else parse(body)
- (status, json, hdrs)
+ val req = headers.foldLeft(OBPReq.url(s"$baseUrl$path").addHeader("Accept", "*/*")) {
+ case (r, (k, v)) => r.addHeader(k, v)
+ }
+ execAndParse(req)
}
private def makeHttpRequestWithBody(
@@ -70,24 +64,14 @@ class Http4s700TransactionTest extends ServerSetupWithTestData {
body: String,
headers: Map[String, String] = Map.empty
): (Int, JValue, Map[String, String]) = {
- val base = url(s"$baseUrl$path")
- val withHdr = (headers + ("Content-Type" -> "application/json")).foldLeft(base) {
- case (r, (k, v)) => r.addHeader(k, v)
- }
- val methodReq = method.toUpperCase match {
+ val base = OBPReq.url(s"$baseUrl$path").addHeader("Accept", "*/*").addHeader("Content-Type", "application/json")
+ val withHdr = headers.foldLeft(base) { case (r, (k, v)) => r.addHeader(k, v) }
+ val req = method.toUpperCase match {
case "POST" => withHdr.POST << body
case "PUT" => withHdr.PUT << body
case _ => withHdr << body
}
- val response = Http.default(
- methodReq.setHeader("Accept", "*/*") > as.Response(p =>
- (p.getStatusCode, p.getResponseBody,
- p.getHeaders.iterator().asScala.map(e => e.getKey -> e.getValue).toMap)
- )
- )
- val (status, responseBody, hdrs) = Await.result(response, 10.seconds)
- val json = if (responseBody.trim.isEmpty) JObject(Nil) else parse(responseBody)
- (status, json, hdrs)
+ execAndParse(req)
}
private def makeHttpRequestWithMethod(
@@ -95,29 +79,21 @@ class Http4s700TransactionTest extends ServerSetupWithTestData {
path: String,
headers: Map[String, String] = Map.empty
): (Int, JValue, Map[String, String]) = {
- val base = url(s"$baseUrl$path")
+ val base = OBPReq.url(s"$baseUrl$path").addHeader("Accept", "*/*")
val withHdr = headers.foldLeft(base) { case (r, (k, v)) => r.addHeader(k, v) }
- val methodReq = method.toUpperCase match {
+ val req = method.toUpperCase match {
case "DELETE" => withHdr.DELETE
case "POST" => withHdr.POST
case _ => withHdr
}
- val response = Http.default(
- methodReq.setHeader("Accept", "*/*") > as.Response(p =>
- (p.getStatusCode, p.getResponseBody,
- p.getHeaders.iterator().asScala.map(e => e.getKey -> e.getValue).toMap)
- )
- )
- val (status, body, hdrs) = Await.result(response, 10.seconds)
- val json = if (body.trim.isEmpty) JObject(Nil) else parse(body)
- (status, json, hdrs)
+ execAndParse(req)
}
private def entitlementIdFromJson(json: JValue): String =
json match {
case JObject(fields) =>
- fields.collectFirst { case f if f.name == "entitlement_id" =>
- f.value.asInstanceOf[JString].s
+ fields.collectFirst { case (name, value) if name == "entitlement_id" =>
+ value.asInstanceOf[JString].s
}.getOrElse(fail("Expected entitlement_id in response"))
case _ => fail("Expected JSON object in response")
}
@@ -229,7 +205,6 @@ class Http4s700TransactionTest extends ServerSetupWithTestData {
}
Then("All POST responses are 201 and all DELETE responses are 204")
- // Filter to only the statuses we actually got (no skipped deletes)
val postStatuses = allStatuses.zipWithIndex.collect { case (s, i) if i % 2 == 0 => s }
val deleteStatuses = allStatuses.zipWithIndex.collect { case (s, i) if i % 2 == 1 => s }
postStatuses.forall(_ == 201) shouldBe true
@@ -238,7 +213,6 @@ class Http4s700TransactionTest extends ServerSetupWithTestData {
scenario("A 4xx error response does not exhaust the connection pool", Http4s700TransactionTag) {
Given("An unauthenticated POST request that will return 401")
- // No auth header — 401 is guaranteed regardless of any prior role grants in this suite.
val body = s"""{"bank_id":"","role_name":"CanGetAnyUser"}"""
val (unauthStatus, _, _) = makeHttpRequestWithBody(
"POST", s"/obp/v7.0.0/users/${resourceUser1.userId}/entitlements", body)
diff --git a/obp-api/src/test/scala/code/api/v7_0_0/V7ResourceDocsAggregationTest.scala b/obp-api/src/test/scala/code/api/v7_0_0/V7ResourceDocsAggregationTest.scala
index 2f2a3ea477..fed8f398e6 100644
--- a/obp-api/src/test/scala/code/api/v7_0_0/V7ResourceDocsAggregationTest.scala
+++ b/obp-api/src/test/scala/code/api/v7_0_0/V7ResourceDocsAggregationTest.scala
@@ -2,17 +2,13 @@ package code.api.v7_0_0
import org.json4s._
import code.Http4sTestServer
-import code.setup.ServerSetupWithTestData
-import dispatch.Defaults._
-import dispatch._
+import code.setup.{OBPReq, ServerSetupWithTestData}
import org.json4s.JValue
import org.json4s.JsonAST.{JArray, JObject, JString}
import com.openbankproject.commons.util.JsonAliases.parse
import org.scalatest.Tag
import scala.collection.JavaConverters._
-import scala.concurrent.Await
-import scala.concurrent.duration._
import com.openbankproject.commons.util.JsonAliases.RichJField
/**
@@ -54,30 +50,13 @@ class V7ResourceDocsAggregationTest extends ServerSetupWithTestData {
path: String,
headers: Map[String, String] = Map.empty
): (Int, JValue, Map[String, String]) = {
- val request = url(s"$baseUrl$path")
- val requestWithHeaders = headers.foldLeft(request) { case (req, (key, value)) =>
- req.addHeader(key, value)
- }
-
- try {
- val response = Http.default(
- requestWithHeaders.setHeader("Accept", "*/*") > as.Response(p =>
- (p.getStatusCode, p.getResponseBody, p.getHeaders.iterator().asScala.map(e => e.getKey -> e.getValue).toMap)
- )
- )
- val (statusCode, body, responseHeaders) = Await.result(response, 30.seconds)
- val json = if (body.trim.isEmpty) JObject(Nil) else parse(body)
- (statusCode, json, responseHeaders)
- } catch {
- case e: java.util.concurrent.ExecutionException =>
- val statusPattern = """(\d{3})""".r
- statusPattern.findFirstIn(e.getCause.getMessage) match {
- case Some(code) => (code.toInt, JObject(Nil), Map.empty)
- case None => throw e
- }
- case e: Exception =>
- throw e
+ val req = headers.foldLeft(OBPReq.url(s"$baseUrl$path").addHeader("Accept", "*/*")) {
+ case (r, (k, v)) => r.addHeader(k, v)
}
+ val (status, body, okHdrs) = req.executeRaw()
+ val json = if (body.trim.isEmpty) JObject(Nil) else parse(body)
+ val hdrs = okHdrs.toMultimap.asScala.flatMap { case (k, vs) => vs.asScala.map(v => k -> v) }.toMap
+ (status, json, hdrs)
}
private def toFieldMap(fields: List[org.json4s.JsonAST.JField]): Map[String, JValue] =
diff --git a/obp-api/src/test/scala/code/concurrency/ConcurrentRaceSetup.scala b/obp-api/src/test/scala/code/concurrency/ConcurrentRaceSetup.scala
index fd18544643..72af9625e6 100644
--- a/obp-api/src/test/scala/code/concurrency/ConcurrentRaceSetup.scala
+++ b/obp-api/src/test/scala/code/concurrency/ConcurrentRaceSetup.scala
@@ -28,9 +28,8 @@ package code.concurrency
import code.entitlement.MappedEntitlement
import code.model.dataAccess.MappedBankAccount
-import code.setup.{APIResponse, DefaultUsers, ServerSetupWithTestData}
+import code.setup.{APIResponse, DefaultUsers, OBPReq, ServerSetupWithTestData}
import com.openbankproject.commons.model.{AccountId, BankId}
-import dispatch.Req
import net.liftweb.mapper.By
import org.scalatest.Tag
@@ -66,8 +65,8 @@ object ConcurrencyRace extends Tag("code.concurrency.ConcurrencyRace")
* - The whole JVM shares one server, one H2 DB and one Hikari pool (forkMode=once). Use dedicated
* bank/account/user ids and keep the concurrency count modest (≤ ~30) so the pool is not
* exhausted for sibling suites.
- * - Concurrent use of the shared dispatch HttpClient can briefly corrupt a pooled connection
- * ("invalid version format"); SendServerRequests already retries once.
+ * - Concurrent use of the shared OkHttp client can briefly corrupt a pooled connection; retries
+ * are handled by OBPReq / SendServerRequests.
*/
trait ConcurrentRaceSetup extends ServerSetupWithTestData with DefaultUsers {
@@ -76,9 +75,9 @@ trait ConcurrentRaceSetup extends ServerSetupWithTestData with DefaultUsers {
private implicit val raceEc: scala.concurrent.ExecutionContext =
scala.concurrent.ExecutionContext.Implicits.global
- def v4_0_0_Request: Req = baseRequest / "obp" / "v4.0.0"
- def v3_0_0_Request: Req = baseRequest / "obp" / "v3.0.0"
- def v2_0_0_Request: Req = baseRequest / "obp" / "v2.0.0"
+ def v4_0_0_Request: OBPReq = baseRequest / "obp" / "v4.0.0"
+ def v3_0_0_Request: OBPReq = baseRequest / "obp" / "v3.0.0"
+ def v2_0_0_Request: OBPReq = baseRequest / "obp" / "v2.0.0"
/** System owner view — present on every test account, carries all read permissions. */
val SystemOwnerViewId = "owner"
diff --git a/obp-api/src/test/scala/code/setup/OBPReq.scala b/obp-api/src/test/scala/code/setup/OBPReq.scala
new file mode 100644
index 0000000000..952ab68621
--- /dev/null
+++ b/obp-api/src/test/scala/code/setup/OBPReq.scala
@@ -0,0 +1,107 @@
+package code.setup
+
+import java.nio.charset.{Charset, StandardCharsets}
+import java.util.concurrent.TimeUnit
+
+import okhttp3.{Headers => OkHeaders, MediaType => OkMediaType, OkHttpClient, Request, RequestBody, HttpUrl, Response => OkResponse}
+
+/**
+ * Immutable HTTP request builder backed by OkHttp3.
+ * Drop-in replacement for dispatch's Req with the same operator surface:
+ * `/`, `.GET/.POST/.PUT/.DELETE/.PATCH/.HEAD/.OPTIONS`, `<:<`, `< value))
+ def setHeader(name: String, value: String): OBPReq = copy(reqHeaders = reqHeaders.filterNot(_._1 == name) :+ (name -> value))
+ def addQueryParameter(name: String, value: String): OBPReq = < s"$mediaType; charset=${charset.name()}"))
+
+ def url: String = baseUrl
+
+ def toRequest(): Request = toOkHttpRequest
+
+ def executeRaw(): (Int, String, OkHeaders) = {
+ val response: OkResponse = OBPReq.client.newCall(toOkHttpRequest).execute()
+ try {
+ val code = response.code()
+ val body = Option(response.body()).fold("")(_.string())
+ (code, body, response.headers())
+ } finally { response.close() }
+ }
+
+ def toOkHttpRequest: Request = {
+ val parsedUrl = HttpUrl.parse(baseUrl)
+ if (parsedUrl == null) throw new IllegalArgumentException(s"Invalid URL: $baseUrl")
+
+ val urlBuilder = parsedUrl.newBuilder()
+ queryParams.foreach { case (k, v) => urlBuilder.addQueryParameter(k, v) }
+
+ val requestBody: RequestBody = method.toUpperCase match {
+ case "GET" | "HEAD" | "OPTIONS" => null
+ case _ if reqBody.isEmpty => RequestBody.create(new Array[Byte](0), null)
+ case _ =>
+ val mt = reqHeaders.toMap.get(OBPReq.ContentTypeHeader)
+ .flatMap(ct => Option(OkMediaType.parse(ct)))
+ .orNull
+ RequestBody.create(reqBody.getBytes(bodyCharset), mt)
+ }
+
+ val builder = new Request.Builder()
+ .url(urlBuilder.build())
+ .method(method.toUpperCase, requestBody)
+
+ reqHeaders.foreach { case (k, v) => builder.addHeader(k, v) }
+ builder.build()
+ }
+}
+
+object OBPReq {
+ private[setup] val ContentTypeHeader = "Content-Type"
+
+ val client: OkHttpClient = new OkHttpClient.Builder()
+ .connectTimeout(30, TimeUnit.SECONDS)
+ .readTimeout(60, TimeUnit.SECONDS)
+ .writeTimeout(30, TimeUnit.SECONDS)
+ .build()
+
+ def url(s: String): OBPReq = OBPReq(baseUrl = s)
+ def host(h: String, p: Int): OBPReq = OBPReq(baseUrl = s"http://$h:$p")
+ def host(h: String): OBPReq = OBPReq(baseUrl = s"http://$h")
+}
diff --git a/obp-api/src/test/scala/code/setup/SendServerRequests.scala b/obp-api/src/test/scala/code/setup/SendServerRequests.scala
index 7b8d5b30c4..9597d75ef3 100644
--- a/obp-api/src/test/scala/code/setup/SendServerRequests.scala
+++ b/obp-api/src/test/scala/code/setup/SendServerRequests.scala
@@ -26,33 +26,29 @@ TESOBE (http://www.tesobe.com/)
*/
package code.setup
+import java.net.URLDecoder
import java.nio.charset.{Charset, StandardCharsets}
import java.util.TimeZone
import code.api.ResponseHeader
-import dispatch.Defaults._
-import dispatch._
import net.liftweb.common.Full
+import net.liftweb.util.Helpers._
+import okhttp3.{Headers => OkHeaders}
import org.json4s.JsonAST.JValue
import org.json4s._
import com.openbankproject.commons.util.JsonAliases._
-import net.liftweb.util.Helpers._
-import java.net.URLDecoder
-
-import io.netty.handler.codec.http.HttpHeaders
import scala.collection.JavaConverters._
-import scala.concurrent.Await
-import scala.concurrent.duration.Duration
+import scala.concurrent.{ExecutionContext, Future}
-case class APIResponse(code: Int, body: JValue, headers: Option[HttpHeaders])
+case class APIResponse(code: Int, body: JValue, headers: Option[OkHeaders])
/**
* This trait simulate the Rest process, HTTP parameters --> Reset parameters
- * simulate the four methods GET, POST, DELETE and POST
- * Prepare the Headers, query parameters and form parameters, send these to OBP-API
+ * simulate the four methods GET, POST, DELETE and POST
+ * Prepare the Headers, query parameters and form parameters, send these to OBP-API
* and get the response code and response body back.
- *
+ *
*/
trait SendServerRequests {
@@ -60,227 +56,144 @@ trait SendServerRequests {
import code.api.util.APIUtil.OAuth.{Consumer, Token}
- implicit def Request2RequestSigner(r: Req): RequestSigner = new RequestSigner(r)
+ implicit def Request2RequestSigner(r: OBPReq): RequestSigner = new RequestSigner(r)
- class RequestSigner(rb: Req) {
- def <@(consumer: Consumer, token: Token): Req =
+ class RequestSigner(rb: OBPReq) {
+ def <@(consumer: Consumer, token: Token): OBPReq =
rb <:< Map("Authorization" -> s"""DirectLogin token="${token.value}"""")
- def <@(consumerAndToken: Option[(Consumer, Token)]): Req =
+ def <@(consumerAndToken: Option[(Consumer, Token)]): OBPReq =
consumerAndToken match {
case Some((_, token)) => rb <:< Map("Authorization" -> s"""DirectLogin token="${token.value}"""")
case None => rb
}
}
- case class ReqData (
- url: String,
- method: String,
- body: String,
- body_encoding: String,
- headers: Map[String, String],
- query_params: Map[String,String],
- form_params: Map[String,String]
- )
+ protected def url(s: String): OBPReq = OBPReq.url(s)
+ protected def host(h: String, p: Int): OBPReq = OBPReq.host(h, p)
+ protected def host(h: String): OBPReq = OBPReq.host(h)
- def encode_% (s: String) = java.net.URLEncoder.encode(s, StandardCharsets.UTF_8.name())
+ case class ReqData(
+ url: String,
+ method: String,
+ body: String,
+ body_encoding: String,
+ headers: List[(String, String)],
+ query_params: List[(String, String)]
+ )
- def decode_% (s: String) = java.net.URLDecoder.decode(s, StandardCharsets.UTF_8.name())
+ def encode_%(s: String) = java.net.URLEncoder.encode(s, StandardCharsets.UTF_8.name())
+ def decode_%(s: String) = URLDecoder.decode(s, StandardCharsets.UTF_8.name())
- def createRequest( reqData: ReqData ): Req = {
- val charset = if(reqData.body_encoding == "") Charset.defaultCharset() else Charset.forName(reqData.body_encoding)
- val rb = url(reqData.url)
+ def createRequest(reqData: ReqData): OBPReq = {
+ val charset = if (reqData.body_encoding == "") Charset.defaultCharset() else Charset.forName(reqData.body_encoding)
+ val rb = OBPReq.url(reqData.url)
.setMethod(reqData.method)
.setBodyEncoding(charset)
.setBody(reqData.body) <:< reqData.headers
- if (reqData.query_params.nonEmpty)
- rb < vs.asScala.map(v => s"$k: $v") }
+ .mkString(", ")
+ val bodySnippet = if (bodyStr == null) "" else {
+ val maxLen = 1000
+ if (bodyStr.length > maxLen) bodyStr.take(maxLen) + "..." else bodyStr
+ }
+ throw new Exception(
+ s"""There is no ${ResponseHeader.`Correlation-Id`} in response header.
+ |Couldn't parse response from ${req.url}
+ |status=$status
+ |headers=[$headersStr]
+ |body-snippet=${bodySnippet}""".stripMargin
+ )
+ }
+
+ val contentTypeList = okHeaders.values(OBPReq.ContentTypeHeader).asScala.toList.map(_.toLowerCase)
+ val isYaml = contentTypeList.exists(_.contains("yaml"))
+
+ if (isYaml) {
+ APIResponse(responseCode, JString(bodyStr), Some(okHeaders))
+ } else {
+ val parsedBody: Option[JValue] =
+ if (bodyStr.isEmpty) Some(JNothing)
+ else tryo { parse(bodyStr) }.toOption orElse
+ tryo {
+ parse(s"[$bodyStr]") match {
+ case JArray(v :: _) => v
+ case _ => throw new RuntimeException("empty array")
+ }
+ }.toOption
+ parsedBody match {
+ case Some(b) => APIResponse(responseCode, b, Some(okHeaders))
+ case None => throw new Exception(s"couldn't parse response from ${req.url} : $bodyStr")
+ }
+ }
}
- // generate the requestData from input values, such as request, body, encoding and headers.
- def extractParamsAndHeaders(req: Req, body: String, encoding: String, extra_headers:Map[String,String] = Map.empty): ReqData= {
- val r = req.toRequest
- val query_params:Map[String,String] = r.getQueryParams.asScala.map(qp => qp.getName -> URLDecoder.decode(qp.getValue,"UTF-8")).toMap[String,String]
- val form_params: Map[String,String] = r.getFormParams.asScala.map( fp => fp.getName -> fp.getValue).toMap[String,String]
- val headers:Map[String,String] = r.getHeaders.entries().asScala.map (h => h.getKey -> h.getValue).toMap[String,String]
- val url:String = r.getUrl
- val method:String = r.getMethod
+ private def getAPIResponse(req: OBPReq): APIResponse = executeRequest(req)
- ReqData(url, method, body, encoding, headers ++ extra_headers, query_params, form_params)
- }
+ private def getAPIResponseAsync(req: OBPReq): Future[APIResponse] =
+ Future { scala.concurrent.blocking { getAPIResponse(req) } }(ExecutionContext.global)
+ private def sendSync(req: OBPReq, body: String = "", extraHeaders: Map[String, String] = Map.empty): APIResponse =
+ getAPIResponse(createRequest(extractParamsAndHeaders(req, body, "UTF-8", extraHeaders)))
- private def ApiResponseCommonPart(req: Req) = {
- for (response <- Http.default(req > as.Response(p => p)))
- yield {
- //{} -->parse(body) => JObject(List()) , this is not "NO Content", change "" --> JNothing
- val body = if (response.getResponseBody().isEmpty) "" else response.getResponseBody()
-
- // Check that every response has a correlationId at Response Header
- val list = response.getHeaders(ResponseHeader.`Correlation-Id`).asScala.toList
- list match {
- case Nil =>
- // Improve diagnostic information: include HTTP status, all response headers and a snippet of the body.
- val status = response.getStatusCode
- val headersStr = try {
- // response.getHeaders().entries() returns a Java collection of header entries
- response.getHeaders().entries().asScala.map(h => s"${h.getKey}: ${h.getValue}").mkString(", ")
- } catch {
- case _: Throwable => "unable to read headers"
- }
- val bodySnippet = if (body == null) {
- ""
- } else {
- val maxLen = 1000
- if (body.length > maxLen) body.take(maxLen) + "..." else body
- }
- throw new Exception(
- s"""There is no ${ResponseHeader.`Correlation-Id`} in response header.
- |Couldn't parse response from ${req.url}
- |status=$status
- |headers=[$headersStr]
- |body-snippet=${bodySnippet}""".stripMargin
- )
- case _ =>
- }
-
- // Handle YAML responses: don't try to parse as JSON. Wrap YAML as a JString so tests
- // that expect a JValue can still receive the body.
- val contentTypeList = response.getHeaders("Content-Type").asScala.toList.map(_.toLowerCase)
- val isYaml = contentTypeList.exists(_.contains("yaml"))
- if (isYaml) {
- APIResponse(response.getStatusCode, JString(body), Some(response.getHeaders()))
- } else {
- // json4s-native 3.6.x rejects primitive root values (booleans, strings, numbers, null).
- // Wrap in a single-element array so the native parser accepts it, then extract the
- // first element — handles all JSON primitive types generically.
- val parsedBody: Option[JValue] = tryo { parse(body) }.toOption orElse
- tryo {
- parse(s"[$body]") match {
- case JArray(v :: _) => v
- case _ => throw new RuntimeException("empty array")
- }
- }.toOption
- parsedBody match {
- case Some(b) => APIResponse(response.getStatusCode, b, Some(response.getHeaders()))
- case None => throw new Exception(s"couldn't parse response from ${req.url} : $body")
- }
- }
- }
- }
+ private def sendAsync(req: OBPReq, body: String = "", extraHeaders: Map[String, String] = Map.empty): Future[APIResponse] =
+ getAPIResponseAsync(createRequest(extractParamsAndHeaders(req, body, "UTF-8", extraHeaders)))
- private def getAPIResponse(req : Req) : APIResponse = {
- try {
- Await.result(ApiResponseCommonPart(req), Duration.Inf)
- } catch {
- case e: Exception if e.getMessage != null && e.getMessage.contains("invalid version format") =>
- // Connection pool pollution detected - retry once with a fresh connection
- // This happens when concurrent tests share the same HTTP client and one test's
- // error response corrupts the connection state
- Thread.sleep(100) // Brief delay to let connection close
- Await.result(ApiResponseCommonPart(req), Duration.Inf)
- }
- }
+ private val ContentType = OBPReq.ContentTypeHeader
+ private val ApplicationJson = "application/json"
- private def getAPIResponseAsync(req: Req): Future[APIResponse] = {
- ApiResponseCommonPart(req)
- }
+ private val jsonHeaders: Map[String, String] = Map(ContentType -> ApplicationJson, "Accept" -> ApplicationJson)
+ private val putHeaders: Map[String, String] = Map(ContentType -> ApplicationJson)
- /**
- *this method does a POST request given a URL, a JSON
- */
- def makePostRequest(req: Req, json: String, headers: List[(String, String)] = Nil): APIResponse = {
- val extra_headers = Map( "Content-Type" -> "application/json",
- "Accept" -> "application/json") ++ headers
- val reqData = extractParamsAndHeaders(req.POST, json, "UTF-8", extra_headers)
- val jsonReq = createRequest(reqData)
- getAPIResponse(jsonReq)
- }
- /**
- *this method does a POST request given a URL, a JSON
- */
- def makePostRequestAsync(req: Req, json: String = ""): Future[APIResponse] = {
- val extra_headers = Map( "Content-Type" -> "application/json",
- "Accept" -> "application/json")
- val reqData = extractParamsAndHeaders(req.POST, json, "UTF-8", extra_headers)
- val jsonReq = createRequest(reqData)
- getAPIResponseAsync(jsonReq)
- }
+ def makePostRequest(req: OBPReq, json: String, headers: List[(String, String)] = Nil): APIResponse =
+ sendSync(req.POST, json, jsonHeaders ++ headers)
-// Accepts an additional option header Map
- def makePostRequestAdditionalHeader(req: Req, json: String = "", params: List[(String, String)] = Nil): APIResponse = {
- val extra_headers = Map( "Content-Type" -> "application/json",
- "Accept" -> "application/json") ++ params
- val reqData = extractParamsAndHeaders(req.POST, json, "UTF-8", extra_headers)
- val jsonReq = createRequest(reqData)
- getAPIResponse(jsonReq)
- }
+ def makePostRequestAsync(req: OBPReq, json: String = ""): Future[APIResponse] =
+ sendAsync(req.POST, json, jsonHeaders)
- def makePutRequest(req: Req, json: String, headers: (String, String) *) : APIResponse = {
- val extra_headers = Map("Content-Type" -> "application/json") ++ headers.toMap
- val reqData = extractParamsAndHeaders(req.PUT, json, "UTF-8", extra_headers)
- val jsonReq = createRequest(reqData)
- getAPIResponse(jsonReq)
- }
+ def makePostRequestAdditionalHeader(req: OBPReq, json: String = "", params: List[(String, String)] = Nil): APIResponse =
+ sendSync(req.POST, json, jsonHeaders ++ params)
- def makePatchRequest(req: Req, json: String, headers: (String, String) *) : APIResponse = {
- val extra_headers = Map("Content-Type" -> "application/json") ++ headers.toMap
- val reqData = extractParamsAndHeaders(req.PATCH, json, "UTF-8", extra_headers)
- val jsonReq = createRequest(reqData)
- getAPIResponse(jsonReq)
- }
+ def makePutRequest(req: OBPReq, json: String, headers: (String, String)*): APIResponse =
+ sendSync(req.PUT, json, putHeaders ++ headers.toMap)
- def makePutRequestAsync(req: Req, json: String = ""): Future[APIResponse] = {
- val extra_headers = Map("Content-Type" -> "application/json")
- val reqData = extractParamsAndHeaders(req.PUT, json, "UTF-8", extra_headers)
- val jsonReq = createRequest(reqData)
- getAPIResponseAsync(jsonReq)
- }
+ def makePatchRequest(req: OBPReq, json: String, headers: (String, String)*): APIResponse =
+ sendSync(req.PATCH, json, putHeaders ++ headers.toMap)
- /**
- * this method does a GET request given a URL
- */
- def makeGetRequest(req: Req, params: List[(String, String)] = Nil) : APIResponse = {
- val extra_headers = Map.empty ++ params
- val reqData = extractParamsAndHeaders(req.GET, "", "UTF-8", extra_headers)
- val jsonReq = createRequest(reqData)
- getAPIResponse(jsonReq)
- }
-
- /**
- * this method does a HEAD request given a URL
- */
- def makeHeadRequest(req: Req, params: List[(String, String)] = Nil) : APIResponse = {
- val extra_headers = Map.empty ++ params
- val reqData = extractParamsAndHeaders(req.HEAD, "", "UTF-8", extra_headers)
- val jsonReq = createRequest(reqData)
- getAPIResponse(jsonReq)
- }
- /**
- * this method does a GET request given a URL
- */
- def makeGetRequestAsync(req: Req, params: List[(String, String)] = Nil): Future[APIResponse] = {
- val extra_headers = Map.empty ++ params
- val reqData = extractParamsAndHeaders(req.GET, "", "UTF-8", extra_headers)
- val jsonReq = createRequest(reqData)
- getAPIResponseAsync(jsonReq)
- }
+ def makePutRequestAsync(req: OBPReq, json: String = ""): Future[APIResponse] =
+ sendAsync(req.PUT, json, putHeaders)
- /**
- * this method does a delete request given a URL
- */
- def makeDeleteRequest(req: Req) : APIResponse = {
- //Note: method will be set too late for oauth signing, so set it before using <@
- val jsonReq = req.DELETE
- getAPIResponse(jsonReq)
- }
- /**
- * this method does a delete request given a URL
- */
- def makeDeleteRequestAsync(req: Req): Future[APIResponse] = {
- //Note: method will be set too late for oauth signing, so set it before using <@
- val jsonReq = req.DELETE
- getAPIResponseAsync(jsonReq)
- }
+ def makeGetRequest(req: OBPReq, params: List[(String, String)] = Nil): APIResponse =
+ sendSync(req.GET, extraHeaders = Map.empty ++ params)
+
+ def makeHeadRequest(req: OBPReq, params: List[(String, String)] = Nil): APIResponse =
+ sendSync(req.HEAD, extraHeaders = Map.empty ++ params)
+
+ def makeGetRequestAsync(req: OBPReq, params: List[(String, String)] = Nil): Future[APIResponse] =
+ sendAsync(req.GET, extraHeaders = Map.empty ++ params)
+
+ def makeDeleteRequest(req: OBPReq): APIResponse = getAPIResponse(req.DELETE)
+
+ def makeDeleteRequestAsync(req: OBPReq): Future[APIResponse] = getAPIResponseAsync(req.DELETE)
}
diff --git a/obp-api/src/test/scala/code/setup/ServerSetup.scala b/obp-api/src/test/scala/code/setup/ServerSetup.scala
index 199209715e..e09b0c704a 100644
--- a/obp-api/src/test/scala/code/setup/ServerSetup.scala
+++ b/obp-api/src/test/scala/code/setup/ServerSetup.scala
@@ -38,7 +38,6 @@ import code.model.{Consumer, Nonce, Token}
import code.model.dataAccess.{AuthUser, ResourceUser}
import code.util.Helper.MdcLoggable
import com.openbankproject.commons.model.{AccountId, BankId}
-import dispatch._
import net.liftweb.common.{Empty, Full}
import org.json4s.JsonDSL._
import net.liftweb.mapper.MetaMapper
diff --git a/obp-api/src/test/scala/code/setup/ServerSetupAsync.scala b/obp-api/src/test/scala/code/setup/ServerSetupAsync.scala
index 320a9c797d..60f7371f24 100644
--- a/obp-api/src/test/scala/code/setup/ServerSetupAsync.scala
+++ b/obp-api/src/test/scala/code/setup/ServerSetupAsync.scala
@@ -35,7 +35,6 @@ import code.TestServer
import code.api.util.{APIUtil, CustomJsonFormats}
import code.util.Helper.MdcLoggable
import com.openbankproject.commons.model.{AccountId, BankId}
-import dispatch._
import net.liftweb.common.{Empty, Full}
import org.json4s.JsonDSL._
import org.scalatest._
diff --git a/pom.xml b/pom.xml
index 6ecae876c8..4a3e242ebc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
scaladocs/
http://scala-tools.org/mvnsites/liftweb
-
+
11
${java.version}
${java.version}
@@ -160,6 +160,7 @@
3.0.8
test
+
diff --git a/run_tests_parallel.sh b/run_tests_parallel.sh
index 6944c8d534..8ed8d97537 100755
--- a/run_tests_parallel.sh
+++ b/run_tests_parallel.sh
@@ -1,8 +1,10 @@
#!/bin/bash
-# Local parallel test runner — mirror CI's parallel structure as closely as
-# possible while dropping the cross-machine artifact-transfer complexity.
-# Shard definitions and the shard-4 catch-all logic match
-# .github/workflows/build_pull_request.yml exactly.
+# Local parallel test runner — mirrors CI's test coverage on a single machine.
+# CI (build_pull_request.yml / build_container.yml) uses 9 shards across 9 VMs;
+# this script uses 4 coarser shards that achieve identical coverage via the
+# catch-all mechanism, without exhausting the single local DB connection pool
+# (> 4 shards causes connection-pool contention and spurious failures).
+# Catch-all logic (build_s4) is a direct port of CI's shard-8 catch-all.
# Usage: ./run_tests_parallel.sh [--shards=4|6]
#
# ── CI step → local equivalent (how cross-machine machinery is replaced) ───
@@ -97,7 +99,11 @@ alloc_free_port() {
return 1
}
-# ── Shard definitions (identical to the CI matrix) ────────────────────────
+# ── Shard definitions ─────────────────────────────────────────────────────
+# Deliberately coarser than CI's 9 shards: CI splits each package onto its own
+# VM; locally we merge packages to stay within the shared DB connection pool.
+# Coverage is identical: the catch-all (build_s4) picks up any package not
+# named here, same as CI's shard-8 catch-all.
S1="code.api.v4_0_0"
S2="code.api.v6_0_0,code.api.v5_0_0,code.api.v3_0_0,code.api.v2_1_0,\
@@ -109,13 +115,13 @@ S3="code.api.v1_2_1,code.api.ResourceDocs1_4_0,code.api.util,code.api.berlin,\
code.management,code.metrics,code.model,code.views,code.usercustomerlinks,\
code.customer,code.errormessages"
-# Shard 4 base (identical to CI)
+# Shard 4 base — auth/login/connector/util plus any packages not in shards 1-3
S4_BASE="code.api.v5_1_0,code.api.v3_1_0,code.api.http4sbridge,code.api.v7_0_0,\
code.api.Authentication,code.api.dauthTest,code.api.DirectLoginTest,\
code.api.gateWayloginTest,code.api.OBPRestHelperTest,code.util,code.connector"
# ── Shard 4 catch-all: discover every package not covered by shards 1–3 ───
-# (identical to CI)
+# (same logic as CI shard-8 catch-all — ensures no new package is silently skipped)
build_s4() {
local ASSIGNED="$S1 $(echo "$S2" | tr ',' ' ') $(echo "$S3" | tr ',' ' ') $(echo "$S4_BASE" | tr ',' ' ')"
local ALL_PKGS
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000..3185093de2
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1 @@
+sonar.cpd.exclusions=obp-api/src/test/**/*.scala,obp-api/src/test/**/*.java