diff --git a/build.gradle b/build.gradle index 24f6202a..25d3ed4a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-library' // to unleash the lombok magic - id "io.freefair.lombok" version "8.10.2" + id "io.freefair.lombok" version "8.11" // to make our tests output more fancy id 'com.adarshr.test-logger' version '4.0.0' // to publish packages diff --git a/gradle.properties b/gradle.properties index 7c8630e3..cd6db4e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Main properties group=com.truelayer archivesBaseName=truelayer-java -version=16.0.0 +version=16.0.1 # Artifacts properties sonatype_repository_url=https://s01.oss.sonatype.org/service/local/ diff --git a/src/main/java/com/truelayer/java/Environment.java b/src/main/java/com/truelayer/java/Environment.java index f0991dd9..d3c22e2c 100644 --- a/src/main/java/com/truelayer/java/Environment.java +++ b/src/main/java/com/truelayer/java/Environment.java @@ -1,6 +1,7 @@ package com.truelayer.java; import java.net.URI; +import java.text.MessageFormat; import lombok.*; @RequiredArgsConstructor(access = AccessLevel.PRIVATE) @@ -13,6 +14,8 @@ public class Environment { private final URI hppUri; + private static final String PAYMENTS_API_DEFAULT_VERSION = "v3"; + /** * Builder for development environment * @return a development environment object @@ -20,7 +23,7 @@ public class Environment { public static Environment development() { return new Environment( URI.create("https://auth.t7r.dev"), - URI.create("https://api.t7r.dev"), + URI.create(MessageFormat.format("https://api.t7r.dev/{0}/", PAYMENTS_API_DEFAULT_VERSION)), URI.create("https://payment.t7r.dev")); } @@ -31,7 +34,8 @@ public static Environment development() { public static Environment sandbox() { return new Environment( URI.create("https://auth.truelayer-sandbox.com"), - URI.create("https://api.truelayer-sandbox.com"), + URI.create( + MessageFormat.format("https://api.truelayer-sandbox.com/{0}/", PAYMENTS_API_DEFAULT_VERSION)), URI.create("https://payment.truelayer-sandbox.com")); } @@ -42,7 +46,7 @@ public static Environment sandbox() { public static Environment live() { return new Environment( URI.create("https://auth.truelayer.com"), - URI.create("https://api.truelayer.com"), + URI.create(MessageFormat.format("https://api.truelayer.com/{0}/", PAYMENTS_API_DEFAULT_VERSION)), URI.create("https://payment.truelayer.com")); } diff --git a/src/test/java/com/truelayer/java/EnvironmentTests.java b/src/test/java/com/truelayer/java/EnvironmentTests.java index 28e2d344..88c67f3d 100644 --- a/src/test/java/com/truelayer/java/EnvironmentTests.java +++ b/src/test/java/com/truelayer/java/EnvironmentTests.java @@ -15,7 +15,7 @@ public void shouldCreateALiveEnvironment() { assertEquals("https://auth.truelayer.com", environment.getAuthApiUri().toString()); assertEquals( - "https://api.truelayer.com", environment.getPaymentsApiUri().toString()); + "https://api.truelayer.com/v3/", environment.getPaymentsApiUri().toString()); assertEquals("https://payment.truelayer.com", environment.getHppUri().toString()); } @@ -25,7 +25,7 @@ public void shouldCreateADevelopmentEnvironment() { Environment environment = Environment.development(); assertEquals("https://auth.t7r.dev", environment.getAuthApiUri().toString()); - assertEquals("https://api.t7r.dev", environment.getPaymentsApiUri().toString()); + assertEquals("https://api.t7r.dev/v3/", environment.getPaymentsApiUri().toString()); assertEquals("https://payment.t7r.dev", environment.getHppUri().toString()); } @@ -38,7 +38,7 @@ public void shouldCreateASandboxEnvironment() { "https://auth.truelayer-sandbox.com", environment.getAuthApiUri().toString()); assertEquals( - "https://api.truelayer-sandbox.com", + "https://api.truelayer-sandbox.com/v3/", environment.getPaymentsApiUri().toString()); assertEquals( "https://payment.truelayer-sandbox.com", environment.getHppUri().toString()); diff --git a/src/test/java/com/truelayer/java/acceptance/PaymentsAcceptanceTests.java b/src/test/java/com/truelayer/java/acceptance/PaymentsAcceptanceTests.java index 0bee4bf4..1e07ea6a 100644 --- a/src/test/java/com/truelayer/java/acceptance/PaymentsAcceptanceTests.java +++ b/src/test/java/com/truelayer/java/acceptance/PaymentsAcceptanceTests.java @@ -39,6 +39,7 @@ import com.truelayer.java.versioninfo.LibraryInfoLoader; import java.net.URI; import java.nio.charset.StandardCharsets; +import java.text.MessageFormat; import java.time.LocalDate; import java.util.*; import java.util.concurrent.ThreadLocalRandom; @@ -824,8 +825,8 @@ private static AuthorizationFlowResponse startAuthorizationFlowWithRetry(String String requestJsonString = mapper.writeValueAsString(jsonNode); // build url - HttpUrl url = HttpUrl.parse(String.format( - "%s/payments/%s/authorization-flow", + HttpUrl url = HttpUrl.parse(MessageFormat.format( + "{0}payments/{1}/authorization-flow", Environment.sandbox().getPaymentsApiUri().toString(), paymentId)); RequestBody body = RequestBody.create(requestJsonString, MediaType.parse("application/json; charset=utf-8"));