You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/03/25 16:49:57 UTC
[1/2] olingo-odata4 git commit: ExpandBuilder is optional now
Repository: olingo-odata4
Updated Branches:
refs/heads/ExpandTreeBuilder f25291dfb -> a85d2fe1b
ExpandBuilder is optional now
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/3c6a3e0f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/3c6a3e0f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/3c6a3e0f
Branch: refs/heads/ExpandTreeBuilder
Commit: 3c6a3e0fe432bc33ca6e8db520bba87f5642fb88
Parents: f25291d
Author: Christian Holzer <c....@sap.com>
Authored: Wed Mar 25 14:49:10 2015 +0100
Committer: Christian Holzer <c....@sap.com>
Committed: Wed Mar 25 14:49:10 2015 +0100
----------------------------------------------------------------------
.../core/deserializer/json/ODataJsonDeserializer.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3c6a3e0f/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
index 0937681..50c6910 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
@@ -77,10 +77,8 @@ public class ODataJsonDeserializer implements ODataDeserializer {
objectMapper.configure(DeserializationFeature.FAIL_ON_READING_DUP_TREE_KEY, true);
JsonParser parser = new JsonFactory(objectMapper).createParser(stream);
final ObjectNode tree = parser.getCodec().readTree(parser);
- final ExpandTreeBuilderImpl expandBuilder = new ExpandTreeBuilderImpl();
- return DeserializerResultImpl.with().entitySet(consumeEntitySetNode(edmEntityType, tree, expandBuilder))
- .expandOption(expandBuilder.build())
+ return DeserializerResultImpl.with().entitySet(consumeEntitySetNode(edmEntityType, tree, null))
.build();
} catch (JsonParseException e) {
throw new DeserializerException("An JsonParseException occurred", e,
@@ -261,16 +259,16 @@ public class ODataJsonDeserializer implements ODataDeserializer {
link.setType(ODataLinkType.ENTITY_SET_NAVIGATION.toString());
EntitySetImpl inlineEntitySet = new EntitySetImpl();
inlineEntitySet.getEntities().addAll(consumeEntitySetArray(edmNavigationProperty.getType(),
- jsonNode,
- expandBuilder.expand(edmNavigationProperty)));
+ jsonNode,
+ expandBuilder != null ? expandBuilder.expand(edmNavigationProperty) : null));
link.setInlineEntitySet(inlineEntitySet);
} else if (!jsonNode.isArray() && (!jsonNode.isValueNode() || jsonNode.isNull())
&& !edmNavigationProperty.isCollection()) {
link.setType(ODataLinkType.ENTITY_NAVIGATION.toString());
if (!jsonNode.isNull()) {
Entity inlineEntity = consumeEntityNode(edmNavigationProperty.getType(),
- (ObjectNode) jsonNode,
- expandBuilder.expand(edmNavigationProperty));
+ (ObjectNode) jsonNode,
+ expandBuilder != null ? expandBuilder.expand(edmNavigationProperty) : null);
link.setInlineEntity(inlineEntity);
}
} else {
[2/2] olingo-odata4 git commit: JavaDoc changed
Posted by ch...@apache.org.
JavaDoc changed
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a85d2fe1
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a85d2fe1
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a85d2fe1
Branch: refs/heads/ExpandTreeBuilder
Commit: a85d2fe1b372772569971ec9bae1c9a8aa336bcd
Parents: 3c6a3e0
Author: Christian Holzer <c....@sap.com>
Authored: Wed Mar 25 14:59:28 2015 +0100
Committer: Christian Holzer <c....@sap.com>
Committed: Wed Mar 25 14:59:28 2015 +0100
----------------------------------------------------------------------
.../apache/olingo/server/api/deserializer/DeserializerResult.java | 2 +-
.../apache/olingo/server/api/deserializer/ODataDeserializer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a85d2fe1/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java
index 8d1c4a6..85452af 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java
@@ -40,7 +40,7 @@ public interface DeserializerResult {
/**
* Returns the ExpandOptions for serialized entities
- * @return an {@link ExpandOption}
+ * @return an {@link ExpandOption} or null
*/
ExpandOption getExpandTree();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a85d2fe1/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
index 9dacaea..495b9f3 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
@@ -33,7 +33,7 @@ public interface ODataDeserializer {
/**
* Deserializes an entity stream into an {@link Entity} object.
* Validates: property types, no double properties, correct json types
- * Returns a deserialized {@link Entity} object and an {@link ExpandOption}
+ * Returns a deserialized {@link Entity} object and an {@link ExpandOption} object
* @param stream
* @param edmEntityType
* @return {@link DeserializerResult}