From 73f2b18a376c0f5ad0f8d03ad35b9b6a72341149 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Fri, 25 Aug 2023 21:10:40 +0530 Subject: [PATCH] refactor(tooling-api): rename 'InitializeProjectMessage' to 'InitializeProjectParams' --- .../androidide/services/builder/GradleBuildService.java | 4 ++-- .../src/main/java/com/itsaky/androidide/lsp/api/LSPTest.kt | 4 ++-- .../com/itsaky/androidide/projects/api/ModuleProjectTest.kt | 4 ++-- .../itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt | 4 ++-- .../tooling/impl/MultiModuleAndroidProjectTest.kt | 6 +++--- .../com/itsaky/androidide/tooling/api/IToolingApiServer.kt | 4 ++-- ...itializeProjectMessage.kt => InitializeProjectParams.kt} | 6 +++++- .../java/com/itsaky/androidide/inflater/XmlInflaterTest.kt | 4 ++-- 8 files changed, 20 insertions(+), 16 deletions(-) rename subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/{InitializeProjectMessage.kt => InitializeProjectParams.kt} (84%) diff --git a/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.java b/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.java index eb6e83004f..a3f98e4676 100644 --- a/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.java +++ b/app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.java @@ -56,7 +56,7 @@ import com.itsaky.androidide.tooling.api.IProject; import com.itsaky.androidide.tooling.api.IToolingApiClient; import com.itsaky.androidide.tooling.api.IToolingApiServer; -import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage; +import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams; import com.itsaky.androidide.tooling.api.messages.TaskExecutionMessage; import com.itsaky.androidide.tooling.api.messages.result.BuildCancellationRequestResult; import com.itsaky.androidide.tooling.api.messages.result.BuildInfo; @@ -403,7 +403,7 @@ public boolean isBuildInProgress() { @Override public CompletableFuture initializeProject(@NonNull String rootDir) { checkServerStarted(); - final var message = new InitializeProjectMessage(rootDir, "", getGradleInstallationDir()); + final var message = new InitializeProjectParams(rootDir, "", getGradleInstallationDir()); return performBuildTasks(server.initialize(message)); } diff --git a/lsp/testing/src/main/java/com/itsaky/androidide/lsp/api/LSPTest.kt b/lsp/testing/src/main/java/com/itsaky/androidide/lsp/api/LSPTest.kt index 6e29f6c036..6bdbd11393 100644 --- a/lsp/testing/src/main/java/com/itsaky/androidide/lsp/api/LSPTest.kt +++ b/lsp/testing/src/main/java/com/itsaky/androidide/lsp/api/LSPTest.kt @@ -35,7 +35,7 @@ import com.itsaky.androidide.projects.ProjectManager import com.itsaky.androidide.projects.builder.BuildService import com.itsaky.androidide.tooling.api.IProject import com.itsaky.androidide.tooling.api.IToolingApiServer -import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage +import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams import com.itsaky.androidide.tooling.testing.ToolingApiTestLauncher import com.itsaky.androidide.utils.Environment import com.itsaky.androidide.utils.FileProvider @@ -92,7 +92,7 @@ abstract class LSPTest { Lookup.getDefault().update(BuildService.KEY_PROJECT_PROXY, project) server - .initialize(InitializeProjectMessage(FileProvider.testProjectRoot().toFile().absolutePath, + .initialize(InitializeProjectParams(FileProvider.testProjectRoot().toFile().absolutePath, "")) .get() diff --git a/subprojects/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt b/subprojects/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt index 9008c65f48..9a8f5b3b48 100644 --- a/subprojects/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt +++ b/subprojects/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt @@ -25,7 +25,7 @@ import com.itsaky.androidide.lookup.Lookup import com.itsaky.androidide.projects.ProjectManager import com.itsaky.androidide.projects.builder.BuildService import com.itsaky.androidide.tooling.api.IAndroidProject -import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage +import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams import com.itsaky.androidide.tooling.testing.ToolingApiTestLauncher import com.itsaky.androidide.utils.FileProvider import com.itsaky.androidide.utils.SourceClassTrie.SourceNode @@ -46,7 +46,7 @@ class ModuleProjectTest { @Test fun test() { val (server, project) = ToolingApiTestLauncher().launchServer() - server.initialize(InitializeProjectMessage(FileProvider.testProjectRoot().pathString, "")).get() + server.initialize(InitializeProjectParams(FileProvider.testProjectRoot().pathString, "")).get() Lookup.getDefault().register(BuildService.KEY_PROJECT_PROXY, project) diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt index aa6370b4a3..10a2769f21 100644 --- a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt +++ b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt @@ -20,7 +20,7 @@ package com.itsaky.androidide.tooling.impl import com.itsaky.androidide.tooling.api.IProject import com.itsaky.androidide.tooling.api.IToolingApiClient import com.itsaky.androidide.tooling.api.IToolingApiServer -import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage +import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams import com.itsaky.androidide.tooling.api.messages.TaskExecutionMessage import com.itsaky.androidide.tooling.api.messages.result.BuildCancellationRequestResult import com.itsaky.androidide.tooling.api.messages.result.BuildCancellationRequestResult.Reason.CANCELLATION_ERROR @@ -69,7 +69,7 @@ internal class ToolingApiServerImpl(private val project: ProjectImpl) : private var buildCancellationToken: CancellationTokenSource? = null private val log = ILogger.newInstance(javaClass.simpleName) - override fun initialize(params: InitializeProjectMessage): CompletableFuture { + override fun initialize(params: InitializeProjectParams): CompletableFuture { return CompletableFuture.supplyAsync { try { if (initialized && connector != null) { diff --git a/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt b/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt index 24d5243391..ffb6b59bab 100644 --- a/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt +++ b/subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt @@ -25,7 +25,7 @@ import com.itsaky.androidide.tooling.api.IJavaProject import com.itsaky.androidide.tooling.api.IProject import com.itsaky.androidide.tooling.api.IToolingApiServer import com.itsaky.androidide.tooling.api.ProjectType -import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage +import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams import com.itsaky.androidide.tooling.api.models.AndroidProjectMetadata import com.itsaky.androidide.tooling.api.models.JavaModuleExternalDependency import com.itsaky.androidide.tooling.api.models.JavaModuleProjectDependency @@ -47,7 +47,7 @@ class MultiModuleAndroidProjectTest { @Test fun `test simple multi module project initialization`() { val (server, project) = ToolingApiTestLauncher().launchServer() - server.initialize(InitializeProjectMessage(FileProvider.testProjectRoot().pathString, "")).get() + server.initialize(InitializeProjectParams(FileProvider.testProjectRoot().pathString, "")).get() doAssertions(project, server) } @@ -197,7 +197,7 @@ class MultiModuleAndroidProjectTest { client.agpVersion = agpVersion client.gradleVersion = gradleVersion val (server, project) = ToolingApiTestLauncher().launchServer(client = client) - server.initialize(InitializeProjectMessage(FileProvider.testProjectRoot().pathString, + server.initialize(InitializeProjectParams(FileProvider.testProjectRoot().pathString, "")).get() doAssertions(project = project, server = server) FileProvider.testProjectRoot().resolve(MultiVersionTestClient.buildFile).deleteExisting() diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiServer.kt b/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiServer.kt index 76b13dc5be..7ad94ff7d5 100644 --- a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiServer.kt +++ b/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiServer.kt @@ -17,7 +17,7 @@ package com.itsaky.androidide.tooling.api -import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage +import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams import com.itsaky.androidide.tooling.api.messages.TaskExecutionMessage import com.itsaky.androidide.tooling.api.messages.result.BuildCancellationRequestResult import com.itsaky.androidide.tooling.api.messages.result.InitializeResult @@ -36,7 +36,7 @@ import java.util.concurrent.* interface IToolingApiServer { /** Initialize the server with the project directory. */ - @JsonRequest fun initialize(params: InitializeProjectMessage): CompletableFuture + @JsonRequest fun initialize(params: InitializeProjectParams): CompletableFuture /** Is the server initialized? */ @JsonRequest fun isServerInitialized(): CompletableFuture diff --git a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectMessage.kt b/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectParams.kt similarity index 84% rename from subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectMessage.kt rename to subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectParams.kt index 6ff696cdf7..599665987f 100644 --- a/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectMessage.kt +++ b/subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/messages/InitializeProjectParams.kt @@ -22,4 +22,8 @@ package com.itsaky.androidide.tooling.api.messages * * @author Akash Yadav */ -data class InitializeProjectMessage(val directory: String, val androidVariant: String, val gradleInstallation: String = "") +data class InitializeProjectParams( + val directory: String, + val androidVariant: String, + val gradleInstallation: String = "" +) diff --git a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/XmlInflaterTest.kt b/xml-inflater/src/test/java/com/itsaky/androidide/inflater/XmlInflaterTest.kt index 58f6455c2a..559ad67235 100644 --- a/xml-inflater/src/test/java/com/itsaky/androidide/inflater/XmlInflaterTest.kt +++ b/xml-inflater/src/test/java/com/itsaky/androidide/inflater/XmlInflaterTest.kt @@ -24,7 +24,7 @@ import com.itsaky.androidide.lookup.Lookup import com.itsaky.androidide.projects.ProjectManager import com.itsaky.androidide.projects.api.AndroidModule import com.itsaky.androidide.projects.builder.BuildService -import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage +import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams import com.itsaky.androidide.tooling.testing.ToolingApiTestLauncher import com.itsaky.androidide.utils.FileProvider import org.junit.Ignore @@ -45,7 +45,7 @@ object XmlInflaterTest { val (server, project) = ToolingApiTestLauncher().launchServer() - server.initialize(InitializeProjectMessage(FileProvider.testProjectRoot().pathString, "")).get() + server.initialize(InitializeProjectParams(FileProvider.testProjectRoot().pathString, "")).get() Lookup.getDefault().register(BuildService.KEY_PROJECT_PROXY, project) ProjectManager.setupProject()