Skip to content

Commit 347853c

Browse files
committed
Do not include null on serilized model
Signed-off-by: Valentin Delaye <jonesbusy@users.noreply.github.com>
1 parent 954431f commit 347853c

8 files changed

Lines changed: 17 additions & 0 deletions

File tree

src/main/java/land/oras/Config.java

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

2323
import com.fasterxml.jackson.annotation.JsonCreator;
2424
import com.fasterxml.jackson.annotation.JsonIgnore;
25+
import com.fasterxml.jackson.annotation.JsonInclude;
2526
import com.fasterxml.jackson.annotation.JsonProperty;
2627
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2728
import java.nio.charset.StandardCharsets;
@@ -45,6 +46,7 @@
4546
Const.JSON_PROPERTY_ANNOTATIONS,
4647
Const.JSON_PROPERTY_DATA
4748
})
49+
@JsonInclude(JsonInclude.Include.NON_NULL)
4850
public final class Config extends Descriptor {
4951

5052
/**

src/main/java/land/oras/Describable.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@
2020

2121
package land.oras;
2222

23+
import com.fasterxml.jackson.annotation.JsonInclude;
24+
2325
/**
2426
* Interface for describable objects
2527
*/
2628
@OrasModel
29+
@JsonInclude(JsonInclude.Include.NON_NULL)
2730
public interface Describable {
2831

2932
/**

src/main/java/land/oras/Descriptor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package land.oras;
2222

2323
import com.fasterxml.jackson.annotation.JsonIgnore;
24+
import com.fasterxml.jackson.annotation.JsonInclude;
2425
import com.fasterxml.jackson.annotation.JsonProperty;
2526
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2627
import java.util.Collections;
@@ -35,6 +36,7 @@
3536
*/
3637
@OrasModel
3738
@JsonPropertyOrder({Const.JSON_PROPERTY_MEDIA_TYPE, Const.JSON_PROPERTY_DIGEST, Const.JSON_PROPERTY_SIZE})
39+
@JsonInclude(JsonInclude.Include.NON_NULL)
3840
public sealed class Descriptor permits Config, Manifest, Layer, Index {
3941

4042
/**

src/main/java/land/oras/Layer.java

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

2323
import com.fasterxml.jackson.annotation.JsonCreator;
2424
import com.fasterxml.jackson.annotation.JsonIgnore;
25+
import com.fasterxml.jackson.annotation.JsonInclude;
2526
import com.fasterxml.jackson.annotation.JsonProperty;
2627
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2728
import java.io.IOException;
@@ -49,6 +50,7 @@
4950
Const.JSON_PROPERTY_ANNOTATIONS,
5051
Const.JSON_PROPERTY_DATA
5152
})
53+
@JsonInclude(JsonInclude.Include.NON_NULL)
5254
public final class Layer extends Descriptor {
5355

5456
/**

src/main/java/land/oras/ManifestDescriptor.java

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

2323
import com.fasterxml.jackson.annotation.JsonCreator;
2424
import com.fasterxml.jackson.annotation.JsonIgnore;
25+
import com.fasterxml.jackson.annotation.JsonInclude;
2526
import com.fasterxml.jackson.annotation.JsonProperty;
2627
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2728
import java.util.Map;
@@ -45,6 +46,7 @@
4546
Const.JSON_PROPERTY_PLATFORM,
4647
Const.JSON_PROPERTY_ANNOTATIONS,
4748
})
49+
@JsonInclude(JsonInclude.Include.NON_NULL)
4850
public final class ManifestDescriptor {
4951

5052
private final @Nullable String artifactType;

src/main/java/land/oras/Platform.java

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

2121
package land.oras;
2222

23+
import com.fasterxml.jackson.annotation.JsonInclude;
2324
import com.fasterxml.jackson.annotation.JsonProperty;
2425
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2526
import java.util.List;
@@ -46,6 +47,7 @@
4647
Const.PLATFORM_OS_VERSION,
4748
Const.PLATFORM_OS_FEATURES
4849
})
50+
@JsonInclude(JsonInclude.Include.NON_NULL)
4951
public record Platform(
5052
@Nullable @JsonProperty(Const.PLATFORM_OS) String os,
5153
@Nullable @JsonProperty(Const.PLATFORM_ARCHITECTURE) String architecture,

src/main/java/land/oras/Subject.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package land.oras;
2222

2323
import com.fasterxml.jackson.annotation.JsonCreator;
24+
import com.fasterxml.jackson.annotation.JsonInclude;
2425
import com.fasterxml.jackson.annotation.JsonProperty;
2526
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2627
import java.util.Objects;
@@ -38,6 +39,7 @@
3839
Const.JSON_PROPERTY_DIGEST,
3940
Const.JSON_PROPERTY_SIZE,
4041
})
42+
@JsonInclude(JsonInclude.Include.NON_NULL)
4143
public final class Subject {
4244

4345
private final String mediaType;

src/main/java/land/oras/Tags.java

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

2121
package land.oras;
2222

23+
import com.fasterxml.jackson.annotation.JsonInclude;
2324
import java.util.List;
2425
import org.jspecify.annotations.NullMarked;
2526
import org.jspecify.annotations.Nullable;
@@ -32,6 +33,7 @@
3233
*/
3334
@NullMarked
3435
@OrasModel
36+
@JsonInclude(JsonInclude.Include.NON_NULL)
3537
public record Tags(String name, List<String> tags, @Nullable String last) {
3638

3739
/**

0 commit comments

Comments
 (0)