feat(java-toolchain): replace JavaTasksUtil with GradleTasksUtil #18

Refactored the Java toolchain to use GradleTasksUtil instead of JavaTasksUtil. This includes changes in JavaBuildSystemProvider and JavaRunProjectService. Also, added a new class GradleBuildTool and removed JavaLibraryConverter. The BuildTool interface was updated to return nullable List of CommonLibraryData.

languages/java/src/main/kotlin/com/phodal/shirelang/java/impl/JavaBuildSystemProvider.kt

@@ -4,7 +4,7 @@ import com.intellij.openapi.externalSystem.service.project.ProjectDataManager
 import com.intellij.openapi.project.Project
 import com.phodal.shirecore.buildsystem.BuildSystemContext
 import com.phodal.shirecore.provider.context.BuildSystemProvider
-import com.phodal.shirelang.java.toolchain.JavaTasksUtil
+import com.phodal.shirelang.java.toolchain.GradleTasksUtil
 import com.phodal.shirelang.java.toolchain.JavaLanguageDetector
 import org.jetbrains.plugins.gradle.util.GradleConstants
 
@@ -17,7 +17,7 @@ open class JavaBuildSystemProvider : BuildSystemProvider() {
         val gradleInfo = projectDataManager.getExternalProjectsData(project, GradleConstants.SYSTEM_ID)
         if (gradleInfo.isNotEmpty()) {
             buildToolName = "Gradle"
-            taskString = JavaTasksUtil.collectGradleTasks(project).joinToString(" ") { it.text }
+            taskString = GradleTasksUtil.collectGradleTasks(project).joinToString(" ") { it.text }
         } else {
             buildToolName = "Maven"
         }

languages/java/src/main/kotlin/com/phodal/shirelang/java/impl/JavaRunProjectService.kt

@@ -11,7 +11,7 @@ import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.util.SmartList
 import com.phodal.shirecore.provider.shire.ProjectRunService
 import com.phodal.shirecore.runner.ConfigurationRunner
-import com.phodal.shirelang.java.toolchain.JavaTasksUtil
+import com.phodal.shirelang.java.toolchain.GradleTasksUtil
 import icons.GradleIcons
 
 class JavaRunProjectService : ProjectRunService, ConfigurationRunner {
@@ -20,7 +20,7 @@ class JavaRunProjectService : ProjectRunService, ConfigurationRunner {
     }
 
     override fun run(project: Project, taskName: String) {
-        val runConfiguration = JavaTasksUtil.configureGradleRun(project, taskName)
+        val runConfiguration = GradleTasksUtil.configureGradleRun(project, taskName)
         executeRunConfigurations(project, runConfiguration)
     }
 
@@ -30,7 +30,7 @@ class JavaRunProjectService : ProjectRunService, ConfigurationRunner {
         result: CompletionResultSet,
     ): List<LookupElement> {
         val lookupElements: MutableList<LookupElement> = SmartList()
-        JavaTasksUtil.collectGradleTasksData(project).filter {
+        GradleTasksUtil.collectGradleTasksData(project).filter {
             !it.isTest && !it.isJvmTest
         }.forEach {
             val element = LookupElementBuilder.create(it.getFqnTaskName())
@@ -44,6 +44,6 @@ class JavaRunProjectService : ProjectRunService, ConfigurationRunner {
     }
 
     override fun tasks(project: Project): List<String> {
-        return JavaTasksUtil.collectGradleTasksData(project).map { it.getFqnTaskName() }
+        return GradleTasksUtil.collectGradleTasksData(project).map { it.getFqnTaskName() }
     }
 }

languages/java/src/main/kotlin/com/phodal/shirelang/java/toolchain/BuildTool.kt

@@ -14,9 +14,11 @@ import com.intellij.openapi.vfs.VirtualFile
  * Implementations of this interface are expected to provide specific functionality for different build tools.
  */
 interface BuildTool {
-    fun prepareLibraryData(project: Project): List<CommonLibraryData>
+    fun prepareLibraryData(project: Project): List<CommonLibraryData>?
 
     fun collectTasks(project: Project): List<TextCompletionInfo>
 
     fun configureRun(project: Project, virtualFile: VirtualFile, taskName: String): LocatableConfigurationBase<*>?
 }
+
+data class CommonLibraryData(val groupId: String?, val artifactId: String?, val version: String?)

languages/java/src/main/kotlin/com/phodal/shirelang/java/toolchain/JavaLibraryConverter.kt → languages/java/src/main/kotlin/com/phodal/shirelang/java/toolchain/GradleBuildTool.kt

@@ -1,18 +1,15 @@
 package com.phodal.shirelang.java.toolchain
 
+import com.intellij.execution.configurations.LocatableConfigurationBase
 import com.intellij.openapi.externalSystem.model.project.LibraryData
 import com.intellij.openapi.externalSystem.service.project.ProjectDataManager
+import com.intellij.openapi.externalSystem.service.ui.completion.TextCompletionInfo
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.plugins.gradle.util.GradleConstants
 
-data class CommonLibraryData(val groupId: String?, val artifactId: String?, val version: String?)
-
-object JavaLibraryConverter {
-    fun prepareLibraryData(project: Project): List<CommonLibraryData>? {
-        return prepareGradleLibrary(project) ?: MavenBuildTool().prepareLibraryData(project)
-    }
-
-    fun prepareGradleLibrary(project: Project): List<CommonLibraryData>? {
+class GradleBuildTool: BuildTool {
+    override fun prepareLibraryData(project: Project): List<CommonLibraryData>? {
         val basePath = project.basePath ?: return null
         val projectData = ProjectDataManager.getInstance().getExternalProjectData(
             project, GradleConstants.SYSTEM_ID, basePath
@@ -30,4 +27,16 @@ object JavaLibraryConverter {
             CommonLibraryData(it.groupId, it.artifactId, it.version)
         }
     }
+
+    override fun collectTasks(project: Project): List<TextCompletionInfo> {
+        TODO("Not yet implemented")
+    }
+
+    override fun configureRun(
+        project: Project,
+        virtualFile: VirtualFile,
+        taskName: String,
+    ): LocatableConfigurationBase<*>? {
+        TODO("Not yet implemented")
+    }
 }

languages/java/src/main/kotlin/com/phodal/shirelang/java/toolchain/JavaTasksUtil.kt → languages/java/src/main/kotlin/com/phodal/shirelang/java/toolchain/GradleTasksUtil.kt

@@ -10,7 +10,7 @@ import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration
 import org.jetbrains.plugins.gradle.service.project.GradleTasksIndices
 import org.jetbrains.plugins.gradle.util.GradleTaskData
 
-object JavaTasksUtil {
+object GradleTasksUtil {
     fun collectGradleTasks(project: Project): List<TextCompletionInfo> {
         val indices = GradleTasksIndices.getInstance(project)
 

languages/java/src/main/kotlin/com/phodal/shirelang/java/toolchain/TechStackConverter.kt

@@ -7,7 +7,8 @@ import com.phodal.shirelang.java.archmeta.SpringLibrary
 
 object TechStackConverter {
     fun convertTechStack(project: Project): TechStack {
-        val libraryDataList = JavaLibraryConverter.prepareLibraryData(project)
+        val libraryDataList =
+            GradleBuildTool().prepareLibraryData(project) ?: MavenBuildTool().prepareLibraryData(project)
 
         val techStack = TechStack()
         var hasMatchSpringMvc = false