Refactor ChatCommunicationManager and ChatMessageProvider

aws · Sep 14, 2024 · a55c1d4 · a55c1d4
1 parent 9da95e3
commit a55c1d4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/chat/ChatCommunicationManager.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/chat/ChatCommunicationManager.java
@@ -23,7 +23,7 @@ public void sendMessageToChatServerAsync(Command command, Object params) {
 
            switch(command) {
                case CHAT_TAB_ADD:
-                   GenericTabParams tabParams = jsonHandler.deserialize(jsonParams, GenericTabParams.class).orElse(null);
+                   GenericTabParams tabParams = jsonHandler.deserialize(jsonParams, GenericTabParams.class);
                    chatMessageProivder.sendTabAdd(tabParams);
                    break;
                default:

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/chat/ChatMessageProvider.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/chat/ChatMessageProvider.java
@@ -23,16 +23,11 @@ public ChatMessageProvider() {
     }
 
     public void sendTabAdd(GenericTabParams tabParams) {
-        if (tabParams == null) {
-            PluginLogger.error("Chat server request halted for " + Command.CHAT_TAB_ADD + ". No params provided.");
-            return;
-        }
-
          try {
              PluginLogger.info("Sending " + Command.CHAT_TAB_ADD + " message to Amazon Q LSP server");
              amazonQLspServer.tabAdd(tabParams).get();
          } catch (InterruptedException | ExecutionException e) {
-             PluginLogger.error("Error occurred while sending ");
+             PluginLogger.error("Error occurred while sending message to Amazon Q LSP server for command " + Command.CHAT_TAB_ADD);
          }
     }
 }
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/util/JsonHandler.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/util/JsonHandler.java
@@ -1,7 +1,5 @@
 package software.aws.toolkits.eclipse.amazonq.util;
 
-import java.util.Optional;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -23,13 +21,13 @@ public String serialize(Object obj) {
         return serializedObj;
     }
 
-    public <T> Optional<T> deserialize(String jsonString, Class<T> cls) {
+    public <T> T deserialize(String jsonString, Class<T> cls) {
         try {
             T params = objectMapper.readValue(jsonString, cls);
-            return Optional.ofNullable(params);
+            return params;
         } catch (JsonProcessingException e) {
             PluginLogger.error("Error occurred while deserializing jsonString: " + jsonString ,e);
         }
-        return Optional.empty();
+        return null;
     }
 }
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/LoginViewCommandParser.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/LoginViewCommandParser.java
@@ -29,7 +29,7 @@ public final Optional<ParsedCommand> parseCommand(final Object[] arguments) {
                 ParsedCommand parsedCommand = commandRequest.getParsedCommand();
 
                 if (parsedCommand.getCommand() == null) {
-                    return null;
+                    return Optional.empty();
                 }
 
                 return Optional.ofNullable(parsedCommand);