Replace duplicate hasTestablePackage with containsTestablePkg

ballerina-platform · Nov 5, 2024 · 871d329 · 871d329
1 parent c5bb91b
commit 871d329
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java b/compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java
@@ -275,8 +275,8 @@ public void visit(BLangPackage pkgNode) {
                      .filter(f -> !f.flagSet.contains(Flag.LAMBDA))
                      .toList());
 
-        if (!(pkgNode instanceof BLangTestablePackage)) {
-            find(pkgNode.getTestablePkg().orElse(null));
+        if (!(pkgNode instanceof BLangTestablePackage) && pkgNode.containsTestablePkg()) {
+            find(pkgNode.getTestablePkg().orElseThrow());
         }
     }
 

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java
@@ -391,7 +391,7 @@ public void performCodeGen(ModuleContext moduleContext, CompilationCache compila
             return;
         }
 
-        if (!bLangPackage.hasTestablePackage()) {
+        if (!bLangPackage.containsTestablePkg()) {
             return;
         }
 

diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/BIRGen.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/BIRGen.java
@@ -292,7 +292,7 @@ public BLangPackage genBIR(BLangPackage astPkg) {
         astPkg.accept(this);
 
         this.birOptimizer.optimizePackage(birPkg);
-        if (!astPkg.moduleContextDataHolder.skipTests() && astPkg.hasTestablePackage()) {
+        if (!astPkg.moduleContextDataHolder.skipTests() && astPkg.containsTestablePkg()) {
             astPkg.getTestablePkgs().forEach(testPkg -> {
                 BIRPackage testBirPkg = new BIRPackage(testPkg.pos, testPkg.packageID.orgName,
                         testPkg.packageID.pkgName, testPkg.packageID.name, testPkg.packageID.version,

diff --git a/...g/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/interop/InteropValidator.java b/...g/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/interop/InteropValidator.java
@@ -105,7 +105,7 @@ private void validateModulePackages(ModuleId moduleId, CompilerBackend compilerB
 
     private void validateTestPackages(ModuleId moduleId, CompilerBackend compilerBackend,
                                       BLangPackage bLangPackage) {
-        if (bLangPackage.moduleContextDataHolder.skipTests() || !bLangPackage.hasTestablePackage()) {
+        if (bLangPackage.moduleContextDataHolder.skipTests() || !bLangPackage.containsTestablePkg()) {
             return;
         }
         Set<Path> testDependencies = getPlatformDependencyPaths(moduleId, compilerBackend,

diff --git a/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangPackage.java b/compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/tree/BLangPackage.java
@@ -274,10 +274,6 @@ public Set<Flag> getFlags() {
         return flagSet;
     }
 
-    public boolean hasTestablePackage() {
-        return !this.testablePkgs.isEmpty();
-    }
-
     public void addClassDefinition(BLangClassDefinition classDefNode) {
         this.topLevelNodes.add(classDefNode);
         this.classDefinitions.add(classDefNode);