com.amazonaws.services.codecommit.model

Class ConflictResolution

java.lang.Object

com.amazonaws.services.codecommit.model.ConflictResolution

All Implemented Interfaces:

StructuredPojo, Serializable, Cloneable

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

A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.

See Also:

AWS API Documentation, Serialized Form

Constructor Summary

Constructors

Constructor and Description
ConflictResolution()

Method Summary

Modifier and Type	Method and Description
ConflictResolution	clone()
boolean	equals(Object obj)
List<DeleteFileEntry>	getDeleteFiles() Files that will be deleted as part of the merge conflict resolution.
List<ReplaceContentEntry>	getReplaceContents() Files that will have content replaced as part of the merge conflict resolution.
List<SetFileModeEntry>	getSetFileModes() File modes that will be set as part of the merge conflict resolution.
int	hashCode()
void	marshall(ProtocolMarshaller protocolMarshaller) Marshalls this structured data using the given ProtocolMarshaller.
void	setDeleteFiles(Collection<DeleteFileEntry> deleteFiles) Files that will be deleted as part of the merge conflict resolution.
void	setReplaceContents(Collection<ReplaceContentEntry> replaceContents) Files that will have content replaced as part of the merge conflict resolution.
void	setSetFileModes(Collection<SetFileModeEntry> setFileModes) File modes that will be set as part of the merge conflict resolution.
String	toString() Returns a string representation of this object.
ConflictResolution	withDeleteFiles(Collection<DeleteFileEntry> deleteFiles) Files that will be deleted as part of the merge conflict resolution.
ConflictResolution	withDeleteFiles(DeleteFileEntry... deleteFiles) Files that will be deleted as part of the merge conflict resolution.
ConflictResolution	withReplaceContents(Collection<ReplaceContentEntry> replaceContents) Files that will have content replaced as part of the merge conflict resolution.
ConflictResolution	withReplaceContents(ReplaceContentEntry... replaceContents) Files that will have content replaced as part of the merge conflict resolution.
ConflictResolution	withSetFileModes(Collection<SetFileModeEntry> setFileModes) File modes that will be set as part of the merge conflict resolution.
ConflictResolution	withSetFileModes(SetFileModeEntry... setFileModes) File modes that will be set as part of the merge conflict resolution.

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, wait, wait, wait

Constructor Detail

ConflictResolution

public ConflictResolution()

Method Detail

getReplaceContents

public List<ReplaceContentEntry> getReplaceContents()

Files that will have content replaced as part of the merge conflict resolution.

Returns:

Files that will have content replaced as part of the merge conflict resolution.

setReplaceContents

public void setReplaceContents(Collection<ReplaceContentEntry> replaceContents)

Files that will have content replaced as part of the merge conflict resolution.

Parameters:

replaceContents - Files that will have content replaced as part of the merge conflict resolution.

withReplaceContents

public ConflictResolution withReplaceContents(ReplaceContentEntry... replaceContents)

Files that will have content replaced as part of the merge conflict resolution.

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

Parameters:

replaceContents - Files that will have content replaced as part of the merge conflict resolution.

Returns:

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

withReplaceContents

public ConflictResolution withReplaceContents(Collection<ReplaceContentEntry> replaceContents)

Files that will have content replaced as part of the merge conflict resolution.

Parameters:

replaceContents - Files that will have content replaced as part of the merge conflict resolution.

Returns:

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

getDeleteFiles

public List<DeleteFileEntry> getDeleteFiles()

Files that will be deleted as part of the merge conflict resolution.

Returns:

Files that will be deleted as part of the merge conflict resolution.

setDeleteFiles

public void setDeleteFiles(Collection<DeleteFileEntry> deleteFiles)

Files that will be deleted as part of the merge conflict resolution.

Parameters:

deleteFiles - Files that will be deleted as part of the merge conflict resolution.

withDeleteFiles

public ConflictResolution withDeleteFiles(DeleteFileEntry... deleteFiles)

Files that will be deleted as part of the merge conflict resolution.

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

Parameters:

deleteFiles - Files that will be deleted as part of the merge conflict resolution.

Returns:

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

withDeleteFiles

public ConflictResolution withDeleteFiles(Collection<DeleteFileEntry> deleteFiles)

Files that will be deleted as part of the merge conflict resolution.

Parameters:

deleteFiles - Files that will be deleted as part of the merge conflict resolution.

Returns:

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

getSetFileModes

public List<SetFileModeEntry> getSetFileModes()

File modes that will be set as part of the merge conflict resolution.

Returns:

File modes that will be set as part of the merge conflict resolution.

setSetFileModes

public void setSetFileModes(Collection<SetFileModeEntry> setFileModes)

File modes that will be set as part of the merge conflict resolution.

Parameters:

setFileModes - File modes that will be set as part of the merge conflict resolution.

withSetFileModes

public ConflictResolution withSetFileModes(SetFileModeEntry... setFileModes)

File modes that will be set as part of the merge conflict resolution.

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

Parameters:

setFileModes - File modes that will be set as part of the merge conflict resolution.

Returns:

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

withSetFileModes

public ConflictResolution withSetFileModes(Collection<SetFileModeEntry> setFileModes)

File modes that will be set as part of the merge conflict resolution.

Parameters:

setFileModes - File modes that will be set as part of the merge conflict resolution.

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 ConflictResolution 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.