[OLINGO-632] Merge branch 'master' into OLINGO-632_OSGi-Support
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/cd8d77c7 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/cd8d77c7 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/cd8d77c7 Branch: refs/heads/OLINGO-632_OSGi-Support Commit: cd8d77c7bb1620670442afd16df2cfa6d36eb417 Parents: c536ce3 0c511f8 Author: Michael Bolz <[email protected]> Authored: Tue May 26 14:31:26 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Tue May 26 14:31:26 2015 +0200 ---------------------------------------------------------------------- .../fit/tecsvc/client/ConditionalITCase.java | 80 +++ .../tecsvc/client/EntityReferencesITCase.java | 215 +++++++ .../olingo/fit/tecsvc/client/MediaITCase.java | 4 + .../fit/tecsvc/http/EntityReferenceITCase.java | 91 +++ .../core/edm/primitivetype/EdmBooleanTest.java | 4 +- .../olingo/server/api/ClientServerError.java | 143 ----- .../olingo/server/api/EtagInformation.java | 72 +++ .../org/apache/olingo/server/api/OData.java | 15 +- .../olingo/server/api/ODataServerError.java | 143 +++++ .../server/api/processor/DefaultProcessor.java | 7 +- .../server/api/processor/ErrorProcessor.java | 4 +- .../server/api/serializer/ODataSerializer.java | 32 +- .../apache/olingo/server/core/ErrorHandler.java | 26 +- .../server/core/responses/EntityResponse.java | 4 +- .../core/responses/EntitySetResponse.java | 4 +- .../server/core/responses/MetadataResponse.java | 4 +- .../server/core/responses/PropertyResponse.java | 4 +- .../core/responses/ServiceDocumentResponse.java | 4 +- .../apache/olingo/server/core/EtagParser.java | 86 +++ .../server/core/ODataExceptionHelper.java | 50 +- .../apache/olingo/server/core/ODataHandler.java | 24 +- .../server/core/ODataHttpHandlerImpl.java | 4 +- .../apache/olingo/server/core/ODataImpl.java | 11 + .../serializer/json/ODataJsonSerializer.java | 100 +++- .../serializer/xml/ODataXmlSerializerImpl.java | 20 +- .../server/core/uri/validator/UriValidator.java | 124 ++-- .../olingo/server/core/EtagParserTest.java | 131 +++++ .../json/ClientErrorSerializerTest.java | 136 ----- .../json/ServerErrorSerializerTest.java | 136 +++++ .../olingo/server/tecsvc/data/DataCreator.java | 589 +++++++++++++++---- .../olingo/server/tecsvc/data/DataProvider.java | 63 +- .../processor/TechnicalEntityProcessor.java | 308 +++++++--- .../olingo/server/core/ODataHandlerTest.java | 4 +- .../json/ODataJsonSerializerTest.java | 91 ++- .../core/uri/antlr/TestFullResourcePath.java | 5 +- .../core/uri/validator/UriValidatorTest.java | 203 ++++++- pom.xml | 1 + samples/client/pom.xml | 8 + .../core/http/CookieHttpClientFactory.java | 2 +- .../CustomConnectionsHttpClientFactory.java | 2 +- .../core/http/ParametersHttpClientFactory.java | 2 +- .../http/ParametersHttpUriRequestFactory.java | 2 +- .../ProtocolInterceptorHttpClientFactory.java | 2 +- .../http/RequestRetryHttpClientFactory.java | 2 +- .../http/SocketFactoryHttpClientFactory.java | 2 +- .../core/http/StatefulHttpClientFactory.java | 2 +- 46 files changed, 2273 insertions(+), 693 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cd8d77c7/pom.xml ----------------------------------------------------------------------
