moved func to ImportExport utils helper

app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ImportExportUtils.java

@@ -2,13 +2,16 @@
 
 import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.Datasource;
+import com.appsmith.server.domains.Application;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.mongodb.MongoTransactionException;
 import org.springframework.transaction.TransactionException;
 
 import java.util.Map;
 
+import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
+
 @Slf4j
 public class ImportExportUtils {
 
@@ -39,10 +42,10 @@ public static String getErrorMessage(Throwable throwable) {
      * @return
      */
     public static String sanitizeDatasourceInActionDTO(ActionDTO actionDTO,
-                                                 Map<String, String> datasourceMap,
-                                                 Map<String, String> pluginMap,
-                                                 String workspaceId,
-                                                 boolean isExporting) {
+                                                       Map<String, String> datasourceMap,
+                                                       Map<String, String> pluginMap,
+                                                       String workspaceId,
+                                                       boolean isExporting) {
 
         if (actionDTO != null && actionDTO.getDatasource() != null) {
 
@@ -69,4 +72,34 @@ public static String sanitizeDatasourceInActionDTO(ActionDTO actionDTO,
 
         return "";
     }
+
+    public static void setPropertiesToExistingApplication(Application importedApplication, Application existingApplication) {
+        importedApplication.setId(existingApplication.getId());
+        // For the existing application we don't need to default
+        // value of the flag
+        // The isPublic flag has a default value as false and this
+        // would be confusing to user
+        // when it is reset to false during importing where the
+        // application already is present in DB
+        importedApplication.setIsPublic(null);
+        importedApplication.setPolicies(null);
+        // These properties are not present in the application when it is created, hence the initial commit
+        // to git doesn't contain these keys and if we want to discard the changes, the function
+        // copyNestedNonNullProperties
+        // ignore these properties and the changes are not discarded
+        if (importedApplication.getUnpublishedApplicationDetail() == null) {
+            existingApplication.setUnpublishedApplicationDetail(null);
+        }
+        if (importedApplication.getPublishedApplicationDetail() == null) {
+            existingApplication.setPublishedApplicationDetail(null);
+        }
+        if (importedApplication.getPublishedAppLayout() == null) {
+            existingApplication.setPublishedAppLayout(null);
+        }
+        if (importedApplication.getUnpublishedAppLayout() == null) {
+            existingApplication.setUnpublishedAppLayout(null);
+        }
+
+        copyNestedNonNullProperties(importedApplication, existingApplication);
+    }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java

@@ -112,6 +112,7 @@
 import static com.appsmith.server.constants.ResourceModes.EDIT;
 import static com.appsmith.server.constants.ResourceModes.VIEW;
 import static com.appsmith.server.helpers.ImportExportUtils.sanitizeDatasourceInActionDTO;
+import static com.appsmith.server.helpers.ImportExportUtils.setPropertiesToExistingApplication;
 import static java.lang.Boolean.TRUE;
 
 @Slf4j
@@ -836,36 +837,6 @@ private String validateApplicationJson(ApplicationJson importedDoc) {
         return errorField;
     }
 
-    private void setPropertiesToExistingApplication(Application importedApplication, Application existingApplication) {
-        importedApplication.setId(existingApplication.getId());
-        // For the existing application we don't need to default
-        // value of the flag
-        // The isPublic flag has a default value as false and this
-        // would be confusing to user
-        // when it is reset to false during importing where the
-        // application already is present in DB
-        importedApplication.setIsPublic(null);
-        importedApplication.setPolicies(null);
-        // These properties are not present in the application when it is created, hence the initial commit
-        // to git doesn't contain these keys and if we want to discard the changes, the function
-        // copyNestedNonNullProperties
-        // ignore these properties and the changes are not discarded
-        if (importedApplication.getUnpublishedApplicationDetail() == null) {
-            existingApplication.setUnpublishedApplicationDetail(null);
-        }
-        if (importedApplication.getPublishedApplicationDetail() == null) {
-            existingApplication.setPublishedApplicationDetail(null);
-        }
-        if (importedApplication.getPublishedAppLayout() == null) {
-            existingApplication.setPublishedAppLayout(null);
-        }
-        if (importedApplication.getUnpublishedAppLayout() == null) {
-            existingApplication.setUnpublishedAppLayout(null);
-        }
-
-        copyNestedNonNullProperties(importedApplication, existingApplication);
-    }
-
     /**
      * This function will take the application reference object to hydrate the application in mongoDB
      *