Skip to content

Commit bced560

Browse files
Angular2GuyAngular2Guy
committed
fix: cleanup
1 parent e61d170 commit bced560

File tree

7 files changed

+40
-77
lines changed

7 files changed

+40
-77
lines changed

‎backend/src/main/java/ch/xxx/trader/adapter/clients/test/RestClientCoinbase.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,20 @@
1515
*/
1616
package ch.xxx.trader.adapter.clients.test;
1717

18+
import ch.xxx.trader.domain.model.dto.WrapperCb;
19+
import ch.xxx.trader.domain.model.entity.QuoteCb;
20+
import org.springframework.http.MediaType;
21+
import org.springframework.web.reactive.function.client.WebClient;
22+
import reactor.core.publisher.Mono;
23+
import tools.jackson.databind.json.JsonMapper;
24+
25+
import javax.net.ssl.HttpsURLConnection;
1826
import java.io.BufferedReader;
1927
import java.io.IOException;
2028
import java.io.InputStreamReader;
2129
import java.net.MalformedURLException;
2230
import java.net.URL;
2331

24-
import javax.net.ssl.HttpsURLConnection;
25-
26-
import org.springframework.http.MediaType;
27-
import org.springframework.web.reactive.function.client.WebClient;
28-
29-
import com.fasterxml.jackson.databind.ObjectMapper;
30-
31-
import ch.xxx.trader.domain.model.dto.WrapperCb;
32-
import ch.xxx.trader.domain.model.entity.QuoteCb;
33-
import reactor.core.publisher.Mono;
34-
3532
public class RestClientCoinbase {
3633
private static final String URL = "https://api.coinbase.com/v2";
3734

@@ -69,7 +66,7 @@ private void testIt(){
6966
}
7067

7168
private void print_content(HttpsURLConnection con){
72-
ObjectMapper mapper = new ObjectMapper();
69+
var mapper = new JsonMapper();
7370
if(con!=null){
7471

7572
try {

‎backend/src/main/java/ch/xxx/trader/adapter/config/ApplicationConfig.java‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,24 @@
1515
*/
1616
package ch.xxx.trader.adapter.config;
1717

18-
import java.time.Duration;
19-
20-
import javax.net.ssl.SSLException;
21-
18+
import io.netty.channel.ChannelOption;
19+
import io.netty.handler.ssl.SslContextBuilder;
20+
import io.netty.handler.timeout.ReadTimeoutHandler;
21+
import io.netty.handler.timeout.WriteTimeoutHandler;
2222
import org.springframework.boot.autoconfigure.web.WebProperties;
2323
import org.springframework.context.annotation.Bean;
2424
import org.springframework.context.annotation.Configuration;
2525
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
2626
import org.springframework.web.reactive.function.client.WebClient;
27-
28-
import com.fasterxml.jackson.databind.ObjectMapper;
29-
30-
import ch.xxx.trader.usecase.common.DtoUtils;
31-
import io.netty.channel.ChannelOption;
32-
import io.netty.handler.ssl.SslContextBuilder;
33-
import io.netty.handler.timeout.ReadTimeoutHandler;
34-
import io.netty.handler.timeout.WriteTimeoutHandler;
3527
import reactor.netty.http.client.HttpClient;
3628
import reactor.netty.resources.ConnectionProvider;
3729
import reactor.netty.tcp.SslProvider.SslContextSpec;
3830

31+
import javax.net.ssl.SSLException;
32+
import java.time.Duration;
33+
3934
@Configuration
4035
public class ApplicationConfig {
41-
42-
@Bean
43-
public ObjectMapper createObjectMapper() {
44-
return DtoUtils.produceObjectMapper();
45-
}
4636

4737
@Bean
4838
public WebProperties.Resources resources() {

‎backend/src/main/java/ch/xxx/trader/adapter/events/KafkaStreams.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@
3030
import org.springframework.context.annotation.Profile;
3131
import org.springframework.stereotype.Component;
3232

33-
import com.fasterxml.jackson.core.JsonProcessingException;
34-
import com.fasterxml.jackson.databind.ObjectMapper;
35-
3633
import ch.xxx.trader.adapter.config.KafkaConfig;
3734
import ch.xxx.trader.domain.model.dto.RevokedTokensDto;
3835
import ch.xxx.trader.domain.model.entity.RevokedToken;
3936
import ch.xxx.trader.usecase.common.LastlogoutTimestampExtractor;
37+
import tools.jackson.databind.json.JsonMapper;
4038

4139
@Profile("kafka | prod")
4240
@Component
@@ -45,9 +43,9 @@ public class KafkaStreams {
4543
private static final long LOGOUT_TIMEOUT = 120L;
4644
private static final long GRACE_TIMEOUT = 5L;
4745
private static final String UNPARSEABLE_JSON = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod";
48-
private ObjectMapper objectMapper;
46+
private final JsonMapper objectMapper;
4947

50-
public KafkaStreams(ObjectMapper objectMapper) {
48+
public KafkaStreams(JsonMapper objectMapper) {
5149
this.objectMapper = objectMapper;
5250
}
5351

@@ -73,22 +71,18 @@ public Topology userLogout(final StreamsBuilder builder) {
7371
return builder.build(streamsConfiguration);
7472
}
7573

76-
private String convertToRevokedTokens(List<String> value) {
77-
try {
74+
private String convertToRevokedTokens(List<String> value) {
7875
List<RevokedToken> revokedTokenList = value.stream().map(myValue -> {
7976
RevokedToken result;
8077
try {
8178
result = this.objectMapper.readValue(myValue, RevokedToken.class);
82-
} catch (Exception e) {
79+
} catch (RuntimeException e) {
8380
LOGGER.warn(String.format("Failed to deserialize %s", myValue), e);
8481
result = new RevokedToken(null, UNPARSEABLE_JSON, UNPARSEABLE_JSON, null);
8582
}
8683
return result;
8784
}).filter(myRevokedToken -> !UNPARSEABLE_JSON.equalsIgnoreCase(myRevokedToken.getName())
8885
&& !UNPARSEABLE_JSON.equalsIgnoreCase(myRevokedToken.getUuid())).toList();
89-
return this.objectMapper.writeValueAsString(new RevokedTokensDto(revokedTokenList));
90-
} catch (JsonProcessingException e) {
91-
throw new RuntimeException(e);
92-
}
86+
return this.objectMapper.writeValueAsString(new RevokedTokensDto(revokedTokenList));
9387
}
9488
}

‎backend/src/main/java/ch/xxx/trader/usecase/common/DtoUtils.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,17 @@
1515
*/
1616
package ch.xxx.trader.usecase.common;
1717

18-
import java.lang.invoke.CallSite;
19-
import java.lang.invoke.LambdaMetafactory;
20-
import java.lang.invoke.MethodHandle;
21-
import java.lang.invoke.MethodHandles;
22-
import java.lang.invoke.MethodType;
18+
import tools.jackson.databind.json.JsonMapper;
19+
20+
import java.lang.invoke.*;
2321
import java.util.function.BiConsumer;
2422
import java.util.function.Function;
2523

26-
import com.fasterxml.jackson.databind.ObjectMapper;
27-
import com.fasterxml.jackson.databind.SerializationFeature;
28-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
29-
3024
public class DtoUtils {
3125
public static final String CREATEDAT = "createdAt";
3226

33-
public static ObjectMapper produceObjectMapper() {
34-
ObjectMapper objectMapper = new ObjectMapper();
35-
objectMapper.registerModule(new JavaTimeModule());
36-
objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
37-
return objectMapper;
27+
public static JsonMapper produceJsonMapper() {
28+
return new JsonMapper();
3829
}
3930

4031
// source: https://dzone.com/articles/setters-method-handles-and-java-11

‎backend/src/main/java/ch/xxx/trader/usecase/common/LastlogoutTimestampExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class LastlogoutTimestampExtractor implements TimestampExtractor {
2626

2727
@Override
2828
public long extract(ConsumerRecord<Object, Object> record, long partitionTime) {
29-
RevokedToken revokedToken = DtoUtils.produceObjectMapper().convertValue(record.value(), RevokedToken.class);
29+
RevokedToken revokedToken = DtoUtils.produceJsonMapper().convertValue(record.value(), RevokedToken.class);
3030
// LOGGER.info(revokedToken.toString());
3131
return Timestamp.valueOf(revokedToken.getLastLogout()).getTime();
3232
}

‎backend/src/main/java/ch/xxx/trader/usecase/mappers/EventMapper.java‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,25 @@
1515
*/
1616
package ch.xxx.trader.usecase.mappers;
1717

18-
import java.util.Optional;
19-
2018
import org.slf4j.Logger;
2119
import org.slf4j.LoggerFactory;
2220
import org.springframework.stereotype.Service;
21+
import tools.jackson.databind.json.JsonMapper;
2322

24-
import com.fasterxml.jackson.core.JsonProcessingException;
25-
import com.fasterxml.jackson.databind.ObjectMapper;
23+
import java.util.Optional;
2624

2725
@Service
2826
public class EventMapper {
2927
private static final Logger LOG = LoggerFactory.getLogger(EventMapper.class);
30-
private final ObjectMapper objectMapper;
28+
private final JsonMapper objectMapper;
3129

32-
public EventMapper(ObjectMapper objectMapper) {
30+
public EventMapper(JsonMapper objectMapper) {
3331
this.objectMapper = objectMapper;
3432
}
3533

3634
public String mapDtoToString(Object dto) {
37-
String dtoJson;
38-
try {
39-
dtoJson = this.objectMapper.writeValueAsString(dto);
40-
} catch (JsonProcessingException e) {
41-
throw new RuntimeException(e);
42-
}
43-
return dtoJson;
35+
String dtoJson = this.objectMapper.writeValueAsString(dto);
36+
return dtoJson;
4437
}
4538

4639
public <T> Optional<T> mapJsonToObject(String jsonString, Class<T> myClass) {

‎backend/src/test/java/ch/xxx/trader/adapter/cron/ScheduledTaskTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515
*/
1616
package ch.xxx.trader.adapter.cron;
1717

18-
import org.junit.jupiter.api.Assertions;
19-
import org.junit.jupiter.api.Test;
20-
21-
import com.fasterxml.jackson.core.JsonProcessingException;
22-
import com.fasterxml.jackson.databind.JsonMappingException;
23-
import com.fasterxml.jackson.databind.ObjectMapper;
24-
2518
import ch.xxx.trader.domain.model.entity.QuoteIb;
2619
import ch.xxx.trader.domain.model.entity.paxos.PaxosQuote;
20+
import com.fasterxml.jackson.core.JsonProcessingException;
21+
import com.fasterxml.jackson.databind.JsonMappingException;
22+
import org.junit.jupiter.api.Assertions;
23+
import org.junit.jupiter.api.Test;
24+
import tools.jackson.databind.json.JsonMapper;
2725

2826
public class ScheduledTaskTest {
2927
private static final String VALUE = "{\"market\":\"BTCUSD\", \"best_bid\":{\"price\":\"29318.75\", \"amount\":\"0.40468933\"}, "
@@ -33,7 +31,7 @@ public class ScheduledTaskTest {
3331
+ "\"end\":\"2023-04-29T06:53:17.898910Z\"}}, \"today\":{\"high\":\"29457.75\", \"low\":\"29232.25\", \"open\":\"29340.50\", "
3432
+ "\"volume\":\"24.83650853\", \"volume_weighted_average_price\":\"29361.10623022\", \"range\":{\"begin\":\"2023-04-29T00:00:00Z\", "
3533
+ "\"end\":\"2023-04-29T06:53:17.898910Z\"}}, \"snapshot_at\":\"2023-04-29T06:53:17.898910Z\"}";
36-
private ObjectMapper objectMapper = new ObjectMapper();
34+
private JsonMapper objectMapper = new JsonMapper();
3735

3836
@Test
3937
public void convertTest() throws JsonMappingException, JsonProcessingException {

0 commit comments

Comments
 (0)