Skip to content

Commit 7a3bb4b

Browse files
committed
fix(deps): update dependencies
1 parent c2e3af4 commit 7a3bb4b

34 files changed

Lines changed: 142 additions & 197 deletions

File tree

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v24.13.0
1+
lts/*

async/async-commons/src/main/java/org/reactivecommons/async/commons/converters/json/DefaultObjectMapperSupplier.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package org.reactivecommons.async.commons.converters.json;
22

33
import io.cloudevents.jackson.JsonFormat;
4-
import tools.jackson.databind.ObjectMapper;
54
import tools.jackson.databind.json.JsonMapper;
65

76
public class DefaultObjectMapperSupplier implements ObjectMapperSupplier {
87

98
@Override
10-
public ObjectMapper get() {
9+
public JsonMapper get() {
1110
return JsonMapper.builder()
1211
.addModule(JsonFormat.getCloudEventJacksonModule())
1312
.findAndAddModules()

async/async-commons/src/main/java/org/reactivecommons/async/commons/converters/json/JacksonMessageConverter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.reactivecommons.async.commons.converters.MessageConverter;
1111
import org.reactivecommons.async.commons.exceptions.MessageConversionException;
1212
import tools.jackson.databind.JsonNode;
13-
import tools.jackson.databind.ObjectMapper;
13+
import tools.jackson.databind.json.JsonMapper;
1414

1515
@RequiredArgsConstructor
1616
public abstract class JacksonMessageConverter implements MessageConverter {
@@ -19,26 +19,26 @@ public abstract class JacksonMessageConverter implements MessageConverter {
1919
public static final String APPLICATION_CLOUD_EVENT_JSON = "application/cloudevents+json";
2020
public static final String APPLICATION_JSON = "application/json";
2121

22-
protected final ObjectMapper objectMapper;
22+
protected final JsonMapper jsonMapper;
2323

2424
@Override
2525
public <T> AsyncQuery<T> readAsyncQuery(Message message, Class<T> bodyClass) {
2626
final AsyncQueryJson asyncQueryJson = readValue(message, AsyncQueryJson.class);
27-
final T value = objectMapper.treeToValue(asyncQueryJson.getQueryData(), bodyClass);
27+
final T value = jsonMapper.treeToValue(asyncQueryJson.getQueryData(), bodyClass);
2828
return new AsyncQuery<>(asyncQueryJson.getResource(), value);
2929
}
3030

3131
@Override
3232
public <T> DomainEvent<T> readDomainEvent(Message message, Class<T> bodyClass) {
3333
final DomainEventJson domainEventJson = readValue(message, DomainEventJson.class);
34-
final T value = objectMapper.treeToValue(domainEventJson.getData(), bodyClass);
34+
final T value = jsonMapper.treeToValue(domainEventJson.getData(), bodyClass);
3535
return new DomainEvent<>(domainEventJson.getName(), domainEventJson.getEventId(), value);
3636
}
3737

3838
@Override
3939
public <T> Command<T> readCommand(Message message, Class<T> bodyClass) {
4040
final CommandJson commandJson = readValue(message, CommandJson.class);
41-
final T value = objectMapper.treeToValue(commandJson.getData(), bodyClass);
41+
final T value = jsonMapper.treeToValue(commandJson.getData(), bodyClass);
4242
return new Command<>(commandJson.getName(), commandJson.getCommandId(), value);
4343
}
4444

@@ -50,7 +50,7 @@ public CloudEvent readCloudEvent(Message message) {
5050
@Override
5151
public <T> T readValue(Message message, Class<T> valueClass) {
5252
try {
53-
return objectMapper.readValue(message.getBody(), valueClass);
53+
return jsonMapper.readValue(message.getBody(), valueClass);
5454
} catch (Exception e) {
5555
throw new MessageConversionException(FAILED_TO_CONVERT_MESSAGE_CONTENT, e);
5656
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.reactivecommons.async.commons.converters.json;
22

3-
import tools.jackson.databind.ObjectMapper;
3+
import tools.jackson.databind.json.JsonMapper;
44

55
import java.util.function.Supplier;
66

7-
public interface ObjectMapperSupplier extends Supplier<ObjectMapper> {
7+
public interface ObjectMapperSupplier extends Supplier<JsonMapper> {
88
}

async/async-commons/src/test/java/org/reactivecommons/async/commons/converters/json/DefaultObjectMapperSupplierTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.Getter;
55
import lombok.NoArgsConstructor;
66
import org.junit.jupiter.api.Test;
7-
import tools.jackson.databind.ObjectMapper;
7+
import tools.jackson.databind.json.JsonMapper;
88

99
import java.time.LocalDateTime;
1010
import java.util.Date;
@@ -15,30 +15,29 @@ class DefaultObjectMapperSupplierTest {
1515

1616
private final DefaultObjectMapperSupplier defaultObjectMapperSupplier = new DefaultObjectMapperSupplier();
1717

18-
1918
@Test
2019
void shouldMapWithUnknownProperties() {
21-
ObjectMapper objectMapper = defaultObjectMapperSupplier.get();
20+
JsonMapper jsonMapper = defaultObjectMapperSupplier.get();
2221

2322
SampleClassExtra base = new SampleClassExtra("23", "one", new Date(), 45L);
24-
final String serialized = objectMapper.writeValueAsString(base);
23+
final String serialized = jsonMapper.writeValueAsString(base);
2524

26-
final SampleClass result = objectMapper.readValue(serialized, SampleClass.class);
25+
final SampleClass result = jsonMapper.readValue(serialized, SampleClass.class);
2726

2827
assertThat(result).usingRecursiveComparison().isEqualTo(base);
2928
}
3029

3130
@Test
3231
void shouldSerializeAndDeserializeLocalDateTime() {
33-
ObjectMapper objectMapper = defaultObjectMapperSupplier.get();
32+
JsonMapper jsonMapper = defaultObjectMapperSupplier.get();
3433

3534
LocalDateTime now = LocalDateTime.of(2025, 12, 10, 14, 30, 0);
3635
SampleClassWithLocalDateTime sample = new SampleClassWithLocalDateTime("123", "Test", now);
3736

38-
final String serialized = objectMapper.writeValueAsString(sample);
37+
final String serialized = jsonMapper.writeValueAsString(sample);
3938
assertThat(serialized).contains("2025-12-10");
4039

41-
final SampleClassWithLocalDateTime result = objectMapper.readValue(serialized, SampleClassWithLocalDateTime.class);
40+
final SampleClassWithLocalDateTime result = jsonMapper.readValue(serialized, SampleClassWithLocalDateTime.class);
4241

4342
assertThat(result.getId()).isEqualTo("123");
4443
assertThat(result.getName()).isEqualTo("Test");

async/async-kafka/src/main/java/org/reactivecommons/async/kafka/converters/json/KafkaJacksonMessageConverter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
import org.reactivecommons.async.commons.exceptions.MessageConversionException;
88
import org.reactivecommons.async.kafka.KafkaMessage;
99
import org.reactivecommons.async.kafka.KafkaMessage.KafkaMessageProperties;
10-
import tools.jackson.databind.ObjectMapper;
10+
import tools.jackson.databind.json.JsonMapper;
1111

1212
import java.nio.charset.StandardCharsets;
1313
import java.util.HashMap;
1414
import java.util.Map;
1515

1616
public class KafkaJacksonMessageConverter extends JacksonMessageConverter {
1717

18-
public KafkaJacksonMessageConverter(ObjectMapper objectMapper) {
19-
super(objectMapper);
18+
public KafkaJacksonMessageConverter(JsonMapper jsonMapper) {
19+
super(jsonMapper);
2020
}
2121

2222
@Override
@@ -26,7 +26,7 @@ public Message toMessage(Object object) {
2626
}
2727
byte[] bytes;
2828
try {
29-
String jsonString = this.objectMapper.writeValueAsString(object);
29+
String jsonString = this.jsonMapper.writeValueAsString(object);
3030
bytes = jsonString.getBytes(StandardCharsets.UTF_8);
3131
} catch (Exception e) {
3232
throw new MessageConversionException(FAILED_TO_CONVERT_MESSAGE_CONTENT, e);

async/async-kafka/src/test/java/org/reactivecommons/async/kafka/converters/json/KafkaJacksonMessageConverterTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.reactivecommons.async.commons.communications.Message;
1313
import org.reactivecommons.async.commons.converters.json.DefaultObjectMapperSupplier;
1414
import org.reactivecommons.async.commons.converters.json.ObjectMapperSupplier;
15-
import tools.jackson.databind.ObjectMapper;
15+
import tools.jackson.databind.json.JsonMapper;
1616

1717
import java.net.URI;
1818
import java.time.OffsetDateTime;
@@ -23,13 +23,13 @@
2323

2424
class KafkaJacksonMessageConverterTest {
2525
private static KafkaJacksonMessageConverter converter;
26-
private static ObjectMapper objectMapper;
26+
private static JsonMapper jsonMapper;
2727

2828
@BeforeAll
2929
static void setUp() {
3030
ObjectMapperSupplier supplier = new DefaultObjectMapperSupplier();
31-
objectMapper = supplier.get();
32-
converter = new KafkaJacksonMessageConverter(objectMapper);
31+
jsonMapper = supplier.get();
32+
converter = new KafkaJacksonMessageConverter(jsonMapper);
3333
}
3434

3535
@Test
@@ -61,21 +61,21 @@ void shouldSerializeCloudEvent() {
6161
.withType("test")
6262
.withDataContentType("application/json")
6363
.withTime(dateTime)
64-
.withData(objectMapper.writeValueAsBytes(event))
64+
.withData(jsonMapper.writeValueAsBytes(event))
6565
.build();
6666

6767
String expectedJson = "{\"specversion\":\"1.0\",\"id\":\"" + id +
6868
"\",\"source\":\"https://reactivecommons.org/events\",\"type\":\"test\"," +
6969
"\"datacontenttype\":\"application/json\",\"time\":\"" + dateTime +
7070
"\",\"data\":{\"name\":\"name\",\"age\":1}}";
71-
JsonCloudEvent expectedJsonNode = objectMapper.readValue(expectedJson, JsonCloudEvent.class);
71+
JsonCloudEvent expectedJsonNode = jsonMapper.readValue(expectedJson, JsonCloudEvent.class);
7272
// Act
7373
Message message = converter.toMessage(testCloudEvent);
7474
// Assert
7575
assertEquals("test", message.getProperties().getTopic());
7676
assertEquals(id, message.getProperties().getKey());
7777
assertEquals("application/cloudevents+json", message.getProperties().getContentType());
78-
JsonCloudEvent receivedJsonNode = objectMapper.readValue(new String(message.getBody()), JsonCloudEvent.class);
78+
JsonCloudEvent receivedJsonNode = jsonMapper.readValue(new String(message.getBody()), JsonCloudEvent.class);
7979
assertEquals(expectedJsonNode, receivedJsonNode);
8080
}
8181

async/async-rabbit/src/main/java/org/reactivecommons/async/rabbit/converters/json/RabbitJacksonMessageConverter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import org.reactivecommons.async.commons.communications.Message;
55
import org.reactivecommons.async.commons.converters.json.JacksonMessageConverter;
66
import org.reactivecommons.async.rabbit.RabbitMessage;
7-
import tools.jackson.databind.ObjectMapper;
7+
import tools.jackson.databind.json.JsonMapper;
88

99
import java.nio.charset.StandardCharsets;
1010

1111
public class RabbitJacksonMessageConverter extends JacksonMessageConverter {
1212

13-
public RabbitJacksonMessageConverter(ObjectMapper objectMapper) {
14-
super(objectMapper);
13+
public RabbitJacksonMessageConverter(JsonMapper jsonMapper) {
14+
super(jsonMapper);
1515
}
1616

1717
@Override
@@ -20,7 +20,7 @@ public Message toMessage(Object object) {
2020
return rabbitMessage;
2121
}
2222
byte[] bytes;
23-
String jsonString = this.objectMapper.writeValueAsString(object);
23+
String jsonString = this.jsonMapper.writeValueAsString(object);
2424
bytes = jsonString.getBytes(StandardCharsets.UTF_8);
2525
RabbitMessage.RabbitMessageProperties props = new RabbitMessage.RabbitMessageProperties();
2626
if (object instanceof CloudEvent) {

async/async-rabbit/src/test/java/org/reactivecommons/async/rabbit/RabbitDirectAsyncGatewayTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import reactor.rabbitmq.SendOptions;
2929
import reactor.rabbitmq.Sender;
3030
import reactor.test.StepVerifier;
31-
import tools.jackson.databind.ObjectMapper;
31+
import tools.jackson.databind.json.JsonMapper;
3232

3333
import java.time.Duration;
3434
import java.util.List;
@@ -326,7 +326,7 @@ private void senderMock() {
326326

327327
private void mockReply() {
328328
Message message = mock(Message.class);
329-
ObjectMapper mapper = new ObjectMapper();
329+
JsonMapper mapper = new JsonMapper();
330330
when(message.getBody()).thenReturn(mapper.writeValueAsString(new DummyMessage()).getBytes());
331331
final Sinks.One<Message> processor = Sinks.one();
332332
processor.tryEmitValue(message);

async/async-rabbit/src/test/java/org/reactivecommons/async/rabbit/communications/ReactiveMessageSenderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ class ReactiveMessageSenderTest {
3333

3434
private ReactiveMessageSender messageSender;
3535

36-
private final JsonMapper objectMapper = new JsonMapper();
36+
private final JsonMapper jsonMapper = new JsonMapper();
3737

3838
@Mock
3939
private Sender sender;
4040

4141
@Spy
42-
private final MessageConverter messageConverter = new RabbitJacksonMessageConverter(objectMapper);
42+
private final MessageConverter messageConverter = new RabbitJacksonMessageConverter(jsonMapper);
4343

4444
@Mock
4545
private final SendOptions sendOptions = new SendOptions();
@@ -56,7 +56,7 @@ void init() {
5656
});
5757
when(sender.send(any(Publisher.class))).then(invocation -> {
5858
final Flux<OutboundMessage> argument = invocation.getArgument(0);
59-
argument.subscribe(); // Suscribirse para inicializar el sink
59+
argument.subscribe(); // Subscribe to initialize the sink
6060
return Mono.empty();
6161
});
6262
String sourceApplication = "TestApp";

0 commit comments

Comments
 (0)