Skip to content

Add support for optional JsonbCreator parameters #239

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.

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import javax.json.bind.serializer.DeserializationContext;
import javax.json.bind.serializer.JsonbDeserializer;
import javax.json.stream.JsonParser;
import java.lang.reflect.Array;
import java.lang.reflect.Type;
import java.util.Optional;
import java.util.OptionalDouble;
Expand Down Expand Up @@ -157,6 +158,8 @@ protected Object convertNullToOptionalEmpty(Type propertyType, Object value) {
return OptionalLong.empty();
} else if (propertyType == OptionalDouble.class) {
return OptionalDouble.empty();
} else if (((Class<?>) propertyType).isPrimitive()){
return Array.get(Array.newInstance((Class<?>) propertyType, 1), 0);
} else {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,7 @@ private T createInstance(Class<T> rawType, JsonbCreator creator) {
final List<Object> paramValues = new ArrayList<>();
for(CreatorModel param : creator.getParams()) {
final ValueWrapper valueWrapper = values.get(param.getName());
//required by spec
if (valueWrapper == null){
throw new JsonbException(Messages.getMessage(MessageKeys.JSONB_CREATOR_MISSING_PROPERTY, param.getName()));
}
paramValues.add(valueWrapper.getValue());
paramValues.add(valueWrapper == null ? convertNullToOptionalEmpty(param.getType(), null) : valueWrapper.getValue());
}
instance = creator.call(paramValues.toArray(), rawType);
return instance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,16 @@
*/
public class JsonbCreatorTest {

private static byte DEFAULT_BYTE;

@Test
public void testRootConstructor() {
String json = "{\"str1\":\"abc\",\"str2\":\"def\",\"bigDec\":25}";
final Jsonb jsonb = JsonbBuilder.create();
CreatorConstructorPojo pojo = jsonb.fromJson(json, CreatorConstructorPojo.class);
assertEquals("abc", pojo.str1);
assertEquals("def", pojo.str2);
assertNull(pojo.missing);
assertEquals(new BigDecimal("25"), pojo.bigDec);
}

Expand All @@ -52,6 +55,7 @@ public void testRootFactoryMethod() {
CreatorFactoryMethodPojo pojo = jsonb.fromJson(json, CreatorFactoryMethodPojo.class);
assertEquals("abc", pojo.str1);
assertEquals("def", pojo.str2);
assertNull(pojo.missing);
assertEquals(new BigDecimal("25"), pojo.bigDec);
}

Expand All @@ -62,10 +66,12 @@ public void testRootCreatorWithInnerCreator() {
CreatorConstructorPojo pojo = jsonb.fromJson(json, CreatorConstructorPojo.class);
assertEquals("abc", pojo.str1);
assertEquals("def", pojo.str2);
assertNull(pojo.missing);
assertEquals(new BigDecimal("25"), pojo.bigDec);

assertEquals("inn1", pojo.innerFactoryCreator.str1);
assertEquals("inn2", pojo.innerFactoryCreator.str2);
assertNull(pojo.innerFactoryCreator.missing);
assertEquals(new BigDecimal("11"), pojo.innerFactoryCreator.bigDec);
}

Expand All @@ -89,10 +95,13 @@ public void testMultipleCreatorsError() {
}
}

@Test(expected = JsonbException.class)
@Test
public void testCreatorWithoutJsonbParameters1() {
//arg2 is missing in json document
JsonbBuilder.create().fromJson("{\"arg0\":\"abc\", \"s2\":\"def\"}", CreatorWithoutJsonbProperty1.class);
final CreatorWithoutJsonbProperty1 result = JsonbBuilder.create().fromJson("{\"arg0\":\"abc\", \"s2\":\"def\"}", CreatorWithoutJsonbProperty1.class);
assertEquals("abc", result.getPar1());
assertEquals("def", result.getPar2());
assertEquals(DEFAULT_BYTE, result.getPar3());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,17 @@ public class CreatorConstructorPojo {

public String str2;

public String missing;

public BigDecimal bigDec;

public CreatorFactoryMethodPojo innerFactoryCreator;

@JsonbCreator
public CreatorConstructorPojo(@JsonbProperty("str1") String str1, @JsonbProperty("str2") String str2) {
public CreatorConstructorPojo(@JsonbProperty("str1") String str1, @JsonbProperty("str2") String str2, @JsonbProperty("missing") String missing) {
this.str1 = str1;
this.str2 = str2;
this.missing = missing;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,17 @@ public class CreatorFactoryMethodPojo {

public final String str2;

public final String missing;

public BigDecimal bigDec;

private CreatorFactoryMethodPojo(String str1, String str2) {
private CreatorFactoryMethodPojo(String str1, String str2, String missing) {
this.str1 = str1;
this.str2 = str2;
this.missing = missing;
}
@JsonbCreator
public static CreatorFactoryMethodPojo getInstance(@JsonbProperty("par1") String str1, @JsonbProperty("par2")String str2) {
return new CreatorFactoryMethodPojo(str1, str2);
public static CreatorFactoryMethodPojo getInstance(@JsonbProperty("par1") String str1, @JsonbProperty("par2")String str2, @JsonbProperty("missing") String missing) {
return new CreatorFactoryMethodPojo(str1, str2, missing);
}
}