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

OLINGO-682: adding support for

This commit is contained in:
Ramesh Reddy 2015-06-02 17:49:03 -05:00
parent 181e463563
commit ce1f6ad8e9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
View File

@ -330,13 +330,13 @@ public class ODataJsonSerializer implements ODataSerializer {
final Link navigationLink = linked.getNavigationLink(property.getName());
final ExpandItem innerOptions = expandAll ? null :
ExpandSelectHelper.getExpandItem(expand.getExpandItems(), propertyName);
if (innerOptions != null && (innerOptions.isRef() || innerOptions.getLevelsOption() != null)) {
throw new SerializerException("Expand options $ref and $levels are not supported.",
if (innerOptions != null && innerOptions.getLevelsOption() != null) {
throw new SerializerException("Expand option $levels is not supported.",
SerializerException.MessageKeys.NOT_IMPLEMENTED);
}
writeExpandedNavigationProperty(metadata, property, navigationLink,
innerOptions == null ? null : innerOptions.getExpandOption(),
innerOptions == null ? null : innerOptions.getSelectOption(),
innerOptions == null ? null : innerOptions.getSelectOption(), innerOptions.isRef(),
json);
}
}
@ -345,7 +345,8 @@ public class ODataJsonSerializer implements ODataSerializer {
protected void writeExpandedNavigationProperty(final ServiceMetadata metadata,
final EdmNavigationProperty property, final Link navigationLink,
final ExpandOption innerExpand, final SelectOption innerSelect, final JsonGenerator json)
final ExpandOption innerExpand, final SelectOption innerSelect, boolean onlyReference,
final JsonGenerator json)
throws IOException, SerializerException {
json.writeFieldName(property.getName());
if (property.isCollection()) {
@ -354,14 +355,14 @@ public class ODataJsonSerializer implements ODataSerializer {
json.writeEndArray();
} else {
writeEntitySet(metadata, property.getType(), navigationLink.getInlineEntitySet(), innerExpand,
innerSelect, false, json);
innerSelect, onlyReference, json);
}
} else {
if (navigationLink == null || navigationLink.getInlineEntity() == null) {
json.writeNull();
} else {
writeEntity(metadata, property.getType(), navigationLink.getInlineEntity(), null,
innerExpand, innerSelect, false, json);
innerExpand, innerSelect, onlyReference, json);
}
}
}