Skip to content

Commit 70d108a

Browse files
committed
Unify field order in toString methods
1 parent c8154fe commit 70d108a

File tree

3 files changed

+25
-15
lines changed

3 files changed

+25
-15
lines changed

problem4j-core/src/main/java/io/github/problem4j/core/AbstractProblem.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,13 @@ public String toString() {
224224
entries.add("\"instance\" : \"" + escape(getInstance().toString()) + "\"");
225225
}
226226

227-
getExtensionMembers()
227+
getExtensionMembers().entrySet().stream()
228+
.sorted(Map.Entry.comparingByKey())
228229
.forEach(
229-
(field, value) -> {
230+
entry -> {
231+
String field = entry.getKey();
232+
Object value = entry.getValue();
233+
230234
if (value == null) {
231235
return;
232236
}

problem4j-core/src/main/java/io/github/problem4j/core/AbstractProblemBuilder.java

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -289,20 +289,25 @@ public String toString() {
289289
entries.add("\"instance\" : \"" + escape(instance.toString()) + "\"");
290290
}
291291

292-
extensions.forEach(
293-
(field, value) -> {
294-
if (value == null) {
295-
return;
296-
}
292+
extensions.entrySet().stream()
293+
.sorted(Map.Entry.comparingByKey())
294+
.forEach(
295+
entry -> {
296+
String field = entry.getKey();
297+
Object value = entry.getValue();
297298

298-
if (value instanceof String) {
299-
entries.add("\"" + field + "\" : \"" + escape((String) value) + "\"");
300-
} else if (value instanceof Number || value instanceof Boolean) {
301-
entries.add("\"" + field + "\" : " + value);
302-
} else {
303-
entries.add(getObjectLine(field, value));
304-
}
305-
});
299+
if (value == null) {
300+
return;
301+
}
302+
303+
if (value instanceof String) {
304+
entries.add("\"" + field + "\" : \"" + escape((String) value) + "\"");
305+
} else if (value instanceof Number || value instanceof Boolean) {
306+
entries.add("\"" + field + "\" : " + value);
307+
} else {
308+
entries.add(getObjectLine(field, value));
309+
}
310+
});
306311

307312
return entries.isEmpty()
308313
? "{ }"

problem4j-core/src/main/java/io/github/problem4j/core/AbstractProblemContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ public String toString() {
163163
return "{ }";
164164
}
165165
return toMap().entrySet().stream()
166+
.sorted(Map.Entry.comparingByKey())
166167
.map(this::toEntryLine)
167168
.collect(Collectors.joining(", ", "{ ", " }"));
168169
}

0 commit comments

Comments
 (0)