Skip to content

Blank strings should not be deserialized as JsonNullable.undefined() #125 #152

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.

Sign up for GitHub

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
joshuabrandes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Blank strings should not be deserialized as JsonNullable.undefined() #125 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 1 addition & 23 deletions src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson2Deserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
package org.openapitools.jackson.nullable;


import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.DeserializationConfig;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.deser.ValueInstantiator;
import com.fasterxml.jackson.databind.deser.std.ReferenceTypeDeserializer;
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
import com.fasterxml.jackson.databind.type.ReferenceType;

import java.io.IOException;

public class JsonNullableJackson2Deserializer extends ReferenceTypeDeserializer<JsonNullable<Object>> {

private static final long serialVersionUID = 1L;

private boolean isStringDeserializer = false;

/*
/**********************************************************
/* Life-cycle
Expand All @@ -28,9 +21,6 @@ public class JsonNullableJackson2Deserializer extends ReferenceTypeDeserializer<
public JsonNullableJackson2Deserializer(JavaType fullType, ValueInstantiator inst,
TypeDeserializer typeDeser, JsonDeserializer<?> deser) {
super(fullType, inst, typeDeser, deser);
if (fullType instanceof ReferenceType && ((ReferenceType) fullType).getReferencedType() != null) {
this.isStringDeserializer = ((ReferenceType) fullType).getReferencedType().isTypeOrSubTypeOf(String.class);
}
}

/*
Expand All @@ -39,18 +29,6 @@ public JsonNullableJackson2Deserializer(JavaType fullType, ValueInstantiator ins
/**********************************************************
*/

@Override
public JsonNullable<Object> deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
JsonToken t = p.getCurrentToken();
if (t == JsonToken.VALUE_STRING && !isStringDeserializer) {
String str = p.getText().trim();
if (str.isEmpty()) {
return JsonNullable.undefined();
}
}
return super.deserialize(p, ctxt);
}

@Override
public JsonNullableJackson2Deserializer withResolved(TypeDeserializer typeDeser, JsonDeserializer<?> valueDeser) {
return new JsonNullableJackson2Deserializer(_fullType, _valueInstantiator,
Expand Down Expand Up @@ -92,4 +70,4 @@ public Boolean supportsUpdate(DeserializationConfig config) {
// yes; regardless of value deserializer reference itself may be updated
return Boolean.TRUE;
}
}
}
23 changes: 1 addition & 22 deletions src/main/java/org/openapitools/jackson/nullable/JsonNullableJackson3Deserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
package org.openapitools.jackson.nullable;


import tools.jackson.core.JacksonException;
import tools.jackson.core.JsonParser;
import tools.jackson.core.JsonToken;
import tools.jackson.databind.DeserializationConfig;
import tools.jackson.databind.DeserializationContext;
import tools.jackson.databind.JavaType;
import tools.jackson.databind.ValueDeserializer;
import tools.jackson.databind.deser.ValueInstantiator;
import tools.jackson.databind.deser.std.ReferenceTypeDeserializer;
import tools.jackson.databind.jsontype.TypeDeserializer;
import tools.jackson.databind.type.ReferenceType;

