Merge pull request #44171 from Thevakumar-Luheerathan/ballerina-lang-iss-44168-mast

Thevakumar-Luheerathan · web-flow · commit 0462ef76d766 · 2025-07-03T09:47:09.000+05:30
Fix sticky flag
diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/BuildCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/BuildCommand.java
@@ -226,9 +226,6 @@ public void execute() {
             return;
         }
 
-        if (sticky == null) {
-            sticky = false;
-        }
 
         // load project
         Project project;
diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PackCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/PackCommand.java
@@ -159,10 +159,6 @@ public void execute() {
 
         Project project;
 
-        if (sticky == null) {
-            sticky = false;
-        }
-
         BuildOptions buildOptions = constructBuildOptions();
 
         // Throw an error if its a single file
diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/RunCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/RunCommand.java
@@ -220,10 +220,6 @@ public void execute() {
             }
         }
 
-        if (sticky == null) {
-            sticky = false;
-        }
-
         if (this.watch) {
             try {
                 ProjectWatcher projectWatcher = new ProjectWatcher(
diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/TestCommand.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/cmd/TestCommand.java
@@ -254,9 +254,6 @@ public void execute() {
             }
         }
 
-        if (sticky == null) {
-            sticky = false;
-        }
         if (isParallelExecution) {
             this.outStream.println("WARNING: Running tests in parallel is an experimental feature");
         }
diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilationOptions.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/CompilationOptions.java
@@ -78,7 +78,7 @@ public boolean offlineBuild() {
     }
 
     boolean sticky() {
-        return toBooleanTrueIfNull(this.sticky);
+        return toBooleanDefaultIfNull(this.sticky);
     }
 
     boolean experimental() {
@@ -266,13 +266,6 @@ private boolean toBooleanDefaultIfNull(Boolean bool) {
         return bool;
     }
 
-    private boolean toBooleanTrueIfNull(Boolean bool) {
-        if (bool == null) {
-            return true;
-        }
-        return bool;
-    }
-
     private String toStringDefaultIfNull(String value) {
         if (value == null) {
             return "";
diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/bala/BalaProject.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/bala/BalaProject.java
@@ -55,7 +55,8 @@ public class BalaProject extends Project {
      */
     public static BalaProject loadProject(ProjectEnvironmentBuilder environmentBuilder, Path balaPath) {
         PackageConfig packageConfig = PackageConfigCreator.createBalaProjectConfig(balaPath);
-        BalaProject balaProject = new BalaProject(environmentBuilder, balaPath, BuildOptions.builder().build());
+        BalaProject balaProject = new BalaProject(environmentBuilder, balaPath, BuildOptions.builder().setSticky(true)
+                .build());
         balaProject.addPackage(packageConfig);
         return balaProject;
     }
diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/ManifestBuilder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/internal/ManifestBuilder.java
@@ -897,7 +897,7 @@ private BuildOptions setBuildOptions(TomlTableNode tomlTableNode) {
         Boolean dumpBuildTime =
                 getBooleanFromBuildOptionsTableNode(tableNode, BuildOptions.OptionName.DUMP_BUILD_TIME.toString());
         Boolean sticky =
-                getTrueFromBuildOptionsTableNode(tableNode, CompilerOptionName.STICKY.toString());
+                getBooleanFromBuildOptionsTableNode(tableNode, CompilerOptionName.STICKY.toString());
         String cloud = "";
         if (topLevelNode != null) {
             cloud = getStringFromTomlTableNode(topLevelNode);
@@ -1000,23 +1000,6 @@ private boolean getBooleanFromTemplateNode(TomlTableNode tableNode, String key)
         return false;
     }
 
-    private boolean getTrueFromBuildOptionsTableNode(TomlTableNode tableNode, String key) {
-        TopLevelNode topLevelNode = tableNode.entries().get(key);
-        if (topLevelNode == null || topLevelNode.kind() == TomlType.NONE) {
-            return true;
-        }
-
-        if (topLevelNode.kind() == TomlType.KEY_VALUE) {
-            TomlKeyValueNode keyValueNode = (TomlKeyValueNode) topLevelNode;
-            TomlValueNode value = keyValueNode.value();
-            if (value.kind() == TomlType.BOOLEAN) {
-                TomlBooleanValueNode tomlBooleanValueNode = (TomlBooleanValueNode) value;
-                return tomlBooleanValueNode.getValue();
-            }
-        }
-        return true;
-    }
-
     public static String getStringValueFromTomlTableNode(TomlTableNode tomlTableNode, String key) {
         TopLevelNode topLevelNode = tomlTableNode.entries().get(key);
         if (topLevelNode == null || topLevelNode.kind() == TomlType.NONE) {
diff --git a/project-api/project-api-test/src/test/java/io/ballerina/projects/test/PackageResolutionIntegrationTests.java b/project-api/project-api-test/src/test/java/io/ballerina/projects/test/PackageResolutionIntegrationTests.java
@@ -130,7 +130,7 @@ public void testCase0001(ITestContext ctx) throws IOException {
         // Compare Dependencies.toml file
         // package_a ---> 1.0.2 patch version
         assertTomlFilesEquals(projectDirPath.resolve(DEPENDENCIES_TOML),
-                projectDirPath.resolve(RESOURCE_DIR_NAME).resolve("Dependencies-0001-2.toml"));
+                projectDirPath.resolve(RESOURCE_DIR_NAME).resolve("Dependencies-0001-3.toml"));
 
         // 5. Build package_c again after deleting Dependencies.toml and build file, and setting sticky == false
         deleteDependenciesTomlAndBuildFile(projectDirPath);
@@ -212,7 +212,7 @@ public void testCase0003(ITestContext ctx) throws IOException {
         // Compare Dependencies.toml file
         // package_a ---> 1.0.2 version
         assertTomlFilesEquals(projectDirPath.resolve(DEPENDENCIES_TOML),
-                projectDirPath.resolve(RESOURCE_DIR_NAME).resolve("Dependencies-0003-2.toml"));
+                projectDirPath.resolve(RESOURCE_DIR_NAME).resolve("Dependencies-0003-1.toml"));
 
         // 4. Build package_c again after deleting Dependencies.toml and build file, and setting sticky == false
         deleteDependenciesTomlAndBuildFile(projectDirPath);
@@ -386,7 +386,7 @@ public void testCase0007(ITestContext ctx) throws IOException {
         failIfDiagnosticsExists(buildProject2);
 
         assertTomlFilesEquals(projectDirPath.resolve(DEPENDENCIES_TOML),
-                projectDirPath.resolve(RESOURCE_DIR_NAME).resolve("Dependencies-0007-1.toml"));
+                projectDirPath.resolve(RESOURCE_DIR_NAME).resolve("Dependencies_NoSticky.toml"));
 
         // No Sticky
         deleteBuildFile(projectDirPath);
diff --git a/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestBuildProject.java b/project-api/project-api-test/src/test/java/io/ballerina/projects/test/TestBuildProject.java
@@ -2455,6 +2455,48 @@ public void testConflictingJarsInNonBalPackages() {
                 " dependency of 'platformlib/pkg1'. Picking 'lib3-2.0.1.jar' over 'lib3-2.0.0.jar'.");
     }
 
+    @Test(description = "Test sticky flag when not defined in Ballerina.toml")
+    public void testStickyFlagNotDefinedInToml() throws IOException {
+        Path projectPath = tempResourceDir.resolve("stickyTestProjs/projNullStickyInBalTom");
+        BuildOptions buildOptions = BuildOptions.builder().setSticky(false).build(); // CLI Sticky
+        BuildProject project = loadBuildProject(projectPath, buildOptions);
+        Assert.assertFalse(project.buildOptions().sticky());
+        buildOptions = BuildOptions.builder().setSticky(true).build(); // CLI Sticky
+        project = loadBuildProject(projectPath, buildOptions);
+        Assert.assertTrue(project.buildOptions().sticky());
+        buildOptions = BuildOptions.builder().build(); // CLI Sticky
+        project = loadBuildProject(projectPath, buildOptions);
+        Assert.assertFalse(project.buildOptions().sticky());
+    }
+
+    @Test(description = "Test sticky flag when set to false in Ballerina.toml")
+    public void testStickyFlagFalseInToml() throws IOException {
+        Path projectPath = tempResourceDir.resolve("stickyTestProjs/projFalseStickyInBalTom");
+        BuildOptions buildOptions = BuildOptions.builder().setSticky(false).build(); // CLI Sticky
+        BuildProject project = loadBuildProject(projectPath, buildOptions);
+        Assert.assertFalse(project.buildOptions().sticky());
+        buildOptions = BuildOptions.builder().setSticky(true).build(); // CLI Sticky
+        project = loadBuildProject(projectPath, buildOptions);
+        Assert.assertTrue(project.buildOptions().sticky());
+        buildOptions = BuildOptions.builder().build(); // CLI Sticky
+        project = loadBuildProject(projectPath, buildOptions);
+        Assert.assertFalse(project.buildOptions().sticky());
+    }
+
+    @Test(description = "Test sticky flag when set to true in Ballerina.toml")
+    public void testStickyFlagTrueInToml() throws IOException {
+        Path projectPath = tempResourceDir.resolve("stickyTestProjs/projTrueStickyInBalTom");
+        BuildOptions buildOptions = BuildOptions.builder().setSticky(false).build(); // CLI Sticky
+        BuildProject project = loadBuildProject(projectPath, buildOptions);
+        Assert.assertFalse(project.buildOptions().sticky());
+        buildOptions = BuildOptions.builder().setSticky(true).build(); // CLI Sticky
+        project = loadBuildProject(projectPath, buildOptions);
+        Assert.assertTrue(project.buildOptions().sticky());
+        buildOptions = BuildOptions.builder().build(); // CLI Sticky
+        project = loadBuildProject(projectPath, buildOptions);
+        Assert.assertTrue(project.buildOptions().sticky());
+    }
+
     private static BuildProject loadBuildProject(Path projectPath) {
         return loadBuildProject(projectPath, null);
     }
diff --git a/project-api/project-api-test/src/test/resources/projects_for_resolution_integration_tests/package_f_1_0_0_remove_import_d/resources/Dependencies-0006-2.toml b/project-api/project-api-test/src/test/resources/projects_for_resolution_integration_tests/package_f_1_0_0_remove_import_d/resources/Dependencies-0006-2.toml
@@ -7,10 +7,18 @@
 dependencies-toml-version = "2"
 distribution-version = "**INSERT_DISTRIBUTION_VERSION_HERE**"
 
+[[package]]
+org = "adv_res"
+name = "package_d"
+version = "1.0.0"
+
 [[package]]
 org = "adv_res"
 name = "package_e"
-version = "2.0.0"
+version = "2.0.2"
+dependencies = [
+	{org = "adv_res", name = "package_d"}
+]
 modules = [
 	{org = "adv_res", packageName = "package_e", moduleName = "package_e"}
 ]
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projFalseStickyInBalTom/.devcontainer.json b/project-api/project-api-test/src/test/resources/stickyTestProjs/projFalseStickyInBalTom/.devcontainer.json
@@ -0,0 +1,8 @@
+{
+  "image": "ballerina/ballerina-devcontainer:2201.12.7",
+  "customizations": {
+    "vscode": {
+      "extensions": ["WSO2.ballerina"]
+    }
+  }
+}
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projFalseStickyInBalTom/.gitignore b/project-api/project-api-test/src/test/resources/stickyTestProjs/projFalseStickyInBalTom/.gitignore
@@ -0,0 +1,11 @@
+# Ballerina generates this directory during the compilation of a package.
+# It contains compiler-generated artifacts and the final executable if this is an application package.
+target/
+
+# Ballerina maintains the compiler-generated source code here.
+# Remove this if you want to commit generated sources.
+generated/
+
+# Contains configuration values used during development time.
+# See https://ballerina.io/learn/provide-values-to-configurable-variables/ for more details.
+Config.toml
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projFalseStickyInBalTom/Ballerina.toml b/project-api/project-api-test/src/test/resources/stickyTestProjs/projFalseStickyInBalTom/Ballerina.toml
@@ -0,0 +1,7 @@
+[package]
+org = "luheerathan"
+name = "projWOStickyInBalTom"
+version = "0.1.0"
+
+[build-options]
+sticky = false
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projFalseStickyInBalTom/main.bal b/project-api/project-api-test/src/test/resources/stickyTestProjs/projFalseStickyInBalTom/main.bal
@@ -0,0 +1,5 @@
+import ballerina/io;
+
+public function main() {
+    io:println("Hello, World!");
+}
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projNullStickyInBalTom/.devcontainer.json b/project-api/project-api-test/src/test/resources/stickyTestProjs/projNullStickyInBalTom/.devcontainer.json
@@ -0,0 +1,8 @@
+{
+  "image": "ballerina/ballerina-devcontainer:2201.12.7",
+  "customizations": {
+    "vscode": {
+      "extensions": ["WSO2.ballerina"]
+    }
+  }
+}
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projNullStickyInBalTom/.gitignore b/project-api/project-api-test/src/test/resources/stickyTestProjs/projNullStickyInBalTom/.gitignore
@@ -0,0 +1,11 @@
+# Ballerina generates this directory during the compilation of a package.
+# It contains compiler-generated artifacts and the final executable if this is an application package.
+target/
+
+# Ballerina maintains the compiler-generated source code here.
+# Remove this if you want to commit generated sources.
+generated/
+
+# Contains configuration values used during development time.
+# See https://ballerina.io/learn/provide-values-to-configurable-variables/ for more details.
+Config.toml
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projNullStickyInBalTom/Ballerina.toml b/project-api/project-api-test/src/test/resources/stickyTestProjs/projNullStickyInBalTom/Ballerina.toml
@@ -0,0 +1,6 @@
+[package]
+org = "luheerathan"
+name = "projNullStickyInBalTom"
+version = "0.1.0"
+
+
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projNullStickyInBalTom/main.bal b/project-api/project-api-test/src/test/resources/stickyTestProjs/projNullStickyInBalTom/main.bal
@@ -0,0 +1,5 @@
+import ballerina/io;
+
+public function main() {
+    io:println("Hello, World!");
+}
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projTrueStickyInBalTom/.devcontainer.json b/project-api/project-api-test/src/test/resources/stickyTestProjs/projTrueStickyInBalTom/.devcontainer.json
@@ -0,0 +1,8 @@
+{
+  "image": "ballerina/ballerina-devcontainer:2201.12.7",
+  "customizations": {
+    "vscode": {
+      "extensions": ["WSO2.ballerina"]
+    }
+  }
+}
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projTrueStickyInBalTom/.gitignore b/project-api/project-api-test/src/test/resources/stickyTestProjs/projTrueStickyInBalTom/.gitignore
@@ -0,0 +1,11 @@
+# Ballerina generates this directory during the compilation of a package.
+# It contains compiler-generated artifacts and the final executable if this is an application package.
+target/
+
+# Ballerina maintains the compiler-generated source code here.
+# Remove this if you want to commit generated sources.
+generated/
+
+# Contains configuration values used during development time.
+# See https://ballerina.io/learn/provide-values-to-configurable-variables/ for more details.
+Config.toml
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projTrueStickyInBalTom/Ballerina.toml b/project-api/project-api-test/src/test/resources/stickyTestProjs/projTrueStickyInBalTom/Ballerina.toml
@@ -0,0 +1,7 @@
+[package]
+org = "luheerathan"
+name = "projWStickyInBalTom"
+version = "0.1.0"
+
+[build-options]
+sticky = true
diff --git a/project-api/project-api-test/src/test/resources/stickyTestProjs/projTrueStickyInBalTom/main.bal b/project-api/project-api-test/src/test/resources/stickyTestProjs/projTrueStickyInBalTom/main.bal
@@ -0,0 +1,5 @@
+import ballerina/io;
+
+public function main() {
+    io:println("Hello, World!");
+}

Original file line number	Diff line number	Diff line change
`@@ -226,9 +226,6 @@ public void execute() {`
`226`	`226`	`return;`
`227`	`227`	`}`
`228`	`228`
`229`		`- if (sticky == null) {`
`230`		`- sticky = false;`
`231`		`- }`
`232`	`229`
`233`	`230`	`// load project`
`234`	`231`	`Project project;`
Original file line number	Diff line number	Diff line change
`@@ -220,10 +220,6 @@ public void execute() {`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`223`		`- if (sticky == null) {`
`224`		`- sticky = false;`
`225`		`- }`
`226`		`-`
`227`	`223`	`if (this.watch) {`
`228`	`224`	`try {`
`229`	`225`	`ProjectWatcher projectWatcher = new ProjectWatcher(`
Original file line number	Diff line number	Diff line change
`@@ -254,9 +254,6 @@ public void execute() {`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`257`		`- if (sticky == null) {`
`258`		`- sticky = false;`
`259`		`- }`
`260`	`257`	`if (isParallelExecution) {`
`261`	`258`	`this.outStream.println("WARNING: Running tests in parallel is an experimental feature");`
`262`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public boolean offlineBuild() {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`boolean sticky() {`
`81`		`- return toBooleanTrueIfNull(this.sticky);`
	`81`	`+ return toBooleanDefaultIfNull(this.sticky);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`boolean experimental() {`
`@@ -266,13 +266,6 @@ private boolean toBooleanDefaultIfNull(Boolean bool) {`
`266`	`266`	`return bool;`
`267`	`267`	`}`
`268`	`268`
`269`		`- private boolean toBooleanTrueIfNull(Boolean bool) {`
`270`		`- if (bool == null) {`
`271`		`- return true;`
`272`		`- }`
`273`		`- return bool;`
`274`		`- }`
`275`		`-`
`276`	`269`	`private String toStringDefaultIfNull(String value) {`
`277`	`270`	`if (value == null) {`
`278`	`271`	`return "";`