[OLINGO-414] Merge branch 'master' into OLINGO-JPA-Fixes
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/07984dc1 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/07984dc1 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/07984dc1 Branch: refs/heads/OLINGO-JPA-Fixes Commit: 07984dc1ba40f14a8a92147d1eb9ec40290ed671 Parents: 3ed5889 6bc60b4 Author: mibo <[email protected]> Authored: Wed Aug 24 22:45:14 2016 +0200 Committer: mibo <[email protected]> Committed: Wed Aug 24 22:45:14 2016 +0200 ---------------------------------------------------------------------- .../odata2/api/edm/provider/DataServices.java | 36 +++ .../olingo/odata2/api/ep/EntityProvider.java | 32 +++ .../apache/olingo/odata2/api/uri/PathInfo.java | 2 +- .../odata2/core/batch/BatchHandlerImpl.java | 8 +- .../odata2/core/batch/v2/BatchParser.java | 13 +- .../odata2/core/ep/BasicEntityProvider.java | 23 +- .../odata2/core/ep/ProviderFacadeImpl.java | 7 + .../ep/producer/AtomEntryEntityProducer.java | 3 +- .../core/ep/producer/XmlMetadataProducer.java | 50 ++-- .../odata2/core/batch/BatchHandlerTest.java | 248 +++++++++++++++++++ .../odata2/core/ep/BasicProviderTest.java | 73 +++++- .../ep/consumer/XmlMetadataConsumerTest.java | 70 ++++-- .../core/ep/producer/AtomEntryProducerTest.java | 1 + .../resources/batchContentIdReferencing.batch | 27 ++ .../odata2/fit/client/ClientBatchTest.java | 12 +- .../apache/olingo/odata2/fit/ref/BatchTest.java | 27 +- pom.xml | 3 + 17 files changed, 561 insertions(+), 74 deletions(-) ----------------------------------------------------------------------
