com.amazonaws.services.codecommit.model

Class Conflict

java.lang.Object

com.amazonaws.services.codecommit.model.Conflict

All Implemented Interfaces:

StructuredPojo, Serializable, Cloneable

@Generated(value="com.amazonaws:aws-java-sdk-code-generator")
public class Conflict
extends Object
implements Serializable, Cloneable, StructuredPojo

Information about conflicts in a merge operation.

See Also:

AWS API Documentation, Serialized Form

Constructor Summary

Constructors

Constructor and Description
Conflict()

Method Summary

Modifier and Type	Method and Description
Conflict	clone()
boolean	equals(Object obj)
ConflictMetadata	getConflictMetadata() Metadata about a conflict in a merge operation.
List<MergeHunk>	getMergeHunks() A list of hunks that contain the differences between files or lines causing the conflict.
int	hashCode()
void	marshall(ProtocolMarshaller protocolMarshaller) Marshalls this structured data using the given ProtocolMarshaller.
void	setConflictMetadata(ConflictMetadata conflictMetadata) Metadata about a conflict in a merge operation.
void	setMergeHunks(Collection<MergeHunk> mergeHunks) A list of hunks that contain the differences between files or lines causing the conflict.
String	toString() Returns a string representation of this object.
Conflict	withConflictMetadata(ConflictMetadata conflictMetadata) Metadata about a conflict in a merge operation.
Conflict	withMergeHunks(Collection<MergeHunk> mergeHunks) A list of hunks that contain the differences between files or lines causing the conflict.
Conflict	withMergeHunks(MergeHunk... mergeHunks) A list of hunks that contain the differences between files or lines causing the conflict.

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, wait, wait, wait

Constructor Detail

Conflict

public Conflict()

Method Detail

setConflictMetadata

public void setConflictMetadata(ConflictMetadata conflictMetadata)

Metadata about a conflict in a merge operation.

Parameters:

conflictMetadata - Metadata about a conflict in a merge operation.

getConflictMetadata

public ConflictMetadata getConflictMetadata()

Metadata about a conflict in a merge operation.

Returns:

Metadata about a conflict in a merge operation.

withConflictMetadata

public Conflict withConflictMetadata(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.

getMergeHunks

public List<MergeHunk> getMergeHunks()

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

Returns:

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

setMergeHunks

public void setMergeHunks(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.

withMergeHunks

public Conflict withMergeHunks(MergeHunk... mergeHunks)

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

NOTE: This method appends the values to the existing list (if any). Use setMergeHunks(java.util.Collection) or withMergeHunks(java.util.Collection) if you want to override the existing values.

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.

withMergeHunks

public Conflict withMergeHunks(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.

toString

public 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

Returns:

A string representation of this object.

See Also:

Object.toString()

equals

public boolean equals(Object obj)

Overrides:

equals in class Object

hashCode

public int hashCode()

Overrides:

hashCode in class Object

clone

public Conflict clone()

Overrides:

clone in class Object

marshall

public void marshall(ProtocolMarshaller protocolMarshaller)

Description copied from interface: StructuredPojo

Marshalls this structured data using the given ProtocolMarshaller.

Specified by:

marshall in interface StructuredPojo

Parameters:

protocolMarshaller - Implementation of ProtocolMarshaller used to marshall this object's data.