Skip to content

chore: package refactors and left over changes for git autocommit pr #33768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sondermanish merged 2 commits into from
May 29, 2024
Merged

chore: package refactors and left over changes for git autocommit pr #33768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8328f61
added leftover changes
sondermanish May 27, 2024
5130215
added refactors
sondermanish May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/ce/autocommit/AutoCommitTriggerDTO.java → ...ith/server/dtos/AutoCommitTriggerDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.appsmith.server.helpers.ce.autocommit;
package com.appsmith.server.dtos;

import lombok.AllArgsConstructor;
import lombok.Data;
Expand Down
3 changes: 3 additions & 0 deletions app/server/appsmith-server/src/main/java/com/appsmith/server/git/AutoCommitEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.appsmith.server.git;

public interface AutoCommitEventHandler extends AutoCommitEventHandlerCE {}
2 changes: 1 addition & 1 deletion ...olutions/ce/AutoCommitEventHandlerCE.java → .../server/git/AutoCommitEventHandlerCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.appsmith.server.solutions.ce;
package com.appsmith.server.git;

import com.appsmith.server.events.AutoCommitEvent;
import reactor.core.publisher.Mono;
Expand Down
2 changes: 1 addition & 1 deletion ...ions/ce/AutoCommitEventHandlerCEImpl.java → ...ver/git/AutoCommitEventHandlerCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.appsmith.server.solutions.ce;
package com.appsmith.server.git;

import com.appsmith.external.constants.AnalyticsEvents;
import com.appsmith.external.dtos.ModifiedResources;
Expand Down
3 changes: 1 addition & 2 deletions ...solutions/AutoCommitEventHandlerImpl.java → ...erver/git/AutoCommitEventHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.appsmith.server.solutions;
package com.appsmith.server.git;

import com.appsmith.external.git.GitExecutor;
import com.appsmith.server.configurations.ProjectProperties;
Expand All @@ -7,7 +7,6 @@
import com.appsmith.server.helpers.GitFileUtils;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.services.AnalyticsService;
import com.appsmith.server.solutions.ce.AutoCommitEventHandlerCEImpl;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component;

