Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-609] Fix: ODataJsonDeserializer

This commit is contained in:
Christian Holzer 2015-03-31 12:52:02 +02:00
parent 62f100148a
commit 92e201b0a8
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
View File

@ -290,7 +290,7 @@ public class ODataJsonDeserializer implements ODataDeserializer {
if (jsonNode != null) { if (jsonNode != null) {
EdmNavigationProperty edmNavigationProperty = edmEntityType.getNavigationProperty(navigationPropertyName); EdmNavigationProperty edmNavigationProperty = edmEntityType.getNavigationProperty(navigationPropertyName);
boolean isNullable = edmNavigationProperty.isNullable(); boolean isNullable = edmNavigationProperty.isNullable();
if (jsonNode.isNull() && !isNullable) { if ((jsonNode.isNull() && !isNullable) || (jsonNode.isNull() && edmNavigationProperty.isCollection())) {
throw new DeserializerException("Property: " + navigationPropertyName + " must not be null.", throw new DeserializerException("Property: " + navigationPropertyName + " must not be null.",
DeserializerException.MessageKeys.INVALID_NULL_PROPERTY, navigationPropertyName); DeserializerException.MessageKeys.INVALID_NULL_PROPERTY, navigationPropertyName);
} }

3
lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/PropertyProvider.java
View File

@ -658,8 +658,7 @@ public class PropertyProvider {
public static final NavigationProperty collectionNavPropertyETTwoPrimMany_ETTwoPrim = new NavigationProperty() public static final NavigationProperty collectionNavPropertyETTwoPrimMany_ETTwoPrim = new NavigationProperty()
.setName("NavPropertyETTwoPrimMany") .setName("NavPropertyETTwoPrimMany")
.setType(EntityTypeProvider.nameETTwoPrim) .setType(EntityTypeProvider.nameETTwoPrim)
.setCollection(true) .setCollection(true);
.setNullable(false);
public static final NavigationProperty collectionNavPropertyETAllPrimMany_ETAllPrim = new NavigationProperty() public static final NavigationProperty collectionNavPropertyETAllPrimMany_ETAllPrim = new NavigationProperty()
.setName("NavPropertyETAllPrimMany") .setName("NavPropertyETAllPrimMany")