Skip to content

Commit 3005f2e

Browse files
committed
pretty print json
1 parent d54c751 commit 3005f2e

3 files changed

Lines changed: 17 additions & 10 deletions

File tree

src/main/java/dev/zarr/zarrjava/v3/Array.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.zarr.zarrjava.v3;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import com.fasterxml.jackson.databind.ObjectWriter;
44
import dev.zarr.zarrjava.ZarrException;
55
import dev.zarr.zarrjava.store.FilesystemStore;
66
import dev.zarr.zarrjava.store.StoreHandle;
@@ -17,6 +17,7 @@
1717
import java.util.stream.Collectors;
1818
import javax.annotation.Nonnull;
1919
import static dev.zarr.zarrjava.v3.Node.makeObjectMapper;
20+
import static dev.zarr.zarrjava.v3.Node.makeObjectWriter;
2021

2122
public class Array extends dev.zarr.zarrjava.core.Array implements Node {
2223

@@ -136,8 +137,8 @@ public static Array create(StoreHandle storeHandle, ArrayMetadata arrayMetadata,
136137
"Trying to create a new array in " + storeHandle + ". But " + metadataHandle
137138
+ " already exists.");
138139
}
139-
ObjectMapper objectMapper = makeObjectMapper();
140-
ByteBuffer metadataBytes = ByteBuffer.wrap(objectMapper.writeValueAsBytes(arrayMetadata));
140+
ObjectWriter objectWriter = makeObjectWriter();
141+
ByteBuffer metadataBytes = ByteBuffer.wrap(objectWriter.writeValueAsBytes(arrayMetadata));
141142
metadataHandle.set(metadataBytes);
142143
return new Array(storeHandle, arrayMetadata);
143144
}
@@ -182,8 +183,8 @@ public static ArrayMetadataBuilder metadataBuilder(ArrayMetadata existingMetadat
182183
}
183184

184185
private Array writeMetadata(ArrayMetadata newArrayMetadata) throws ZarrException, IOException {
185-
ObjectMapper objectMapper = makeObjectMapper();
186-
ByteBuffer metadataBytes = ByteBuffer.wrap(objectMapper.writeValueAsBytes(newArrayMetadata));
186+
ObjectWriter objectWriter = makeObjectWriter();
187+
ByteBuffer metadataBytes = ByteBuffer.wrap(objectWriter.writeValueAsBytes(newArrayMetadata));
187188
storeHandle.resolve(ZARR_JSON)
188189
.set(metadataBytes);
189190
return new Array(storeHandle, newArrayMetadata);

src/main/java/dev/zarr/zarrjava/v3/Group.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.zarr.zarrjava.v3;
22

3-
import com.fasterxml.jackson.databind.ObjectMapper;
3+
import com.fasterxml.jackson.databind.ObjectWriter;
44
import dev.zarr.zarrjava.ZarrException;
55
import dev.zarr.zarrjava.store.FilesystemStore;
66
import dev.zarr.zarrjava.store.StoreHandle;
@@ -14,6 +14,7 @@
1414
import javax.annotation.Nonnull;
1515
import javax.annotation.Nullable;
1616
import static dev.zarr.zarrjava.v3.Node.makeObjectMapper;
17+
import static dev.zarr.zarrjava.v3.Node.makeObjectWriter;
1718

1819

1920
public class Group extends dev.zarr.zarrjava.core.Group implements Node {
@@ -44,8 +45,8 @@ public static Group open(String path) throws IOException {
4445
public static Group create(
4546
@Nonnull StoreHandle storeHandle, @Nonnull GroupMetadata groupMetadata
4647
) throws IOException {
47-
ObjectMapper objectMapper = makeObjectMapper();
48-
ByteBuffer metadataBytes = ByteBuffer.wrap(objectMapper.writeValueAsBytes(groupMetadata));
48+
ObjectWriter objectWriter = makeObjectWriter();
49+
ByteBuffer metadataBytes = ByteBuffer.wrap(objectWriter.writeValueAsBytes(groupMetadata));
4950
storeHandle.resolve(ZARR_JSON)
5051
.set(metadataBytes);
5152
return new Group(storeHandle, groupMetadata);
@@ -114,8 +115,8 @@ public Array createArray(String key,
114115
}
115116

116117
private Group writeMetadata(GroupMetadata newGroupMetadata) throws IOException {
117-
ObjectMapper objectMapper = makeObjectMapper();
118-
ByteBuffer metadataBytes = ByteBuffer.wrap(objectMapper.writeValueAsBytes(newGroupMetadata));
118+
ObjectWriter objectWriter = makeObjectWriter();
119+
ByteBuffer metadataBytes = ByteBuffer.wrap(objectWriter.writeValueAsBytes(newGroupMetadata));
119120
storeHandle.resolve(ZARR_JSON)
120121
.set(metadataBytes);
121122
return new Group(storeHandle, newGroupMetadata);

src/main/java/dev/zarr/zarrjava/v3/Node.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.zarr.zarrjava.v3;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
4+
import com.fasterxml.jackson.databind.ObjectWriter;
45
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
56
import dev.zarr.zarrjava.ZarrException;
67
import dev.zarr.zarrjava.store.FilesystemStore;
@@ -23,6 +24,10 @@ static ObjectMapper makeObjectMapper() {
2324
return objectMapper;
2425
}
2526

27+
static ObjectWriter makeObjectWriter() {
28+
return makeObjectMapper().writerWithDefaultPrettyPrinter();
29+
}
30+
2631
/**
2732
* Opens an existing Zarr array or group at a specified storage location.
2833
*

0 commit comments

Comments
 (0)