Skip to content

chore: fixed and simplified json indenting #12

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
quintesse merged 1 commit into from
Aug 26, 2026
Merged

chore: fixed and simplified json indenting #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 8 additions & 75 deletions src/main/java/dev/jbang/jdkdb/util/MetadataUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.core.util.Separators;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
Expand Down Expand Up @@ -53,86 +55,17 @@ public class MetadataUtils {
private static final Pattern DURATION_PATTERN = Pattern.compile("^(\\d+)([dwmy])$");
private static final Pattern VERSION_PATTERN = Pattern.compile("^(?:1\\.)?(\\d+)");

// Custom pretty printer with proper formatting
private static MinimalPrettyPrinter printer = new MinimalPrettyPrinter() {
private int depth = 0;

private void indent(JsonGenerator g) throws IOException {
g.writeRaw("\n");
for (int i = 0; i < depth; i++) {
g.writeRaw(" ");
}
}

@Override
public void writeStartArray(JsonGenerator g) throws IOException {
g.writeRaw('[');
depth++;
}

@Override
public void beforeArrayValues(JsonGenerator g) throws IOException {
indent(g);
}

@Override
public void writeArrayValueSeparator(JsonGenerator g) throws IOException {
g.writeRaw(',');
indent(g);
}

@Override
public void writeEndArray(JsonGenerator g, int nrOfValues) throws IOException {
depth--;
if (nrOfValues > 0) {
indent(g);
}
g.writeRaw(']');
}

@Override
public void writeStartObject(JsonGenerator g) throws IOException {
g.writeRaw('{');
depth++;
}

@Override
public void beforeObjectEntries(JsonGenerator g) throws IOException {
indent(g);
}

@Override
public void writeObjectFieldValueSeparator(JsonGenerator g) throws IOException {
g.writeRaw(": ");
}

@Override
public void writeObjectEntrySeparator(JsonGenerator g) throws IOException {
g.writeRaw(',');
indent(g);
}

@Override
public void writeEndObject(JsonGenerator g, int nrOfEntries) throws IOException {
depth--;
if (nrOfEntries > 0) {
indent(g);
}
g.writeRaw('}');
}
};

static {
printer.setRootValueSeparator("\n");
}

// Use a mix-in to override the JsonPropertyOrder annotation
private static ObjectMapper writeMapper = JsonMapper.builder()
.configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false)
.enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
.enable(SerializationFeature.INDENT_OUTPUT)
.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)
.defaultPrettyPrinter(printer)
.defaultPrettyPrinter(new DefaultPrettyPrinter()
.withObjectIndenter(new DefaultIndenter(" ", "\n"))
.withArrayIndenter(new DefaultIndenter(" ", "\n"))
.withSeparators(
Separators.createDefaultInstance().withObjectFieldValueSpacing(Separators.Spacing.AFTER)))
.build();

// Add a mix-in to override the @JsonPropertyOrder annotation
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/dev/jbang/jdkdb/util/MetadataUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void testValidSaveMetadata() throws Exception {
"checksum": "741a6df853edecfadd81b4a389271eb937c2626a",
"checksum_type": "sha1",
"distro": "microsoft",
"features": [],
"features": [ ],
"file_type": "tar.gz",
"filename": "microsoft-jdk-25.0.2-macos-x64.tar.gz",
"image_type": "jdk",
Expand Down