Skip to content
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

chore: checkout remote #38390

Open
wants to merge 6 commits into
base: release
Choose a base branch
from
Open

chore: checkout remote #38390

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f7c8ff
added autocommit and protected branches methods
sondermanish Dec 25, 2024
43626f8
spotless changes
sondermanish Dec 26, 2024
d443eeb
added suggested strings
sondermanish Dec 26, 2024
20cae3e
Merge remote-tracking branch 'origin/release' into chore/protected-br…
sondermanish Dec 27, 2024
61f8cf4
modifications to existing apis
sondermanish Dec 27, 2024
9737897
added changes
sondermanish Dec 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
18 changes: 15 additions & 3 deletions ...er/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
import com.appsmith.server.constants.ArtifactType;
import com.appsmith.server.domains.Artifact;
import com.appsmith.server.dtos.ArtifactImportDTO;
import com.appsmith.server.dtos.AutoCommitResponseDTO;
import com.appsmith.server.dtos.GitConnectDTO;
import reactor.core.publisher.Mono;

import java.util.List;

public interface CentralGitServiceCE {

Mono<? extends ArtifactImportDTO> importArtifactFromGit(
Expand Down Expand Up @@ -41,15 +44,24 @@ Mono<GitStatusDTO> getStatus(

Mono<? extends Artifact> checkoutReference(
String referenceArtifactId,
String referenceToBeCheckedOut,
GitRefDTO gitRefDTO,
boolean addFileLock,
ArtifactType artifactType,
GitType gitType,
RefType refType);
GitType gitType);

Mono<? extends Artifact> createReference(
String referencedArtifactId, GitRefDTO refDTO, ArtifactType artifactType, GitType gitType);

Mono<? extends Artifact> deleteGitReference(
String baseArtifactId, GitRefDTO gitRefDTO, ArtifactType artifactType, GitType gitType);

Mono<List<String>> updateProtectedBranches(
String baseArtifactId, List<String> branchNames, ArtifactType artifactType);

Mono<List<String>> getProtectedBranches(String baseArtifactId, ArtifactType artifactType);

Mono<Boolean> toggleAutoCommitEnabled(String baseArtifactId, ArtifactType artifactType);

Mono<AutoCommitResponseDTO> getAutoCommitProgress(
String baseArtifactId, String branchName, ArtifactType artifactType);
}
10 changes: 8 additions & 2 deletions ...rver/src/main/java/com/appsmith/server/git/central/CentralGitServiceCECompatibleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.appsmith.server.datasources.base.DatasourceService;
import com.appsmith.server.exports.internal.ExportService;
import com.appsmith.server.git.GitRedisUtils;
import com.appsmith.server.git.autocommit.helpers.GitAutoCommitHelper;
import com.appsmith.server.git.resolver.GitArtifactHelperResolver;
import com.appsmith.server.git.resolver.GitHandlingServiceResolver;
import com.appsmith.server.git.utils.GitAnalyticsUtils;
Expand All @@ -17,13 +18,15 @@
import io.micrometer.observation.ObservationRegistry;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.reactive.TransactionalOperator;

@Slf4j
@Service
public class CentralGitServiceCECompatibleImpl extends CentralGitServiceCEImpl
implements CentralGitServiceCECompatible {

public CentralGitServiceCECompatibleImpl(
GitRedisUtils gitRedisUtils,
GitProfileUtils gitProfileUtils,
GitAnalyticsUtils gitAnalyticsUtils,
UserDataService userDataService,
Expand All @@ -37,9 +40,11 @@ public CentralGitServiceCECompatibleImpl(
PluginService pluginService,
ImportService importService,
ExportService exportService,
GitRedisUtils gitRedisUtils,
GitAutoCommitHelper gitAutoCommitHelper,
TransactionalOperator transactionalOperator,
ObservationRegistry observationRegistry) {
super(
gitRedisUtils,
gitProfileUtils,
gitAnalyticsUtils,
userDataService,
Expand All @@ -53,7 +58,8 @@ public CentralGitServiceCECompatibleImpl(
pluginService,
importService,
exportService,
gitRedisUtils,
gitAutoCommitHelper,
transactionalOperator,
observationRegistry);
}
}
Loading
Loading