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/8bd9e0ca Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8bd9e0ca Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8bd9e0ca Branch: refs/heads/olingo-266-ref Commit: 8bd9e0ca9776b56b55b58fcc66883b21bc5f4c02 Parents: fc42d2a c32f4a0 Author: fmartelli <[email protected]> Authored: Mon May 12 11:55:39 2014 +0200 Committer: fmartelli <[email protected]> Committed: Mon May 12 11:55:39 2014 +0200 ---------------------------------------------------------------------- fit/src/main/resources/V40/badRequest.json | 50 ++++++++----- fit/src/main/resources/V40/notFound.json | 44 +++++++++--- .../olingo/fit/v4/ErrorResponseTestITCase.java | 76 ++++++++++++++++++++ .../apache/olingo/commons/api/Constants.java | 4 ++ .../olingo/commons/api/domain/ODataError.java | 17 +++++ .../commons/api/domain/ODataErrorDetail.java | 48 +++++++++++++ .../commons/core/data/AbstractODataError.java | 32 +++++++-- .../core/data/JSONODataErrorDeserializer.java | 34 ++++++++- .../data/JSONODataErrorDetailDeserializer.java | 66 +++++++++++++++++ .../core/data/JSONODataErrorDetailImpl.java | 62 ++++++++++++++++ 10 files changed, 402 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
