Skip to content

Commit 770d25c

Browse files
committed
Use JavaTimeModule module with all OBJECT_MAPPER references
1 parent 1ee5617 commit 770d25c

38 files changed

+149
-44
lines changed

api/src/main/java/com/javadiscord/jdi/core/api/DiscordResponseParser.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010

1111
import com.fasterxml.jackson.core.JsonProcessingException;
1212
import com.fasterxml.jackson.databind.ObjectMapper;
13+
import com.fasterxml.jackson.databind.json.JsonMapper;
14+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1315

1416
public class DiscordResponseParser {
15-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
17+
private static final ObjectMapper OBJECT_MAPPER =
18+
JsonMapper.builder().addModule(new JavaTimeModule()).build();
1619
private final DiscordRequestDispatcher dispatcher;
1720

1821
public DiscordResponseParser(DiscordRequestDispatcher dispatcher) {

api/src/main/java/com/javadiscord/jdi/core/api/builders/CreateMessageBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public CreateMessageBuilder tts(boolean tts) {
5959
return this;
6060
}
6161

62-
public CreateMessageBuilder embeds(List<Embed> embeds) {
63-
this.embeds = Optional.of(embeds);
62+
public CreateMessageBuilder embeds(Embed... embeds) {
63+
this.embeds = Optional.of(List.of(embeds));
6464
return this;
6565
}
6666

core/src/main/java/com/javadiscord/jdi/core/Discord.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,16 @@
3232
import com.javadiscord.jdi.internal.gateway.identify.IdentifyRequest;
3333

3434
import com.fasterxml.jackson.databind.ObjectMapper;
35+
import com.fasterxml.jackson.databind.json.JsonMapper;
36+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
3537
import org.apache.logging.log4j.LogManager;
3638
import org.apache.logging.log4j.Logger;
3739

3840
public class Discord {
3941
private static final Logger LOGGER = LogManager.getLogger(Discord.class);
4042
private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool();
41-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
43+
private static final ObjectMapper OBJECT_MAPPER =
44+
JsonMapper.builder().addModule(new JavaTimeModule()).build();
4245
private static final String WEBSITE = "https://javadiscord.com/";
4346

4447
private static final String BASE_URL =

gateway/src/main/java/com/javadiscord/jdi/internal/gateway/WebSocketHandler.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
import com.fasterxml.jackson.core.JsonProcessingException;
1515
import com.fasterxml.jackson.databind.ObjectMapper;
16+
import com.fasterxml.jackson.databind.json.JsonMapper;
17+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1618
import io.vertx.core.Handler;
1719
import io.vertx.core.buffer.Buffer;
1820
import io.vertx.core.http.WebSocket;
@@ -21,7 +23,8 @@
2123

2224
public class WebSocketHandler implements Handler<WebSocket> {
2325
private static final Logger LOGGER = LogManager.getLogger(WebSocketHandler.class);
24-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
26+
private static final ObjectMapper OBJECT_MAPPER =
27+
JsonMapper.builder().addModule(new JavaTimeModule()).build();
2528
private static final Map<Integer, GatewayOperationHandler> OPERATION_HANDLER = new HashMap<>();
2629
private final ConnectionMediator connectionMediator;
2730
private final Cache cache;

gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/AutoModerationDecoder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.fasterxml.jackson.databind.json.JsonMapper;
10+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
911

1012
public class AutoModerationDecoder implements EventDecoder<AutoModerationRule> {
11-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
13+
private static final ObjectMapper OBJECT_MAPPER =
14+
JsonMapper.builder().addModule(new JavaTimeModule()).build();
1215

1316
@Override
1417
public AutoModerationRule decode(GatewayEvent gatewayEvent) {

gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelDecoder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.fasterxml.jackson.databind.json.JsonMapper;
10+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
911

1012
public class ChannelDecoder implements EventDecoder<Channel> {
11-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
13+
private static final ObjectMapper OBJECT_MAPPER =
14+
JsonMapper.builder().addModule(new JavaTimeModule()).build();
1215

1316
@Override
1417
public Channel decode(GatewayEvent gatewayEvent) {

gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/ChannelPinUpdateDecoder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.fasterxml.jackson.databind.json.JsonMapper;
10+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
911

1012
public class ChannelPinUpdateDecoder implements EventDecoder<MessagePin> {
11-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
13+
private static final ObjectMapper OBJECT_MAPPER =
14+
JsonMapper.builder().addModule(new JavaTimeModule()).build();
1215

1316
@Override
1417
public MessagePin decode(GatewayEvent gatewayEvent) {

gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EntitlementDecoder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.fasterxml.jackson.databind.json.JsonMapper;
10+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
911

1012
public class EntitlementDecoder implements EventDecoder<Entitlement> {
11-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
13+
private static final ObjectMapper OBJECT_MAPPER =
14+
JsonMapper.builder().addModule(new JavaTimeModule()).build();
1215

1316
@Override
1417
public Entitlement decode(GatewayEvent gatewayEvent) {

gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/EventUserDecoder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.fasterxml.jackson.databind.json.JsonMapper;
10+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
911

1012
public class EventUserDecoder implements EventDecoder<EventUser> {
11-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
13+
private static final ObjectMapper OBJECT_MAPPER =
14+
JsonMapper.builder().addModule(new JavaTimeModule()).build();
1215

1316
@Override
1417
public EventUser decode(GatewayEvent gatewayEvent) {

gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/events/codec/decoders/GuildBanDecoder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66

77
import com.fasterxml.jackson.core.JsonProcessingException;
88
import com.fasterxml.jackson.databind.ObjectMapper;
9+
import com.fasterxml.jackson.databind.json.JsonMapper;
10+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
911

1012
public class GuildBanDecoder implements EventDecoder<GuildBan> {
11-
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
13+
private static final ObjectMapper OBJECT_MAPPER =
14+
JsonMapper.builder().addModule(new JavaTimeModule()).build();
1215

1316
@Override
1417
public GuildBan decode(GatewayEvent gatewayEvent) {

0 commit comments

Comments
 (0)