Skip to content

Commit 0b816eb

Browse files
committed
Backporting v41.1.1 fix
1 parent 5aa5a79 commit 0b816eb

3 files changed

Lines changed: 6 additions & 19 deletions

File tree

src/main/java/com/adyen/Service.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,6 @@ protected String createBaseURL(String url) {
106106
+ "-pal-live.adyenpayments.com/pal/servlet/");
107107
}
108108

109-
if (url.contains("paltokenization-")) {
110-
if (config.getLiveEndpointUrlPrefix() == null) {
111-
throw new IllegalArgumentException("please provide a live url prefix in the client");
112-
}
113-
url =
114-
url.replaceFirst(
115-
"https://paltokenization-test.adyen.com/paltokenization/servlet/",
116-
"https://"
117-
+ config.getLiveEndpointUrlPrefix()
118-
+ "-paltokenization-live.adyenpayments.com/paltokenization/servlet/");
119-
}
120-
121109
if (url.contains("checkout-")) {
122110
if (config.getLiveEndpointUrlPrefix() == null) {
123111
throw new IllegalArgumentException("please provide a live url prefix in the client");

src/test/java/com/adyen/RecurringTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ public void baseUrlOnTest() throws NoSuchFieldException, IllegalAccessException
9999
String baseURL = (String) baseURLField.get(recurring);
100100
assertEquals(
101101
String.format(
102-
"https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v%s",
103-
RecurringApi.API_VERSION),
102+
"https://pal-test.adyen.com/pal/servlet/Recurring/v%s", RecurringApi.API_VERSION),
104103
baseURL);
105104
}
106105

@@ -120,7 +119,7 @@ public void baseUrlOnLive() throws NoSuchFieldException, IllegalAccessException
120119
String baseURL = (String) baseURLField.get(recurring);
121120
assertEquals(
122121
String.format(
123-
"https://myCompany-paltokenization-live.adyenpayments.com/paltokenization/servlet/Recurring/v%s",
122+
"https://myCompany-pal-live.adyenpayments.com/pal/servlet/Recurring/v%s",
124123
RecurringApi.API_VERSION),
125124
baseURL);
126125
}
@@ -147,7 +146,7 @@ public void testListRecurringDetails() throws Exception {
147146
.request(
148147
eq(
149148
String.format(
150-
"https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v%s/listRecurringDetails",
149+
"https://pal-test.adyen.com/pal/servlet/Recurring/v%s/listRecurringDetails",
151150
RecurringApi.API_VERSION)),
152151
requestBodyCaptor.capture(),
153152
eq(client.getConfig()),

src/test/java/com/adyen/ServiceTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,17 @@ public void testSessionAuthenticationLiveUrl() {
111111
public void testLiveRecurringUrlWithPrefix() {
112112

113113
config.setLiveEndpointUrlPrefix("123456789-company");
114-
String testUrl = "https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v68";
114+
String testUrl = "https://pal-test.adyen.com/pal/servlet/Recurring/v68";
115115
String expectedUrl =
116-
"https://123456789-company-paltokenization-live.adyenpayments.com/paltokenization/servlet/Recurring/v68";
116+
"https://123456789-company-pal-live.adyenpayments.com/pal/servlet/Recurring/v68";
117117

118118
String actualUrl = service.createBaseURL(testUrl);
119119
assertEquals(expectedUrl, actualUrl);
120120
}
121121

122122
@Test
123123
public void testLiveRecurringUrlWithoutPrefix() {
124-
String testUrl = "https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v68";
124+
String testUrl = "https://pal-test.adyen.com/pal/servlet/Recurring/v68";
125125

126126
IllegalArgumentException e =
127127
assertThrows(IllegalArgumentException.class, () -> service.createBaseURL(testUrl));

0 commit comments

Comments
 (0)