You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/08/04 16:57:49 UTC

[13/13] olingo-odata4 git commit: Merge remote-tracking branch 'origin/OLINGO-640'

Merge remote-tracking branch 'origin/OLINGO-640'


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/633578a1
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/633578a1
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/633578a1

Branch: refs/heads/master
Commit: 633578a180f8b68b247a5269cdc29e701d7f6184
Parents: 10fb60f db0b9d3
Author: Christian Amend <ch...@sap.com>
Authored: Tue Aug 4 16:49:55 2015 +0200
Committer: Christian Amend <ch...@sap.com>
Committed: Tue Aug 4 16:49:55 2015 +0200

----------------------------------------------------------------------
 .../olingo/fit/tecsvc/client/BasicITCase.java   |  174 +-
 .../fit/tecsvc/client/BasicXmlITCase.java       |   45 +
 .../fit/tecsvc/client/BatchClientITCase.java    |    8 +-
 .../fit/tecsvc/client/BatchClientXmlITCase.java |   44 +
 .../olingo/fit/tecsvc/client/BindingITCase.java |    6 +-
 .../fit/tecsvc/client/BindingXmlITCase.java     |   51 +
 .../fit/tecsvc/client/ConditionalITCase.java    |    9 +-
 .../fit/tecsvc/client/ConditionalXmlITCase.java |   45 +
 .../fit/tecsvc/client/DeepInsertITCase.java     |   44 +-
 .../fit/tecsvc/client/DeepInsertXmlITCase.java  |  960 +++++++++
 .../tecsvc/client/EntityReferencesITCase.java   |  107 +-
 .../client/EntityReferencesXmlITCase.java       |   45 +
 .../fit/tecsvc/client/ExpandSelectITCase.java   |   60 +-
 .../tecsvc/client/ExpandSelectXmlITCase.java    |   45 +
 .../ExpandWithSystemQueryOptionsITCase.java     |   57 +-
 .../ExpandWithSystemQueryOptionsXmlITCase.java  |   45 +
 .../tecsvc/client/FilterSystemQueryITCase.java  |  165 +-
 .../client/FilterSystemQueryXmlITCase.java      |   45 +
 .../fit/tecsvc/client/FunctionImportITCase.java |   27 +-
 .../tecsvc/client/FunctionImportXmlITCase.java  |   45 +
 .../olingo/fit/tecsvc/client/MediaITCase.java   |   13 +-
 .../fit/tecsvc/client/MediaXmlITCase.java       |   45 +
 .../fit/tecsvc/client/NavigationITCase.java     |   24 +-
 .../fit/tecsvc/client/NavigationXmlITCase.java  |   45 +
 .../OrderBySystemQueryOptionXmlITCase.java      |   45 +
 .../tecsvc/client/PrimitiveComplexITCase.java   |   45 +-
 .../client/PrimitiveComplexXmlITCase.java       |   48 +
 .../client/SystemQueryOptionXmlITCase.java      |   45 +
 .../olingo/fit/v4/AbstractTestITCase.java       |    2 +-
 .../apache/olingo/fit/v4/AsyncTestITCase.java   |    3 +
 .../olingo/fit/v4/EntityRetrieveTestITCase.java |    3 +
 .../olingo/fit/v4/MediaEntityTestITCase.java    |    2 +-
 .../apache/olingo/fit/v4/OAuth2TestITCase.java  |    2 +-
 .../olingo/client/core/ODataClientFactory.java  |   19 +-
 .../core/serialization/AbstractAtomDealer.java  |    4 +-
 .../core/serialization/AtomDeserializer.java    |   18 +-
 .../core/serialization/AtomSerializer.java      |  208 +-
 .../core/serialization/ODataBinderImpl.java     |    2 +-
 .../apache/olingo/client/core/v4/JSONTest.java  |    2 +-
 .../apache/olingo/client/core/v4/Customers.xml  |    9 +-
 .../apache/olingo/client/core/v4/Products_5.xml |    2 +-
 .../olingo/client/core/v4/VipCustomer.xml       |    2 +-
 .../apache/olingo/client/core/v4/annotated.xml  |    4 +-
 .../core/v4/entity.withcomplexnavigation.xml    |    3 +-
 .../EntityCollectionSerializerOptions.java      |   14 +-
 .../olingo/server/core/ServiceRequest.java      |    3 +-
 .../olingo/server/core/ContentNegotiator.java   |    4 +-
 .../apache/olingo/server/core/ODataImpl.java    |   16 +-
 .../deserializer/xml/ODataXmlDeserializer.java  |  702 +++++++
 .../core/serializer/xml/ODataXmlSerializer.java | 1043 ++++++++++
 .../serializer/xml/ODataXmlSerializerImpl.java  |  155 --
 .../xml/ServiceDocumentXmlSerializer.java       |  143 ++
 .../server/core/ContentNegotiatorTest.java      |    3 +-
 .../olingo/server/core/ODataImplTest.java       |    3 +-
 .../xml/MetadataDocumentXmlSerializerTest.java  |   14 +-
 .../xml/ServerErrorXmlSerializerTest.java       |   93 +
 .../xml/ServiceDocumentXmlSerializerTest.java   |  105 +
 .../olingo/server/tecsvc/TechnicalServlet.java  |    2 +-
 .../olingo/server/tecsvc/data/ActionData.java   |   11 +-
 .../olingo/server/tecsvc/data/DataCreator.java  |  225 ++-
 .../olingo/server/tecsvc/data/DataProvider.java |    8 +-
 .../server/tecsvc/data/RequestValidator.java    |   12 +-
 .../processor/TechnicalEntityProcessor.java     |  118 +-
 .../tecsvc/processor/TechnicalProcessor.java    |    1 -
 .../ExpandSystemQueryOptionHandler.java         |    2 +-
 .../server/tecsvc/data/DataProviderTest.java    |   20 +-
 lib/server-test/pom.xml                         |    5 +
 .../json/ODataJsonSerializerTest.java           |   18 +-
 .../xml/ODataXmlDeserializerTest.java           |  630 ++++++
 .../serializer/xml/ODataXmlSerializerTest.java  | 1872 ++++++++++++++++++
 .../olingo/server/core/uri/UriHelperTest.java   |    2 +-
 pom.xml                                         |    2 +-
 72 files changed, 7235 insertions(+), 613 deletions(-)
----------------------------------------------------------------------