Allow to deserialize an empty string to null #630
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,6 +41,7 @@ | |
| public abstract class AbstractStreamDecoder extends LimitingStream implements Decoder { | ||
|
|
||
| private boolean currentlyUnwrappingArray = false; | ||
| private String readString; | ||
|
|
||
| public AbstractStreamDecoder(@NonNull RemainingLimits remainingLimits) { | ||
| super(remainingLimits); | ||
|
|
@@ -257,7 +258,13 @@ public String decodeString() throws IOException { | |
| preDecodeValue(currentToken); | ||
| switch (currentToken) { | ||
| case STRING: | ||
| String text; | ||
| if (readString == null) { | ||
| text = getString(); | ||
| } else { | ||
| text = readString; | ||
| readString = null; | ||
| } | ||
| nextToken(); | ||
| return text; | ||
| case NUMBER: | ||
|
|
@@ -733,18 +740,35 @@ protected final <T> T decodeCustom(ValueDecoder<T> readFunction, boolean callNex | |
| return value; | ||
| } | ||
|
|
||
| @Override | ||
| public String decodeStringNullable() throws IOException { | ||
| TokenType currentToken = currentToken(); | ||
| preDecodeValue(currentToken); | ||
| if (currentToken == TokenType.NULL) { | ||
| nextToken(); | ||
| return null; | ||
| } | ||
| return decodeString(); | ||
| } | ||
|
|
||
| @Override | ||
| public final boolean decodeNull() throws IOException { | ||
| TokenType currentToken = currentToken(); | ||
| preDecodeValue(currentToken); | ||
| if (currentToken == TokenType.NULL) { | ||
| nextToken(); | ||
| return true; | ||
| } else if (currentToken == TokenType.STRING) { | ||
| readString = getString(); | ||
| if (readString.isEmpty()) { | ||
| readString = null; | ||
| nextToken(); | ||
| return true; | ||
| } | ||
| } | ||
| // we don't support unwrapping null values from arrays, because the api user wouldn't be able to distinguish | ||
| // `[null]` and `null` anymore. | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -734,6 +734,7 @@ public static final class DerProperty<B, P> { | |
| public final P defaultValue; | ||
| public final boolean mustSetField; | ||
| public final boolean explicitlyRequired; | ||
| public final boolean primitive; | ||
| public final boolean nonNull; | ||
| public final boolean nullable; | ||
| public final boolean isAnySetter; | ||
|
|
@@ -802,6 +803,7 @@ public DerProperty(ConversionService conversionService, | |
| } else { | ||
| this.beanProperty = null; | ||
| } | ||
| this.primitive = argument.isPrimitive(); | ||
| // compute default | ||
| AnnotationMetadata annotationMetadata = resolveArgumentMetadata(instrospection, argument, argumentMetadata); | ||
| this.views = SerdeAnnotationUtil.resolveViews(instrospection, annotationMetadata); | ||
|
|
@@ -909,18 +911,23 @@ public void deserializeAndSetConstructorValue(Decoder objectDecoder, Deserialize | |
| public void deserializeAndSetPropertyValue(Decoder objectDecoder, Deserializer.DecoderContext decoderContext, B beanInstance) throws IOException { | ||
| try { | ||
| P value = deserializer.deserializeNullable(objectDecoder, decoderContext, argument); | ||
| if (value == null) { | ||
| if (primitive) { | ||
| return; | ||
| } | ||
| if (!nullable) { | ||
| if (!explicitlyRequired) { | ||
| value = defaultValue; | ||
| if (value == null) { | ||
| if (!mustSetField) { | ||
| return; | ||
| } | ||
| value = deserializer.getDefaultValue(decoderContext, argument); | ||
| } | ||
| } else { | ||
| throw new SerdeException("Unable to deserialize type [" + instrospection.getBeanType().getName() + "]. Required property [" + argument + | ||
| "] is not present in supplied data"); | ||
| } | ||
| } | ||
| } | ||
| beanProperty.setUnsafe(beanInstance, value); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,7 +100,6 @@ private SerdeException serializeIntoNotSupported(Argument<?> type) { | |
| return new SerdeException("Serializer for type: " + type + " doesn't support serializing into an existing object"); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isEmpty(EncoderContext context, Object value) { | ||
| if (value == null) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ | |
| */ | ||
| package io.micronaut.serde | ||
|
|
||
| import io.micronaut.core.type.Argument | ||
| import io.micronaut.http.HttpStatus | ||
| import spock.lang.Unroll | ||
|
|
||
|
|
@@ -92,6 +93,63 @@ class Test { | |
| Locale | [value: Locale.CANADA_FRENCH] | '{"value":"fr-CA"}' | ||
| } | ||
|
|
||
| @Unroll | ||
| void "test empty string to #type"() { | ||
| given: | ||
| def context = buildContext('test.Test', """ | ||
| package test; | ||
|
|
||
| import io.micronaut.serde.annotation.Serdeable; | ||
|
|
||
| @Serdeable | ||
| class Test { | ||
| @io.micronaut.core.annotation.Nullable | ||
| private $type.name value; | ||
| public void setValue($type.name value) { | ||
| this.value = value; | ||
| } | ||
| public $type.name getValue() { | ||
| return value; | ||
| } | ||
| } | ||
| """, true) | ||
| when: | ||
| def jsonMapper = context.getBean(getJsonMapperClass()) | ||
| typeUnderTest = argumentOf(context, 'test.Test') | ||
| byte[] bytes = jsonMapper.writeValueAsBytes(Argument.mapOf(String.class, String.class), Map.of("value", "")) | ||
| def read = jsonMapper.readValue(bytes, typeUnderTest) | ||
| typeUnderTest.type.isInstance(read) | ||
|
|
||
| then: | ||
| read.value == result | ||
|
|
||
| cleanup: | ||
| context.close() | ||
|
|
||
| where: | ||
| type | result | ||
| BigDecimal | null | ||
| BigInteger | null | ||
| String | "" | ||
| boolean | false | ||
| byte | 0 | ||
| short | 0 | ||
| int | 0 | ||
| long | 0 | ||
| double | 0 | ||
| float | 0 | ||
| char | 0 | ||
| //wrappers | ||
| Boolean | null | ||
| Byte | null | ||
| Short | null | ||
| Integer | null | ||
| Long | null | ||
| Double | null | ||
| Float | null | ||
| Character | null | ||
| } | ||
|
|
||
| @Unroll | ||
| void "test basic type #type missing value"() { | ||
| given: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,10 +21,13 @@ | |
| import org.junit.platform.suite.api.SuiteDisplayName; | ||
|
|
||
| @Suite | ||
| @ExcludeClassNamePatterns({ | ||
| "io.micronaut.http.server.tck.tests.constraintshandler.ControllerConstraintHandlerTest", | ||
| "io.micronaut.http.server.tck.tests.forms.FormsSubmissionsWithListsTest" // Support converting a value to a collection | ||
| }) | ||
| @SelectPackages({ | ||
| "io.micronaut.http.server.tck.tests", | ||
| "io.micronaut.serde.http.server.tck.netty" | ||
| }) | ||
| @SuiteDisplayName("HTTP Server TCK for Netty") | ||
| public class NettyHttpServerTestSuite { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we use?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why?