Refactor grpc related logic

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/GenerateForAssertionAction.kt

@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getAssertionRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getAssertionGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.AssertionRequest
 
 class GenerateForAssertionAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
         AssertionRequest(
-            getAssertionRequestMessage(e),
+            getAssertionGrpcRequest(e),
             e.project!!,
         ).execute()
     }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/GenerateForClassAction.kt

@@ -2,14 +2,14 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getClassRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getClassGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.ClassRequest
 import org.utbot.cpp.clion.plugin.utils.isCPPFileName
 
 class GenerateForClassAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
         ClassRequest(
-            getClassRequestMessage(e),
+            getClassGrpcRequest(e),
             e.project!!,
         ).execute()
     }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/GenerateForFileAction.kt

@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getFileRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getFileGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.FileRequest
 import org.utbot.cpp.clion.plugin.utils.isCPPorCFileName
 
 class GenerateForFileAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
-        FileRequest(getFileRequestMessage(e), e.project!!).execute()
+        FileRequest(getFileGrpcRequest(e), e.project!!).execute()
     }
 
     // action is available only if the selected file ends in .cpp, .hpp, .c or .h

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/GenerateForFolderAction.kt

@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getFolderRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getFolderGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.FolderRequest
 
 class GenerateForFolderAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
         FolderRequest(
-            getFolderRequestMessage(e),
+            getFolderGrpcRequest(e),
             e.project!!
         ).execute()
     }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/GenerateForFunctionAction.kt

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getFunctionRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getFunctionGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.FunctionRequest
 
 class GenerateForFunctionAction : GenerateTestsBaseAction() {
@@ -13,7 +13,7 @@ class GenerateForFunctionAction : GenerateTestsBaseAction() {
 
     override fun actionPerformed(e: AnActionEvent) {
         FunctionRequest(
-            getFunctionRequestMessage(e),
+            getFunctionGrpcRequest(e),
             e.project!!
         ).execute()
     }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/GenerateForLineAction.kt

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getLineRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getLineGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.LineRequest
 
 class GenerateForLineAction : GenerateTestsBaseAction() {
@@ -15,7 +15,7 @@ class GenerateForLineAction : GenerateTestsBaseAction() {
 
     override fun actionPerformed(e: AnActionEvent) {
         LineRequest(
-            getLineRequestMessage(e),
+            getLineGrpcRequest(e),
             e.project!!
         ).execute()
     }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/GenerateForPredicateAction.kt

@@ -9,8 +9,8 @@ import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.components.fields.ExtendableTextField
 import javax.swing.ListSelectionModel
 import javax.swing.event.DocumentEvent
-import org.utbot.cpp.clion.plugin.utils.getFunctionRequestMessage
-import org.utbot.cpp.clion.plugin.utils.getPredicateRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getFunctionGrpcRequest
+import org.utbot.cpp.clion.plugin.grpc.getPredicateGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.FunctionReturnTypeRequest
 import org.utbot.cpp.clion.plugin.client.requests.PredicateRequest
 import org.utbot.cpp.clion.plugin.utils.client
@@ -88,7 +88,7 @@ class GenerateForPredicateAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
 
         fun sendPredicateToServer(validationType: ValidationType, valueToCompare: String, comparisonOperator: String) {
-            val predicateRequest = getPredicateRequestMessage(validationType, valueToCompare, comparisonOperator, e)
+            val predicateRequest = getPredicateGrpcRequest(e, comparisonOperator, validationType, valueToCompare)
             PredicateRequest(
                 predicateRequest,
                 e.project!!
@@ -122,7 +122,7 @@ class GenerateForPredicateAction : GenerateTestsBaseAction() {
 
         FunctionReturnTypeRequest(
             e.project!!,
-            getFunctionRequestMessage(e)
+            getFunctionGrpcRequest(e)
         ) { functionReturnType ->
             val type = functionReturnType.validationType
             chooseComparisonOperator(type) { comparisonOperator ->

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/GenerateForProjectAction.kt

@@ -1,7 +1,7 @@
 package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.utbot.cpp.clion.plugin.utils.getProjectRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getProjectGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.ProjectRequest
 import org.utbot.cpp.clion.plugin.utils.client
 
@@ -12,7 +12,7 @@ class GenerateForProjectAction : GenerateTestsBaseAction() {
 
     override fun actionPerformed(e: AnActionEvent) {
         ProjectRequest(
-            getProjectRequestMessage(e),
+            getProjectGrpcRequest(e),
             e.project!!
         ).apply {
             e.client.executeRequest(this)

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/GenerateForSnippetAction.kt

@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getSnippetRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getSnippetGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.SnippetRequest
 
 class GenerateForSnippetAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
         SnippetRequest(
-            getSnippetRequestMessage(e),
+            getSnippetGrpcRequest(e),
             e.project!!
         ).execute()
     }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/ReconfigureProjectAction.kt

@@ -4,7 +4,7 @@ import com.intellij.notification.Notification
 import com.intellij.notification.NotificationAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import org.utbot.cpp.clion.plugin.UTBot
-import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
 import testsgen.Testgen
 
@@ -16,7 +16,7 @@ class ReconfigureProjectAction: NotificationAction(UTBot.message("projectConfigu
     override fun actionPerformed(e: AnActionEvent) {
         CheckProjectConfigurationRequest(
             e.project!!,
-            getProjectConfigRequestMessage(e.project!!, Testgen.ConfigMode.ALL),
+            getProjectConfigGrpcRequest(e.project!!, Testgen.ConfigMode.ALL),
         ).execute()
     }
 

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/RunWithCoverageAction.kt

@@ -1,10 +1,12 @@
 package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.psi.PsiElement
-import org.utbot.cpp.clion.plugin.utils.getCoverageAndResultsRequest
+import org.utbot.cpp.clion.plugin.grpc.getCoverageAndResultsGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.RunWithCoverageRequest
+import org.utbot.cpp.clion.plugin.grpc.activeProject
 import org.utbot.cpp.clion.plugin.ui.testsResults.TestNameAndTestSuite
 
 
@@ -17,7 +19,8 @@ class RunWithCoverageAction(val element: PsiElement) : GenerateTestsBaseAction()
         val testArgs = TestNameAndTestSuite.getFromPsiElement(element)
         val suiteName = testArgs.suite
         val testedMethodName = testArgs.name
-        val request = getCoverageAndResultsRequest(e, suiteName, testedMethodName)
+        val filePath = e.getRequiredData(CommonDataKeys.VIRTUAL_FILE).path
+        val request = getCoverageAndResultsGrpcRequest(e.activeProject(), filePath, suiteName, testedMethodName)
         RunWithCoverageRequest(
             e.project!!,
             request

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/Client.kt

@@ -21,8 +21,8 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 
 import kotlinx.coroutines.Job
-import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
-import org.utbot.cpp.clion.plugin.utils.getVersionInfo
+import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
+import org.utbot.cpp.clion.plugin.grpc.getVersionGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
 import org.utbot.cpp.clion.plugin.listeners.ConnectionStatus
 import org.utbot.cpp.clion.plugin.listeners.UTBotEventsListener
@@ -84,7 +84,7 @@ class Client(
     fun configureProject() {
         CheckProjectConfigurationRequest(
             project,
-            getProjectConfigRequestMessage(project, Testgen.ConfigMode.CHECK)
+            getProjectConfigGrpcRequest(project, Testgen.ConfigMode.CHECK)
         ).also {
             executeRequest(it)
         }
@@ -96,7 +96,7 @@ class Client(
         requestsCS.launch {
             // Logger.info("sending HandShake request!")
             try {
-                stub.handshake(getVersionInfo())
+                stub.handshake(getVersionGrpcRequest())
                 logger.info { "Handshake successful!" }
             } catch (e: Exception) {
                 logger.warn { "HandShake failed with the following error: ${e.message}" }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/LoggingChannels.kt

@@ -5,8 +5,8 @@ import com.intellij.openapi.project.Project
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collect
-import org.utbot.cpp.clion.plugin.utils.getDummyRequest
-import org.utbot.cpp.clion.plugin.utils.getLogChannelRequest
+import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
+import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
 import org.utbot.cpp.clion.plugin.ui.userLog.OutputProvider
 import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
 import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
@@ -58,11 +58,11 @@ class GTestChannel(project: Project): BaseChannel(project) {
     override val console: UTBotConsole = project.service<OutputProvider>().gtestOutputChannel.outputConsole
 
     override suspend fun close(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub) {
-        stub.closeGTestChannel(getDummyRequest())
+        stub.closeGTestChannel(getDummyGrpcRequest())
     }
 
     override suspend fun open(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub): Flow<Testgen.LogEntry> {
-        return stub.openGTestChannel(getLogChannelRequest(logLevel))
+        return stub.openGTestChannel(getLogChannelGrpcRequest(logLevel))
     }
 }
 
@@ -72,10 +72,10 @@ class ServerLogChannel(project: Project): BaseChannel(project) {
     override val console: UTBotConsole = project.service<OutputProvider>().serverOutputChannel.outputConsole
 
     override suspend fun close(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub) {
-        stub.closeLogChannel(getDummyRequest())
+        stub.closeLogChannel(getDummyGrpcRequest())
     }
 
     override suspend fun open(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub): Flow<Testgen.LogEntry> {
-        return stub.openLogChannel(getLogChannelRequest(logLevel))
+        return stub.openLogChannel(getLogChannelGrpcRequest(logLevel))
     }
 }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/requests/CheckProjectConfigurationRequest.kt

@@ -5,7 +5,7 @@ import com.intellij.openapi.project.Project
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import org.utbot.cpp.clion.plugin.UTBot
-import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
 import org.utbot.cpp.clion.plugin.client.handlers.CheckProjectConfigurationHandler
 import testsgen.Testgen
 import testsgen.TestsGenServiceGrpcKt
@@ -16,7 +16,7 @@ class CheckProjectConfigurationRequest(
 ): BaseRequest<Testgen.ProjectConfigRequest, Flow<Testgen.ProjectConfigResponse>>(request, project) {
     override val logMessage: String = "Sending request to check project configuration."
 
-    constructor(project: Project): this(project, getProjectConfigRequestMessage(project, Testgen.ConfigMode.CHECK))
+    constructor(project: Project): this(project, getProjectConfigGrpcRequest(project, Testgen.ConfigMode.CHECK))
     constructor(e: AnActionEvent): this(e.project!!)
 
     override suspend fun TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub.send(cancellationJob: Job?): Flow<Testgen.ProjectConfigResponse> {

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/requests/CreateBuildFolderRequest.kt

@@ -5,7 +5,7 @@ import com.intellij.openapi.project.Project
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import org.utbot.cpp.clion.plugin.UTBot
-import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
 import org.utbot.cpp.clion.plugin.client.handlers.CreateBuildDirHandler
 import testsgen.Testgen
 import testsgen.TestsGenServiceGrpcKt
@@ -16,7 +16,7 @@ class CreateBuildDirRequest(
 ): BaseRequest<Testgen.ProjectConfigRequest, Flow<Testgen.ProjectConfigResponse>>(request, project) {
     override val logMessage: String = "Sending request to check project configuration."
 
-    constructor(e: AnActionEvent): this(e.project!!, getProjectConfigRequestMessage(e.project!!, Testgen.ConfigMode.CREATE_BUILD_DIR))
+    constructor(e: AnActionEvent): this(e.project!!, getProjectConfigGrpcRequest(e.project!!, Testgen.ConfigMode.CREATE_BUILD_DIR))
 
     override suspend fun TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub.send(cancellationJob: Job?): Flow<Testgen.ProjectConfigResponse> {
         return this.configureProject(request)

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/requests/GenerateJsonFilesRequest.kt

@@ -5,7 +5,7 @@ import com.intellij.openapi.project.Project
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import org.utbot.cpp.clion.plugin.UTBot
-import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
 import org.utbot.cpp.clion.plugin.client.handlers.GenerateJsonHandler
 import testsgen.Testgen
 import testsgen.TestsGenServiceGrpcKt
@@ -16,7 +16,7 @@ class GenerateJsonFilesRequest(
 ): BaseRequest<Testgen.ProjectConfigRequest, Flow<Testgen.ProjectConfigResponse>>(request, project) {
     override val logMessage: String = "Sending request to check project configuration."
 
-    constructor(project: Project): this(project, getProjectConfigRequestMessage(project, Testgen.ConfigMode.GENERATE_JSON_FILES))
+    constructor(project: Project): this(project, getProjectConfigGrpcRequest(project, Testgen.ConfigMode.GENERATE_JSON_FILES))
     constructor(e: AnActionEvent): this(e.project!!)
 
     override suspend fun TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub.send(cancellationJob: Job?): Flow<Testgen.ProjectConfigResponse> {