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/05/12 10:07:55 UTC
[17/17] git commit: [OLINGO-266] Merge remote-tracking branch
'origin/master' into olingo-266-ref
[OLINGO-266] Merge remote-tracking branch 'origin/master' into olingo-266-ref
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8e28a7d9
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8e28a7d9
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8e28a7d9
Branch: refs/heads/olingo-266-ref
Commit: 8e28a7d995dcd85aaf20d1cc11afedd6d80923b0
Parents: 04a9ad4 f1cbc4a
Author: Stephan Klevenz <st...@sap.com>
Authored: Mon May 12 10:04:19 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Mon May 12 10:04:19 2014 +0200
----------------------------------------------------------------------
.../ext/proxy/EntityContainerFactory.java | 19 +-
.../olingo/ext/proxy/api/AbstractContainer.java | 32 --
.../apache/olingo/ext/proxy/api/Container.java | 32 ++
.../commons/AbstractInvocationHandler.java | 9 +-
.../commons/AbstractTypeInvocationHandler.java | 225 +++-----
.../commons/ComplexTypeInvocationHandler.java | 168 ++++--
.../olingo/ext/proxy/commons/Container.java | 544 ------------------
.../olingo/ext/proxy/commons/ContainerImpl.java | 548 +++++++++++++++++++
.../EntityContainerInvocationHandler.java | 13 +-
.../commons/EntitySetInvocationHandler.java | 2 +-
.../commons/EntityTypeInvocationHandler.java | 148 ++++-
.../proxy/commons/FactoryInvocationHandler.java | 84 +++
.../olingo/ext/proxy/utils/ClassUtils.java | 3 +-
.../olingo/ext/proxy/utils/CoreUtils.java | 492 +++++++++++++++++
.../olingo/ext/proxy/utils/EngineUtils.java | 436 ---------------
ext/pojogen-maven-plugin/pom.xml | 2 +-
.../src/it/actionOverloadingService/pom.xml | 92 ----
.../it/actionOverloadingService/verify.groovy | 20 -
.../src/it/defaultService/pom.xml | 92 ----
.../src/it/defaultService/verify.groovy | 20 -
.../src/it/keyAsSegmentService/pom.xml | 92 ----
.../src/it/keyAsSegmentService/verify.groovy | 20 -
.../src/it/northwind/pom.xml | 92 ----
.../src/it/northwind/verify.groovy | 20 -
.../src/it/odataWriterDefaultService/pom.xml | 92 ----
.../it/odataWriterDefaultService/verify.groovy | 20 -
.../src/it/openTypeService/pom.xml | 92 ----
.../src/it/openTypeService/verify.groovy | 20 -
.../src/it/primitiveKeysService/pom.xml | 92 ----
.../src/it/primitiveKeysService/verify.groovy | 20 -
.../src/it/staticServiceV3/pom.xml | 92 ----
.../src/it/staticServiceV3/verify.groovy | 20 -
.../src/it/staticServiceV4/pom.xml | 92 ----
.../src/it/staticServiceV4/verify.groovy | 20 -
.../ext/pojogen/AbstractMetadataMojo.java | 1 -
.../olingo/ext/pojogen/AbstractUtility.java | 16 +-
.../olingo/ext/pojogen/V3MetadataMojo.java | 245 +++++----
.../src/main/resources/complexType.vm | 1 -
.../src/main/resources/container.vm | 5 +-
.../src/main/resources/entityCollection.vm | 5 +-
.../src/main/resources/entitySet.vm | 1 -
.../src/main/resources/entityType.vm | 32 +-
.../src/main/resources/entityTypeKey.vm | 1 -
.../src/main/resources/singleton.vm | 1 -
.../src/main/resources/v30/complexType.vm | 23 +-
.../src/main/resources/v40/complexType.vm | 23 +-
.../org/apache/olingo/fit/AbstractServices.java | 113 ++--
.../apache/olingo/fit/V3ActionOverloading.java | 2 +-
.../java/org/apache/olingo/fit/V3OpenType.java | 7 +-
.../java/org/apache/olingo/fit/V3Services.java | 7 +-
.../main/java/org/apache/olingo/fit/V4Demo.java | 7 +-
.../java/org/apache/olingo/fit/V4OpenType.java | 9 +-
.../java/org/apache/olingo/fit/V4Services.java | 19 +-
.../org/apache/olingo/fit/V4Vocabularies.java | 8 +-
.../apache/olingo/fit/metadata/EntityType.java | 24 +-
.../apache/olingo/fit/metadata/Metadata.java | 42 +-
.../olingo/fit/utils/AbstractUtilities.java | 73 +--
.../org/apache/olingo/fit/utils/Commons.java | 2 +
.../org/apache/olingo/fit/utils/Constants.java | 1 +
.../org/apache/olingo/fit/utils/DataBinder.java | 61 ++-
.../org/apache/olingo/fit/utils/FSManager.java | 6 +-
.../apache/olingo/fit/utils/JSONUtilities.java | 5 +-
.../apache/olingo/fit/utils/XMLUtilities.java | 5 +-
.../V30/CustomerInfo/16/entity.full.json | 11 +
.../resources/V30/CustomerInfo/16/entity.xml | 37 ++
fit/src/main/resources/V40/openTypeMetadata.xml | 10 +-
.../olingo/fit/proxy/v3/AbstractTest.java | 33 +-
.../proxy/v3/AuthEntityRetrieveTestITCase.java | 50 ++
.../fit/proxy/v3/EntityCreateTestITCase.java | 210 +++++++
.../fit/proxy/v3/EntityRetrieveTestITCase.java | 36 +-
.../AllGeoCollectionTypesSet.java | 2 +-
.../astoriadefaultservice/AllGeoTypesSet.java | 2 +-
.../services/astoriadefaultservice/Car.java | 2 +-
.../astoriadefaultservice/Computer.java | 2 +-
.../astoriadefaultservice/ComputerDetail.java | 2 +-
.../astoriadefaultservice/Customer.java | 2 +-
.../astoriadefaultservice/CustomerInfo.java | 2 +-
.../astoriadefaultservice/DefaultContainer.java | 6 +-
.../services/astoriadefaultservice/Driver.java | 2 +-
.../astoriadefaultservice/LastLogin.java | 2 +-
.../services/astoriadefaultservice/License.java | 2 +-
.../services/astoriadefaultservice/Login.java | 2 +-
.../astoriadefaultservice/MappedEntityType.java | 2 +-
.../services/astoriadefaultservice/Message.java | 2 +-
.../MessageAttachment.java | 2 +-
.../services/astoriadefaultservice/Order.java | 2 +-
.../astoriadefaultservice/OrderLine.java | 2 +-
.../astoriadefaultservice/PageView.java | 2 +-
.../services/astoriadefaultservice/Person.java | 2 +-
.../astoriadefaultservice/PersonMetadata.java | 2 +-
.../services/astoriadefaultservice/Product.java | 2 +-
.../astoriadefaultservice/ProductDetail.java | 2 +-
.../astoriadefaultservice/ProductPhoto.java | 2 +-
.../astoriadefaultservice/ProductReview.java | 2 +-
.../astoriadefaultservice/RSAToken.java | 2 +-
.../astoriadefaultservice/package-info.java | 1 +
.../astoriadefaultservice/types/Aliases.java | 6 +-
.../types/AllSpatialCollectionTypes.java | 5 +-
.../AllSpatialCollectionTypesCollection.java | 2 +-
.../types/AllSpatialCollectionTypes_Simple.java | 17 +-
...SpatialCollectionTypes_SimpleCollection.java | 2 +-
.../types/AllSpatialTypes.java | 37 +-
.../types/AllSpatialTypesCollection.java | 2 +-
.../astoriadefaultservice/types/AuditInfo.java | 17 +-
.../types/BackOrderLine.java | 13 +-
.../types/BackOrderLine2.java | 13 +-
.../types/BackOrderLine2Collection.java | 2 +-
.../types/BackOrderLineCollection.java | 2 +-
.../astoriadefaultservice/types/Car.java | 11 +-
.../types/CarCollection.java | 2 +-
.../types/ComplexToCategory.java | 6 +-
.../types/ComplexWithAllPrimitiveTypes.java | 6 +-
.../astoriadefaultservice/types/Computer.java | 16 +-
.../types/ComputerCollection.java | 15 +-
.../types/ComputerDetail.java | 37 +-
.../types/ComputerDetailCollection.java | 16 +-
.../types/ConcurrencyInfo.java | 6 +-
.../types/ContactDetails.java | 38 +-
.../astoriadefaultservice/types/Contractor.java | 15 +-
.../types/ContractorCollection.java | 2 +-
.../astoriadefaultservice/types/Customer.java | 42 +-
.../types/CustomerCollection.java | 2 +-
.../types/CustomerInfo.java | 7 +-
.../types/CustomerInfoCollection.java | 2 +-
.../astoriadefaultservice/types/Dimensions.java | 6 +-
.../types/DiscontinuedProduct.java | 58 +-
.../types/DiscontinuedProductCollection.java | 2 +-
.../astoriadefaultservice/types/Driver.java | 7 +-
.../types/DriverCollection.java | 2 +-
.../astoriadefaultservice/types/Employee.java | 22 +-
.../types/EmployeeCollection.java | 12 +-
.../astoriadefaultservice/types/LastLogin.java | 11 +-
.../types/LastLoginCollection.java | 2 +-
.../astoriadefaultservice/types/License.java | 13 +-
.../types/LicenseCollection.java | 2 +-
.../astoriadefaultservice/types/Login.java | 7 +-
.../types/LoginCollection.java | 2 +-
.../types/MappedEntityType.java | 68 ++-
.../types/MappedEntityTypeCollection.java | 2 +-
.../astoriadefaultservice/types/Message.java | 17 +-
.../types/MessageAttachment.java | 7 +-
.../types/MessageAttachmentCollection.java | 2 +-
.../types/MessageCollection.java | 2 +-
.../astoriadefaultservice/types/MessageKey.java | 2 +-
.../astoriadefaultservice/types/Order.java | 20 +-
.../types/OrderCollection.java | 2 +-
.../astoriadefaultservice/types/OrderLine.java | 13 +-
.../types/OrderLineCollection.java | 2 +-
.../types/OrderLineKey.java | 2 +-
.../astoriadefaultservice/types/PageView.java | 13 +-
.../types/PageViewCollection.java | 2 +-
.../astoriadefaultservice/types/Person.java | 7 +-
.../types/PersonCollection.java | 2 +-
.../types/PersonMetadata.java | 11 +-
.../types/PersonMetadataCollection.java | 2 +-
.../astoriadefaultservice/types/Phone.java | 6 +-
.../astoriadefaultservice/types/Product.java | 51 +-
.../types/ProductCollection.java | 15 +-
.../types/ProductDetail.java | 7 +-
.../types/ProductDetailCollection.java | 2 +-
.../types/ProductPageView.java | 17 +-
.../types/ProductPageViewCollection.java | 2 +-
.../types/ProductPhoto.java | 9 +-
.../types/ProductPhotoCollection.java | 2 +-
.../types/ProductPhotoKey.java | 2 +-
.../types/ProductReview.java | 11 +-
.../types/ProductReviewCollection.java | 2 +-
.../types/ProductReviewKey.java | 2 +-
.../astoriadefaultservice/types/RSAToken.java | 7 +-
.../types/RSATokenCollection.java | 2 +-
.../types/SpecialEmployee.java | 19 +-
.../types/SpecialEmployeeCollection.java | 2 +-
.../types/package-info.java | 1 +
.../olingo/fit/proxy/v4/AbstractTest.java | 2 +-
.../proxy/v4/AuthEntityRetrieveTestITCase.java | 49 ++
.../services/odatawcfservice/Accounts.java | 2 +-
.../odata/services/odatawcfservice/Boss.java | 2 +-
.../odata/services/odatawcfservice/Company.java | 2 +-
.../services/odatawcfservice/Customers.java | 2 +-
.../odatawcfservice/DefaultStoredPI.java | 2 +-
.../services/odatawcfservice/Departments.java | 2 +-
.../services/odatawcfservice/Employees.java | 2 +-
.../odatawcfservice/InMemoryEntities.java | 6 +-
.../services/odatawcfservice/LabourUnion.java | 2 +-
.../services/odatawcfservice/OrderDetails.java | 2 +-
.../odata/services/odatawcfservice/Orders.java | 2 +-
.../odata/services/odatawcfservice/People.java | 2 +-
.../odatawcfservice/ProductDetails.java | 2 +-
.../odatawcfservice/ProductReviews.java | 2 +-
.../services/odatawcfservice/Products.java | 2 +-
.../services/odatawcfservice/PublicCompany.java | 2 +-
.../services/odatawcfservice/StoredPIs.java | 2 +-
.../odatawcfservice/SubscriptionTemplates.java | 2 +-
.../services/odatawcfservice/VipCustomer.java | 2 +-
.../services/odatawcfservice/package-info.java | 1 +
.../odatawcfservice/types/AccessLevel.java | 1 +
.../services/odatawcfservice/types/Account.java | 24 +-
.../types/AccountCollection.java | 29 +-
.../odatawcfservice/types/AccountInfo.java | 6 +-
.../services/odatawcfservice/types/Address.java | 6 +-
.../services/odatawcfservice/types/Asset.java | 9 +-
.../odatawcfservice/types/AssetCollection.java | 2 +-
.../services/odatawcfservice/types/Club.java | 7 +-
.../odatawcfservice/types/ClubCollection.java | 2 +-
.../services/odatawcfservice/types/Color.java | 1 +
.../services/odatawcfservice/types/Company.java | 28 +-
.../odatawcfservice/types/CompanyAddress.java | 6 +-
.../odatawcfservice/types/CompanyCategory.java | 1 +
.../types/CompanyCollection.java | 22 +-
.../odatawcfservice/types/CreditCardPI.java | 19 +-
.../types/CreditCardPICollection.java | 2 +-
.../odatawcfservice/types/CreditRecord.java | 11 +-
.../types/CreditRecordCollection.java | 2 +-
.../odatawcfservice/types/Customer.java | 37 +-
.../types/CustomerCollection.java | 2 +-
.../odatawcfservice/types/Department.java | 7 +-
.../types/DepartmentCollection.java | 2 +-
.../odatawcfservice/types/Employee.java | 35 +-
.../types/EmployeeCollection.java | 2 +-
.../odatawcfservice/types/GiftCard.java | 15 +-
.../types/GiftCardCollection.java | 16 +-
.../odatawcfservice/types/HomeAddress.java | 6 +-
.../odatawcfservice/types/LabourUnion.java | 7 +-
.../types/LabourUnionCollection.java | 2 +-
.../services/odatawcfservice/types/Order.java | 11 +-
.../odatawcfservice/types/OrderCollection.java | 2 +-
.../odatawcfservice/types/OrderDetail.java | 13 +-
.../types/OrderDetailCollection.java | 2 +-
.../odatawcfservice/types/OrderDetailKey.java | 2 +-
.../types/PaymentInstrument.java | 9 +-
.../types/PaymentInstrumentCollection.java | 2 +-
.../services/odatawcfservice/types/Person.java | 34 +-
.../odatawcfservice/types/PersonCollection.java | 23 +-
.../services/odatawcfservice/types/Product.java | 25 +-
.../types/ProductCollection.java | 18 +-
.../odatawcfservice/types/ProductDetail.java | 15 +-
.../types/ProductDetailCollection.java | 15 +-
.../odatawcfservice/types/ProductDetailKey.java | 2 +-
.../odatawcfservice/types/ProductReview.java | 15 +-
.../types/ProductReviewCollection.java | 2 +-
.../odatawcfservice/types/ProductReviewKey.java | 2 +-
.../odatawcfservice/types/PublicCompany.java | 27 +-
.../types/PublicCompanyCollection.java | 2 +-
.../odatawcfservice/types/Statement.java | 11 +-
.../types/StatementCollection.java | 2 +-
.../odatawcfservice/types/StoredPI.java | 11 +-
.../types/StoredPICollection.java | 2 +-
.../odatawcfservice/types/Subscription.java | 13 +-
.../types/SubscriptionCollection.java | 2 +-
.../odatawcfservice/types/package-info.java | 1 +
.../apache/olingo/fit/v3/BatchTestITCase.java | 13 +
.../olingo/fit/v4/AbstractTestITCase.java | 6 +-
.../olingo/fit/v4/DerivedTypeTestITCase.java | 78 +++
.../olingo/fit/v4/EntityCreateTestITCase.java | 2 +-
.../olingo/fit/v4/EntityRetrieveTestITCase.java | 30 +-
.../olingo/fit/v4/KeyAsSegmentTestITCase.java | 9 +-
.../olingo/fit/v4/OpenTypeTestITCase.java | 12 +-
.../olingo/client/api/op/CommonODataBinder.java | 9 +
.../olingo/client/core/edm/EdmClientImpl.java | 6 +-
.../olingo/client/core/edm/EdmSchemaImpl.java | 24 +-
.../client/core/edm/v3/EdmOperationProxy.java | 10 +-
.../client/core/op/impl/v3/ODataBinderImpl.java | 9 +-
.../client/core/op/impl/v4/ODataBinderImpl.java | 9 +-
.../core/v3/EdmEnabledODataClientImpl.java | 3 +
.../core/v4/EdmEnabledODataClientImpl.java | 3 +
.../olingo/client/core/v3/MetadataTest.java | 33 +-
.../client/core/v3/ComputerDetail_-10.json | 29 +-
.../core/v3/Product_-10_Dimensions_Width.json | 5 +-
.../commons/api/domain/ODataPrimitiveValue.java | 4 +
.../core/data/AbstractJsonDeserializer.java | 9 +-
.../core/data/AbstractJsonSerializer.java | 9 +-
.../commons/core/data/JSONEntitySerializer.java | 20 +-
.../domain/AbstractODataPrimitiveValue.java | 12 +-
273 files changed, 3415 insertions(+), 3369 deletions(-)
----------------------------------------------------------------------