From d700353ed88a6e8650d21ead03f2d2fc2404168e Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 18 Mar 2026 15:44:07 +0100 Subject: [PATCH] update Rpc --- .../delta/rpc/{BaseTransport.java => BaseRpcTransport.java} | 2 +- src/main/java/chat/delta/rpc/Rpc.java | 6 +++--- src/main/java/com/b44t/messenger/FFITransport.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/chat/delta/rpc/{BaseTransport.java => BaseRpcTransport.java} (98%) diff --git a/src/main/java/chat/delta/rpc/BaseTransport.java b/src/main/java/chat/delta/rpc/BaseRpcTransport.java similarity index 98% rename from src/main/java/chat/delta/rpc/BaseTransport.java rename to src/main/java/chat/delta/rpc/BaseRpcTransport.java index d0f98e799..0ba22172b 100644 --- a/src/main/java/chat/delta/rpc/BaseTransport.java +++ b/src/main/java/chat/delta/rpc/BaseRpcTransport.java @@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; /* Basic RPC Transport implementation */ -public abstract class BaseTransport implements Rpc.Transport { +public abstract class BaseRpcTransport implements Rpc.RpcTransport { private final Map> requestFutures = new ConcurrentHashMap<>(); private int requestId = 0; private final ObjectMapper mapper = new ObjectMapper(); diff --git a/src/main/java/chat/delta/rpc/Rpc.java b/src/main/java/chat/delta/rpc/Rpc.java index 142631e00..e6444ab29 100644 --- a/src/main/java/chat/delta/rpc/Rpc.java +++ b/src/main/java/chat/delta/rpc/Rpc.java @@ -9,16 +9,16 @@ import chat.delta.rpc.types.*; public class Rpc { - public interface Transport { + public interface RpcTransport { void call(String method, JsonNode... params) throws RpcException; T callForResult(TypeReference resultType, String method, JsonNode... params) throws RpcException; ObjectMapper getObjectMapper(); } - public final Transport transport; + public final RpcTransport transport; private final ObjectMapper mapper; - public Rpc(Transport transport) { + public Rpc(RpcTransport transport) { this.transport = transport; this.mapper = transport.getObjectMapper(); } diff --git a/src/main/java/com/b44t/messenger/FFITransport.java b/src/main/java/com/b44t/messenger/FFITransport.java index 7891a8809..a4196bea0 100644 --- a/src/main/java/com/b44t/messenger/FFITransport.java +++ b/src/main/java/com/b44t/messenger/FFITransport.java @@ -1,9 +1,9 @@ package com.b44t.messenger; -import chat.delta.rpc.BaseTransport; +import chat.delta.rpc.BaseRpcTransport; /* RPC transport over C FFI */ -public class FFITransport extends BaseTransport { +public class FFITransport extends BaseRpcTransport { private final DcJsonrpcInstance dcJsonrpcInstance; public FFITransport(DcJsonrpcInstance dcJsonrpcInstance) {