Skip to content

Commit a633f8a

Browse files
author
brokkoli71
committed
JsonInclude.Include.NON_NULL for all json attributes
1 parent 9bb4fc3 commit a633f8a

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

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

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

3+
import com.fasterxml.jackson.annotation.JsonInclude;
34
import com.fasterxml.jackson.databind.ObjectMapper;
45
import com.fasterxml.jackson.databind.ObjectWriter;
56
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -19,6 +20,7 @@ static ObjectMapper makeObjectMapper() {
1920
ObjectMapper objectMapper = new ObjectMapper();
2021
objectMapper.registerModule(new Jdk8Module());
2122
objectMapper.registerSubtypes(CodecRegistry.getNamedTypes());
23+
objectMapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);
2224
return objectMapper;
2325
}
2426

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

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

3+
import com.fasterxml.jackson.annotation.JsonInclude;
34
import com.fasterxml.jackson.databind.ObjectMapper;
45
import com.fasterxml.jackson.databind.ObjectWriter;
56
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -21,6 +22,7 @@ static ObjectMapper makeObjectMapper() {
2122
ObjectMapper objectMapper = new ObjectMapper();
2223
objectMapper.registerModule(new Jdk8Module());
2324
objectMapper.registerSubtypes(CodecRegistry.getNamedTypes());
25+
objectMapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);
2426
return objectMapper;
2527
}
2628

src/main/java/dev/zarr/zarrjava/v3/codec/core/BytesCodec.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonIgnore;
5-
import com.fasterxml.jackson.annotation.JsonInclude;
65
import com.fasterxml.jackson.annotation.JsonProperty;
76
import dev.zarr.zarrjava.ZarrException;
87
import dev.zarr.zarrjava.v3.codec.Codec;
@@ -12,7 +11,6 @@
1211
import javax.annotation.Nonnull;
1312
import javax.annotation.Nullable;
1413

15-
@JsonInclude(JsonInclude.Include.NON_NULL)
1614
public class BytesCodec extends dev.zarr.zarrjava.core.codec.core.BytesCodec implements Codec {
1715

1816
@JsonIgnore

src/test/java/dev/zarr/zarrjava/ZarrV3Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ public void testCodecWithoutConfiguration() throws ZarrException, IOException {
585585
.withCodecs(CodecBuilder::withBytes)
586586
.build()
587587
);
588-
Assertions.assertTrue(storeHandle.resolve("zarr.json").exists());
588+
Assertions.assertTrue(storeHandle.resolve(ZARR_JSON).exists());
589589
Codec bytesCodec = array.metadata().codecs[0];
590590
Assertions.assertInstanceOf(BytesCodec.class, bytesCodec);
591591
Assertions.assertNull(((BytesCodec) bytesCodec).configuration);

0 commit comments

Comments
 (0)