Skip to content

Commit 5aa5a79

Browse files
AdyenAutomationBotAdyenAutomationBot
committed
[recurring] Automated update from Adyen/adyen-openapi@d265ad5 
1 parent 7da93b7 commit 5aa5a79

4 files changed

Lines changed: 68 additions & 62 deletions

File tree

‎src/main/java/com/adyen/service/recurring/RecurringApi.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ public class RecurringApi extends Service {
4444
*/
4545
public RecurringApi(Client client) {
4646
super(client);
47-
this.baseURL =
48-
createBaseURL(
49-
"https://paltokenization-test.adyen.com/paltokenization/servlet/Recurring/v68");
47+
this.baseURL = createBaseURL("https://pal-test.adyen.com/pal/servlet/Recurring/v68");
5048
}
5149

5250
/**

‎src/main/java/com/adyen/terminal/serialization/AuthenticatedDataTypeAdapterFactory.java‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.google.gson.reflect.TypeToken;
3434
import com.google.gson.stream.JsonReader;
3535
import com.google.gson.stream.JsonWriter;
36-
3736
import java.io.IOException;
3837

3938
/**
@@ -46,46 +45,46 @@
4645
*/
4746
public class AuthenticatedDataTypeAdapterFactory implements TypeAdapterFactory {
4847

49-
@Override
50-
@SuppressWarnings("unchecked")
51-
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
52-
if (!AuthenticatedData.class.isAssignableFrom(type.getRawType())) {
53-
return null;
54-
}
48+
@Override
49+
@SuppressWarnings("unchecked")
50+
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
51+
if (!AuthenticatedData.class.isAssignableFrom(type.getRawType())) {
52+
return null;
53+
}
5554

56-
TypeAdapter<AuthenticatedData> delegate =
57-
gson.getDelegateAdapter(this, TypeToken.get(AuthenticatedData.class));
58-
TypeAdapter<JsonObject> jsonObjectAdapter = gson.getAdapter(JsonObject.class);
55+
TypeAdapter<AuthenticatedData> delegate =
56+
gson.getDelegateAdapter(this, TypeToken.get(AuthenticatedData.class));
57+
TypeAdapter<JsonObject> jsonObjectAdapter = gson.getAdapter(JsonObject.class);
5958

60-
return (TypeAdapter<T>)
61-
new TypeAdapter<AuthenticatedData>() {
62-
@Override
63-
public void write(JsonWriter out, AuthenticatedData value) throws IOException {
64-
delegate.write(out, value);
65-
}
59+
return (TypeAdapter<T>)
60+
new TypeAdapter<AuthenticatedData>() {
61+
@Override
62+
public void write(JsonWriter out, AuthenticatedData value) throws IOException {
63+
delegate.write(out, value);
64+
}
6665

67-
@Override
68-
public AuthenticatedData read(JsonReader in) throws IOException {
69-
JsonObject jsonObject = jsonObjectAdapter.read(in);
66+
@Override
67+
public AuthenticatedData read(JsonReader in) throws IOException {
68+
JsonObject jsonObject = jsonObjectAdapter.read(in);
7069

71-
JsonArray keyTransportOrKEKArray = null;
72-
if (jsonObject.has("keyTransportOrKEK")) {
73-
keyTransportOrKEKArray = jsonObject.getAsJsonArray("keyTransportOrKEK");
74-
jsonObject.remove("keyTransportOrKEK");
75-
}
76-
AuthenticatedData result = delegate.fromJsonTree(jsonObject);
77-
if (keyTransportOrKEKArray != null) {
78-
for (JsonElement element : keyTransportOrKEKArray) {
79-
JsonObject item = element.getAsJsonObject();
80-
if (item.has("KEKIdentifier")) {
81-
result.getKeyTransportOrKEK().add(gson.fromJson(item, KEK.class));
82-
} else {
83-
result.getKeyTransportOrKEK().add(gson.fromJson(item, KeyTransport.class));
84-
}
85-
}
86-
}
87-
return result;
88-
}
89-
};
90-
}
70+
JsonArray keyTransportOrKEKArray = null;
71+
if (jsonObject.has("keyTransportOrKEK")) {
72+
keyTransportOrKEKArray = jsonObject.getAsJsonArray("keyTransportOrKEK");
73+
jsonObject.remove("keyTransportOrKEK");
74+
}
75+
AuthenticatedData result = delegate.fromJsonTree(jsonObject);
76+
if (keyTransportOrKEKArray != null) {
77+
for (JsonElement element : keyTransportOrKEKArray) {
78+
JsonObject item = element.getAsJsonObject();
79+
if (item.has("KEKIdentifier")) {
80+
result.getKeyTransportOrKEK().add(gson.fromJson(item, KEK.class));
81+
} else {
82+
result.getKeyTransportOrKEK().add(gson.fromJson(item, KeyTransport.class));
83+
}
84+
}
85+
}
86+
return result;
87+
}
88+
};
89+
}
9190
}

