Move all hardcoded code to single class

ballerina-platform · Jul 25, 2024 · d12dcd5 · d12dcd5
1 parent 772e8c1
commit d12dcd5
Show file tree

Hide file tree

Showing 11 changed files with 197 additions and 195 deletions.
diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/CreateExecutableTask.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/CreateExecutableTask.java
@@ -146,13 +146,11 @@ public void execute(Project project) {
 
             if (project.buildOptions().getTargetPath() != null) {
                 this.out.println("\t" + relativePathToExecutableString);
+            } else if (relativePathToExecutableString.contains("..")
+                    || relativePathToExecutableString.contains("." + File.separator)) {
+                this.out.println("\t" + executablePathString);
             } else {
-                if (relativePathToExecutableString.contains("..")
-                        || relativePathToExecutableString.contains("." + File.separator)) {
-                    this.out.println("\t" + executablePathString);
-                } else {
-                    this.out.println("\t" + relativePathToExecutableString);
-                }
+                this.out.println("\t" + relativePathToExecutableString);
             }
         }
 

diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/TestUtils.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/utils/TestUtils.java
@@ -480,11 +480,10 @@ private static String getFunctionToMockClassName(String id) {
     public static String getClassPath(JBallerinaBackend jBallerinaBackend, Package currentPackage) {
         JarResolver jarResolver = jBallerinaBackend.jarResolver();
 
-        List<Path> dependencies = getTestDependencyPaths(currentPackage, jarResolver);
-
         List<Path> jarList = getModuleJarPaths(jBallerinaBackend, currentPackage);
-        dependencies.removeAll(jarList);
-        dependencies.removeAll(jarResolver.optimizedJarLibraryPaths);
+        List<Path> dependencies = getTestDependencyPaths(currentPackage, jarResolver).stream()
+                .filter(each -> !jarList.contains(each) && !jarResolver.optimizedJarLibraryPaths.contains(each))
+                .toList();
 
         StringJoiner classPath = joinClassPaths(dependencies);
         return classPath.toString();

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
@@ -131,10 +131,10 @@ public class JBallerinaBackend extends CompilerBackend {
     private final UsedBIRNodeAnalyzer usedBIRNodeAnalyzer;
     private final CodeGenOptimizationReportEmitter codeGenOptimizationReportEmitter;
     private final Map<String, ByteArrayOutputStream> optimizedJarStreams;
-    protected final Set<PackageID> unusedCompilerLevelPackageIds;
-    protected final Set<PackageId> unusedProjectLevelPackageIds;
-    protected final Set<ModuleId> unusedModuleIds;
-    protected final Map<PackageId, Set<String>> pkgWiseUsedNativeClassPaths;
+    private final Set<PackageID> unusedCompilerLevelPackageIds;
+    final Set<PackageId> unusedProjectLevelPackageIds;
+    final Set<ModuleId> unusedModuleIds;
+    final Map<PackageId, Set<String>> pkgWiseUsedNativeClassPaths;
 
     public static JBallerinaBackend from(PackageCompilation packageCompilation, JvmTarget jdkVersion) {
         return from(packageCompilation, jdkVersion, true);
@@ -231,8 +231,7 @@ private void performCodeGen(boolean shrink) {
                 ModuleContext.shrinkDocuments(moduleContext);
             }
             // Codegen happens later when --optimize flag is active. We cannot clean the BlangPkgs until then.
-            if (!project.buildOptions().optimizeCodegen() &&
-                    project.kind() == ProjectKind.BALA_PROJECT) {
+            if (!project.buildOptions().optimizeCodegen() && project.kind() == ProjectKind.BALA_PROJECT) {
                 moduleContext.cleanBLangPackage();
             }
         }
@@ -303,6 +302,7 @@ private void markCommonDependencies(BLangPackage bLangPackage) {
         collectDependencies(bLangPackage.symbol, buildPkgDependencies);
         collectDependencies(bLangPackage.getTestablePkg().symbol, testablePkgDependencies);
 
+        // FIXME: this filter should be applied only if env variable is not set?
         buildPkgDependencies.stream()
                 .filter(testablePkgDependencies::contains).filter(pkgSymbol -> !isWhiteListedModule(pkgSymbol.pkgID))
                 .forEach(pkgSymbol -> {

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JarResolver.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JarResolver.java
@@ -20,6 +20,7 @@
 import io.ballerina.projects.internal.DefaultDiagnosticResult;
 import io.ballerina.projects.internal.PackageDiagnostic;
 import io.ballerina.projects.internal.ProjectDiagnosticErrorCode;
+import io.ballerina.projects.util.CodegenOptimizationUtils;
 import io.ballerina.projects.util.ProjectConstants;
 import io.ballerina.projects.util.ProjectUtils;
 import io.ballerina.tools.diagnostics.Diagnostic;
@@ -48,10 +49,6 @@
 import java.util.zip.ZipEntry;
 
 import static io.ballerina.identifier.Utils.encodeNonFunctionIdentifier;
-import static io.ballerina.projects.util.CodegenOptimizationConstants.BALLERINAI_OBSERVE;
-import static io.ballerina.projects.util.CodegenOptimizationConstants.BALLERINAX;
-import static io.ballerina.projects.util.CodegenOptimizationConstants.BALLERINA_OBSERVE;
-import static io.ballerina.projects.util.CodegenOptimizationConstants.DOT_DRIVER;
 import static io.ballerina.projects.util.ProjectConstants.ANON_ORG;
 import static io.ballerina.projects.util.ProjectConstants.DOT;
 
@@ -264,7 +261,7 @@ private static boolean hasEmptyIdOrVersion(JarLibrary entry) {
 
     private boolean isUsedDependency(JarLibrary otherJarDependency, Set<String> usedNativeClassPaths) {
         String pkgName = otherJarDependency.packageName().orElseThrow();
-        if (isWhiteListedPkg(pkgName)) {
+        if (CodegenOptimizationUtils.isWhiteListedModule(pkgName)) {
             return true;
         }
         if (usedNativeClassPaths.isEmpty()) {
@@ -283,16 +280,6 @@ private boolean isUsedDependency(JarLibrary otherJarDependency, Set<String> used
         }
     }
 
-    private boolean isWhiteListedPkg(String pkgName) {
-        return pkgName.equals(BALLERINA_OBSERVE) || pkgName.equals(BALLERINAI_OBSERVE) || isDriverPkg(pkgName);
-    }
-
-    // Driver pkgs are pkgs such as "ballerinax/mysql.driver".
-    // These pkgs contain only native jars without any source code.
-    private boolean isDriverPkg(String pkgName) {
-        return pkgName.startsWith(BALLERINAX) && pkgName.endsWith(DOT_DRIVER);
-    }
-
     private void reportDiagnostic(JarLibrary existingEntry, JarLibrary newEntry) {
         // Report diagnostic only for non ballerina dependencies
         if (!existingEntry.packageName().orElseThrow().startsWith(ProjectConstants.BALLERINA_ORG)