Skip to content

Commit fd5e779

Browse files
committed
chore: cleanup
1 parent d772396 commit fd5e779

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<project.build.outputTimestamp>2025-03-14T14:11:02Z</project.build.outputTimestamp>
2121

2222
<maven.compiler.release>${osslabz.java.version}</maven.compiler.release>
23+
24+
<jackson.version>2.18.3</jackson.version>
2325
</properties>
2426

2527
<licenses>
@@ -49,9 +51,15 @@
4951
<dependency>
5052
<groupId>com.fasterxml.jackson.core</groupId>
5153
<artifactId>jackson-databind</artifactId>
52-
<version>2.18.3</version>
54+
<version>${jackson.version}</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.fasterxml.jackson.datatype</groupId>
58+
<artifactId>jackson-datatype-jsr310</artifactId>
59+
<version>${jackson.version}</version>
5360
</dependency>
5461

62+
5563
<!-- logging -->
5664
<dependency>
5765
<groupId>org.slf4j</groupId>

src/main/java/net/osslabz/jsonrpc/JsonRpcTcpClient.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
import static net.osslabz.jsonrpc.JsonRpcFieldNames.RESULT;
77

88
import com.fasterxml.jackson.core.JsonProcessingException;
9+
import com.fasterxml.jackson.databind.DeserializationFeature;
910
import com.fasterxml.jackson.databind.JsonNode;
1011
import com.fasterxml.jackson.databind.ObjectMapper;
12+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1113
import java.io.Closeable;
1214
import java.io.IOException;
1315
import java.net.InetSocketAddress;
@@ -62,6 +64,8 @@ public JsonRpcTcpClient(String host, int port) {
6264
this.host = host;
6365
this.port = port;
6466
this.objectMapper = new ObjectMapper();
67+
objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
68+
objectMapper.registerModule(new JavaTimeModule());
6569

6670
Thread selectorThread = new Thread(this::processSelectorEvents);
6771
selectorThread.setDaemon(true);
@@ -82,7 +86,7 @@ private void processSelectorEvents() {
8286
try {
8387
Thread.sleep(100);
8488
} catch (InterruptedException e) {
85-
throw new JsonRcpException(e);
89+
// ignore
8690
}
8791
continue;
8892
}
@@ -121,10 +125,10 @@ private void processSelectorEvents() {
121125
writeData(key);
122126
}
123127
} catch (IOException e) {
128+
pendingRequests.clear();
124129
pendingResponses.forEach((id, future) ->
125130
future.completeExceptionally(e));
126131
pendingResponses.clear();
127-
pendingRequests.clear();
128132
}
129133
}
130134
}
@@ -262,7 +266,6 @@ private void readData(SelectionKey key) {
262266
} catch (Exception e) {
263267
throw new JsonRcpException(e);
264268
}
265-
266269
}
267270

268271

0 commit comments

Comments
 (0)