[OLINGO-824] Merge branch 'OLINGO-824_FacetsOnJoinColumns'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/2a22911d Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/2a22911d Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/2a22911d Branch: refs/heads/master Commit: 2a22911dc2d9b8d23ce304404cd940c219b1df69 Parents: 2675f5f 4752ec1 Author: mibo <[email protected]> Authored: Tue Nov 17 19:44:23 2015 +0100 Committer: mibo <[email protected]> Committed: Tue Nov 17 19:44:23 2015 +0100 ---------------------------------------------------------------------- .../jpa/processor/core/model/JPAEdmFacets.java | 16 +++- .../processor/core/model/JPAEdmProperty.java | 87 ++++++++++---------- .../core/model/JPAEdmPropertyTest.java | 49 ++++++++--- .../jpa/processor/ref/model/Customer.java | 19 ++++- 4 files changed, 110 insertions(+), 61 deletions(-) ----------------------------------------------------------------------
