Skip to content

Allow configuring spaces before and/or after the colon in DefaultPrettyPrinter #1042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 13, 2023
Merged

Allow configuring spaces before and/or after the colon in DefaultPrettyPrinter #1042

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0db5ae8
Allow to configure the space before the colon in DefaultPrettyPrinter.
digulla Jun 6, 2023
4450b57
Second attempt to move the spacing config to Separators.
digulla Jun 7, 2023
eb46c9d
Moved rootSeparator to Separators.
digulla Jun 13, 2023
feaec2f
Fixed deprecations in existing code.
digulla Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/fasterxml/jackson/core/util/DefaultPrettyPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ protected DefaultPrettyPrinter _withSpaces(boolean state)
*/
public DefaultPrettyPrinter withSeparators(Separators separators) {
_separators = separators;
_objectFieldValueSeparatorWithSpaces = " " + separators.getObjectFieldValueSeparator() + " ";
_objectFieldValueSeparatorWithSpaces = separators.getObjectFieldValueSeparator();
return this;
}

Expand Down
36 changes: 32 additions & 4 deletions src/main/java/com/fasterxml/jackson/core/util/Separators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ public class Separators implements Serializable
{
private static final long serialVersionUID = 1;

private final char objectFieldValueSeparator;
private static final String DEFAULT_OBJECT_FIELD_VALUE_SEPARATOR = " : ";

private final String objectFieldValueSeparator;
private final char objectEntrySeparator;
private final char arrayValueSeparator;

Expand All @@ -24,20 +26,46 @@ public static Separators createDefaultInstance() {
}

public Separators() {
this(':', ',', ',');
this(DEFAULT_OBJECT_FIELD_VALUE_SEPARATOR, ',', ',');
}

public Separators(char objectFieldValueSeparator,
char objectEntrySeparator, char arrayValueSeparator) {
this(migrate(objectFieldValueSeparator), objectEntrySeparator, arrayValueSeparator);
}

public Separators(String objectFieldValueSeparator,
char objectEntrySeparator, char arrayValueSeparator) {
if (objectFieldValueSeparator == null) {
objectFieldValueSeparator = DEFAULT_OBJECT_FIELD_VALUE_SEPARATOR;
} else if (objectFieldValueSeparator.trim().isEmpty()) {
throw new IllegalArgumentException("objectFieldValueSeparator can't be blank");
}
this.objectFieldValueSeparator = objectFieldValueSeparator;
this.objectEntrySeparator = objectEntrySeparator;
this.arrayValueSeparator = arrayValueSeparator;
}

private static String migrate(char objectFieldValueSeparator) {
return " " + objectFieldValueSeparator + " ";
}

public Separators withObjectFieldValueSeparator(char sep) {
return (objectFieldValueSeparator == sep) ? this
return (objectFieldValueSeparator == migrate(sep)) ? this
: new Separators(sep, objectEntrySeparator, arrayValueSeparator);
}

public Separators withObjectFieldValueSeparator(String sep) {
if (sep == null) {
sep = DEFAULT_OBJECT_FIELD_VALUE_SEPARATOR;
}
return (objectFieldValueSeparator.equals(sep)) ? this
: new Separators(sep, objectEntrySeparator, arrayValueSeparator);
}

public Separators withCompactObjectFieldValueSeparator() {
return withObjectFieldValueSeparator(": ");
}

public Separators withObjectEntrySeparator(char sep) {
return (objectEntrySeparator == sep) ? this
Expand All @@ -49,7 +77,7 @@ public Separators withArrayValueSeparator(char sep) {
: new Separators(objectFieldValueSeparator, objectEntrySeparator, sep);
}

public char getObjectFieldValueSeparator() {
public String getObjectFieldValueSeparator() {
return objectFieldValueSeparator;
}

Expand Down