You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/09/23 15:01:37 UTC
[6/6] git commit: [OLINGO-422] Merge branch
'OLINGO-422-SelectExpandSupport'
[OLINGO-422] Merge branch 'OLINGO-422-SelectExpandSupport'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/5f5060fd
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/5f5060fd
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/5f5060fd
Branch: refs/heads/master
Commit: 5f5060fdc1f9da15d6684f9bd9c95c27a8030361
Parents: 0dbd53d 588ae2a
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Sep 23 14:42:38 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Sep 23 14:42:38 2014 +0200
----------------------------------------------------------------------
.../olingo/commons/api/data/ContextURL.java | 11 +-
.../core/serialization/ContextURLParser.java | 35 +-
.../server/api/serializer/ODataSerializer.java | 18 +-
.../api/serializer/ODataSerializerOptions.java | 87 +++++
.../core/serializer/ODataXmlSerializerImpl.java | 16 +-
.../serializer/json/ODataJsonSerializer.java | 151 +++++++--
.../serializer/utils/ContextURLBuilder.java | 4 +-
.../core/serializer/utils/ContextURLHelper.java | 145 ++++++++
.../serializer/utils/ExpandSelectHelper.java | 155 +++++++++
.../serializer/utils/ContextURLBuilderTest.java | 21 +-
.../olingo/server/tecsvc/data/DataProvider.java | 338 +++++++++++--------
.../tecsvc/processor/TechnicalProcessor.java | 32 +-
.../server/tecsvc/data/DataProviderTest.java | 13 +-
.../core/serializer/ExpandSelectMock.java | 90 +++++
.../json/ODataJsonSerializerTest.java | 300 +++++++++++++++-
.../serializer/utils/ContextURLHelperTest.java | 179 ++++++++++
16 files changed, 1359 insertions(+), 236 deletions(-)
----------------------------------------------------------------------