Skip to content

Commit c44f316

Browse files
committed
chore: cleanup and fixes
1 parent 28263e5 commit c44f316

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

annotations/src/main/java/com/javadiscord/jdi/core/processor/ClassFileUtil.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@ public static List<File> getClassesInClassPath() {
2525
String[] classpathEntries = classpath.split(File.pathSeparator);
2626

2727
for (String entry : classpathEntries) {
28-
if (
29-
entry.contains("io.netty")
30-
|| entry.contains("org.apache")
31-
|| entry.contains("io.vertx")
32-
|| entry.contains("com.fasterxml")
33-
|| entry.contains("org.javassist")
34-
|| entry.contains("com.github.mizosoft.methanol")
35-
) {
36-
continue;
37-
}
38-
3928
File file = new File(entry);
4029
try {
4130
classesInPath.addAll(getClasses(file));

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,19 @@ public class WebSocketHandler implements Handler<WebSocket> {
2828
private static final Map<Integer, GatewayOperationHandler> OPERATION_HANDLER = new HashMap<>();
2929
private final ConnectionMediator connectionMediator;
3030
private final Cache cache;
31+
private final HeartbeatService heartbeatService;
3132

3233
public WebSocketHandler(
3334
ConnectionMediator connectionMediator,
34-
Cache cache
35+
Cache cache, HeartbeatService heartbeatService
3536
) {
3637
this.connectionMediator = connectionMediator;
3738
this.cache = cache;
39+
this.heartbeatService = heartbeatService;
3840
registerHandlers();
3941
}
4042

4143
private void registerHandlers() {
42-
HeartbeatService heartbeatService = new HeartbeatService(connectionMediator);
4344
OPERATION_HANDLER.put(GatewayOpcode.HELLO, new HelloOperationHandler(heartbeatService));
4445
OPERATION_HANDLER.put(
4546
GatewayOpcode.HEARTBEAT_ACK, new HeartbeatAckOperationHandler(heartbeatService)

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.javadiscord.jdi.internal.gateway;
22

33
import com.javadiscord.jdi.internal.cache.Cache;
4+
import com.javadiscord.jdi.internal.gateway.handlers.heartbeat.HeartbeatService;
45
import com.javadiscord.jdi.internal.gateway.identify.IdentifyRequest;
56

67
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -23,6 +24,7 @@ public class WebSocketManager {
2324
private final Cache cache;
2425
private WebSocket webSocket;
2526
private WebSocketClient webSocketClient;
27+
private HeartbeatService heartbeatService;
2628
private boolean retryAllowed;
2729

2830
public WebSocketManager(
@@ -36,6 +38,8 @@ public WebSocketManager(
3638
}
3739

3840
public void start(ConnectionMediator connectionMediator) {
41+
heartbeatService = new HeartbeatService(connectionMediator);
42+
3943
String gatewayURL = connectionMediator.getConnectionDetails().getGatewayURL();
4044

4145
WebSocketConnectOptions webSocketConnectOptions =
@@ -61,7 +65,7 @@ public void start(ConnectionMediator connectionMediator) {
6165
this.webSocket = webSocket;
6266

6367
WebSocketHandler webSocketHandler =
64-
new WebSocketHandler(connectionMediator, cache);
68+
new WebSocketHandler(connectionMediator, cache, heartbeatService);
6569

6670
webSocketHandler.handle(webSocket);
6771

@@ -101,6 +105,9 @@ public void stop() {
101105
if (webSocket != null && !webSocket.isClosed()) {
102106
webSocket.close();
103107
}
108+
if (heartbeatService != null) {
109+
heartbeatService.stop();
110+
}
104111
webSocketClient.close()
105112
.onSuccess(res -> LOGGER.info("Web socket client has been shutdown"))
106113
.onFailure(err -> LOGGER.error("Failed to shutdown web socket client", err));

gateway/src/main/java/com/javadiscord/jdi/internal/gateway/handlers/heartbeat/HeartbeatService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ private void checkHeartbeatAckReceived(WebSocket webSocket) {
5555
}
5656
}
5757

58+
public void stop() {
59+
EXECUTOR_SERVICE.shutdown();
60+
}
61+
5862
public void sendHeartbeat(WebSocket webSocket) {
5963
webSocket.write(
6064
Buffer.buffer()

0 commit comments

Comments
 (0)