[JSDK-66] Bugfix serialization issue

examples/quarkus-mvc/build.gradle

@@ -17,7 +17,7 @@ dependencies {
     implementation 'io.quarkus:quarkus-resteasy-qute'
 
     // TL Java BE library
-    implementation 'com.truelayer:truelayer-java:0.7.0'
+    implementation 'com.truelayer:truelayer-java:0.7.5'
 
     testImplementation 'io.quarkus:quarkus-junit5'
     testImplementation 'io.rest-assured:rest-assured'

examples/quarkus-mvc/src/main/java/com/truelayer/quarkusmvc/services/DonationService.java

@@ -2,13 +2,14 @@
 
 import com.truelayer.java.ITrueLayerClient;
 import com.truelayer.java.entities.CurrencyCode;
+import com.truelayer.java.entities.accountidentifier.IbanAccountIdentifier;
 import com.truelayer.java.entities.accountidentifier.SortCodeAccountNumberAccountIdentifier;
 import com.truelayer.java.entities.beneficiary.ExternalAccount;
 import com.truelayer.java.payments.entities.User;
 import com.truelayer.java.payments.entities.paymentmethod.BankTransfer;
 import com.truelayer.java.payments.entities.paymentmethod.provider.UserSelectedProviderSelection;
-import com.truelayer.quarkusmvc.models.DonationResult;
 import com.truelayer.quarkusmvc.models.DonationRequest;
+import com.truelayer.quarkusmvc.models.DonationResult;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 

gradle.properties

@@ -1,7 +1,7 @@
 # Main properties
 group=com.truelayer
 archivesBaseName=truelayer-java
-version=0.7.4
+version=0.7.5
 
 # Artifacts properties
 sonatype_repository_url=https://s01.oss.sonatype.org/service/local/

src/main/java/com/truelayer/java/entities/accountidentifier/AccountIdentifier.java

@@ -58,52 +58,52 @@ public static NrbAccountIdentifier.NrbAccountIdentifierBuilder nrb() {
     }
 
     @JsonIgnore
-    public boolean isSortCodeAccountNumber() {
+    public boolean isSortCodeAccountNumberIdentifier() {
         return this instanceof SortCodeAccountNumberAccountIdentifier;
     }
 
     @JsonIgnore
-    public boolean isIban() {
+    public boolean isIbanIdentifier() {
         return this instanceof IbanAccountIdentifier;
     }
 
     @JsonIgnore
-    public boolean isBban() {
+    public boolean isBbanIdentifier() {
         return this instanceof BbanAccountIdentifier;
     }
 
     @JsonIgnore
-    public boolean isNrb() {
+    public boolean isNrbIdentifier() {
         return this instanceof NrbAccountIdentifier;
     }
 
     @JsonIgnore
     public SortCodeAccountNumberAccountIdentifier asSortCodeAccountNumber() {
-        if (!isSortCodeAccountNumber()) {
+        if (!isSortCodeAccountNumberIdentifier()) {
             throw new TrueLayerException(buildErrorMessage());
         }
         return (SortCodeAccountNumberAccountIdentifier) this;
     }
 
     @JsonIgnore
     public IbanAccountIdentifier asIban() {
-        if (!isIban()) {
+        if (!isIbanIdentifier()) {
             throw new TrueLayerException(buildErrorMessage());
         }
         return (IbanAccountIdentifier) this;
     }
 
     @JsonIgnore
     public BbanAccountIdentifier asBban() {
-        if (!isBban()) {
+        if (!isBbanIdentifier()) {
             throw new TrueLayerException(buildErrorMessage());
         }
         return (BbanAccountIdentifier) this;
     }
 
     @JsonIgnore
     public NrbAccountIdentifier asNrb() {
-        if (!isNrb()) {
+        if (!isNrbIdentifier()) {
             throw new TrueLayerException(buildErrorMessage());
         }
         return (NrbAccountIdentifier) this;

src/test/java/com/truelayer/java/entities/accountidentifier/AccountIdentifierTests.java

@@ -1,8 +1,10 @@
 package com.truelayer.java.entities.accountidentifier;
 
+import static com.truelayer.java.Utils.getObjectMapper;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.truelayer.java.TrueLayerException;
+import lombok.SneakyThrows;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -13,15 +15,19 @@ class AccountIdentifierTests {
     public void shouldYieldTrueIfSortCodeAccNumber() {
         AccountIdentifier sut = new SortCodeAccountNumberAccountIdentifier("123456", "12345678");
 
-        assertTrue(sut.isSortCodeAccountNumber());
+        assertTrue(sut.isSortCodeAccountNumberIdentifier());
     }
 
+    @SneakyThrows
     @Test
     @DisplayName("It should convert to an instance of class SortCodeAccountNumberAccountIdentifier")
     public void shouldConvertToSortCodeAccNumber() {
         AccountIdentifier sut = new SortCodeAccountNumberAccountIdentifier("123456", "12345678");
 
         assertDoesNotThrow(sut::asSortCodeAccountNumber);
+        assertEquals(
+                "{\"sort_code\":\"123456\",\"account_number\":\"12345678\",\"type\":\"sort_code_account_number\"}",
+                getObjectMapper().writeValueAsString(sut));
     }
 
     @Test
@@ -39,15 +45,18 @@ public void shouldNotConvertToSortCodeAccNumber() {
     public void shouldYieldTrueIfIban() {
         AccountIdentifier sut = new IbanAccountIdentifier("12345678");
 
-        assertTrue(sut.isIban());
+        assertTrue(sut.isIbanIdentifier());
     }
 
+    @SneakyThrows
     @Test
     @DisplayName("It should convert to an instance of class IbanAccountIdentifier")
     public void shouldConvertToIban() {
         AccountIdentifier sut = new IbanAccountIdentifier("12345678");
 
         assertDoesNotThrow(sut::asIban);
+        assertEquals(
+                "{\"iban\":\"12345678\",\"type\":\"iban\"}", getObjectMapper().writeValueAsString(sut));
     }
 
     @Test
@@ -65,15 +74,18 @@ public void shouldNotConvertToIbanAccountIdentifier() {
     public void shouldYieldTrueIfBban() {
         AccountIdentifier sut = new BbanAccountIdentifier("12345678");
 
-        assertTrue(sut.isBban());
+        assertTrue(sut.isBbanIdentifier());
     }
 
+    @SneakyThrows
     @Test
     @DisplayName("It should convert to an instance of class BbanAccountIdentifier")
     public void shouldConvertToBban() {
         AccountIdentifier sut = new BbanAccountIdentifier("12345678");
 
         assertDoesNotThrow(sut::asBban);
+        assertEquals(
+                "{\"bban\":\"12345678\",\"type\":\"bban\"}", getObjectMapper().writeValueAsString(sut));
     }
 
     @Test
@@ -91,15 +103,18 @@ public void shouldNotConvertToBbanAccountIdentifier() {
     public void shouldYieldTrueIfNrb() {
         AccountIdentifier sut = new NrbAccountIdentifier("12345678");
 
-        assertTrue(sut.isNrb());
+        assertTrue(sut.isNrbIdentifier());
     }
 
+    @SneakyThrows
     @Test
     @DisplayName("It should convert to an instance of class NrbAccountIdentifier")
     public void shouldConvertToNrb() {
         AccountIdentifier sut = new NrbAccountIdentifier("12345678");
 
         assertDoesNotThrow(sut::asNrb);
+        assertEquals(
+                "{\"nrb\":\"12345678\",\"type\":\"nrb\"}", getObjectMapper().writeValueAsString(sut));
     }
 
     @Test

src/test/java/com/truelayer/java/merchantaccounts/entities/transactions/TransactionTests.java

@@ -6,6 +6,7 @@
 import com.truelayer.java.entities.CurrencyCode;
 import java.util.Date;
 import java.util.UUID;
+import lombok.SneakyThrows;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -26,6 +27,7 @@ public void shouldYieldTrueIfMerchantAccountPayment() {
         assertTrue(sut.isMerchantAccountPayment());
     }
 
+    @SneakyThrows
     @Test
     @DisplayName("It should convert to an instance of class MerchantAccountPayment")
     public void shouldConvertToMerchantAccountPayment() {