added autocommit migration nuances

app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaMigration.java

@@ -67,28 +67,24 @@ public Mono<ApplicationJson> migrateApplicationJsonToLatestSchema(
                     // TODO: make import flow migration reactive
                     return Mono.just(migrateServerSchema(appJson))
                             .flatMap(migratedApplicationJson -> {
-                                if (migratedApplicationJson.getServerSchemaVersion() == 9
-                                        && Boolean.TRUE.equals(MigrationHelperMethods.doesRestApiRequireMigration(
-                                                migratedApplicationJson))) {
-                                    return jsonSchemaMigrationHelper
-                                            .addDatasourceConfigurationToDefaultRestApiActions(
-                                                    baseApplicationId, branchName, migratedApplicationJson)
-                                            .map(applicationJsonWithMigration10 -> {
-                                                applicationJsonWithMigration10.setServerSchemaVersion(10);
-                                                return applicationJsonWithMigration10;
-                                            });
+                                if (migratedApplicationJson.getServerSchemaVersion() == 9) {
+                                    migratedApplicationJson.setServerSchemaVersion(10);
+                                }
+
+                                if (migratedApplicationJson.getServerSchemaVersion() == 10) {
+                                    if (Boolean.TRUE.equals(MigrationHelperMethods.doesRestApiRequireMigration(
+                                            migratedApplicationJson))) {
+                                        return jsonSchemaMigrationHelper
+                                                .addDatasourceConfigurationToDefaultRestApiActions(
+                                                        baseApplicationId, branchName, migratedApplicationJson);
+                                    }
+
+                                    migratedApplicationJson.setServerSchemaVersion(11);
                                 }
 
-                                migratedApplicationJson.setServerSchemaVersion(10);
                                 return Mono.just(migratedApplicationJson);
                             })
                             .map(migratedAppJson -> {
-                                if (applicationJson
-                                        .getServerSchemaVersion()
-                                        .equals(jsonSchemaVersions.getServerVersion())) {
-                                    return applicationJson;
-                                }
-
                                 applicationJson.setServerSchemaVersion(jsonSchemaVersions.getServerVersion());
                                 return applicationJson;
                             });
@@ -193,16 +189,14 @@ private ApplicationJson nonReactiveServerMigrationForImport(ApplicationJson appl
 
         switch (applicationJson.getServerSchemaVersion()) {
             case 9:
+                applicationJson.setServerSchemaVersion(10);
+            case 10:
                 // this if for cases where we have empty datasource configs
                 MigrationHelperMethods.migrateApplicationJsonToVersionTen(applicationJson, Map.of());
-                applicationJson.setServerSchemaVersion(10);
+                applicationJson.setServerSchemaVersion(11);
             default:
         }
 
-        if (applicationJson.getServerSchemaVersion().equals(jsonSchemaVersions.getServerVersion())) {
-            return applicationJson;
-        }
-
         applicationJson.setServerSchemaVersion(jsonSchemaVersions.getServerVersion());
         return applicationJson;
     }

app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/JsonSchemaVersionsFallback.java

@@ -4,7 +4,7 @@
 
 @Component
 public class JsonSchemaVersionsFallback {
-    private static final Integer serverVersion = 10;
+    private static final Integer serverVersion = 11;
     public static final Integer clientVersion = 1;
 
     public Integer getServerVersion() {

app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/MigrationHelperMethods.java

@@ -44,6 +44,8 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.appsmith.external.constants.PluginConstants.PackageName.GRAPHQL_PLUGIN;
+import static com.appsmith.external.constants.PluginConstants.PackageName.REST_API_PLUGIN;
 import static com.appsmith.server.constants.ResourceModes.EDIT;
 import static com.appsmith.server.constants.ResourceModes.VIEW;
 import static org.springframework.data.mongodb.core.query.Criteria.where;
@@ -1235,13 +1237,30 @@ public static void setThemeSettings(Application.ThemeSetting themeSetting) {
         }
     }
 
-    private static boolean conditionForDefaultRestDatasourceMigration(NewAction action) {
+    public static boolean conditionForDefaultRestDatasourceMigration(NewAction action) {
+        if (action.getUnpublishedAction() == null
+                || action.getUnpublishedAction().getDatasource() == null) {
+            return false;
+        }
+
         Datasource actionDatasource = action.getUnpublishedAction().getDatasource();
 
+        // probable check for the  default rest datasource action is.
+        // it has no datasource id and action's plugin id is either rest-api or graphql plugin.
+        boolean probableCheckForDefaultRestDatasource = !org.springframework.util.StringUtils.hasText(
+                        actionDatasource.getId())
+                && (REST_API_PLUGIN.equals(action.getPluginId()) || GRAPHQL_PLUGIN.equals(action.getPluginId()));
+
         // condition to check if the action is default rest datasource.
         // it has no datasource id and name is equal to DEFAULT_REST_DATASOURCE
-        boolean isActionDefaultRestDatasource = !org.springframework.util.StringUtils.hasText(actionDatasource.getId())
-                && PluginConstants.DEFAULT_REST_DATASOURCE.equals(actionDatasource.getName());
+        boolean certainCheckForDefaultRestDatasource =
+                !org.springframework.util.StringUtils.hasText(actionDatasource.getId())
+                        && PluginConstants.DEFAULT_REST_DATASOURCE.equals(actionDatasource.getName());
+
+        // Two separate types of checks over here, it's either the obvious certain way to identify or
+        // the likely chance that the datasource is present.
+        boolean isActionDefaultRestDatasource =
+                certainCheckForDefaultRestDatasource || probableCheckForDefaultRestDatasource;
 
         // condition to check if the action has missing url or has no config at all
         boolean isDatasourceConfigurationOrUrlMissing = actionDatasource.getDatasourceConfiguration() == null
@@ -1322,18 +1341,25 @@ public static void setDatasourceConfigDetailsInDefaultRestDatasourceForActions(
 
         if (defaultDatasourceActionMap.containsKey(action.getGitSyncId())) {
             NewAction actionFromMap = defaultDatasourceActionMap.get(action.getGitSyncId());
+            // NPE check to avoid migration failures
+            if (actionFromMap.getUnpublishedAction() == null
+                    || actionFromMap.getUnpublishedAction().getDatasource() == null
+                    || actionFromMap.getUnpublishedAction().getDatasource().getDatasourceConfiguration() == null) {
+                return;
+            }
+
+            // set the datasource config in the json action only if the datasource config from db is not null,
+            // else it'll start to show as uncommited changes.
             DatasourceConfiguration datasourceConfigurationFromDBAction =
                     actionFromMap.getUnpublishedAction().getDatasource().getDatasourceConfiguration();
 
-            if (datasourceConfigurationFromDBAction != null) {
-                datasourceConfiguration.setUrl(datasourceConfigurationFromDBAction.getUrl());
-            }
-        }
+            // At this point it's established that datasource config of db action is not null.
+            datasourceConfiguration.setUrl(datasourceConfigurationFromDBAction.getUrl());
+            actionDatasource.setDatasourceConfiguration(datasourceConfiguration);
 
-        if (!org.springframework.util.StringUtils.hasText(datasourceConfiguration.getUrl())) {
+        } else {
             datasourceConfiguration.setUrl("");
+            actionDatasource.setDatasourceConfiguration(datasourceConfiguration);
         }
-
-        actionDatasource.setDatasourceConfiguration(datasourceConfiguration);
     }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/utils/JsonSchemaMigrationHelper.java

@@ -1,6 +1,5 @@
 package com.appsmith.server.migrations.utils;
 
-import com.appsmith.external.constants.PluginConstants;
 import com.appsmith.server.applications.base.ApplicationService;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.NewAction;
@@ -45,21 +44,7 @@ public Mono<ApplicationJson> addDatasourceConfigurationToDefaultRestApiActions(
                     return newActionService
                             .findAllByApplicationIdAndViewMode(
                                     branchedApplication.getId(), Boolean.FALSE, Optional.empty(), Optional.empty())
-                            .filter(action -> {
-                                if (action.getUnpublishedAction() == null
-                                        || action.getUnpublishedAction().getDatasource() == null) {
-                                    return false;
-                                }
-
-                                boolean reverseFlag = StringUtils.hasText(action.getUnpublishedAction()
-                                                .getDatasource()
-                                                .getId())
-                                        || !PluginConstants.DEFAULT_REST_DATASOURCE.equals(action.getUnpublishedAction()
-                                                .getDatasource()
-                                                .getName());
-
-                                return !reverseFlag;
-                            })
+                            .filter(MigrationHelperMethods::conditionForDefaultRestDatasourceMigration)
                             .collectMap(NewAction::getGitSyncId);
                 })
                 .map(newActionMap -> {