[OLINGO-506] Better fix
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/4bab6aab Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/4bab6aab Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/4bab6aab Branch: refs/heads/Olingo-129_PocJpaDataStore Commit: 4bab6aab0f3de274df100f9a37dfa86992016d0c Parents: 8730ca5 Author: Michael Bolz <[email protected]> Authored: Mon Dec 8 15:17:55 2014 +0100 Committer: Michael Bolz <[email protected]> Committed: Mon Dec 8 15:17:55 2014 +0100 ---------------------------------------------------------------------- .../core/edm/AnnotationEdmProvider.java | 21 ++++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/4bab6aab/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 48140a7..8b6e7f6 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 @@ -283,7 +283,7 @@ public class AnnotationEdmProvider extends EdmProvider { private void handleEntityContainer(final Class<?> aClass) { EdmEntityType entityType = aClass.getAnnotation(EdmEntityType.class); if (entityType != null) { - FullQualifiedName typeName = createFqnForEntityType(aClass, entityType); + FullQualifiedName typeName = createFqnForEntityType(aClass); String containerName = ANNOTATION_HELPER.extractContainerName(aClass); ContainerBuilder builder = containerName2ContainerBuilder.get(containerName); if (builder == null) { @@ -302,7 +302,7 @@ public class AnnotationEdmProvider extends EdmProvider { return new EntitySet().setName(entitySetName).setEntityType(typeName); } - private FullQualifiedName createFqnForEntityType(final Class<?> annotatedClass, final EdmEntityType entityType) { + private FullQualifiedName createFqnForEntityType(final Class<?> annotatedClass) { return ANNOTATION_HELPER.extractEntityTypeFqn(annotatedClass); } @@ -366,7 +366,7 @@ public class AnnotationEdmProvider extends EdmProvider { for (Field field : fields) { EdmProperty ep = field.getAnnotation(EdmProperty.class); if (ep != null) { - properties.add(createProperty(ep, field, namespace)); + properties.add(createProperty(ep, field)); EdmKey eti = field.getAnnotation(EdmKey.class); if (eti != null) { keyProperties.add(createKeyProperty(ep, field)); @@ -446,9 +446,9 @@ public class AnnotationEdmProvider extends EdmProvider { return keyProperty.setName(entityName); } - private Property createProperty(final EdmProperty ep, final Field field, final String defaultNamespace) { + private Property createProperty(final EdmProperty ep, final Field field) { if (isAnnotatedEntity(field.getType())) { - return createComplexProperty(field, defaultNamespace); + return createComplexProperty(field); } else { return createSimpleProperty(ep, field); } @@ -485,20 +485,15 @@ public class AnnotationEdmProvider extends EdmProvider { return resultFacets; } - private Property createComplexProperty(final Field field, final String defaultNamespace) { + private Property createComplexProperty(final Field field) { ComplexProperty cp = new ComplexProperty(); // settings from property String entityName = ANNOTATION_HELPER.getPropertyName(field); cp.setName(entityName); // settings from related complex entity - EdmComplexType ece = field.getType().getAnnotation(EdmComplexType.class); - String complexEntityNamespace = ece.namespace(); - if (complexEntityNamespace.isEmpty()) { - complexEntityNamespace = defaultNamespace; - } - String name = ANNOTATION_HELPER.extractComplexTypeName(field.getType()); - cp.setType(new FullQualifiedName(complexEntityNamespace, name)); + FullQualifiedName fqn = ANNOTATION_HELPER.extractComplexTypeFqn(field.getType()); + cp.setType(fqn); return cp; }
