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/39eb8212 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/39eb8212 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/39eb8212 Branch: refs/heads/master Commit: 39eb82125829d9cadf014aed82e5e37bac225a94 Parents: 046cdb1 4376658 Author: fmartelli <[email protected]> Authored: Wed Apr 16 08:47:51 2014 +0200 Committer: fmartelli <[email protected]> Committed: Wed Apr 16 08:47:51 2014 +0200 ---------------------------------------------------------------------- .../org/apache/olingo/fit/AbstractServices.java | 109 +++++++++++-------- .../java/org/apache/olingo/fit/V4Services.java | 3 +- .../olingo/fit/utils/AbstractJSONUtilities.java | 2 +- .../olingo/fit/utils/AbstractUtilities.java | 14 +-- .../org/apache/olingo/fit/utils/Commons.java | 40 ++++--- .../org/apache/olingo/fit/utils/Constants.java | 2 + .../org/apache/olingo/fit/utils/DataBinder.java | 8 +- .../101/links/MyPaymentInstruments(101901).xml | 6 +- .../Accounts/101/links/MyPaymentInstruments.xml | 22 ++-- lib/client-core/pom.xml | 21 ++++ .../client/core/it/AbstractBaseTestITCase.java | 98 +++++++++++++++++ .../core/it/AbstractMetadataTestITCase.java | 1 + .../client/core/it/v3/AbstractTestITCase.java | 71 +----------- .../client/core/it/v4/AbstractTestITCase.java | 8 +- .../core/it/v4/EntityCreateTestITCase.java | 93 +++++++++++++++- .../apache/olingo/client/core/v4/AtomTest.java | 1 + .../core/data/AbstractJsonSerializer.java | 37 ++++--- .../commons/core/data/AtomDeserializer.java | 4 + .../commons/core/data/AtomSerializer.java | 9 +- .../commons/core/data/JSONEntrySerializer.java | 8 +- .../core/data/JSONPropertySerializer.java | 8 +- pom.xml | 15 ++- 22 files changed, 384 insertions(+), 196 deletions(-) ----------------------------------------------------------------------
