Implement int to enum deserialization. #1590
Conversation
|
Hey, I posted an issue about enum deserialization, where the read value is not checked against the metadata (#1593). I was about to make a PR about it, but i saw this PR, which is touching the same method. It would be easier to merge if the fix is applied as part of this PR, if everybody is ok with it of course. @bdebaere what do you think about adding something like: if (selectedMember == null && this.MessageReaderSettings.ThrowIfTypeConflictsWithMetadata)
{
throw new ODataException(Strings.ValidationUtils_EnumMemberDoesNotExistOnType(enumValue, propertyName, edmEnumType.FullTypeName()));
}and you must always try to get the or we can extend ReaderValidationUtils with a similar to method and call it when deserializing the enum value.Thanks! |
|
@adzhilyanov I'd be happy to merge, I haven't gotten around to it yet. |
|
@xuzhg , @KanishManuja-MS could we get your review on this? |
| return new ODataEnumValue(enumStr, expectedValueTypeReference.FullName()); | ||
| object enumValue = this.JsonReader.ReadPrimitiveValue(); | ||
| string enumString; | ||
| if (enumValue is int enumIntValue) |
There was a problem hiding this comment.
enumValue is int enumIntValue [](start = 16, length = 29)
This new syntax maybe not pass .NET 4.5 and .NET 3.5 compiler. Please change it to normal.
| else | ||
| { | ||
| throw new ODataException(ODataErrorStrings.ReaderValidationUtils_CannotConvertPrimitiveValue(enumValue, typeof(IEdmEnumTypeReference))); | ||
| } |
There was a problem hiding this comment.
I'd like to see Unit test to cover the changes.
|
When will be done this issue ? |
|
@bdebaere Kindly work on review comments. |
| { | ||
| IEdmEnumType edmEnumType = expectedValueTypeReference.EnumDefinition(); | ||
| IEdmEnumMember selectedMember = edmEnumType.Members.FirstOrDefault(member => member.Value.Value == enumIntValue); | ||
| enumString = selectedMember.Name; |
There was a problem hiding this comment.
Can't selectedMember be null here because of FirstOrDefault potentially not finding an element?
Issues
This pull request fixes issue OData/WebApi#1902.
Description
Reads a PrimitiveValue instead of a StringValue and tries to convert the value to an enum.
Checklist (Uncheck if it is not completed)