Skip to content
This repository was archived by the owner on Oct 18, 2024. It is now read-only.

Commit b20e108

Browse files
committed
refactor(tooling-api): rename 'InitializeProjectMessage' to 'InitializeProjectParams'
1 parent 556afa0 commit b20e108

File tree

8 files changed

+20
-16
lines changed

8 files changed

+20
-16
lines changed

app/src/main/java/com/itsaky/androidide/services/builder/GradleBuildService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import com.itsaky.androidide.tooling.api.IProject;
5757
import com.itsaky.androidide.tooling.api.IToolingApiClient;
5858
import com.itsaky.androidide.tooling.api.IToolingApiServer;
59-
import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage;
59+
import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams;
6060
import com.itsaky.androidide.tooling.api.messages.TaskExecutionMessage;
6161
import com.itsaky.androidide.tooling.api.messages.result.BuildCancellationRequestResult;
6262
import com.itsaky.androidide.tooling.api.messages.result.BuildInfo;
@@ -403,7 +403,7 @@ public boolean isBuildInProgress() {
403403
@Override
404404
public CompletableFuture<InitializeResult> initializeProject(@NonNull String rootDir) {
405405
checkServerStarted();
406-
final var message = new InitializeProjectMessage(rootDir, "", getGradleInstallationDir());
406+
final var message = new InitializeProjectParams(rootDir, "", getGradleInstallationDir());
407407
return performBuildTasks(server.initialize(message));
408408
}
409409

lsp/testing/src/main/java/com/itsaky/androidide/lsp/api/LSPTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import com.itsaky.androidide.projects.ProjectManager
3535
import com.itsaky.androidide.projects.builder.BuildService
3636
import com.itsaky.androidide.tooling.api.IProject
3737
import com.itsaky.androidide.tooling.api.IToolingApiServer
38-
import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage
38+
import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams
3939
import com.itsaky.androidide.tooling.testing.ToolingApiTestLauncher
4040
import com.itsaky.androidide.utils.Environment
4141
import com.itsaky.androidide.utils.FileProvider
@@ -92,7 +92,7 @@ abstract class LSPTest {
9292
Lookup.getDefault().update(BuildService.KEY_PROJECT_PROXY, project)
9393

9494
server
95-
.initialize(InitializeProjectMessage(FileProvider.testProjectRoot().toFile().absolutePath,
95+
.initialize(InitializeProjectParams(FileProvider.testProjectRoot().toFile().absolutePath,
9696
""))
9797
.get()
9898

subprojects/projects/src/test/java/com/itsaky/androidide/projects/api/ModuleProjectTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.itsaky.androidide.lookup.Lookup
2525
import com.itsaky.androidide.projects.ProjectManager
2626
import com.itsaky.androidide.projects.builder.BuildService
2727
import com.itsaky.androidide.tooling.api.IAndroidProject
28-
import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage
28+
import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams
2929
import com.itsaky.androidide.tooling.testing.ToolingApiTestLauncher
3030
import com.itsaky.androidide.utils.FileProvider
3131
import com.itsaky.androidide.utils.SourceClassTrie.SourceNode
@@ -46,7 +46,7 @@ class ModuleProjectTest {
4646
@Test
4747
fun test() {
4848
val (server, project) = ToolingApiTestLauncher().launchServer()
49-
server.initialize(InitializeProjectMessage(FileProvider.testProjectRoot().pathString, "")).get()
49+
server.initialize(InitializeProjectParams(FileProvider.testProjectRoot().pathString, "")).get()
5050

5151
Lookup.getDefault().register(BuildService.KEY_PROJECT_PROXY, project)
5252

subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/ToolingApiServerImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package com.itsaky.androidide.tooling.impl
2020
import com.itsaky.androidide.tooling.api.IProject
2121
import com.itsaky.androidide.tooling.api.IToolingApiClient
2222
import com.itsaky.androidide.tooling.api.IToolingApiServer
23-
import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage
23+
import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams
2424
import com.itsaky.androidide.tooling.api.messages.TaskExecutionMessage
2525
import com.itsaky.androidide.tooling.api.messages.result.BuildCancellationRequestResult
2626
import com.itsaky.androidide.tooling.api.messages.result.BuildCancellationRequestResult.Reason.CANCELLATION_ERROR
@@ -69,7 +69,7 @@ internal class ToolingApiServerImpl(private val project: ProjectImpl) :
6969
private var buildCancellationToken: CancellationTokenSource? = null
7070
private val log = ILogger.newInstance(javaClass.simpleName)
7171

72-
override fun initialize(params: InitializeProjectMessage): CompletableFuture<InitializeResult> {
72+
override fun initialize(params: InitializeProjectParams): CompletableFuture<InitializeResult> {
7373
return CompletableFuture.supplyAsync {
7474
try {
7575
if (initialized && connector != null) {

subprojects/tooling-api-impl/src/test/java/com/itsaky/androidide/tooling/impl/MultiModuleAndroidProjectTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.itsaky.androidide.tooling.api.IJavaProject
2525
import com.itsaky.androidide.tooling.api.IProject
2626
import com.itsaky.androidide.tooling.api.IToolingApiServer
2727
import com.itsaky.androidide.tooling.api.ProjectType
28-
import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage
28+
import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams
2929
import com.itsaky.androidide.tooling.api.models.AndroidProjectMetadata
3030
import com.itsaky.androidide.tooling.api.models.JavaModuleExternalDependency
3131
import com.itsaky.androidide.tooling.api.models.JavaModuleProjectDependency
@@ -47,7 +47,7 @@ class MultiModuleAndroidProjectTest {
4747
@Test
4848
fun `test simple multi module project initialization`() {
4949
val (server, project) = ToolingApiTestLauncher().launchServer()
50-
server.initialize(InitializeProjectMessage(FileProvider.testProjectRoot().pathString, "")).get()
50+
server.initialize(InitializeProjectParams(FileProvider.testProjectRoot().pathString, "")).get()
5151
doAssertions(project, server)
5252
}
5353

@@ -197,7 +197,7 @@ class MultiModuleAndroidProjectTest {
197197
client.agpVersion = agpVersion
198198
client.gradleVersion = gradleVersion
199199
val (server, project) = ToolingApiTestLauncher().launchServer(client = client)
200-
server.initialize(InitializeProjectMessage(FileProvider.testProjectRoot().pathString,
200+
server.initialize(InitializeProjectParams(FileProvider.testProjectRoot().pathString,
201201
"")).get()
202202
doAssertions(project = project, server = server)
203203
FileProvider.testProjectRoot().resolve(MultiVersionTestClient.buildFile).deleteExisting()

subprojects/tooling-api/src/main/java/com/itsaky/androidide/tooling/api/IToolingApiServer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package com.itsaky.androidide.tooling.api
1919

20-
import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage
20+
import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams
2121
import com.itsaky.androidide.tooling.api.messages.TaskExecutionMessage
2222
import com.itsaky.androidide.tooling.api.messages.result.BuildCancellationRequestResult
2323
import com.itsaky.androidide.tooling.api.messages.result.InitializeResult
@@ -36,7 +36,7 @@ import java.util.concurrent.*
3636
interface IToolingApiServer {
3737

3838
/** Initialize the server with the project directory. */
39-
@JsonRequest fun initialize(params: InitializeProjectMessage): CompletableFuture<InitializeResult>
39+
@JsonRequest fun initialize(params: InitializeProjectParams): CompletableFuture<InitializeResult>
4040

4141
/** Is the server initialized? */
4242
@JsonRequest fun isServerInitialized(): CompletableFuture<Boolean>
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,8 @@ package com.itsaky.androidide.tooling.api.messages
2222
*
2323
* @author Akash Yadav
2424
*/
25-
data class InitializeProjectMessage(val directory: String, val androidVariant: String, val gradleInstallation: String = "")
25+
data class InitializeProjectParams(
26+
val directory: String,
27+
val androidVariant: String,
28+
val gradleInstallation: String = ""
29+
)

xml-inflater/src/test/java/com/itsaky/androidide/inflater/XmlInflaterTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.itsaky.androidide.lookup.Lookup
2424
import com.itsaky.androidide.projects.ProjectManager
2525
import com.itsaky.androidide.projects.api.AndroidModule
2626
import com.itsaky.androidide.projects.builder.BuildService
27-
import com.itsaky.androidide.tooling.api.messages.InitializeProjectMessage
27+
import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams
2828
import com.itsaky.androidide.tooling.testing.ToolingApiTestLauncher
2929
import com.itsaky.androidide.utils.FileProvider
3030
import org.junit.Ignore
@@ -45,7 +45,7 @@ object XmlInflaterTest {
4545

4646
val (server, project) =
4747
ToolingApiTestLauncher().launchServer()
48-
server.initialize(InitializeProjectMessage(FileProvider.testProjectRoot().pathString, "")).get()
48+
server.initialize(InitializeProjectParams(FileProvider.testProjectRoot().pathString, "")).get()
4949

5050
Lookup.getDefault().register(BuildService.KEY_PROJECT_PROXY, project)
5151
ProjectManager.setupProject()

0 commit comments

Comments
 (0)