Merge pull request #278 from Bhashinee/revert-271-revert-268-main

Fix persist compiler crash when no persist configurations are found
ballerina-platform · Apr 2, 2024 · b981b10 · b981b10
2 parents 7048f30 + 125487e
commit b981b10
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- [Fixed the persist compiler crash when no persist configurations are found](https://github.com/ballerina-platform/ballerina-library/issues/6187)
+
 ### Added
 - [Added compiler plugin validations for Postgresql as a datasource](https://github.com/ballerina-platform/ballerina-library/issues/5829)
 

diff --git a/...er-plugin-test/src/test/java/io/ballerina/stdlib/persist/compiler/CompilerPluginTest.java b/...er-plugin-test/src/test/java/io/ballerina/stdlib/persist/compiler/CompilerPluginTest.java
@@ -20,6 +20,7 @@
 
 import io.ballerina.projects.DiagnosticResult;
 import io.ballerina.projects.Package;
+import io.ballerina.projects.PackageCompilation;
 import io.ballerina.projects.directory.BuildProject;
 import io.ballerina.projects.directory.SingleFileProject;
 import io.ballerina.tools.diagnostics.Diagnostic;
@@ -105,13 +106,8 @@ public void validateWithOldPersistTomlConfig() {
 
     @Test
     public void testWithoutDatastore() {
-        try {
-            loadPersistModelFile("project_9", "field-types.bal").getCompilation();
-            Assert.fail("Compilation should fail");
-        } catch (Exception e) {
-            Assert.assertTrue(e.getMessage().contains("the persist.datastore configuration does not exist in " +
-                    "the Ballerina.toml file"));
-        }
+        PackageCompilation loadedProject = loadPersistModelFile("project_9", "field-types.bal").getCompilation();
+        Assert.assertEquals(loadedProject.diagnosticResult().errorCount(), 0);
     }
 
     @Test

diff --git a/compiler-plugin/src/main/java/io/ballerina/stdlib/persist/compiler/utils/Utils.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/persist/compiler/utils/Utils.java
@@ -221,7 +221,9 @@ private static String getDataStoreName(Path configPath) throws BalException {
                     }
                 }
             }
-            throw new BalException("the persist.datastore configuration does not exist in the Ballerina.toml file");
+            // Skip data store-specific validations if the `tool.persist` configuration does not exist in the `toml`
+            // files, instead of returning an error.
+            return null;
         } catch (IOException e) {
             throw new BalException("error while reading persist configurations. " + e.getMessage());
         }

diff --git a/...lugin/src/main/java/io/ballerina/stdlib/persist/compiler/utils/ValidatorsByDatastore.java b/...lugin/src/main/java/io/ballerina/stdlib/persist/compiler/utils/ValidatorsByDatastore.java
@@ -55,8 +55,8 @@ public static boolean validateSimpleTypes(Entity entity, Node typeNode, String t
                                               List<DiagnosticProperty<?>> properties, String type, String datastore) {
         boolean validFlag = true;
 
-        if (isOptionalType && (datastore.equals(Constants.Datastores.GOOGLE_SHEETS)
-        || datastore.equals(Constants.Datastores.REDIS))) {
+        if (isOptionalType && (Constants.Datastores.GOOGLE_SHEETS.equals(datastore)
+                || Constants.Datastores.REDIS.equals(datastore))) {
             entity.reportDiagnostic(PERSIST_308.getCode(),
                     MessageFormat.format(PERSIST_308.getMessage(), type),
                     PERSIST_308.getSeverity(), typeNode.location(), properties);
@@ -127,6 +127,10 @@ public static boolean validateImportedTypes(Entity entity, Node typeNode,
     }
 
     public static boolean isValidSimpleType(String type, String datastore) {
+        // If the datastore is null(ex: before executing the generate command), ignore the data type validation.
+        if (null == datastore) {
+            return true;
+        }
         switch (datastore) {
             case Constants.Datastores.MYSQL:
                 return isValidMysqlType(type);
@@ -146,6 +150,10 @@ public static boolean isValidSimpleType(String type, String datastore) {
     }
 
     public static boolean isValidArrayType(String type, String datastore) {
+        // If the datastore is null(ex: before executing the generate command), ignore the data type validation.
+        if (null == datastore) {
+            return true;
+        }
         switch (datastore) {
             case Constants.Datastores.MYSQL:
                 return isValidMysqlArrayType(type);
@@ -165,7 +173,10 @@ public static boolean isValidArrayType(String type, String datastore) {
     }
 
     public static boolean isValidImportedType(String modulePrefix, String identifier, String datastore) {
-
+        // If the datastore is null(ex: before executing the generate command), ignore the data type validation.
+        if (null == datastore) {
+            return true;
+        }
         switch (datastore) {
             case Constants.Datastores.MYSQL:
                 return isValidMysqlImportedType(modulePrefix, identifier);