Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .codegen.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "engineHash": "450fb53", "specHash": "d0976fc", "version": "10.9.0" }
{ "engineHash": "a82031b", "specHash": "d0976fc", "version": "10.9.0" }
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ public void serializeAsField(
return;
}

// For non-nullable fields, serialize only if the value is not null
if (value != null) {
boolean isOneOfWithNoNonNullValue =
value instanceof OneOfUnion && !((OneOfUnion) value).hasAnyNonNullValue();
if (value != null && !isOneOfWithNoNonNullValue) {
writer.serializeAsField(pojo, jgen, provider);
}
}
Expand Down
24 changes: 23 additions & 1 deletion src/main/java/com/box/sdkgen/internal/OneOfEight.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;

public class OneOfEight<T0, T1, T2, T3, T4, T5, T6, T7> extends SerializableObject {
public class OneOfEight<T0, T1, T2, T3, T4, T5, T6, T7> extends SerializableObject
implements OneOfUnion {
protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
protected T0 value0;
protected T1 value1;
Expand All @@ -30,6 +31,18 @@ public OneOfEight(
this.value7 = value7;
}

@Override
public boolean hasAnyNonNullValue() {
return value0 != null
|| value1 != null
|| value2 != null
|| value3 != null
|| value4 != null
|| value5 != null
|| value6 != null
|| value7 != null;
}

public static class OneOfEightSerializer
extends JsonSerializer<OneOfEight<?, ?, ?, ?, ?, ?, ?, ?>> {

Expand All @@ -45,28 +58,37 @@ public void serialize(
throws IOException {
if (itemEntryField.value0 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value0);
return;
}
if (itemEntryField.value1 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value1);
return;
}
if (itemEntryField.value2 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value2);
return;
}
if (itemEntryField.value3 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value3);
return;
}
if (itemEntryField.value4 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value4);
return;
}
if (itemEntryField.value5 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value5);
return;
}
if (itemEntryField.value6 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value6);
return;
}
if (itemEntryField.value7 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value7);
return;
}
gen.writeNull();
}
}
}
30 changes: 29 additions & 1 deletion src/main/java/com/box/sdkgen/internal/OneOfEleven.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;

public class OneOfEleven<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends SerializableObject {
public class OneOfEleven<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends SerializableObject
implements OneOfUnion {
protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
protected T0 value0;
protected T1 value1;
Expand Down Expand Up @@ -46,6 +47,21 @@ public OneOfEleven(
this.value10 = value10;
}

@Override
public boolean hasAnyNonNullValue() {
return value0 != null
|| value1 != null
|| value2 != null
|| value3 != null
|| value4 != null
|| value5 != null
|| value6 != null
|| value7 != null
|| value8 != null
|| value9 != null
|| value10 != null;
}

public static class OneOfElevenSerializer
extends JsonSerializer<OneOfEleven<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?>> {

Expand All @@ -61,37 +77,49 @@ public void serialize(
throws IOException {
if (itemEntryField.value0 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value0);
return;
}
if (itemEntryField.value1 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value1);
return;
}
if (itemEntryField.value2 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value2);
return;
}
if (itemEntryField.value3 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value3);
return;
}
if (itemEntryField.value4 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value4);
return;
}
if (itemEntryField.value5 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value5);
return;
}
if (itemEntryField.value6 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value6);
return;
}
if (itemEntryField.value7 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value7);
return;
}
if (itemEntryField.value8 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value8);
return;
}
if (itemEntryField.value9 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value9);
return;
}
if (itemEntryField.value10 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value10);
return;
}
gen.writeNull();
}
}
}
13 changes: 12 additions & 1 deletion src/main/java/com/box/sdkgen/internal/OneOfFive.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;

