Package com.atlassian.bamboo.plan.branch
Class BranchIntegrationHelperImpl
- java.lang.Object
-
- com.atlassian.bamboo.plan.branch.BranchIntegrationHelperImpl
-
- All Implemented Interfaces:
VcsBranchIntegrationHelper
public class BranchIntegrationHelperImpl extends Object implements VcsBranchIntegrationHelper
-
-
Constructor Summary
Constructors Constructor Description BranchIntegrationHelperImpl(AdministrationConfigurationAccessor administrationConfigurationAccessor, CustomVariableContext customVariableContext)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description String
getCommitterEmail()
String
getCommitterName()
String
getIntegrationCommitMessage()
@Nullable VcsBranch
getIntegrationVcsBranch(@NotNull BuildContext buildContext)
@Nullable PlanRepositoryDefinition
getIntegrationVcsRepository(@NotNull BuildContext buildContext)
@NotNull MergeResult
merge(@NotNull BuildContext buildContext, @NotNull VcsRepositoryData defaultRepositoryDefinition, @NotNull VcsRepositoryModuleDescriptor moduleDescriptor, @NotNull VcsBranch integrationBranch, @NotNull File mergeDir, @Nullable BuildLogger logger)
void
mergeAndUpdateResult(@NotNull BuildContext buildContext, @NotNull PlanRepositoryDefinition defaultRepositoryDef, @NotNull VcsRepositoryModuleDescriptor moduleDescriptor, @NotNull MergeResultContext mergeResult, @NotNull File mergeDir, @Nullable BuildLogger buildLogger, @NotNull Consumer<MergeResult> mergeResultConsumer, @NotNull Runnable afterMergeFinished)
protected @NotNull String
toBuildLogger(@Nullable BuildLogger logger, @NotNull String msg)
-
-
-
Constructor Detail
-
BranchIntegrationHelperImpl
public BranchIntegrationHelperImpl(AdministrationConfigurationAccessor administrationConfigurationAccessor, CustomVariableContext customVariableContext)
-
-
Method Detail
-
getIntegrationCommitMessage
public String getIntegrationCommitMessage()
- Specified by:
getIntegrationCommitMessage
in interfaceVcsBranchIntegrationHelper
-
getCommitterName
public String getCommitterName()
- Specified by:
getCommitterName
in interfaceVcsBranchIntegrationHelper
-
getCommitterEmail
public String getCommitterEmail()
- Specified by:
getCommitterEmail
in interfaceVcsBranchIntegrationHelper
-
toBuildLogger
@NotNull protected @NotNull String toBuildLogger(@Nullable @Nullable BuildLogger logger, @NotNull @NotNull String msg)
-
getIntegrationVcsRepository
@Nullable public @Nullable PlanRepositoryDefinition getIntegrationVcsRepository(@NotNull @NotNull BuildContext buildContext)
- Specified by:
getIntegrationVcsRepository
in interfaceVcsBranchIntegrationHelper
- Returns:
-
getIntegrationVcsBranch
@Nullable public @Nullable VcsBranch getIntegrationVcsBranch(@NotNull @NotNull BuildContext buildContext)
- Specified by:
getIntegrationVcsBranch
in interfaceVcsBranchIntegrationHelper
- Returns:
-
merge
@NotNull public @NotNull MergeResult merge(@NotNull @NotNull BuildContext buildContext, @NotNull @NotNull VcsRepositoryData defaultRepositoryDefinition, @NotNull @NotNull VcsRepositoryModuleDescriptor moduleDescriptor, @NotNull @NotNull VcsBranch integrationBranch, @NotNull @NotNull File mergeDir, @Nullable @Nullable BuildLogger logger) throws RepositoryException
- Specified by:
merge
in interfaceVcsBranchIntegrationHelper
- Throws:
RepositoryException
-
mergeAndUpdateResult
public void mergeAndUpdateResult(@NotNull @NotNull BuildContext buildContext, @NotNull @NotNull PlanRepositoryDefinition defaultRepositoryDef, @NotNull @NotNull VcsRepositoryModuleDescriptor moduleDescriptor, @NotNull @NotNull MergeResultContext mergeResult, @NotNull @NotNull File mergeDir, @Nullable @Nullable BuildLogger buildLogger, @NotNull @NotNull Consumer<MergeResult> mergeResultConsumer, @NotNull @NotNull Runnable afterMergeFinished)
- Specified by:
mergeAndUpdateResult
in interfaceVcsBranchIntegrationHelper
-
-