Skip to content

Commit d14acac

Browse files
committed
Minor post-merge fix wrt #1178
1 parent 80e79f1 commit d14acac

File tree

1 file changed

+30
-12
lines changed

1 file changed

+30
-12
lines changed

src/main/java/com/fasterxml/jackson/core/util/Separators.java

+30-12
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,17 @@ public Separators(
160160
}
161161

162162
public Separators withRootSeparator(String sep) {
163-
return (rootSeparator.equals(sep)) ? this
164-
: new Separators(sep, objectFieldValueSeparator, objectFieldValueSpacing, objectEntrySeparator, objectEntrySpacing, objectEmptySeparator, arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
163+
return Objects.equals(rootSeparator, sep) ? this
164+
: new Separators(sep, objectFieldValueSeparator, objectFieldValueSpacing,
165+
objectEntrySeparator, objectEntrySpacing, objectEmptySeparator,
166+
arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
165167
}
166-
168+
167169
public Separators withObjectFieldValueSeparator(char sep) {
168170
return (objectFieldValueSeparator == sep) ? this
169-
: new Separators(rootSeparator, sep, objectFieldValueSpacing, objectEntrySeparator, objectEntrySpacing, objectEmptySeparator, arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
171+
: new Separators(rootSeparator, sep, objectFieldValueSpacing,
172+
objectEntrySeparator, objectEntrySpacing, objectEmptySeparator,
173+
arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
170174
}
171175

172176
/**
@@ -176,12 +180,16 @@ public Separators withObjectFieldValueSeparator(char sep) {
176180
*/
177181
public Separators withObjectFieldValueSpacing(Spacing spacing) {
178182
return (objectFieldValueSpacing == spacing) ? this
179-
: new Separators(rootSeparator, objectFieldValueSeparator, spacing, objectEntrySeparator, objectEntrySpacing, objectEmptySeparator, arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
183+
: new Separators(rootSeparator, objectFieldValueSeparator, spacing,
184+
objectEntrySeparator, objectEntrySpacing, objectEmptySeparator,
185+
arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
180186
}
181187

182188
public Separators withObjectEntrySeparator(char sep) {
183189
return (objectEntrySeparator == sep) ? this
184-
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing, sep, objectEntrySpacing, objectEmptySeparator, arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
190+
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing,
191+
sep, objectEntrySpacing, objectEmptySeparator,
192+
arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
185193
}
186194

187195
/**
@@ -191,7 +199,9 @@ public Separators withObjectEntrySeparator(char sep) {
191199
*/
192200
public Separators withObjectEntrySpacing(Spacing spacing) {
193201
return (objectEntrySpacing == spacing) ? this
194-
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing, objectEntrySeparator, spacing, objectEmptySeparator, arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
202+
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing,
203+
objectEntrySeparator, spacing, objectEmptySeparator,
204+
arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
195205
}
196206

197207
/**
@@ -200,13 +210,17 @@ public Separators withObjectEntrySpacing(Spacing spacing) {
200210
* @since 2.17
201211
*/
202212
public Separators withObjectEmptySeparator(String sep) {
203-
return Objects.equals(arrayEmptySeparator, sep) ? this
204-
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing, objectEntrySeparator, objectEntrySpacing, sep, arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
213+
return Objects.equals(objectEmptySeparator, sep) ? this
214+
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing,
215+
objectEntrySeparator, objectEntrySpacing, sep,
216+
arrayValueSeparator, arrayValueSpacing, arrayEmptySeparator);
205217
}
206218

207219
public Separators withArrayValueSeparator(char sep) {
208220
return (arrayValueSeparator == sep) ? this
209-
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing, objectEntrySeparator, objectEntrySpacing, objectEmptySeparator, sep, arrayValueSpacing, arrayEmptySeparator);
221+
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing,
222+
objectEntrySeparator, objectEntrySpacing, objectEmptySeparator,
223+
sep, arrayValueSpacing, arrayEmptySeparator);
210224
}
211225

212226
/**
@@ -216,7 +230,9 @@ public Separators withArrayValueSeparator(char sep) {
216230
*/
217231
public Separators withArrayValueSpacing(Spacing spacing) {
218232
return (arrayValueSpacing == spacing) ? this
219-
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing, objectEntrySeparator, objectEntrySpacing, objectEmptySeparator, arrayValueSeparator, spacing, arrayEmptySeparator);
233+
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing,
234+
objectEntrySeparator, objectEntrySpacing, objectEmptySeparator,
235+
arrayValueSeparator, spacing, arrayEmptySeparator);
220236
}
221237

222238
/**
@@ -226,7 +242,9 @@ public Separators withArrayValueSpacing(Spacing spacing) {
226242
*/
227243
public Separators withArrayEmptySeparator(String sep) {
228244
return Objects.equals(arrayEmptySeparator, sep) ? this
229-
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing, objectEntrySeparator, objectEntrySpacing, objectEmptySeparator, arrayValueSeparator, arrayValueSpacing, sep);
245+
: new Separators(rootSeparator, objectFieldValueSeparator, objectFieldValueSpacing,
246+
objectEntrySeparator, objectEntrySpacing, objectEmptySeparator,
247+
arrayValueSeparator, arrayValueSpacing, sep);
230248
}
231249

232250
/**

0 commit comments

Comments
 (0)