forked from aws/aws-sdk-java
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathConflict.java
More file actions
219 lines (194 loc) · 7.08 KB
/
Conflict.java
File metadata and controls
219 lines (194 loc) · 7.08 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
/*
* Copyright 2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
* the License. A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
* and limitations under the License.
*/
package com.amazonaws.services.codecommit.model;
import java.io.Serializable;
import javax.annotation.Generated;
import com.amazonaws.protocol.StructuredPojo;
import com.amazonaws.protocol.ProtocolMarshaller;
/**
* <p>
* Information about conflicts in a merge operation.
* </p>
*
* @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/Conflict" target="_top">AWS API
* Documentation</a>
*/
@Generated("com.amazonaws:aws-java-sdk-code-generator")
public class Conflict implements Serializable, Cloneable, StructuredPojo {
/**
* <p>
* Metadata about a conflict in a merge operation.
* </p>
*/
private ConflictMetadata conflictMetadata;
/**
* <p>
* A list of hunks that contain the differences between files or lines causing the conflict.
* </p>
*/
private java.util.List<MergeHunk> mergeHunks;
/**
* <p>
* Metadata about a conflict in a merge operation.
* </p>
*
* @param conflictMetadata
* Metadata about a conflict in a merge operation.
*/
public void setConflictMetadata(ConflictMetadata conflictMetadata) {
this.conflictMetadata = conflictMetadata;
}
/**
* <p>
* Metadata about a conflict in a merge operation.
* </p>
*
* @return Metadata about a conflict in a merge operation.
*/
public ConflictMetadata getConflictMetadata() {
return this.conflictMetadata;
}
/**
* <p>
* Metadata about a conflict in a merge operation.
* </p>
*
* @param conflictMetadata
* Metadata about a conflict in a merge operation.
* @return Returns a reference to this object so that method calls can be chained together.
*/
public Conflict withConflictMetadata(ConflictMetadata conflictMetadata) {
setConflictMetadata(conflictMetadata);
return this;
}
/**
* <p>
* A list of hunks that contain the differences between files or lines causing the conflict.
* </p>
*
* @return A list of hunks that contain the differences between files or lines causing the conflict.
*/
public java.util.List<MergeHunk> getMergeHunks() {
return mergeHunks;
}
/**
* <p>
* A list of hunks that contain the differences between files or lines causing the conflict.
* </p>
*
* @param mergeHunks
* A list of hunks that contain the differences between files or lines causing the conflict.
*/
public void setMergeHunks(java.util.Collection<MergeHunk> mergeHunks) {
if (mergeHunks == null) {
this.mergeHunks = null;
return;
}
this.mergeHunks = new java.util.ArrayList<MergeHunk>(mergeHunks);
}
/**
* <p>
* A list of hunks that contain the differences between files or lines causing the conflict.
* </p>
* <p>
* <b>NOTE:</b> This method appends the values to the existing list (if any). Use
* {@link #setMergeHunks(java.util.Collection)} or {@link #withMergeHunks(java.util.Collection)} if you want to
* override the existing values.
* </p>
*
* @param mergeHunks
* A list of hunks that contain the differences between files or lines causing the conflict.
* @return Returns a reference to this object so that method calls can be chained together.
*/
public Conflict withMergeHunks(MergeHunk... mergeHunks) {
if (this.mergeHunks == null) {
setMergeHunks(new java.util.ArrayList<MergeHunk>(mergeHunks.length));
}
for (MergeHunk ele : mergeHunks) {
this.mergeHunks.add(ele);
}
return this;
}
/**
* <p>
* A list of hunks that contain the differences between files or lines causing the conflict.
* </p>
*
* @param mergeHunks
* A list of hunks that contain the differences between files or lines causing the conflict.
* @return Returns a reference to this object so that method calls can be chained together.
*/
public Conflict withMergeHunks(java.util.Collection<MergeHunk> mergeHunks) {
setMergeHunks(mergeHunks);
return this;
}
/**
* 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.
*
* @return A string representation of this object.
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
if (getConflictMetadata() != null)
sb.append("ConflictMetadata: ").append(getConflictMetadata()).append(",");
if (getMergeHunks() != null)
sb.append("MergeHunks: ").append(getMergeHunks());
sb.append("}");
return sb.toString();
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (obj instanceof Conflict == false)
return false;
Conflict other = (Conflict) obj;
if (other.getConflictMetadata() == null ^ this.getConflictMetadata() == null)
return false;
if (other.getConflictMetadata() != null && other.getConflictMetadata().equals(this.getConflictMetadata()) == false)
return false;
if (other.getMergeHunks() == null ^ this.getMergeHunks() == null)
return false;
if (other.getMergeHunks() != null && other.getMergeHunks().equals(this.getMergeHunks()) == false)
return false;
return true;
}
@Override
public int hashCode() {
final int prime = 31;
int hashCode = 1;
hashCode = prime * hashCode + ((getConflictMetadata() == null) ? 0 : getConflictMetadata().hashCode());
hashCode = prime * hashCode + ((getMergeHunks() == null) ? 0 : getMergeHunks().hashCode());
return hashCode;
}
@Override
public Conflict clone() {
try {
return (Conflict) super.clone();
} catch (CloneNotSupportedException e) {
throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
}
}
@com.amazonaws.annotation.SdkInternalApi
@Override
public void marshall(ProtocolMarshaller protocolMarshaller) {
com.amazonaws.services.codecommit.model.transform.ConflictMarshaller.getInstance().marshall(this, protocolMarshaller);
}
}