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

[OLINGO-1126]ClientProperty hasNullValue incorrect for null complex values

This commit is contained in:
ramya vasanth 2017-06-09 12:57:54 +05:30
parent d1ef643c97
commit aea44a33a0
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
View File

@ -1519,7 +1519,7 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
assertNotNull(entity.getProperty(PROPERTY_COMP).getComplexValue()); assertNotNull(entity.getProperty(PROPERTY_COMP).getComplexValue());
assertEquals("olingo.odata.test1.CTAllPrim", entity.getProperty(PROPERTY_COMP).getComplexValue().getTypeName()); assertEquals("olingo.odata.test1.CTAllPrim", entity.getProperty(PROPERTY_COMP).getComplexValue().getTypeName());
assertEquals(PROPERTY_COMP, entity.getProperty(PROPERTY_COMP).getName()); assertEquals(PROPERTY_COMP, entity.getProperty(PROPERTY_COMP).getName());
assertNull(entity.getProperty(PROPERTY_COMP).getComplexValue().get(PROPERTY_COMP).getComplexValue()); assertTrue(entity.getProperty(PROPERTY_COMP).hasNullValue());
} }
@Test @Test
@ -1540,7 +1540,7 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
ClientEntity entity = odataClient.getReader().readEntity(input, ContentType.JSON); ClientEntity entity = odataClient.getReader().readEntity(input, ContentType.JSON);
assertEquals("olingo.odata.test1.CTAllPrim", entity.getProperty(PROPERTY_COMP).getComplexValue().getTypeName()); assertEquals("olingo.odata.test1.CTAllPrim", entity.getProperty(PROPERTY_COMP).getComplexValue().getTypeName());
assertEquals(PROPERTY_COMP, entity.getProperty(PROPERTY_COMP).getName()); assertEquals(PROPERTY_COMP, entity.getProperty(PROPERTY_COMP).getName());
assertTrue(entity.getProperty(PROPERTY_COMP).getComplexValue().asJavaMap().size() == 0); assertTrue(entity.getProperty(PROPERTY_COMP).hasNullValue());
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -1565,7 +1565,6 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
Map<String, Object> map = entity.getProperty(PROPERTY_COMP).getComplexValue().asJavaMap(); Map<String, Object> map = entity.getProperty(PROPERTY_COMP).getComplexValue().asJavaMap();
assertEquals(map.size(), 2); assertEquals(map.size(), 2);
assertEquals(((Map<String, Object>)map.get(PROPERTY_COMP)).size(), 16); assertEquals(((Map<String, Object>)map.get(PROPERTY_COMP)).size(), 16);
assertNull(entity.getProperty(PROPERTY_COMP_NAV).getComplexValue().get(PROPERTY_COMP_NAV).getComplexValue());
assertEquals("Collection(olingo.odata.test1.CTPrimComp)", entity.getProperty(COL_PROPERTY_COMP). assertEquals("Collection(olingo.odata.test1.CTPrimComp)", entity.getProperty(COL_PROPERTY_COMP).
getCollectionValue().getTypeName()); getCollectionValue().getTypeName());
assertEquals(0, entity.getProperty(COL_PROPERTY_COMP).getCollectionValue().size()); assertEquals(0, entity.getProperty(COL_PROPERTY_COMP).getCollectionValue().size());
@ -1573,8 +1572,6 @@ public class BasicITCase extends AbstractParamTecSvcITCase {
getComplexValue().getTypeName()); getComplexValue().getTypeName());
assertEquals("olingo.odata.test1.CTTwoPrim", entity.getProperty(PROPERTY_COMP_TWO_PRIM). assertEquals("olingo.odata.test1.CTTwoPrim", entity.getProperty(PROPERTY_COMP_TWO_PRIM).
getComplexValue().getTypeName()); getComplexValue().getTypeName());
assertNull(entity.getProperty(PROPERTY_COMP_TWO_PRIM).getComplexValue().
get(PROPERTY_COMP_TWO_PRIM).getComplexValue());
} }
@Test @Test

3
lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientPropertyImpl.java
View File

@ -77,7 +77,8 @@ public final class ClientPropertyImpl extends ClientValuableImpl implements Clie
*/ */
@Override @Override
public boolean hasNullValue() { public boolean hasNullValue() {
return value == null || value.isPrimitive() && value.asPrimitive().toValue() == null; return value == null || value.isPrimitive() && value.asPrimitive().toValue() == null
|| value.isComplex() && value.asComplex().asJavaMap().size() == 0;
} }
@Override @Override

2
lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java
View File

@ -65,7 +65,7 @@ public class ClientValuableImpl implements ClientValuable {
@Override @Override
public boolean hasComplexValue() { public boolean hasComplexValue() {
return !hasNullValue() && value.isComplex(); return value != null && value.isComplex();
} }
@Override @Override

1
lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
View File

@ -891,7 +891,6 @@ public class ODataBinderImpl implements ODataBinder {
} }
if (edm != null && edm.getComplexType(type) != null) { if (edm != null && edm.getComplexType(type) != null) {
ClientComplexValue cValue = client.getObjectFactory().newComplexValue(type.toString()); ClientComplexValue cValue = client.getObjectFactory().newComplexValue(type.toString());
cValue.add(new ClientPropertyImpl(((Property)valuable).getName(), null));
value = cValue; value = cValue;
} else { } else {
if (type != null && !EdmPrimitiveTypeKind.String.getFullQualifiedName().equals(type) if (type != null && !EdmPrimitiveTypeKind.String.getFullQualifiedName().equals(type)