You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/06/02 13:37:58 UTC
[02/12] git commit: [OLINGO-266] Merge remote-tracking branch
'origin/master' into olingo-266-tecsvc
[OLINGO-266] Merge remote-tracking branch 'origin/master' into olingo-266-tecsvc
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/92a4404d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/92a4404d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/92a4404d
Branch: refs/heads/master
Commit: 92a4404dd451480ee31800ad62435112a0c11d61
Parents: a9ed465 72d894c
Author: Stephan Klevenz <st...@sap.com>
Authored: Thu May 22 12:35:13 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Thu May 22 12:35:13 2014 +0200
----------------------------------------------------------------------
ext/client-proxy-android/pom.xml | 96 +++++++
ext/client-proxy/pom.xml | 2 +-
.../ext/proxy/api/AbstractAnnotatable.java | 34 ---
.../olingo/ext/proxy/api/Annotatable.java | 34 +++
.../AnnotationsForNavigationProperty.java | 34 +++
.../api/annotations/AnnotationsForProperty.java | 34 +++
.../commons/AbstractInvocationHandler.java | 30 ++-
.../AbstractStructuredInvocationHandler.java | 59 +++--
.../commons/AnnotatableInvocationHandler.java | 180 +++++++++++++
.../commons/AnnotatationsInvocationHandler.java | 91 +++++++
.../ComplexFactoryInvocationHandler.java | 1 +
.../proxy/commons/ComplexInvocationHandler.java | 30 ++-
.../olingo/ext/proxy/commons/ContainerImpl.java | 28 +-
.../proxy/commons/EntityInvocationHandler.java | 27 +-
.../commons/EntitySetInvocationHandler.java | 11 +-
.../olingo/ext/proxy/commons/FilterImpl.java | 2 +-
.../commons/OperationInvocationHandler.java | 7 +-
.../olingo/ext/proxy/commons/SearchImpl.java | 2 +-
.../olingo/ext/proxy/context/EntityContext.java | 3 +-
.../olingo/ext/proxy/utils/CoreUtils.java | 5 +-
.../src/main/resources/complexType.vm | 4 +
.../src/main/resources/entityType.vm | 34 ++-
.../src/main/resources/v40/complexType.vm | 28 +-
ext/pom.xml | 1 +
.../org/apache/olingo/fit/AbstractServices.java | 7 +-
.../apache/olingo/fit/V3ActionOverloading.java | 2 +-
.../java/org/apache/olingo/fit/V3OpenType.java | 2 +-
.../org/apache/olingo/fit/V3PrimitiveKeys.java | 2 +-
.../main/java/org/apache/olingo/fit/V4Demo.java | 2 +-
.../java/org/apache/olingo/fit/V4OpenType.java | 2 +-
.../java/org/apache/olingo/fit/V4Services.java | 55 +++-
.../org/apache/olingo/fit/V4Vocabularies.java | 4 +-
.../org/apache/olingo/fit/utils/DataBinder.java | 48 ++--
.../org/apache/olingo/fit/utils/FSManager.java | 80 ++++--
.../apache/olingo/fit/utils/XMLUtilities.java | 2 +-
.../resources/V40/Accounts/102/entity.full.json | 34 +++
.../main/resources/V40/Accounts/102/entity.xml | 55 ++++
.../V40/Accounts/102/links/MyGiftCard.full.json | 15 ++
.../V40/Accounts/102/links/MyGiftCard.xml | 41 +++
.../MyPaymentInstruments(102901).full.json | 16 ++
.../102/links/MyPaymentInstruments(102901).xml | 40 +++
.../MyPaymentInstruments(102902).full.json | 16 ++
.../102/links/MyPaymentInstruments(102902).xml | 40 +++
.../102/links/MyPaymentInstruments.full.json | 62 +++++
.../Accounts/102/links/MyPaymentInstruments.xml | 95 +++++++
.../main/resources/V40/Boss/entity.full.json | 2 +
fit/src/main/resources/V40/Boss/entity.xml | 5 +-
fit/src/main/resources/V40/openTypeMetadata.xml | 4 +
.../olingo/fit/proxy/v3/AbstractTestITCase.java | 3 -
.../proxy/v3/AuthEntityRetrieveTestITCase.java | 48 ----
.../proxy/v4/AuthEntityCreateTestITCase.java | 50 ++++
.../proxy/v4/AuthEntityRetrieveTestITCase.java | 4 +-
.../fit/proxy/v4/EntityCreateTestITCase.java | 8 +-
.../olingo/fit/proxy/v4/OpenTypeTestITCase.java | 11 +
.../fit/proxy/v4/SingletonTestITCase.java | 20 +-
.../opentypesservicev4/DefaultContainer.java | 6 +-
.../odata/services/opentypesservicev4/Row.java | 1 -
.../services/opentypesservicev4/RowIndex.java | 1 -
.../opentypesservicev4/types/AccountInfo.java | 90 +++++++
.../types/ContactDetails.java | 25 +-
.../opentypesservicev4/types/IndexedRow.java | 5 +-
.../types/IndexedRowCollection.java | 5 +
.../services/opentypesservicev4/types/Row.java | 5 +-
.../opentypesservicev4/types/RowCollection.java | 5 +
.../opentypesservicev4/types/RowIndex.java | 13 +-
.../types/RowIndexCollection.java | 5 +
.../services/odatawcfservice/types/Account.java | 41 ++-
.../odatawcfservice/types/AccountInfo.java | 21 +-
.../services/odatawcfservice/types/Address.java | 23 ++
.../services/odatawcfservice/types/Asset.java | 25 +-
.../services/odatawcfservice/types/Club.java | 21 +-
.../services/odatawcfservice/types/Company.java | 49 +++-
.../odatawcfservice/types/CompanyAddress.java | 30 ++-
.../odatawcfservice/types/CreditCardPI.java | 62 ++++-
.../odatawcfservice/types/CreditRecord.java | 29 ++-
.../odatawcfservice/types/Customer.java | 70 ++++-
.../odatawcfservice/types/Department.java | 29 ++-
.../odatawcfservice/types/Employee.java | 62 ++++-
.../odatawcfservice/types/GiftCard.java | 33 ++-
.../odatawcfservice/types/HomeAddress.java | 30 ++-
.../odatawcfservice/types/LabourUnion.java | 21 +-
.../services/odatawcfservice/types/Order.java | 41 ++-
.../odatawcfservice/types/OrderDetail.java | 41 ++-
.../types/PaymentInstrument.java | 37 ++-
.../services/odatawcfservice/types/Person.java | 49 +++-
.../services/odatawcfservice/types/Product.java | 53 +++-
.../odatawcfservice/types/ProductDetail.java | 37 ++-
.../odatawcfservice/types/ProductReview.java | 37 ++-
.../odatawcfservice/types/PublicCompany.java | 66 ++++-
.../odatawcfservice/types/Statement.java | 29 ++-
.../odatawcfservice/types/StoredPI.java | 29 ++-
.../odatawcfservice/types/Subscription.java | 33 ++-
.../olingo/fit/v3/AbstractTestITCase.java | 4 +-
.../fit/v3/ActionOverloadingTestITCase.java | 155 ++++-------
.../apache/olingo/fit/v3/AsyncTestITCase.java | 15 +-
.../apache/olingo/fit/v3/BatchTestITCase.java | 68 +++--
.../apache/olingo/fit/v3/CountTestITCase.java | 4 +-
.../olingo/fit/v3/EntityCreateTestITCase.java | 16 +-
.../olingo/fit/v3/EntityRetrieveTestITCase.java | 14 +-
.../olingo/fit/v3/EntitySetTestITCase.java | 8 +-
.../olingo/fit/v3/EntityUpdateTestITCase.java | 26 +-
.../apache/olingo/fit/v3/ErrorTestITCase.java | 20 +-
.../olingo/fit/v3/FilterFactoryTestITCase.java | 2 +-
.../apache/olingo/fit/v3/FilterTestITCase.java | 2 +-
.../apache/olingo/fit/v3/InvokeTestITCase.java | 120 ++-------
.../olingo/fit/v3/KeyAsSegmentTestITCase.java | 6 +-
.../apache/olingo/fit/v3/LinkTestITCase.java | 8 +-
.../olingo/fit/v3/MediaEntityTestITCase.java | 44 ++--
.../olingo/fit/v3/OpenTypeTestITCase.java | 6 +-
.../olingo/fit/v3/PrimitiveKeysTestITCase.java | 2 +-
.../fit/v3/PropertyRetrieveTestITCase.java | 8 +-
.../olingo/fit/v3/PropertyTestITCase.java | 23 +-
.../olingo/fit/v3/PropertyValueTestITCase.java | 52 ++--
.../olingo/fit/v3/QueryOptionsTestITCase.java | 12 +-
.../olingo/fit/v4/AbstractTestITCase.java | 4 +-
.../apache/olingo/fit/v4/AsyncTestITCase.java | 6 +-
.../apache/olingo/fit/v4/BatchTestITCase.java | 124 ++++-----
.../fit/v4/BoundOperationInvokeTestITCase.java | 258 +++++++++++++------
.../apache/olingo/fit/v4/DeltaTestITCase.java | 2 +-
.../olingo/fit/v4/DerivedTypeTestITCase.java | 8 +-
.../olingo/fit/v4/EntityCreateTestITCase.java | 6 +-
.../olingo/fit/v4/EntityRetrieveTestITCase.java | 20 +-
.../olingo/fit/v4/EntitySetTestITCase.java | 8 +-
.../olingo/fit/v4/EntityUpdateTestITCase.java | 8 +-
.../olingo/fit/v4/ErrorResponseTestITCase.java | 2 +-
.../olingo/fit/v4/FilterFactoryTestITCase.java | 2 +-
.../olingo/fit/v4/KeyAsSegmentTestITCase.java | 4 +-
.../olingo/fit/v4/MediaEntityTestITCase.java | 21 +-
.../olingo/fit/v4/OpenTypeTestITCase.java | 6 +-
.../fit/v4/OperationImportInvokeTestITCase.java | 96 ++-----
.../olingo/fit/v4/PropertyTestITCase.java | 42 ++-
.../olingo/fit/v4/PropertyValueTestITCase.java | 67 +++--
.../olingo/fit/v4/QueryOptionsTestITCase.java | 22 +-
.../olingo/fit/v4/SingletonTestITCase.java | 6 +-
.../org.apache.olingo.ext.proxy.complex | 1 +
.../client/api/CommonEdmEnabledODataClient.java | 2 +-
.../olingo/client/api/CommonODataClient.java | 7 +-
.../api/communication/header/ODataHeaders.java | 31 +++
.../request/ODataPayloadManager.java | 57 ++++
.../request/ODataStreamManager.java | 57 ----
.../request/ODataStreamedRequest.java | 6 +-
.../request/batch/BatchManager.java | 43 ++++
.../request/batch/BatchStreamManager.java | 42 ---
.../request/batch/ODataRetrieve.java | 37 ---
.../request/batch/ODataSingleRequest.java | 37 +++
.../request/batch/v3/BatchStreamManager.java | 26 --
.../request/batch/v3/ODataBatchRequest.java | 3 +-
.../request/batch/v4/BatchStreamManager.java | 34 ---
.../request/batch/v4/ODataBatchRequest.java | 3 +-
.../request/cud/CommonCUDRequestFactory.java | 41 +++
.../invoke/EdmEnabledInvokeRequestFactory.java | 65 ++++-
.../request/invoke/InvokeRequestFactory.java | 64 ++++-
.../retrieve/CommonRetrieveRequestFactory.java | 17 ++
.../MediaEntityCreateStreamManager.java | 4 +-
.../MediaEntityUpdateStreamManager.java | 4 +-
.../streamed/ODataStreamedEntityRequest.java | 4 +-
.../streamed/StreamUpdateStreamManager.java | 4 +-
.../streamed/StreamedRequestFactory.java | 67 -----
.../request/v4/AsyncBatchRequestWrapper.java | 15 +-
.../client/api/v3/EdmEnabledODataClient.java | 2 +-
.../olingo/client/api/v3/ODataClient.java | 2 +-
.../client/api/v4/EdmEnabledODataClient.java | 2 +-
.../olingo/client/api/v4/ODataClient.java | 2 +-
.../olingo/client/core/AbstractODataClient.java | 1 -
.../communication/header/ODataHeadersImpl.java | 49 +---
.../request/AbstractODataRequest.java | 5 +-
.../request/AbstractODataStreamManager.java | 4 +-
.../request/batch/AbstractBatchManager.java | 143 ++++++++++
.../batch/AbstractBatchStreamManager.java | 138 ----------
.../batch/AbstractODataBatchRequest.java | 6 +-
.../batch/AbstractODataBatchRequestItem.java | 2 +-
.../request/batch/ODataChangesetImpl.java | 2 +-
.../request/batch/ODataRetrieveImpl.java | 81 ------
.../batch/ODataRetrieveResponseItem.java | 87 -------
.../request/batch/ODataSingleRequestImpl.java | 82 ++++++
.../request/batch/ODataSingleResponseItem.java | 87 +++++++
.../batch/v3/BatchRequestFactoryImpl.java | 2 +-
.../request/batch/v3/ODataBatchRequestImpl.java | 36 ++-
.../batch/v4/BatchRequestFactoryImpl.java | 2 +-
.../request/batch/v4/ODataBatchRequestImpl.java | 37 +--
.../batch/v4/ODataOutsideUpdateImpl.java | 84 ------
.../v4/ODataOutsideUpdateResponseItem.java | 80 ------
.../request/cud/AbstractCUDRequestFactory.java | 49 +++-
.../cud/ODataPropertyUpdateRequestImpl.java | 8 +-
.../AbstractEdmEnabledInvokeRequestFactory.java | 172 +++++++++++++
.../invoke/AbstractInvokeRequestFactory.java | 55 +++-
.../v3/EdmEnabledInvokeRequestFactoryImpl.java | 78 +-----
.../invoke/v3/InvokeRequestFactoryImpl.java | 36 +--
.../v4/EdmEnabledInvokeRequestFactoryImpl.java | 78 +-----
.../invoke/v4/InvokeRequestFactoryImpl.java | 36 +--
.../AbstractRetrieveRequestFactory.java | 17 +-
.../request/retrieve/ODataValueRequestImpl.java | 2 +-
.../v3/ODataLinkCollectionRequestImpl.java | 2 +-
.../retrieve/v3/RetrieveRequestFactoryImpl.java | 2 +-
.../retrieve/v4/RetrieveRequestFactoryImpl.java | 2 +-
.../retrieve/v4/XMLMetadataRequestImpl.java | 2 +-
.../AbstractODataStreamedEntityRequest.java | 4 +-
.../streamed/AbstractODataStreamedRequest.java | 20 +-
.../ODataMediaEntityCreateRequestImpl.java | 10 +-
.../ODataMediaEntityUpdateRequestImpl.java | 10 +-
.../streamed/ODataStreamUpdateRequestImpl.java | 10 +-
.../streamed/StreamedRequestFactoryImpl.java | 77 ------
.../v4/AsyncBatchRequestWrapperImpl.java | 21 +-
.../client/core/op/impl/v4/ODataBinderImpl.java | 8 +-
.../apache/olingo/client/core/uri/URIUtils.java | 80 +++---
.../core/v3/EdmEnabledODataClientImpl.java | 2 +-
.../olingo/client/core/v3/ODataClientImpl.java | 13 +-
.../core/v4/EdmEnabledODataClientImpl.java | 2 +-
.../olingo/client/core/v4/ODataClientImpl.java | 13 +-
.../client/core/uri/v3/URIBuilderTest.java | 26 +-
.../client/core/uri/v4/URIBuilderTest.java | 26 +-
.../commons/api/domain/v4/ODataAnnotatable.java | 26 ++
.../api/domain/v4/ODataAnnotatatable.java | 26 --
.../commons/api/domain/v4/ODataDeltaLink.java | 2 +-
.../commons/api/domain/v4/ODataEntity.java | 2 +-
.../commons/api/domain/v4/ODataEntitySet.java | 2 +-
.../olingo/commons/api/domain/v4/ODataLink.java | 2 +-
.../api/domain/v4/ODataLinkedComplexValue.java | 2 +-
.../commons/api/domain/v4/ODataProperty.java | 2 +-
.../core/data/AbstractJsonSerializer.java | 6 +-
.../commons/core/data/AtomDeserializer.java | 1 +
pom.xml | 43 +++-
222 files changed, 4271 insertions(+), 2349 deletions(-)
----------------------------------------------------------------------