Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Serialize navigation-properties on child entities #79

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Serialize navigation-properties on child entities #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions .../src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Linked;
import org.apache.olingo.commons.api.data.Parameter;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ValueType;
Expand Down Expand Up @@ -223,19 +224,19 @@ private Entity consumeEntityNode(final EdmEntityType edmEntityType, final Object
final ExpandTreeBuilder expandBuilder) throws DeserializerException {
Entity entity = new Entity();
entity.setType(edmEntityType.getFullQualifiedName().getFullQualifiedNameAsString());

// Check and consume @id for v4.01
consumeId(tree, entity);

// Check and consume all Properties
consumeEntityProperties(edmEntityType, tree, entity);
consumeEntityProperties(edmEntityType, tree, entity, expandBuilder);

// Check and consume all expanded Navigation Properties
consumeExpandedNavigationProperties(edmEntityType, tree, entity, expandBuilder);

// consume delta json node fields for v4.01
consumeDeltaJsonNodeFields(edmEntityType, tree, entity, expandBuilder);

// consume remaining json node fields
consumeRemainingJsonNodeFields(edmEntityType, tree, entity);

Expand All @@ -245,7 +246,7 @@ private Entity consumeEntityNode(final EdmEntityType edmEntityType, final Object
}

private void consumeDeltaJsonNodeFields(EdmEntityType edmEntityType, ObjectNode node,
Entity entity, ExpandTreeBuilder expandBuilder)
Entity entity, ExpandTreeBuilder expandBuilder)
throws DeserializerException {
if (constants instanceof Constantsv01) {
List<String> navigationPropertyNames = edmEntityType.getNavigationPropertyNames();
Expand Down Expand Up @@ -287,7 +288,7 @@ private void consumeDeltaJsonNodeFields(EdmEntityType edmEntityType, ObjectNode
deltaValue.getDeletedEntities().add(deletedEntity);
} else {
//For @id and properties create normal entity
Entity inlineEntity = consumeEntityNode(edmNavigationProperty.getType(),
Entity inlineEntity = consumeEntityNode(edmNavigationProperty.getType(),
(ObjectNode) arrayElement, expandBuilder);
deltaValue.getEntities().add(inlineEntity);
}
Expand All @@ -301,7 +302,7 @@ private void consumeDeltaJsonNodeFields(EdmEntityType edmEntityType, ObjectNode

}

private void consumeId(ObjectNode node, Entity entity)
private void consumeId(ObjectNode node, Entity entity)
throws DeserializerException {
if (node.get(constants.getId()) != null && constants instanceof Constantsv01) {
try {
Expand All @@ -328,7 +329,7 @@ public DeserializerResult actionParameters(final InputStream stream, final EdmAc
InputStream inputStream1 = new ByteArrayInputStream(inputContent);
ObjectNode tree = parseJsonTree(inputStream1);
parameters = consumeParameters(edmAction, tree);

if (tree.isObject()) {
removeAnnotations(tree);
}
Expand Down Expand Up @@ -461,17 +462,17 @@ private void consumeRemainingJsonNodeFields(final EdmEntityType edmEntityType, f
Link bindingLink = consumeBindingLink(field.getKey(), field.getValue(), edmEntityType);
entity.getNavigationBindings().add(bindingLink);
toRemove.add(field.getKey());
} else if (!field.getKey().contains(ODATA_CONTROL_INFORMATION_PREFIX) &&
} else if (!field.getKey().contains(ODATA_CONTROL_INFORMATION_PREFIX) &&
field.getKey().contains(ODATA_ANNOTATION_MARKER) &&
field.getKey().substring(field.getKey().indexOf(ODATA_ANNOTATION_MARKER))
.contains(".")) {
// Instance annotations start with @ sign followed by
// alias or namespace
// Instance annotations start with @ sign followed by
// alias or namespace
// followed by a dot and then term name
String[] keySplit = field.getKey().split(ODATA_ANNOTATION_MARKER);
String termName = keySplit[1];
Annotation annotation = instanceAnnotDeserializer.consumeInstanceAnnotation(termName, field.getValue());
// If keySplit has a value at zeroth index then instance annotation is specified like
// If keySplit has a value at zeroth index then instance annotation is specified like
// propertyName@Term
if (!keySplit[0].isEmpty()) {
if (edmEntityType.getPropertyNames().contains(keySplit[0])) {
Expand Down Expand Up @@ -542,8 +543,8 @@ private void consumeStreamPropertyNode(final Entity entity,
property.getAnnotations().add(annotation);
}

private void consumeEntityProperties(final EdmEntityType edmEntityType, final ObjectNode node,
final Entity entity) throws DeserializerException {
private void consumeEntityProperties(final EdmEntityType edmEntityType, final ObjectNode node, final Entity entity,
ExpandTreeBuilder expandBuilder) throws DeserializerException {
List<String> propertyNames = edmEntityType.getPropertyNames();
for (String propertyName : propertyNames) {
JsonNode jsonNode = node.get(propertyName);
Expand All @@ -557,24 +558,25 @@ private void consumeEntityProperties(final EdmEntityType edmEntityType, final Ob
edmProperty.isCollection(), edmProperty.isNullable(), edmProperty.getMaxLength(),
edmProperty.getPrecision(), edmProperty.getScale(), edmProperty.isUnicode(), edmProperty.getMapping(),
jsonNode);

entity.addProperty(property);
node.remove(propertyName);
}
}
}

private void consumeExpandedNavigationProperties(final EdmEntityType edmEntityType, final ObjectNode node,
final Entity entity, final ExpandTreeBuilder expandBuilder) throws DeserializerException {
List<String> navigationPropertyNames = edmEntityType.getNavigationPropertyNames();
private void consumeExpandedNavigationProperties(final EdmStructuredType edmStructuredType, final ObjectNode node,
final Linked linked, final ExpandTreeBuilder expandBuilder) throws DeserializerException {
List<String> navigationPropertyNames = edmStructuredType.getNavigationPropertyNames();
for (String navigationPropertyName : navigationPropertyNames) {
// read expanded navigation property
JsonNode jsonNode = node.get(navigationPropertyName);
if (jsonNode != null) {
EdmNavigationProperty edmNavigationProperty = edmEntityType.getNavigationProperty(navigationPropertyName);
EdmNavigationProperty edmNavigationProperty = edmStructuredType.getNavigationProperty(navigationPropertyName);
checkNotNullOrValidNull(jsonNode, edmNavigationProperty);

Link link = createLink(expandBuilder, navigationPropertyName, jsonNode, edmNavigationProperty);
entity.getNavigationLinks().add(link);
linked.getNavigationLinks().add(link);
node.remove(navigationPropertyName);
}
}
Expand Down Expand Up @@ -625,7 +627,7 @@ private Link createLink(final ExpandTreeBuilder expandBuilder, final String navi
}
return link;
}

private Link consumeBindingLink(final String key, final JsonNode jsonNode, final EdmEntityType edmEntityType)
throws DeserializerException {
String[] splitKey = key.split(ODATA_ANNOTATION_MARKER);
Expand Down Expand Up @@ -664,7 +666,7 @@ private Link consumeBindingLink(final String key, final JsonNode jsonNode, final
bindingLink.setBindingLink(null);
} else {
assertIsNullNode(key, jsonNode);
bindingLink.setBindingLink(jsonNode.asText());
bindingLink.setBindingLink(jsonNode.asText());
}
bindingLink.setType(Constants.ENTITY_BINDING_LINK_TYPE);
}
Expand Down Expand Up @@ -726,7 +728,7 @@ private Object readComplexNode(final String name, final EdmType type, final bool
final JsonNode jsonNode)
throws DeserializerException {
// read and add all complex properties
ComplexValue value = readComplexValue(name, type, isNullable, jsonNode);
ComplexValue value = readComplexValue(name, type, isNullable, jsonNode, null);

if (jsonNode.isObject()) {
removeAnnotations((ObjectNode) jsonNode);
Expand Down Expand Up @@ -776,8 +778,8 @@ private void consumePropertyCollectionNode(final String name, final EdmType type
}
}

private ComplexValue readComplexValue(final String name, final EdmType type,
final boolean isNullable, final JsonNode jsonNode) throws DeserializerException {
private ComplexValue readComplexValue(final String name, final EdmType type, final boolean isNullable,
final JsonNode jsonNode, final ExpandTreeBuilder expandBuilder) throws DeserializerException {
if (isValidNull(name, isNullable, jsonNode)) {
return null;
}
Expand All @@ -789,10 +791,10 @@ private ComplexValue readComplexValue(final String name, final EdmType type,
// Even if there are no properties defined we have to give back an empty list
ComplexValue complexValue = new ComplexValue();
EdmComplexType edmType = (EdmComplexType) type;

//Check if the properties are from derived type
edmType = (EdmComplexType) getDerivedType(edmType, jsonNode);

// Check and consume all Properties
for (String propertyName : edmType.getPropertyNames()) {
JsonNode subNode = jsonNode.get(propertyName);
Expand All @@ -811,6 +813,8 @@ private ComplexValue readComplexValue(final String name, final EdmType type,
((ObjectNode) jsonNode).remove(propertyName);
}
}

consumeExpandedNavigationProperties(edmType, (ObjectNode) jsonNode, complexValue, null);
complexValue.setTypeName(edmType.getFullQualifiedName().getFullQualifiedNameAsString());
return complexValue;
}
Expand Down Expand Up @@ -874,7 +878,7 @@ private Geospatial readPrimitiveGeoValue(final String name, final EdmPrimitiveTy
jsonNode.remove(Constants.JSON_CRS).get(Constants.PROPERTIES).
get(Constants.JSON_NAME).asText().split(":")[1]);
}

assertJsonNodeIsEmpty(jsonNode);

if (topNode != null && topNode.isArray()) {
Expand Down