Skip to content

Commit dacb25c

Browse files
committed
Move ObjectMapper to handler
1 parent d192a23 commit dacb25c

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

server/src/main/java/com/exactpro/blockchain/api/client/ClientHandler.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.exactpro.iso20022.CustomerCreditTransfer;
99
import com.exactpro.iso20022.XmlCodec;
1010
import com.fasterxml.jackson.core.JsonProcessingException;
11+
import com.fasterxml.jackson.databind.ObjectMapper;
1112
import jakarta.xml.bind.JAXBException;
1213
import org.apache.logging.log4j.LogManager;
1314
import org.apache.logging.log4j.Logger;
@@ -37,6 +38,7 @@ public class ClientHandler {
3738
private final ConversionRateRepository conversionRateRepository;
3839
private final CurrencyRepository currencyRepository;
3940
private final TransferRepository transferRepository;
41+
private final ObjectMapper objectMapper;
4042
private final MessageRepository messageRepository;
4143
private final XmlCodec xmlCodec;
4244
private final CustomerCreditTransferConverter converter;
@@ -59,6 +61,7 @@ public ClientHandler(
5961
this.clientRepository = clientRepository;
6062
this.conversionRateRepository = conversionRateRepository;
6163
this.transferRepository = transferRepository;
64+
this.objectMapper = new ObjectMapper();
6265
this.messageRepository = messageRepository;
6366
this.currencyRepository = currencyRepository;
6467
this.xmlCodec = xmlCodec;
@@ -190,7 +193,7 @@ Mono<Void> handle(
190193

191194
String transferJson;
192195
try {
193-
transferJson = transfer.toJson();
196+
transferJson = objectMapper.writeValueAsString(transfer);
194197
} catch (JsonProcessingException e) {
195198
return Mono.error(new Exception("Failed to convert Transfer to JSON", e));
196199
}

server/src/main/java/com/exactpro/blockchain/entity/Transfer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.exactpro.blockchain.entity;
22

3-
import com.fasterxml.jackson.core.JsonProcessingException;
4-
import com.fasterxml.jackson.databind.ObjectMapper;
53
import org.springframework.data.annotation.Id;
64
import org.springframework.data.relational.core.mapping.Column;
75
import org.springframework.data.relational.core.mapping.Table;
@@ -14,8 +12,6 @@
1412

1513
@Table("Transfer")
1614
public class Transfer {
17-
private static final ObjectMapper objectMapper = new ObjectMapper();
18-
1915
@Id
2016
@Column("transferId")
2117
private Integer transferId;
@@ -254,9 +250,5 @@ public Builder transferTimestamp(Instant transferTimestamp) {
254250
return this;
255251
}
256252
}
257-
258-
public String toJson() throws JsonProcessingException {
259-
return objectMapper.writeValueAsString(this);
260-
}
261253
}
262254

0 commit comments

Comments
 (0)