public class OneOfFive<T0, T1, T2, T3, T4> extends SerializableObject {
public class OneOfFive<T0, T1, T2, T3, T4> extends SerializableObject implements OneOfUnion {
protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
protected T0 value0;
protected T1 value1;
Expand All @@ -23,6 +23,11 @@ public OneOfFive(T0 value0, T1 value1, T2 value2, T3 value3, T4 value4) {
this.value4 = value4;
}

@Override
public boolean hasAnyNonNullValue() {
return value0 != null || value1 != null || value2 != null || value3 != null || value4 != null;
}

public static class OneOfFiveSerializer extends JsonSerializer<OneOfFive<?, ?, ?, ?, ?>> {

public OneOfFiveSerializer() {
Expand All @@ -35,19 +40,25 @@ public void serialize(
throws IOException {
if (itemEntryField.value0 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value0);
return;
}
if (itemEntryField.value1 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value1);
return;
}
if (itemEntryField.value2 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value2);
return;
}
if (itemEntryField.value3 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value3);
return;
}
if (itemEntryField.value4 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value4);
return;
}
gen.writeNull();
}
}
}
12 changes: 11 additions & 1 deletion src/main/java/com/box/sdkgen/internal/OneOfFour.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;

public class OneOfFour<T0, T1, T2, T3> extends SerializableObject {
public class OneOfFour<T0, T1, T2, T3> extends SerializableObject implements OneOfUnion {
protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
protected T0 value0;
protected T1 value1;
Expand All @@ -21,6 +21,11 @@ public OneOfFour(T0 value0, T1 value1, T2 value2, T3 value3) {
this.value3 = value3;
}

@Override
public boolean hasAnyNonNullValue() {
return value0 != null || value1 != null || value2 != null || value3 != null;
}

public static class OneOfFourSerializer extends JsonSerializer<OneOfFour<?, ?, ?, ?>> {

public OneOfFourSerializer() {
Expand All @@ -33,16 +38,21 @@ public void serialize(
throws IOException {
if (itemEntryField.value0 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value0);
return;
}
if (itemEntryField.value1 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value1);
return;
}
if (itemEntryField.value2 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value2);
return;
}
if (itemEntryField.value3 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value3);
return;
}
gen.writeNull();
}
}
}
26 changes: 25 additions & 1 deletion src/main/java/com/box/sdkgen/internal/OneOfNine.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;

public class OneOfNine<T0, T1, T2, T3, T4, T5, T6, T7, T8> extends SerializableObject {
public class OneOfNine<T0, T1, T2, T3, T4, T5, T6, T7, T8> extends SerializableObject
implements OneOfUnion {
protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
protected T0 value0;
protected T1 value1;
Expand Down Expand Up @@ -40,6 +41,19 @@ public OneOfNine(
this.value8 = value8;
}

@Override
public boolean hasAnyNonNullValue() {
return value0 != null
|| value1 != null
|| value2 != null
|| value3 != null
|| value4 != null
|| value5 != null
|| value6 != null
|| value7 != null
|| value8 != null;
}

public static class OneOfNineSerializer
extends JsonSerializer<OneOfNine<?, ?, ?, ?, ?, ?, ?, ?, ?>> {

Expand All @@ -55,31 +69,41 @@ public void serialize(
throws IOException {
if (itemEntryField.value0 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value0);
return;
}
if (itemEntryField.value1 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value1);
return;
}
if (itemEntryField.value2 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value2);
return;
}
if (itemEntryField.value3 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value3);
return;
}
if (itemEntryField.value4 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value4);
return;
}
if (itemEntryField.value5 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value5);
return;
}
if (itemEntryField.value6 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value6);
return;
}
if (itemEntryField.value7 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value7);
return;
}
if (itemEntryField.value8 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value8);
return;
}
gen.writeNull();
}
}
}
9 changes: 8 additions & 1 deletion src/main/java/com/box/sdkgen/internal/OneOfOne.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;

public class OneOfOne<T0> extends SerializableObject {
public class OneOfOne<T0> extends SerializableObject implements OneOfUnion {
protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
protected T0 value0;

public OneOfOne(T0 value0) {
this.value0 = value0;
}

@Override
public boolean hasAnyNonNullValue() {
return value0 != null;
}

public static class OneOfOneSerializer extends JsonSerializer<OneOfOne<?>> {

public OneOfOneSerializer() {
Expand All @@ -27,7 +32,9 @@ public void serialize(
throws IOException {
if (itemEntryField.value0 != null) {
JsonManager.WRITER.writeValue(gen, itemEntryField.value0);
return;
}
gen.writeNull();
}
}
}
Loading
Loading