Repository: olingo-odata2 Updated Branches: refs/heads/master 750e9b9de -> e4f61ad44
[OLINGO-951] Embeddable changes Signed-off-by: mibo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/e4f61ad4 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/e4f61ad4 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/e4f61ad4 Branch: refs/heads/master Commit: e4f61ad44f250912f72d28a541f887820f20e42c Parents: 750e9b9 Author: Shankara G <[email protected]> Authored: Tue May 3 09:58:22 2016 +0530 Committer: mibo <[email protected]> Committed: Wed May 11 06:04:56 2016 +0200 ---------------------------------------------------------------------- .../odata2/jpa/processor/core/access/data/JPAEntity.java | 8 ++++++-- .../jpa/processor/core/access/data/JPAEntityParser.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/e4f61ad4/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java index 793e151..bda0a1b 100644 --- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java +++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java @@ -432,7 +432,11 @@ public class JPAEntity { JPAEdmMapping mapping = (JPAEdmMapping) edmComplexType.getMapping(); Object embeddableObject = mapping.getJPAType().newInstance(); - accessModifier.invoke(jpaEntity, embeddableObject); + if (propertyName != null) { + accessModifier.invoke(jpaEntity, propertyName, embeddableObject); + } else { + accessModifier.invoke(jpaEntity, embeddableObject); + } HashMap<String, Method> accessModifiers = jpaEntityParser.getAccessModifiers(embeddableObject, edmComplexType, @@ -453,7 +457,7 @@ public class JPAEntity { } else { if (propertyName != null) { setProperty(accessModifier, embeddableObject, propertyValue.get(edmPropertyName), - (EdmSimpleType) edmTyped.getType(), propertyName); + (EdmSimpleType) edmTyped.getType(), edmPropertyName); } else { setProperty(accessModifier, embeddableObject, propertyValue.get(edmPropertyName), (EdmSimpleType) edmTyped.getType()); http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/e4f61ad4/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java index 4c1d439..203712c 100644 --- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java +++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java @@ -564,7 +564,7 @@ public final class JPAEntityParser { } } else { JPAEdmMapping jpaEdmMapping = (JPAEdmMapping) property.getMapping(); - if(jpaEdmMapping.isVirtualAccess()) { + if(jpaEdmMapping != null && jpaEdmMapping.isVirtualAccess()) { method = jpaEntityType.getMethod(ACCESS_MODIFIER_GET, String.class); }else{ method = jpaEntityType.getMethod(methodName, (Class<?>[]) null);
