[OLINGO-206] Merge remote-tracking branch 'origin/master' into olingo-206-val
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/6d66ff39 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/6d66ff39 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/6d66ff39 Branch: refs/heads/olingo-206-validator Commit: 6d66ff3912717ca0a0be1430f8fea6dff149066d Parents: 49e1069 2517423 Author: Stephan Klevenz <[email protected]> Authored: Thu Apr 3 17:54:51 2014 +0200 Committer: Stephan Klevenz <[email protected]> Committed: Thu Apr 3 17:54:51 2014 +0200 ---------------------------------------------------------------------- fit/pom.xml | 18 - .../org/apache/olingo/fit/AbstractServices.java | 14 +- .../java/org/apache/olingo/fit/V3Services.java | 31 ++ fit/src/main/resources/v3/openTypeMetadata.xml | 67 ++++ .../olingo/client/api/op/v4/ODataBinder.java | 2 + .../communication/request/ODataRequestImpl.java | 4 +- .../edm/AbstractEdmServiceMetadataImpl.java | 2 +- .../olingo/client/core/edm/EdmClientImpl.java | 4 +- .../client/core/edm/EdmComplexTypeImpl.java | 5 + .../client/core/edm/EdmEntityContainerImpl.java | 13 +- .../client/core/edm/EdmEntityTypeImpl.java | 5 + .../olingo/client/core/edm/EdmSchemaImpl.java | 51 ++- .../core/edm/EdmStructuredTypeHelperImpl.java | 11 + .../AbstractBasicAuthHttpClientFactory.java | 51 --- .../http/AbstractNTLMAuthHttpClientFactory.java | 63 ---- .../core/http/BasicAuthHttpClientFactory.java | 55 +++ .../core/http/NTLMAuthHttpClientFactory.java | 73 ++++ .../http/ProxyWrapperHttpClientFactory.java | 86 +++++ .../client/core/op/AbstractODataBinder.java | 127 +++---- .../client/core/op/impl/v3/ODataBinderImpl.java | 10 +- .../client/core/op/impl/v4/ODataBinderImpl.java | 53 ++- .../apache/olingo/client/core/uri/URIUtils.java | 21 +- .../client/core/it/v3/AbstractTestITCase.java | 6 +- .../it/v3/AuthEntityRetrieveTestITCase.java | 16 +- .../client/core/it/v3/OpenTypeTestITCase.java | 17 +- .../olingo/client/core/v4/EntityTest.java | 28 ++ .../apache/olingo/client/core/v4/JSONTest.java | 5 +- .../olingo/client/core/v4/atom_cleanup.xsl | 3 +- .../olingo/client/core/v4/entity.full.json | 22 -- .../core/v4/entity.withcomplexnavigation.json | 22 ++ .../core/v4/entity.withcomplexnavigation.xml | 62 ++++ .../apache/olingo/commons/api/data/Entry.java | 16 +- .../apache/olingo/commons/api/data/Linked.java | 38 +++ .../commons/api/data/LinkedComplexValue.java | 24 ++ .../apache/olingo/commons/api/data/Value.java | 4 + .../commons/api/domain/CommonODataEntity.java | 76 +---- .../olingo/commons/api/domain/ODataLinked.java | 70 ++++ .../api/domain/v4/ODataLinkedComplexValue.java | 26 ++ .../api/domain/v4/ODataObjectFactory.java | 2 + .../commons/api/domain/v4/ODataProperty.java | 7 + .../commons/api/domain/v4/ODataValue.java | 14 + .../commons/api/edm/EdmEntityContainer.java | 23 +- .../olingo/commons/api/edm/EdmEntityType.java | 4 +- .../olingo/commons/api/edm/EdmSchema.java | 36 +- .../commons/api/edm/EdmStructuredType.java | 7 + .../commons/core/data/AbstractAtomDealer.java | 2 +- .../core/data/AbstractJsonDeserializer.java | 111 ++++++- .../core/data/AbstractJsonSerializer.java | 57 ++++ .../olingo/commons/core/data/AbstractValue.java | 11 + .../commons/core/data/AtomDeserializer.java | 245 +++++++++++++- .../core/data/AtomPropertyDeserializer.java | 240 ------------- .../core/data/AtomPropertySerializer.java | 116 ------- .../commons/core/data/AtomSerializer.java | 92 ++++- .../core/data/JSONEntryDeserializer.java | 74 +---- .../commons/core/data/JSONEntrySerializer.java | 56 +--- .../core/data/JSONPropertyDeserializer.java | 2 +- .../core/data/LinkedComplexValueImpl.java | 47 +++ .../domain/v4/ODataCollectionValueImpl.java | 11 + .../core/domain/v4/ODataComplexValueImpl.java | 86 ++++- .../core/domain/v4/ODataEnumValueImpl.java | 10 + .../core/domain/v4/ODataObjectFactoryImpl.java | 6 + .../core/domain/v4/ODataPrimitiveValueImpl.java | 11 + .../core/domain/v4/ODataPropertyImpl.java | 16 +- .../olingo/commons/core/edm/AbstractEdm.java | 333 +++++++++++++++++++ .../core/edm/AbstractEdmComplexType.java | 63 ++-- .../core/edm/AbstractEdmEntityContainer.java | 16 +- .../commons/core/edm/AbstractEdmEntityType.java | 13 +- .../commons/core/edm/AbstractEdmImpl.java | 333 ------------------- .../core/edm/AbstractEdmNavigationProperty.java | 17 +- .../commons/core/edm/AbstractEdmSchema.java | 154 +++++++++ .../commons/core/edm/AbstractEdmSchemaImpl.java | 128 ------- .../core/edm/AbstractEdmStructuredType.java | 184 +++++----- .../core/edm/EdmStructuredTypeHelper.java | 3 + .../olingo/commons/core/edm/EdmTypeImpl.java | 45 ++- .../commons/core/edm/EdmImplCachingTest.java | 4 +- .../commons/core/edm/EdmImplCallCreateTest.java | 4 +- .../core/edm/provider/EdmComplexTypeImpl.java | 9 +- .../core/edm/provider/EdmEntityTypeImpl.java | 54 +-- .../core/edm/provider/EdmProviderImpl.java | 4 +- .../server/core/edm/provider/EdmSchemaImpl.java | 4 +- .../provider/EdmStructuredTypeHelperImpl.java | 8 +- .../edm/provider/EdmComplexTypeImplTest.java | 12 +- .../edm/provider/EdmEntityTypeImplTest.java | 11 +- .../core/edm/provider/EdmSchemaImplTest.java | 6 +- .../serializer/xml/MetadataDocumentTest.java | 197 ++++++++++- pom.xml | 2 +- 86 files changed, 2559 insertions(+), 1532 deletions(-) ----------------------------------------------------------------------
