[OLINGO-508] Merge branch 'OLINGO-508_FixAnnotationEdmProvider'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/fbfbff08 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/fbfbff08 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/fbfbff08 Branch: refs/heads/master Commit: fbfbff0889aeaacdca287211952c1c7f63a74387 Parents: 2186daa c0e17ee Author: mibo <[email protected]> Authored: Tue Dec 16 21:36:28 2014 +0100 Committer: mibo <[email protected]> Committed: Tue Dec 16 21:36:28 2014 +0100 ---------------------------------------------------------------------- .../core/datasource/AnnotationInMemoryDs.java | 7 +- .../core/edm/AnnotationEdmProvider.java | 39 +++-- .../processor/core/util/AnnotationHelper.java | 170 ++++++++++++++----- .../processor/core/util/ClassHelper.java | 16 ++ .../core/edm/AnnotationEdmProviderTest.java | 36 ++-- .../annotation/processor/core/model/Team.java | 6 + .../core/util/AnnotationHelperTest.java | 22 ++- .../ref/AnnotationRefServiceFactory.java | 9 +- .../annotation/processor/ref/model/Team.java | 10 ++ .../annotation/processor/ref/MetadataTest.java | 70 +++++--- 10 files changed, 280 insertions(+), 105 deletions(-) ----------------------------------------------------------------------