‎src/main/java/com/adyen/terminal/serialization/TerminalAPIGsonBuilder.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,23 @@
2323

2424
import com.google.gson.Gson;
2525
import com.google.gson.GsonBuilder;
26-
2726
import javax.xml.datatype.XMLGregorianCalendar;
2827

2928
public final class TerminalAPIGsonBuilder {
3029

31-
private TerminalAPIGsonBuilder() {
32-
// not meant to be initialized
33-
}
30+
private TerminalAPIGsonBuilder() {
31+
// not meant to be initialized
32+
}
3433

35-
public static Gson create() {
36-
GsonBuilder gsonBuilder = new GsonBuilder();
37-
gsonBuilder.registerTypeHierarchyAdapter(byte[].class, new ByteArrayToBase64TypeAdapter());
38-
gsonBuilder.registerTypeHierarchyAdapter(
39-
XMLGregorianCalendar.class, new XMLGregorianCalendarTypeAdapter());
40-
gsonBuilder.registerTypeAdapterFactory(new XMLEnumAdapterFactory());
41-
gsonBuilder.registerTypeAdapterFactory(new AuthenticatedDataTypeAdapterFactory());
42-
gsonBuilder.disableHtmlEscaping();
34+
public static Gson create() {
35+
GsonBuilder gsonBuilder = new GsonBuilder();
36+
gsonBuilder.registerTypeHierarchyAdapter(byte[].class, new ByteArrayToBase64TypeAdapter());
37+
gsonBuilder.registerTypeHierarchyAdapter(
38+
XMLGregorianCalendar.class, new XMLGregorianCalendarTypeAdapter());
39+
gsonBuilder.registerTypeAdapterFactory(new XMLEnumAdapterFactory());
40+
gsonBuilder.registerTypeAdapterFactory(new AuthenticatedDataTypeAdapterFactory());
41+
gsonBuilder.disableHtmlEscaping();
4342

44-
return gsonBuilder.create();
45-
}
43+
return gsonBuilder.create();
44+
}
4645
}

‎src/test/java/com/adyen/model/nexo/AuthenticatedDataTest.java‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public void testShouldSerializeAndDeserializeKeyTransportFromMockFile() throws I
3232
KeyTransport keyTransport =
3333
(KeyTransport) deserializedAuthenticatedData.getKeyTransportOrKEK().get(0);
3434
assertNotNull(keyTransport.getRecipientIdentifier());
35-
assertEquals(AlgorithmType.RSA_ENCRYPTION, keyTransport.getKeyEncryptionAlgorithm().getAlgorithm());
35+
assertEquals(
36+
AlgorithmType.RSA_ENCRYPTION, keyTransport.getKeyEncryptionAlgorithm().getAlgorithm());
3637

3738
String serializedJson = terminalApiGson.toJson(deserializedAuthenticatedData);
3839
JsonObject expectedJsonObject = JsonParser.parseString(mockJson).getAsJsonObject();
@@ -130,12 +131,21 @@ public void testDeserializationIsCaseSensitive() throws IOException {
130131
NexoTestUtils.readResource("mocks/terminal-api/authenticated-data-wrong-case.json");
131132

132133
AuthenticatedData result = terminalApiGson.fromJson(wrongCaseJson, AuthenticatedData.class);
133-
assertNotNull(result, "Deserialization should succeed but fields with wrong casing should not be mapped");
134-
assertNull(result.getMACAlgorithm(), "MACAlgorithm should be null when JSON key has wrong casing");
135-
assertNull(result.getEncapsulatedContent(), "EncapsulatedContent should be null when JSON key has wrong casing");
134+
assertNotNull(
135+
result, "Deserialization should succeed but fields with wrong casing should not be mapped");
136+
assertNull(
137+
result.getMACAlgorithm(), "MACAlgorithm should be null when JSON key has wrong casing");
138+
assertNull(
139+
result.getEncapsulatedContent(),
140+
"EncapsulatedContent should be null when JSON key has wrong casing");
136141
assertNull(result.getMAC(), "MAC should be null when JSON key has wrong casing");
137-
assertTrue(result.getKeyTransportOrKEK().isEmpty(), "KeyTransportOrKEK should be null when JSON key has wrong casing");
138-
assertEquals(VersionType.V_0, result.getVersion(), "Version should fall back to default v0 when JSON key has wrong casing");
142+
assertTrue(
143+
result.getKeyTransportOrKEK().isEmpty(),
144+
"KeyTransportOrKEK should be null when JSON key has wrong casing");
145+
assertEquals(
146+
VersionType.V_0,
147+
result.getVersion(),
148+
"Version should fall back to default v0 when JSON key has wrong casing");
139149
}
140150

141151
@Test

0 commit comments

Comments
 (0)