Package software.amazon.awssdk.services.codecommit.model

Class MergeBranchesByThreeWayRequest

java.lang.Object

software.amazon.awssdk.core.SdkRequest

software.amazon.awssdk.awscore.AwsRequest

software.amazon.awssdk.services.codecommit.model.CodeCommitRequest

software.amazon.awssdk.services.codecommit.model.MergeBranchesByThreeWayRequest

All Implemented Interfaces:

SdkPojo, ToCopyableBuilder<MergeBranchesByThreeWayRequest.Builder,MergeBranchesByThreeWayRequest>

@Generated("software.amazon.awssdk:codegen")
public final class MergeBranchesByThreeWayRequest
extends CodeCommitRequest
implements ToCopyableBuilder<MergeBranchesByThreeWayRequest.Builder,MergeBranchesByThreeWayRequest>

Nested Class Summary

Nested Classes

Modifier and Type	Class	Description
static interface	MergeBranchesByThreeWayRequest.Builder

Method Summary

Modifier and Type	Method	Description
String	authorName()	The name of the author who created the commit.
static MergeBranchesByThreeWayRequest.Builder	builder()
String	commitMessage()	The commit message to include in the commit information for the merge.
ConflictDetailLevelTypeEnum	conflictDetailLevel()	The level of conflict detail to use.
String	conflictDetailLevelAsString()	The level of conflict detail to use.
ConflictResolution	conflictResolution()	If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.
ConflictResolutionStrategyTypeEnum	conflictResolutionStrategy()	Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
String	conflictResolutionStrategyAsString()	Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file.
String	destinationCommitSpecifier()	The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
String	email()	The email address of the person merging the branches.
boolean	equals(Object obj)
boolean	equalsBySdkFields(Object obj)
<T> Optional<T>	getValueForField(String fieldName, Class<T> clazz)
int	hashCode()
Boolean	keepEmptyFolders()	If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty.
String	repositoryName()	The name of the repository where you want to merge two branches.
List<SdkField<?>>	sdkFields()
static Class<? extends MergeBranchesByThreeWayRequest.Builder>	serializableBuilderClass()
String	sourceCommitSpecifier()	The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).
String	targetBranch()	The branch where the merge is applied.
MergeBranchesByThreeWayRequest.Builder	toBuilder()
String	toString()	Returns a string representation of this object.

Methods inherited from class software.amazon.awssdk.awscore.AwsRequest

overrideConfiguration

Methods inherited from class java.lang.Object

clone, finalize, getClass, notify, notifyAll, wait, wait, wait

Methods inherited from interface software.amazon.awssdk.utils.builder.ToCopyableBuilder

copy

Method Detail

repositoryName

public final String repositoryName()

The name of the repository where you want to merge two branches.

Returns:

The name of the repository where you want to merge two branches.

sourceCommitSpecifier

public final String sourceCommitSpecifier()

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

Returns:

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

destinationCommitSpecifier

public final String destinationCommitSpecifier()

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

Returns:

The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).

targetBranch

public final String targetBranch()

The branch where the merge is applied.

Returns:

The branch where the merge is applied.

conflictDetailLevel

public final ConflictDetailLevelTypeEnum conflictDetailLevel()

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

If the service returns an enum value that is not available in the current SDK version, conflictDetailLevel will return ConflictDetailLevelTypeEnum.UNKNOWN_TO_SDK_VERSION. The raw value returned by the service is available from conflictDetailLevelAsString().

Returns:

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

See Also:

ConflictDetailLevelTypeEnum

conflictDetailLevelAsString

public final String conflictDetailLevelAsString()

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

If the service returns an enum value that is not available in the current SDK version, conflictDetailLevel will return ConflictDetailLevelTypeEnum.UNKNOWN_TO_SDK_VERSION. The raw value returned by the service is available from conflictDetailLevelAsString().

Returns:

The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.

See Also:

ConflictDetailLevelTypeEnum

conflictResolutionStrategy

public final ConflictResolutionStrategyTypeEnum conflictResolutionStrategy()

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

If the service returns an enum value that is not available in the current SDK version, conflictResolutionStrategy will return ConflictResolutionStrategyTypeEnum.UNKNOWN_TO_SDK_VERSION . The raw value returned by the service is available from conflictResolutionStrategyAsString().

Returns:

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

See Also:

ConflictResolutionStrategyTypeEnum

conflictResolutionStrategyAsString

public final String conflictResolutionStrategyAsString()

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

If the service returns an enum value that is not available in the current SDK version, conflictResolutionStrategy will return ConflictResolutionStrategyTypeEnum.UNKNOWN_TO_SDK_VERSION . The raw value returned by the service is available from conflictResolutionStrategyAsString().

Returns:

Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.

See Also:

ConflictResolutionStrategyTypeEnum

authorName

public final String authorName()

The name of the author who created the commit. This information is used as both the author and committer for the commit.

Returns:

The name of the author who created the commit. This information is used as both the author and committer for the commit.

email

public final String email()

The email address of the person merging the branches. This information is used in the commit information for the merge.

Returns:

The email address of the person merging the branches. This information is used in the commit information for the merge.

commitMessage

public final String commitMessage()

The commit message to include in the commit information for the merge.

Returns:

The commit message to include in the commit information for the merge.

keepEmptyFolders

public final Boolean keepEmptyFolders()

If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.

Returns:

If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.

conflictResolution

public final ConflictResolution conflictResolution()

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

Returns:

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

toBuilder

public MergeBranchesByThreeWayRequest.Builder toBuilder()

Specified by:

toBuilder in interface ToCopyableBuilder<MergeBranchesByThreeWayRequest.Builder,MergeBranchesByThreeWayRequest>

Specified by:

toBuilder in class CodeCommitRequest

builder

public static MergeBranchesByThreeWayRequest.Builder builder()

serializableBuilderClass

public static Class<? extends MergeBranchesByThreeWayRequest.Builder> serializableBuilderClass()

hashCode

public final int hashCode()

Overrides:

hashCode in class AwsRequest

equals

public final boolean equals(Object obj)

Overrides:

equals in class AwsRequest

equalsBySdkFields

public final boolean equalsBySdkFields(Object obj)

Specified by:

equalsBySdkFields in interface SdkPojo

toString

public final String toString()

Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be redacted from this string using a placeholder value.

Overrides:

toString in class Object

getValueForField

public final <T> Optional<T> getValueForField(String fieldName,
                                              Class<T> clazz)

Overrides:

getValueForField in class SdkRequest

sdkFields

public final List<SdkField<?>> sdkFields()

Specified by:

sdkFields in interface SdkPojo