Merge pull request #42547 from gayaldassanayake/fix-same-id-issue

[2201.9.x] Fix the mixing up of target module when the tool id is repeated
ballerina-platform · Apr 16, 2024 · b0dc4b7 · b0dc4b7
2 parents 9eed151 + 1f34235
commit b0dc4b7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunBuildToolsTask.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunBuildToolsTask.java
@@ -88,7 +88,7 @@ public class RunBuildToolsTask implements Task {
     private final boolean exitWhenFinish;
     private ClassLoader toolClassLoader = this.getClass().getClassLoader();
     ServiceLoader<CodeGeneratorTool> toolServiceLoader = ServiceLoader.load(CodeGeneratorTool.class, toolClassLoader);
-    private final Map<String, ToolContext> toolContextMap = new HashMap<>();
+    private final Map<Tool.Field, ToolContext> toolContextMap = new HashMap<>();
 
     public RunBuildToolsTask(PrintStream out) {
         this.outStream = out;
@@ -117,7 +117,7 @@ public void execute(Project project) {
         for (Tool toolEntry : toolEntries) {
             // Populate tool context
             ToolContext toolContext = ToolContext.from(toolEntry, project.currentPackage(), outStream);
-            toolContextMap.put(toolEntry.id().value(), toolContext);
+            toolContextMap.put(toolEntry.id(), toolContext);
         }
         BuildToolResolution buildToolResolution;
         try {
@@ -147,7 +147,7 @@ public void execute(Project project) {
                 .toList();
         for (Tool toolEntry : resolvedToolEntries) {
             String commandName = toolEntry.type().value();
-            ToolContext toolContext = toolContextMap.get(toolEntry.id().value());
+            ToolContext toolContext = toolContextMap.get(toolEntry.id());
             Optional<CodeGeneratorTool> targetTool = BuildToolUtils.getTargetTool(commandName, toolServiceLoader);
             if (targetTool.isEmpty()) {
                 // If the tool is not found, we skip the execution and report a diagnostic
@@ -248,7 +248,7 @@ private boolean validateEmptyOptionsToml(String toolId, Tool.Field toolType) thr
             return true;
         }
         this.outStream.printf("WARNING: Validation of tool options of '%s' for '%s' is skipped due to " +
-                "no tool options found%n", toolType, toolId);
+                "no tool options found%n", toolType.value(), toolId);
         return false;
     }
 

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BuildToolResolution.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/BuildToolResolution.java
@@ -90,7 +90,7 @@ public List<BuildTool> getResolvedTools() {
 
     private void resolveToolDependencies() {
         Project currentProject = packageContext.project();
-        Map<String, ToolContext> toolContextMap = currentProject.getToolContextMap();
+        Map<PackageManifest.Tool.Field, ToolContext> toolContextMap = currentProject.getToolContextMap();
         if (toolContextMap == null || toolContextMap.isEmpty()) {
             return;
         }

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/Project.java
@@ -41,7 +41,7 @@ public abstract class Project {
     private BuildOptions buildOptions;
     protected ProjectEnvironment projectEnvironment;
     private final ProjectKind projectKind;
-    private Map<String, ToolContext> toolContextMap;
+    private Map<PackageManifest.Tool.Field, ToolContext> toolContextMap;
     private List<CompilerPluginContextIml> compilerPluginContexts;
 
     protected Project(ProjectKind projectKind,
@@ -106,15 +106,15 @@ public BuildOptions buildOptions() {
      *
      * @return map of {@code ToolContext}
      */
-    public Map<String, ToolContext> getToolContextMap() {
+    public Map<PackageManifest.Tool.Field, ToolContext> getToolContextMap() {
         return toolContextMap;
     }
 
     /**
      * Assigns a map of build tools.
      * @param toolContextMap map of {@code ToolContext}
      */
-    public void setToolContextMap(Map<String, ToolContext> toolContextMap) {
+    public void setToolContextMap(Map<PackageManifest.Tool.Field, ToolContext> toolContextMap) {
         this.toolContextMap = toolContextMap;
     }