change capabilities request to return a JsonElement

codota · Nov 16, 2023 · 76699fa · 76699fa
1 parent f74e976
commit 76699fa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 23 deletions.
diff --git a/...src/main/java/com/tabnineCommon/binary/requests/capabilities/CapabilitiesAsJsonRequest.kt b/...src/main/java/com/tabnineCommon/binary/requests/capabilities/CapabilitiesAsJsonRequest.kt
diff --git a/Common/src/main/java/com/tabnineCommon/binary/requests/capabilities/CapabilitiesRequest.kt b/Common/src/main/java/com/tabnineCommon/binary/requests/capabilities/CapabilitiesRequest.kt
@@ -1,10 +1,11 @@
 package com.tabnineCommon.binary.requests.capabilities
 
+import com.google.gson.JsonElement
 import com.tabnineCommon.binary.BinaryRequest
 
-class CapabilitiesRequest : BinaryRequest<CapabilitiesResponse> {
-    override fun response(): Class<CapabilitiesResponse> {
-        return CapabilitiesResponse::class.java
+class CapabilitiesRequest : BinaryRequest<JsonElement> {
+    override fun response(): Class<JsonElement> {
+        return JsonElement::class.java
     }
 
     override fun serialize(): Any {

diff --git a/Common/src/main/java/com/tabnineCommon/capabilities/CapabilitiesService.java b/Common/src/main/java/com/tabnineCommon/capabilities/CapabilitiesService.java
@@ -1,5 +1,7 @@
 package com.tabnineCommon.capabilities;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -97,13 +99,13 @@ private void fetchCapabilitiesLoop() {
   }
 
   private void fetchCapabilities() {
-    final CapabilitiesResponse capabilitiesResponse =
-        binaryRequestFacade.executeRequest(new CapabilitiesRequest());
-
-    if (capabilitiesResponse == null) {
+    final JsonElement jsonResponse = binaryRequestFacade.executeRequest(new CapabilitiesRequest());
+    if (jsonResponse == null) {
       return;
     }
 
+    final CapabilitiesResponse capabilitiesResponse =
+        new Gson().fromJson(jsonResponse, CapabilitiesResponse.class);
     if (capabilitiesResponse.getEnabledFeatures() != null) {
       setCapabilities(capabilitiesResponse);
     }

diff --git a/Common/src/main/java/com/tabnineCommon/chat/commandHandlers/GetCapabilitiesHandler.kt b/Common/src/main/java/com/tabnineCommon/chat/commandHandlers/GetCapabilitiesHandler.kt
@@ -4,7 +4,7 @@ import com.google.gson.Gson
 import com.google.gson.JsonElement
 import com.intellij.openapi.project.Project
 import com.tabnineCommon.binary.BinaryRequestFacade
-import com.tabnineCommon.binary.requests.capabilities.CapabilitiesAsJsonRequest
+import com.tabnineCommon.binary.requests.capabilities.CapabilitiesRequest
 import com.tabnineCommon.general.DependencyContainer
 
 data class GetCapabilitiesResponsePayload(val enabledFeatures: Array<String>)
@@ -13,7 +13,7 @@ class GetCapabilitiesHandler(gson: Gson) : ChatMessageHandler<Unit, GetCapabilit
     val binaryRequestFacade: BinaryRequestFacade = DependencyContainer.instanceOfBinaryRequestFacade()
 
     override fun handle(payload: Unit?, project: Project): GetCapabilitiesResponsePayload {
-        val response = binaryRequestFacade.executeRequest(CapabilitiesAsJsonRequest())
+        val response = binaryRequestFacade.executeRequest(CapabilitiesRequest())
         return GetCapabilitiesResponsePayload(response.asJsonObject.getAsJsonArray("enabled_features").map { it.asString }.toTypedArray())
     }