software.amazon.awssdk.services.codecommit.model

Interface Conflict.Builder

All Superinterfaces:

Buildable, CopyableBuilder<Conflict.Builder,Conflict>, SdkBuilder<Conflict.Builder,Conflict>, SdkPojo

Enclosing class:

Conflict

public static interface Conflict.Builder
extends SdkPojo, CopyableBuilder<Conflict.Builder,Conflict>

Method Summary

Modifier and Type	Method and Description
Conflict.Builder	conflictMetadata(ConflictMetadata conflictMetadata) Metadata about a conflict in a merge operation.
default Conflict.Builder	conflictMetadata(Consumer<ConflictMetadata.Builder> conflictMetadata) Metadata about a conflict in a merge operation.
Conflict.Builder	mergeHunks(Collection<MergeHunk> mergeHunks) A list of hunks that contain the differences between files or lines causing the conflict.
Conflict.Builder	mergeHunks(Consumer<MergeHunk.Builder>... mergeHunks) A list of hunks that contain the differences between files or lines causing the conflict.
Conflict.Builder	mergeHunks(MergeHunk... mergeHunks) A list of hunks that contain the differences between files or lines causing the conflict.

Methods inherited from interface software.amazon.awssdk.core.SdkPojo

equalsBySdkFields, sdkFields

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

copy

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

applyMutation, build

Method Detail

conflictMetadata

Conflict.Builder conflictMetadata(ConflictMetadata conflictMetadata)

Metadata about a conflict in a merge operation.

Parameters:

conflictMetadata - Metadata about a conflict in a merge operation.

Returns:

Returns a reference to this object so that method calls can be chained together.

conflictMetadata

default Conflict.Builder conflictMetadata(Consumer<ConflictMetadata.Builder> conflictMetadata)

Metadata about a conflict in a merge operation.

This is a convenience method that creates an instance of the ConflictMetadata.Builder avoiding the need to create one manually via ConflictMetadata.builder().

When the Consumer completes, SdkBuilder.build() is called immediately and its result is passed to conflictMetadata(ConflictMetadata).

Parameters:

conflictMetadata - a consumer that will call methods on ConflictMetadata.Builder

Returns:

Returns a reference to this object so that method calls can be chained together.

See Also:

conflictMetadata(ConflictMetadata)

mergeHunks

Conflict.Builder mergeHunks(Collection<MergeHunk> mergeHunks)

A list of hunks that contain the differences between files or lines causing the conflict.

Parameters:

mergeHunks - A list of hunks that contain the differences between files or lines causing the conflict.

Returns:

Returns a reference to this object so that method calls can be chained together.

mergeHunks

Conflict.Builder mergeHunks(MergeHunk... mergeHunks)

A list of hunks that contain the differences between files or lines causing the conflict.

Parameters:

mergeHunks - A list of hunks that contain the differences between files or lines causing the conflict.

Returns:

Returns a reference to this object so that method calls can be chained together.

mergeHunks

Conflict.Builder mergeHunks(Consumer<MergeHunk.Builder>... mergeHunks)

A list of hunks that contain the differences between files or lines causing the conflict.

This is a convenience method that creates an instance of the MergeHunk.Builder avoiding the need to create one manually via MergeHunk.builder().

When the Consumer completes, SdkBuilder.build() is called immediately and its result is passed to #mergeHunks(List).

Parameters:

mergeHunks - a consumer that will call methods on MergeHunk.Builder

Returns:

Returns a reference to this object so that method calls can be chained together.

See Also:

#mergeHunks(java.util.Collection)