public class JsonNullableJackson3Deserializer extends ReferenceTypeDeserializer<JsonNullable<Object>> {


private boolean isStringDeserializer = false;

/*
/**********************************************************
/* Life-cycle
Expand All @@ -26,9 +20,6 @@ public class JsonNullableJackson3Deserializer extends ReferenceTypeDeserializer<
public JsonNullableJackson3Deserializer(JavaType fullType, ValueInstantiator inst,
TypeDeserializer typeDeser, ValueDeserializer<?> deser) {
super(fullType, inst, typeDeser, deser);
if (fullType instanceof ReferenceType && ((ReferenceType) fullType).getReferencedType() != null) {
this.isStringDeserializer = ((ReferenceType) fullType).getReferencedType().isTypeOrSubTypeOf(String.class);
}
}

/*
Expand All @@ -37,18 +28,6 @@ public JsonNullableJackson3Deserializer(JavaType fullType, ValueInstantiator ins
/**********************************************************
*/

@Override
public JsonNullable<Object> deserialize(JsonParser p, DeserializationContext ctxt) throws JacksonException {
JsonToken t = p.currentToken();
if (t == JsonToken.VALUE_STRING && !isStringDeserializer) {
String str = p.getString().trim();
if (str.isEmpty()) {
return JsonNullable.undefined();
}
}
return super.deserialize(p, ctxt);
}

@Override
protected ReferenceTypeDeserializer<JsonNullable<Object>> withResolved(TypeDeserializer typeDeser, ValueDeserializer<?> valueDeser) {
return new JsonNullableJackson3Deserializer(_fullType, _valueInstantiator,
Expand Down Expand Up @@ -90,4 +69,4 @@ public Boolean supportsUpdate(DeserializationConfig config) {
// yes; regardless of value deserializer reference itself may be updated
return Boolean.TRUE;
}
}
}
8 changes: 4 additions & 4 deletions src/test/java/org/openapitools/jackson/nullable/JsonNullWithEmptyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.junit.jupiter.params.ParameterizedClass;
import org.junit.jupiter.params.provider.MethodSource;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

@ParameterizedClass
Expand Down Expand Up @@ -36,7 +36,7 @@ void setup() {
@Test
void testJsonNullableFromEmpty() throws Exception {
JsonNullable<?> value = jsonProcessor.readValue(quote(""), TypeReferences.INTEGER.getType(jsonProcessor));
assertFalse(value.isPresent());
assertEquals(JsonNullable.of(null), value);
}

// for [datatype-jdk8#23]
Expand All @@ -47,7 +47,7 @@ void testBooleanWithEmpty() throws Exception {
BooleanBean b = jsonProcessor.readValue(aposToQuotes("{'value':''}"), BooleanBean.class);
assertNotNull(b.value);

assertFalse(b.value.isPresent());
assertEquals(JsonNullable.of(null), b.value);
}

private enum TypeReferences {
Expand All @@ -69,4 +69,4 @@ public Object getType(JsonProcessor jsonProcessor) {
public abstract Object getType(JsonProcessor jsonProcessor);
}

}
}
2 changes: 1 addition & 1 deletion src/test/java/org/openapitools/jackson/nullable/JsonNullableBasicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void testJsonNullableCollection() throws Exception {
@Test
void testDeserNull() throws Exception {
JsonNullable<?> value = jsonProcessor.readValue("\"\"", TypeReferences.INTEGER.getType(jsonProcessor));
assertFalse(value.isPresent());
assertEquals(JsonNullable.of(null), value);
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/openapitools/jackson/nullable/JsonNullableSimpleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ void deserializeStringMembers(JsonProcessor jsonProcessor) throws Exception {
void deserializeNonStringMembers(JsonProcessor jsonProcessor) throws Exception {
testReadPetAge(jsonProcessor, JsonNullable.of(Integer.valueOf(15)), "{\"age\":\"15\"}");
testReadPetAge(jsonProcessor, JsonNullable.<Integer>of(null), "{\"age\":null}");
testReadPetAge(jsonProcessor, JsonNullable.<Integer>undefined(), "{\"age\":\"\"}");
testReadPetAge(jsonProcessor, JsonNullable.<Integer>undefined(), "{\"age\":\" \"}");
testReadPetAge(jsonProcessor, JsonNullable.<Integer>of(null), "{\"age\":\"\"}");
testReadPetAge(jsonProcessor, JsonNullable.<Integer>of(null), "{\"age\":\" \"}");
testReadPetAge(jsonProcessor, JsonNullable.<Integer>undefined(), "{}");
}

Expand All @@ -163,8 +163,8 @@ void deserializeStringNonBeanMembers(JsonProcessor jsonProcessor) throws Excepti
void deserializeNonStringNonBeanMembers(JsonProcessor jsonProcessor) throws Exception {
assertEquals(JsonNullable.of(null), jsonProcessor.readValue("\"null\"", TypeReferences.INTEGER.getType(jsonProcessor)));
assertEquals(JsonNullable.of(42), jsonProcessor.readValue("\"42\"", TypeReferences.INTEGER.getType(jsonProcessor)));
assertEquals(JsonNullable.undefined(), jsonProcessor.readValue("\"\"", TypeReferences.INTEGER.getType(jsonProcessor)));
assertEquals(JsonNullable.undefined(), jsonProcessor.readValue("\" \"", TypeReferences.INTEGER.getType(jsonProcessor)));
assertEquals(JsonNullable.of(null), jsonProcessor.readValue("\"\"", TypeReferences.INTEGER.getType(jsonProcessor)));
assertEquals(JsonNullable.of(null), jsonProcessor.readValue("\" \"", TypeReferences.INTEGER.getType(jsonProcessor)));
}

@ParameterizedTest
Expand Down