Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/ef8c3a05 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/ef8c3a05 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/ef8c3a05 Branch: refs/heads/master Commit: ef8c3a0531f5d57fea56e3da951c3746c2f00754 Parents: 03e5462 7276a70 Author: Francesco Chicchiriccò <[email protected]> Authored: Thu Apr 17 10:42:29 2014 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Thu Apr 17 10:42:29 2014 +0200 ---------------------------------------------------------------------- .../org/apache/olingo/fit/AbstractServices.java | 163 ++++--- .../olingo/fit/utils/AbstractJSONUtilities.java | 15 - .../olingo/fit/utils/AbstractUtilities.java | 29 +- .../olingo/fit/utils/AbstractXMLUtilities.java | 133 ------ .../org/apache/olingo/fit/utils/Commons.java | 1 + .../org/apache/olingo/fit/utils/DataBinder.java | 8 +- .../resources/V40/Accounts/101/entity.full.json | 28 +- .../main/resources/V40/Accounts/101/entity.xml | 14 +- .../MyPaymentInstruments(101901).full.json | 14 +- .../101/links/MyPaymentInstruments(101901).xml | 8 +- .../101/links/MyPaymentInstruments.full.json | 46 +- .../Accounts/101/links/MyPaymentInstruments.xml | 26 +- .../V40/OrderDetails/7 5/entity.full.json | 17 + .../resources/V40/OrderDetails/7 5/entity.xml | 42 ++ .../client/core/it/v3/BatchTestITCase.java | 1 - .../client/core/it/v4/BatchTestITCase.java | 466 +++++++++++++++++++ .../core/it/v4/EntityRetrieveTestITCase.java | 2 +- 17 files changed, 706 insertions(+), 307 deletions(-) ----------------------------------------------------------------------
