You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/05/21 20:02:59 UTC
git commit: [OLINGO-129] Fixed complex type name auto creation
Repository: olingo-odata2
Updated Branches:
refs/heads/Olingo-129_PocJpaDataStore 704016426 -> cb0a9cf14
[OLINGO-129] Fixed complex type name auto creation
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/cb0a9cf1
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/cb0a9cf1
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/cb0a9cf1
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: cb0a9cf146385bd83cb5242d0352efbc9bdb296f
Parents: 7040164
Author: Michael Bolz <mi...@sap.com>
Authored: Wed May 21 10:12:11 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Wed May 21 10:12:11 2014 +0200
----------------------------------------------------------------------
.../annotation/processor/core/edm/AnnotationEdmProvider.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/cb0a9cf1/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
index 9c46da2..b35f394 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
@@ -476,7 +476,8 @@ public class AnnotationEdmProvider extends EdmProvider {
if (complexEntityNamespace.isEmpty()) {
complexEntityNamespace = defaultNamespace;
}
- cp.setType(new FullQualifiedName(complexEntityNamespace, ece.name()));
+ String cpeName = ANNOTATION_HELPER.extractComplexTypeName(field.getType());
+ cp.setType(new FullQualifiedName(complexEntityNamespace, cpeName));
return cp;
}