Expand Down
10 changes: 6 additions & 4 deletions app/server/appsmith-server/src/main/java/com/appsmith/server/git/GitRedisUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,19 @@ public class GitRedisUtils {

private final RedisUtils redisUtils;

public Mono<Boolean> addFileLock(String defaultApplicationId) {
public Mono<Boolean> addFileLock(String defaultApplicationId, Boolean isRetryAllowed) {
long numberOfRetries = Boolean.TRUE.equals(isRetryAllowed) ? MAX_RETRIES : 0L;

return redisUtils
.addFileLock(defaultApplicationId)
.retryWhen(Retry.fixedDelay(MAX_RETRIES, RETRY_DELAY)
.retryWhen(Retry.fixedDelay(numberOfRetries, RETRY_DELAY)
.onRetryExhaustedThrow((retryBackoffSpec, retrySignal) -> {
throw new AppsmithException(AppsmithError.GIT_FILE_IN_USE);
}));
}

public Mono<Boolean> addFileLockWithoutRetry(String defaultApplicationId) {
return redisUtils.addFileLock(defaultApplicationId);
public Mono<Boolean> addFileLock(String defaultApplicationId) {
return addFileLock(defaultApplicationId, Boolean.TRUE);
}

public Mono<Boolean> releaseFileLock(String defaultApplicationId) {
Expand Down
3 changes: 2 additions & 1 deletion ...tocommit/AutoCommitEligibilityHelper.java → .../helpers/AutoCommitEligibilityHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.appsmith.server.helpers.ce.autocommit;
package com.appsmith.server.git.autocommit.helpers;

import com.appsmith.server.domains.GitArtifactMetadata;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import com.appsmith.server.dtos.PageDTO;
import reactor.core.publisher.Mono;

Expand Down
3 changes: 2 additions & 1 deletion ...oCommitEligibilityHelperFallbackImpl.java → ...oCommitEligibilityHelperFallbackImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.appsmith.server.helpers.ce.autocommit;
package com.appsmith.server.git.autocommit.helpers;

import com.appsmith.server.domains.GitArtifactMetadata;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import com.appsmith.server.dtos.PageDTO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
Expand Down
5 changes: 3 additions & 2 deletions ...mmit/AutoCommitEligibilityHelperImpl.java → ...pers/AutoCommitEligibilityHelperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.appsmith.server.helpers.ce.autocommit;
package com.appsmith.server.git.autocommit.helpers;

import com.appsmith.external.annotations.FeatureFlagged;
import com.appsmith.external.enums.FeatureFlagEnum;
import com.appsmith.server.constants.ArtifactType;
import com.appsmith.server.domains.GitArtifactMetadata;
import com.appsmith.server.domains.Layout;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.git.GitRedisUtils;
import com.appsmith.server.helpers.CommonGitFileUtils;
Expand Down Expand Up @@ -54,7 +55,7 @@ public Mono<Boolean> isServerAutoCommitRequired(String workspaceId, GitArtifactM
.defaultIfEmpty(FALSE)
.cache();

return Mono.defer(() -> gitRedisUtils.addFileLockWithoutRetry(defaultApplicationId))
return Mono.defer(() -> gitRedisUtils.addFileLock(defaultApplicationId, FALSE))
Copy link
Contributor

@coderabbitai coderabbitai bot May 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tip

Codebase Verification

The search results indicate that several instances of addFileLock across different files do not include the isRetryAllowed parameter. These instances need to be updated to use the new method signature.

Files and Instances to Update:

  • AutoCommitEventHandlerCEImpl.java

    • private Mono<Boolean> addFileLock(String defaultApplicationId)
    • .addFileLock(defaultApplicationId)
    • return addFileLock(autoCommitEvent.getApplicationId())
    • return addFileLock(defaultApplicationId)

  • CommonGitServiceCEImpl.java

    • return Mono.defer(() -> addFileLock(defaultArtifactId))
    • private Mono<Boolean> addFileLock(String defaultArtifactId)
    • .addFileLock(defaultArtifactId)
    • Mono<Boolean> fileLockMono = Mono.defer(() -> addFileLock(defaultArtifactId))
    • addFileLockMono = addFileLock(defaultArtifactId)
    • return addFileLock(tuple3.getT1().getDefaultArtifactId()).then(Mono.just(tuple3))
    • return addFileLock(gitData.getDefaultArtifactId()).then(Mono.just(artifact))
    • return addFileLock(artifact.getGitArtifactMetadata().getDefaultArtifactId())
    • sourceAritfactMono = addFileLock(defaultArtifactId)
    • Mono<? extends Artifact> checkoutRemoteBranchMono = addFileLock(defaultArtifactId)
    • return addFileLock(srcBranchGitData.getDefaultArtifactId())
    • return addFileLock(gitMetadata.getDefaultArtifactId())
    • .flatMap(defaultArtifact -> addFileLock(defaultArtifactId).map(status -> defaultArtifact))
    • .flatMap(branchedArtifact -> addFileLock(defaultArtifactId).thenReturn(branchedArtifact))
    • return addFileLock(gitData.getDefaultArtifactId()).then(Mono.just(defaultArtifact))
    • return addFileLock(defaultArtifactId)
    • return addFileLock(metadata.getDefaultArtifactId())
    • return addFileLock(defaultArtifact.getId())

  • RedisUtils.java

    • public Mono<Boolean> addFileLock(String key)

  • AutoCommitEligibilityHelperTest.java

    • Mockito.when(redisUtils.addFileLock(DEFAULT_APPLICATION_ID)).thenReturn(Mono.just(Boolean.TRUE))

Action Required:

Update the above instances to include the isRetryAllowed parameter in the method calls to addFileLock.

Analysis chain

Update to use the new addFileLock method signature with retry control.

Verify all instances of addFileLock are updated to use the new method signature with isRetryAllowed.

Verify specific instances of addFileLock without the isRetryAllowed parameter.

Scripts Executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify integration of the new `addFileLock` method in the system.

# Test: Search for other usages of `addFileLock` to ensure they are updated.
rg --type java $'addFileLock'

Length of output: 10755

Script:

#!/bin/bash
# Description: Verify all instances of `addFileLock` are updated to use the new method signature with `isRetryAllowed`.

# Test: Search for method definitions and usages of `addFileLock` to ensure they include the `isRetryAllowed` parameter.
rg --type java 'addFileLock\('

Length of output: 8737

Script:

#!/bin/bash
# Description: Extract lines from specific files to verify if `addFileLock` needs updating.

# Files to check
files=(
  "app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AutoCommitEventHandlerCEImpl.java"
  "app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCEImpl.java"
  "app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RedisUtils.java"
  "app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/autocommit/AutoCommitEligibilityHelperTest.java"
)

# Extract lines containing `addFileLock` without `isRetryAllowed`
for file in "${files[@]}"; do
  echo "Checking $file"
  rg 'addFileLock\([^,]*\)' "$file"
done

Length of output: 3826

Copy link
Contributor

@coderabbitai coderabbitai bot May 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tip

Codebase Verification

The verification process has revealed that the addFileLock method has been updated to include the isRetryAllowed parameter in GitRedisUtils.java. However, there are multiple instances across the codebase where the old method signature is still being used without the new parameter.

  • GitServiceCEImpl.java: Multiple instances of addFileLock without the isRetryAllowed parameter.
  • CommonGitServiceCEImpl.java: Multiple instances of addFileLock without the isRetryAllowed parameter.
  • AutoCommitEventHandlerCEImpl.java: Instances of addFileLock without the isRetryAllowed parameter.
  • RedisUtils.java: Instances of addFileLock without the isRetryAllowed parameter.

These instances need to be updated to ensure consistency with the new method signature.

Analysis chain

The updated usage of addFileLock with the isRetryAllowed parameter reflects the method signature change. Ensure that this change is handled correctly in all relevant parts of the application.

Scripts Executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify usage of the updated addFileLock method across the project.

# Test: Search for the usage of addFileLock with the new parameter. Expect: Proper usage across the project.
rg --type java $'addFileLock'

Length of output: 10721

Script:

#!/bin/bash
# Description: Verify the method signature and usage of addFileLock in the identified files.

# Check the method signature in GitRedisUtils.java
echo "Checking method signature in GitRedisUtils.java"
rg --type java --context 5 'public Mono<Boolean> addFileLock' app/server/appsmith-server/src/main/java/com/appsmith/server/git/GitRedisUtils.java

# Check the usage in AutoCommitEligibilityHelperImpl.java
echo "Checking usage in AutoCommitEligibilityHelperImpl.java"
rg --type java --context 5 'addFileLock' app/server/appsmith-server/src/main/java/com/appsmith/server/git/autocommit/helpers/AutoCommitEligibilityHelperImpl.java

# Check the usage in GitServiceCEImpl.java
echo "Checking usage in GitServiceCEImpl.java"
rg --type java --context 5 'addFileLock' app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java

# Check the usage in CommonGitServiceCEImpl.java
echo "Checking usage in CommonGitServiceCEImpl.java"
rg --type java --context 5 'addFileLock' app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCEImpl.java

# Check the usage in AutoCommitEventHandlerCEImpl.java
echo "Checking usage in AutoCommitEventHandlerCEImpl.java"
rg --type java --context 5 'addFileLock' app/server/appsmith-server/src/main/java/com/appsmith/server/git/AutoCommitEventHandlerCEImpl.java

# Check the usage in RedisUtils.java
echo "Checking usage in RedisUtils.java"
rg --type java --context 5 'addFileLock' app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/RedisUtils.java

Length of output: 29273

.then(Mono.defer(() -> isServerMigrationRequiredMonoCached))
.then(Mono.defer(() -> gitRedisUtils.releaseFileLock(defaultApplicationId)))
.then(Mono.defer(() -> isServerMigrationRequiredMonoCached))
Expand Down
3 changes: 2 additions & 1 deletion ...rs/ce/autocommit/GitAutoCommitHelper.java → ...tocommit/helpers/GitAutoCommitHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.appsmith.server.helpers.ce.autocommit;
package com.appsmith.server.git.autocommit.helpers;

import com.appsmith.server.dtos.AutoCommitProgressDTO;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import reactor.core.publisher.Mono;

public interface GitAutoCommitHelper {
Expand Down
3 changes: 2 additions & 1 deletion ...mmit/GitAutoCommitHelperFallbackImpl.java → ...pers/GitAutoCommitHelperFallbackImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.appsmith.server.helpers.ce.autocommit;
package com.appsmith.server.git.autocommit.helpers;

import com.appsmith.server.dtos.AutoCommitProgressDTO;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;

Expand Down
5 changes: 3 additions & 2 deletions ...e/autocommit/GitAutoCommitHelperImpl.java → ...mmit/helpers/GitAutoCommitHelperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.appsmith.server.helpers.ce.autocommit;
package com.appsmith.server.git.autocommit.helpers;

import com.appsmith.external.annotations.FeatureFlagged;
import com.appsmith.external.enums.FeatureFlagEnum;
Expand All @@ -7,14 +7,15 @@
import com.appsmith.server.domains.GitArtifactMetadata;
import com.appsmith.server.domains.GitProfile;
import com.appsmith.server.dtos.AutoCommitProgressDTO;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import com.appsmith.server.events.AutoCommitEvent;
import com.appsmith.server.git.AutoCommitEventHandler;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.GitUtils;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.services.CommonGitService;
import com.appsmith.server.services.UserDataService;
import com.appsmith.server.solutions.ApplicationPermission;
import com.appsmith.server.solutions.AutoCommitEventHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Primary;
Expand Down
4 changes: 2 additions & 2 deletions ...ppsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import com.appsmith.server.clonepage.ClonePageService;
import com.appsmith.server.domains.ActionCollection;
import com.appsmith.server.domains.NewAction;
import com.appsmith.server.git.autocommit.helpers.AutoCommitEligibilityHelper;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.helpers.GitFileUtils;
import com.appsmith.server.helpers.ResponseUtils;
import com.appsmith.server.helpers.ce.autocommit.AutoCommitEligibilityHelper;
import com.appsmith.server.helpers.ce.autocommit.GitAutoCommitHelper;
import com.appsmith.server.layouts.UpdateLayoutService;
import com.appsmith.server.newactions.base.NewActionService;
import com.appsmith.server.newpages.base.NewPageService;
Expand Down
2 changes: 1 addition & 1 deletion ...rver/appsmith-server/src/main/java/com/appsmith/server/services/CommonGitServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import com.appsmith.server.configurations.EmailConfig;
import com.appsmith.server.domains.Application;
import com.appsmith.server.exports.internal.ExportService;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.helpers.ce.autocommit.GitAutoCommitHelper;
import com.appsmith.server.imports.internal.ImportService;
import com.appsmith.server.repositories.GitDeployKeysRepository;
import com.appsmith.server.services.ce_compatible.CommonGitServiceCECompatibleImpl;
Expand Down
2 changes: 1 addition & 1 deletion app/server/appsmith-server/src/main/java/com/appsmith/server/services/GitServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import com.appsmith.server.configurations.EmailConfig;
import com.appsmith.server.datasources.base.DatasourceService;
import com.appsmith.server.exports.internal.ExportService;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
import com.appsmith.server.helpers.GitFileUtils;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.helpers.ResponseUtils;
import com.appsmith.server.helpers.ce.autocommit.GitAutoCommitHelper;
import com.appsmith.server.imports.internal.ImportService;
import com.appsmith.server.newactions.base.NewActionService;
import com.appsmith.server.newpages.base.NewPageService;
Expand Down
4 changes: 2 additions & 2 deletions ...th-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
import com.appsmith.server.dtos.PluginTypeAndCountDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.git.autocommit.helpers.AutoCommitEligibilityHelper;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.helpers.GitFileUtils;
import com.appsmith.server.helpers.GitUtils;
import com.appsmith.server.helpers.ResponseUtils;
import com.appsmith.server.helpers.UserPermissionUtils;
import com.appsmith.server.helpers.ce.autocommit.AutoCommitEligibilityHelper;
import com.appsmith.server.helpers.ce.autocommit.GitAutoCommitHelper;
import com.appsmith.server.layouts.UpdateLayoutService;
import com.appsmith.server.migrations.ApplicationVersion;
import com.appsmith.server.newactions.base.NewActionService;
Expand Down
2 changes: 1 addition & 1 deletion ...appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.exports.internal.ExportService;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.GitDeployKeyGenerator;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.GitUtils;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.helpers.ce.autocommit.GitAutoCommitHelper;
import com.appsmith.server.imports.internal.ImportService;
import com.appsmith.server.repositories.GitDeployKeysRepository;
import com.appsmith.server.services.AnalyticsService;
Expand Down
2 changes: 1 addition & 1 deletion ...erver/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import com.appsmith.server.exports.internal.ExportService;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
Copy link
Contributor

@coderabbitai coderabbitai bot May 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The method commitApplication is complex and handles multiple scenarios. Consider refactoring to simplify the logic and improve readability, perhaps by breaking it down into smaller helper methods.

import com.appsmith.server.helpers.CollectionUtils;
import com.appsmith.server.helpers.GitDeployKeyGenerator;
import com.appsmith.server.helpers.GitFileUtils;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.GitUtils;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.helpers.ResponseUtils;
import com.appsmith.server.helpers.ce.autocommit.GitAutoCommitHelper;
import com.appsmith.server.imports.internal.ImportService;
import com.appsmith.server.migrations.JsonSchemaVersions;
import com.appsmith.server.newactions.base.NewActionService;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/appsmith/server/services/ce_compatible/CommonGitServiceCECompatibleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import com.appsmith.server.configurations.EmailConfig;
import com.appsmith.server.domains.Application;
import com.appsmith.server.exports.internal.ExportService;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.helpers.ce.autocommit.GitAutoCommitHelper;
import com.appsmith.server.imports.internal.ImportService;
import com.appsmith.server.repositories.GitDeployKeysRepository;
import com.appsmith.server.services.AnalyticsService;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/appsmith/server/services/ce_compatible/GitServiceCECompatibleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import com.appsmith.server.configurations.EmailConfig;
import com.appsmith.server.datasources.base.DatasourceService;
import com.appsmith.server.exports.internal.ExportService;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
import com.appsmith.server.helpers.GitFileUtils;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.helpers.ResponseUtils;
import com.appsmith.server.helpers.ce.autocommit.GitAutoCommitHelper;
import com.appsmith.server.imports.internal.ImportService;
import com.appsmith.server.newactions.base.NewActionService;
import com.appsmith.server.newpages.base.NewPageService;
Expand Down
5 changes: 0 additions & 5 deletions ...r/appsmith-server/src/main/java/com/appsmith/server/solutions/AutoCommitEventHandler.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...rc/test/java/com/appsmith/server/git/autocommit/ApplicationPageServiceAutoCommitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
import com.appsmith.server.domains.Layout;
import com.appsmith.server.domains.NewPage;
import com.appsmith.server.dtos.ApplicationJson;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.git.autocommit.helpers.AutoCommitEligibilityHelper;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.ce.autocommit.AutoCommitEligibilityHelper;
import com.appsmith.server.helpers.ce.autocommit.AutoCommitTriggerDTO;
import com.appsmith.server.migrations.JsonSchemaMigration;
import com.appsmith.server.migrations.JsonSchemaVersions;
import com.appsmith.server.newpages.base.NewPageService;
Expand Down Expand Up @@ -55,7 +55,7 @@
import java.util.Set;
import java.util.stream.Collectors;

import static com.appsmith.server.solutions.ce.AutoCommitEventHandlerCEImpl.AUTO_COMMIT_MSG_FORMAT;
import static com.appsmith.server.git.AutoCommitEventHandlerCEImpl.AUTO_COMMIT_MSG_FORMAT;
import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down
6 changes: 3 additions & 3 deletions ...rver/src/test/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.events.AutoCommitEvent;
import com.appsmith.server.featureflags.CachedFeatures;
import com.appsmith.server.git.AutoCommitEventHandler;
import com.appsmith.server.git.AutoCommitEventHandlerImpl;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.DSLMigrationUtils;
import com.appsmith.server.helpers.GitFileUtils;
Expand All @@ -22,8 +24,6 @@
import com.appsmith.server.migrations.JsonSchemaVersions;
import com.appsmith.server.services.AnalyticsService;
import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.solutions.AutoCommitEventHandler;
import com.appsmith.server.solutions.AutoCommitEventHandlerImpl;
import com.appsmith.server.testhelpers.git.GitFileSystemTestHelper;
import lombok.extern.slf4j.Slf4j;
import net.minidev.json.JSONObject;
Expand Down Expand Up @@ -54,7 +54,7 @@
import java.util.UUID;
import java.util.stream.Collectors;

import static com.appsmith.server.solutions.ce.AutoCommitEventHandlerCEImpl.AUTO_COMMIT_MSG_FORMAT;
import static com.appsmith.server.git.AutoCommitEventHandlerCEImpl.AUTO_COMMIT_MSG_FORMAT;
import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down
3 changes: 2 additions & 1 deletion ...mmit/AutoCommitEligibilityHelperTest.java → ...pers/AutoCommitEligibilityHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.appsmith.server.helpers.ce.autocommit;
package com.appsmith.server.git.autocommit.helpers;

import com.appsmith.external.dtos.ModifiedResources;
import com.appsmith.external.enums.FeatureFlagEnum;
Expand All @@ -8,6 +8,7 @@
import com.appsmith.server.domains.Layout;
import com.appsmith.server.domains.Theme;
import com.appsmith.server.dtos.ApplicationJson;
import com.appsmith.server.dtos.AutoCommitTriggerDTO;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.helpers.CommonGitFileUtils;
import com.appsmith.server.helpers.DSLMigrationUtils;
Expand Down
4 changes: 2 additions & 2 deletions ...tocommit/GitAutoCommitHelperImplTest.java → .../helpers/GitAutoCommitHelperImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.appsmith.server.helpers.ce.autocommit;
package com.appsmith.server.git.autocommit.helpers;

import com.appsmith.external.enums.FeatureFlagEnum;
import com.appsmith.server.acl.AclPermission;
Expand All @@ -10,13 +10,13 @@
import com.appsmith.server.domains.GitProfile;
import com.appsmith.server.dtos.AutoCommitProgressDTO;
import com.appsmith.server.events.AutoCommitEvent;
import com.appsmith.server.git.AutoCommitEventHandler;
import com.appsmith.server.helpers.GitPrivateRepoHelper;
import com.appsmith.server.helpers.RedisUtils;
import com.appsmith.server.services.CommonGitService;
import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.UserDataService;
import com.appsmith.server.solutions.ApplicationPermission;
import com.appsmith.server.solutions.AutoCommitEventHandler;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.jgit.lib.BranchTrackingStatus;
import org.junit.jupiter.api.AfterEach;
Expand Down