Use correct object mapper for plugin host

Author: esensar

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This change
 
 ## [Unreleased]
 
+## [0.4.6] - 2022-06-09
+
+- fixed an issue where wrong object mapper was used for plugin host
+
 ## [0.4.5] - 2022-06-08
 
 - exposed `RpcClient` and `ReactiveRpcClient` from `NeovimJavaPluginHost` for easy access to different communication interfaces

plugin-host/src/main/java/com/ensarsarajcic/neovim/java/pluginhost/NeovimJavaPluginHost.java

@@ -25,13 +25,15 @@
 package com.ensarsarajcic.neovim.java.pluginhost;
 
 import com.ensarsarajcic.neovim.java.api.NeovimApi;
+import com.ensarsarajcic.neovim.java.api.NeovimApis;
 import com.ensarsarajcic.neovim.java.api.NeovimStreamApi;
 import com.ensarsarajcic.neovim.java.api.types.apiinfo.ApiInfo;
 import com.ensarsarajcic.neovim.java.api.util.ObjectMappers;
-import com.ensarsarajcic.neovim.java.corerpc.client.RpcClient;
 import com.ensarsarajcic.neovim.java.corerpc.client.RpcConnection;
+import com.ensarsarajcic.neovim.java.corerpc.client.RpcStreamer;
 import com.ensarsarajcic.neovim.java.corerpc.client.StdIoRpcConnection;
 import com.ensarsarajcic.neovim.java.corerpc.reactive.ReactiveRpcClient;
+import com.ensarsarajcic.neovim.java.corerpc.reactive.ReactiveRpcStreamer;
 import com.ensarsarajcic.neovim.java.handler.NeovimHandlerManager;
 import com.ensarsarajcic.neovim.java.handler.NeovimHandlerProxy;
 import com.ensarsarajcic.neovim.java.notifications.NeovimStreamNotificationHandler;
@@ -49,8 +51,8 @@ public final class NeovimJavaPluginHost {
     private final NeovimHandlerProxy neovimHandlerProxy;
     private final NeovimApi api;
     private final NeovimStreamNotificationHandler neovimStreamNotificationHandler;
-    private final RpcClient client;
-    private final ReactiveRpcClient reactiveClient;
+    private final RpcStreamer client;
+    private final ReactiveRpcStreamer reactiveClient;
     private final RemotePluginManager remotePluginManager;
 
     private ApiInfo apiInfo = null;
@@ -73,7 +75,7 @@ public NeovimJavaPluginHost(NeovimHandlerProxy neovimHandlerProxy) {
                 return null;
             }
         });
-        client = RpcClient.getDefaultAsyncInstance();
+        client = NeovimApis.getNeovimRpcStreamer();
         reactiveClient = ReactiveRpcClient.createDefaultInstanceWithCustomStreamer(client);
         neovimStreamNotificationHandler = new NeovimStreamNotificationHandler(reactiveClient);
         remotePluginManager = new RemotePluginManager(neovimHandlerManager, neovimHandlerProxy, client);
@@ -116,11 +118,11 @@ public PluginApi getPluginApi() {
         return pluginApi;
     }
 
-    public RpcClient getClient() {
+    public RpcStreamer getClient() {
         return client;
     }
 
-    public ReactiveRpcClient getReactiveClient() {
+    public ReactiveRpcStreamer getReactiveClient() {
         return reactiveClient;
     }
 }

plugin-host/src/main/java/com/ensarsarajcic/neovim/java/pluginhost/RemotePluginManager.java

@@ -26,6 +26,7 @@
 
 import com.ensarsarajcic.neovim.java.api.util.ObjectMappers;
 import com.ensarsarajcic.neovim.java.corerpc.client.RpcClient;
+import com.ensarsarajcic.neovim.java.corerpc.client.RpcStreamer;
 import com.ensarsarajcic.neovim.java.corerpc.message.NotificationMessage;
 import com.ensarsarajcic.neovim.java.corerpc.message.RequestMessage;
 import com.ensarsarajcic.neovim.java.corerpc.message.ResponseMessage;
@@ -60,14 +61,14 @@ final class RemotePluginManager {
 
     private final NeovimHandlerManager neovimHandlerManager;
     private final NeovimHandlerProxy neovimHandlerProxy;
-    private final RpcClient client;
+    private final RpcStreamer client;
 
     // Hooks
     private final List<Supplier<CompletableFuture<Void>>> preconfigurationHooks = new ArrayList<>();
     private final List<Supplier<CompletableFuture<Void>>> readyHooks = new ArrayList<>();
     private final List<Supplier<CompletableFuture<Void>>> setupMethods = new ArrayList<>();
 
-    RemotePluginManager(NeovimHandlerManager neovimHandlerManager, NeovimHandlerProxy neovimHandlerProxy, RpcClient rpcClient) {
+    RemotePluginManager(NeovimHandlerManager neovimHandlerManager, NeovimHandlerProxy neovimHandlerProxy, RpcStreamer rpcClient) {
         this.neovimHandlerManager = neovimHandlerManager;
         this.neovimHandlerProxy = neovimHandlerProxy;
         this.client = rpcClient;