You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ra...@apache.org on 2021/09/17 04:07:09 UTC

[olingo-odata4] branch master updated: [OLINGO-1544]Fix for deserialize delta request payload with navigation

This is an automated email from the ASF dual-hosted git repository.

ramyav pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git


The following commit(s) were added to refs/heads/master by this push:
     new 002b3af  [OLINGO-1544]Fix for deserialize delta request payload with navigation
002b3af is described below

commit 002b3af2f9df5c67bc7a89cf662d4d6947c4da10
Author: ramya vasanth <ra...@sap.com>
AuthorDate: Thu Sep 16 17:56:04 2021 +0530

    [OLINGO-1544]Fix for deserialize delta request payload with navigation
---
 .../olingo/server/core/deserializer/json/ODataJsonDeserializer.java    | 3 ++-
 pom.xml                                                                | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

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 943b5eb..ea3cdf4 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
@@ -287,7 +287,8 @@ public class ODataJsonDeserializer implements ODataDeserializer {
               deltaValue.getDeletedEntities().add(deletedEntity);
             } else {
               //For @id and properties create normal entity
-              Entity inlineEntity = consumeEntityNode(edmEntityType, (ObjectNode) arrayElement, expandBuilder);
+            	Entity inlineEntity = consumeEntityNode(edmNavigationProperty.getType(), 
+              		  (ObjectNode) arrayElement, expandBuilder);
               deltaValue.getEntities().add(inlineEntity);
             }
           }
diff --git a/pom.xml b/pom.xml
index 614263c..e7a6f34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -596,6 +596,7 @@
                 <exclude>**/server-ref/**</exclude>
                 <exclude>**/dependency-reduced-pom.xml</exclude>
                 <exclude>**/.settings/**</exclude>
+				<exclude>**/SECURITY.md</exclude>
               </excludes>
             </configuration>
           </execution>