chore: Add code-split for injecting JIT pull in app CI/CD

app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/GitApplicationHelperCEImpl.java

@@ -322,4 +322,9 @@ public Application getNewArtifact(String workspaceId, String repoName) {
     public Mono<Application> publishArtifactPostCommit(Artifact committedArtifact) {
         return publishArtifact(committedArtifact, true);
     }
+
+    @Override
+    public Mono<? extends Artifact> validateAndPublishArtifact(Artifact artifact, boolean publish) {
+        return publishArtifact(artifact, publish);
+    }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java

@@ -2245,10 +2245,8 @@ public Mono<? extends Artifact> discardChanges(String branchedArtifactId, Artifa
 
         Mono<? extends Artifact> branchedArtifactMonoCached =
                 gitArtifactHelper.getArtifactById(branchedArtifactId, artifactEditPermission);
-        Mono<? extends Artifact> discardChangeMono;
 
-        // Rehydrate the artifact from local file system
-        discardChangeMono = branchedArtifactMonoCached
+        Mono<? extends Artifact> discardChangeMono = branchedArtifactMonoCached
                 .flatMap(branchedArtifact -> {
                     GitArtifactMetadata branchedGitData = branchedArtifact.getGitArtifactMetadata();
                     if (branchedGitData == null || !hasText(branchedGitData.getDefaultArtifactId())) {
@@ -2288,14 +2286,19 @@ public Mono<? extends Artifact> discardChanges(String branchedArtifactId, Artifa
                                     artifactExchangeJson,
                                     branchName))
                             // Update the last deployed status after the rebase
-                            .flatMap(importedArtifact -> publishArtifact(importedArtifact, true));
+                            .flatMap(importedArtifact ->
+                                    gitApplicationHelper.validateAndPublishArtifact(importedArtifact, true));
                 })
-                .flatMap(branchedArtifact -> releaseFileLock(
-                                branchedArtifact.getGitArtifactMetadata().getDefaultArtifactId())
-                        .then(this.addAnalyticsForGitOperation(
-                                AnalyticsEvents.GIT_DISCARD_CHANGES, branchedArtifact, null)))
+                .flatMap(branchedArtifact ->
+                        this.addAnalyticsForGitOperation(AnalyticsEvents.GIT_DISCARD_CHANGES, branchedArtifact, null))
                 .name(GitSpan.OPS_DISCARD_CHANGES)
-                .tap(Micrometer.observation(observationRegistry));
+                .tap(Micrometer.observation(observationRegistry))
+                .doFinally(signalType -> {
+                    branchedArtifactMonoCached
+                            .flatMap(branchedArtifact -> releaseFileLock(
+                                    branchedArtifact.getGitArtifactMetadata().getDefaultArtifactId()))
+                            .subscribe();
+                });
 
         return Mono.create(
                 sink -> discardChangeMono.subscribe(sink::success, sink::error, null, sink.currentContext()));

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitArtifactHelperCE.java

@@ -68,4 +68,6 @@ public interface GitArtifactHelperCE<T extends Artifact> {
     T getNewArtifact(String workspaceId, String repoName);
 
     Mono<T> publishArtifactPostCommit(Artifact committedArtifact);
+
+    Mono<? extends Artifact> validateAndPublishArtifact(Artifact artifact, boolean publish);
 }

app/server/appsmith-server/src/test/java/com/appsmith/server/testhelpers/git/GitFileSystemTestHelper.java

@@ -64,6 +64,18 @@ public void setupGitRepository(
         // checkout to the new branch
         gitExecutor.createAndCheckoutToBranch(suffix, branchName).block();
 
+        commitArtifact(workspaceId, applicationId, branchName, repoName, applicationJson, "commit message two");
+    }
+
+    public void commitArtifact(
+            String workspaceId,
+            String applicationId,
+            String branchName,
+            String repoName,
+            ApplicationJson applicationJson,
+            String commitMessage)
+            throws GitAPIException, IOException {
+        Path suffix = Paths.get(workspaceId, applicationId, repoName);
         // saving the files into the git repository from application json
         // The files would later be saved in this git repository from resources section instead of applicationJson
         commonGitFileUtils
@@ -72,7 +84,7 @@ public void setupGitRepository(
 
         // commit the application
         gitExecutor
-                .commitArtifact(suffix, "commit message two", "user", "[email protected]", true, false)
+                .commitArtifact(suffix, commitMessage, "user", "[email protected]", true, false)
                 .block();
     }