You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/07/20 11:26:06 UTC
[14/14] git commit: [OLINGO-366] provides stream lazy loading
[OLINGO-366] provides stream lazy loading
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/aa0c5713
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/aa0c5713
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/aa0c5713
Branch: refs/heads/master
Commit: aa0c5713c78385c633c1d2e4c144c0790e3b45de
Parents: dfe68e6
Author: fmartelli <fa...@gmail.com>
Authored: Sun Jul 20 11:25:23 2014 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Sun Jul 20 11:25:23 2014 +0200
----------------------------------------------------------------------
.../org/apache/olingo/ext/proxy/Service.java | 2 +-
.../commons/AbstractPersistenceManager.java | 22 +++--
.../ext/proxy/commons/EdmStreamTypeHandler.java | 70 ++++++++++++++++
.../proxy/commons/EntityInvocationHandler.java | 87 +++++++++++---------
.../olingo/ext/proxy/utils/CoreUtils.java | 10 +--
.../src/main/resources/entityType.vm | 20 +++--
.../olingo/fit/utils/AbstractUtilities.java | 2 +
.../org/apache/olingo/fit/utils/Commons.java | 1 +
.../olingo/fit/proxy/v3/AbstractTestITCase.java | 2 +-
.../olingo/fit/proxy/v3/ContextTestITCase.java | 25 +++---
.../fit/proxy/v3/EntityCreateTestITCase.java | 6 +-
.../fit/proxy/v3/EntityRetrieveTestITCase.java | 1 +
.../fit/proxy/v3/EntityUpdateTestITCase.java | 2 +-
.../olingo/fit/proxy/v3/InvokeTestITCase.java | 6 +-
.../fit/proxy/v3/MediaEntityTestITCase.java | 26 +++---
.../olingo/fit/proxy/v3/OpenTypeTestITCase.java | 8 +-
.../AllGeoCollectionTypesSet.java | 20 +++++
.../astoriadefaultservice/AllGeoTypesSet.java | 20 +++++
.../services/astoriadefaultservice/Car.java | 20 +++++
.../astoriadefaultservice/Computer.java | 20 +++++
.../astoriadefaultservice/ComputerDetail.java | 20 +++++
.../astoriadefaultservice/Customer.java | 20 +++++
.../astoriadefaultservice/CustomerInfo.java | 20 +++++
.../astoriadefaultservice/DefaultContainer.java | 21 +++++
.../services/astoriadefaultservice/Driver.java | 20 +++++
.../astoriadefaultservice/LastLogin.java | 20 +++++
.../services/astoriadefaultservice/License.java | 20 +++++
.../services/astoriadefaultservice/Login.java | 20 +++++
.../astoriadefaultservice/MappedEntityType.java | 20 +++++
.../services/astoriadefaultservice/Message.java | 18 ++++
.../MessageAttachment.java | 20 +++++
.../services/astoriadefaultservice/Order.java | 20 +++++
.../astoriadefaultservice/OrderLine.java | 18 ++++
.../astoriadefaultservice/PageView.java | 20 +++++
.../services/astoriadefaultservice/Person.java | 20 +++++
.../astoriadefaultservice/PersonMetadata.java | 20 +++++
.../services/astoriadefaultservice/Product.java | 20 +++++
.../astoriadefaultservice/ProductDetail.java | 20 +++++
.../astoriadefaultservice/ProductPhoto.java | 18 ++++
.../astoriadefaultservice/ProductReview.java | 18 ++++
.../astoriadefaultservice/RSAToken.java | 20 +++++
.../astoriadefaultservice/types/Aliases.java | 21 +++++
.../types/AllSpatialCollectionTypes.java | 29 ++++++-
.../AllSpatialCollectionTypesCollection.java | 20 +++++
.../types/AllSpatialCollectionTypes_Simple.java | 41 +++++++--
...SpatialCollectionTypes_SimpleCollection.java | 20 +++++
.../types/AllSpatialTypes.java | 61 ++++++++++----
.../types/AllSpatialTypesCollection.java | 20 +++++
.../astoriadefaultservice/types/AuditInfo.java | 21 +++++
.../types/BackOrderLine.java | 42 ++++++++--
.../types/BackOrderLine2.java | 42 ++++++++--
.../types/BackOrderLine2Collection.java | 20 +++++
.../types/BackOrderLineCollection.java | 20 +++++
.../astoriadefaultservice/types/Car.java | 45 +++++++---
.../types/CarCollection.java | 20 +++++
.../types/ComplexToCategory.java | 21 +++++
.../astoriadefaultservice/types/Computer.java | 31 ++++++-
.../types/ComputerCollection.java | 20 +++++
.../types/ComputerDetail.java | 41 +++++++--
.../types/ComputerDetailCollection.java | 20 +++++
.../types/ConcurrencyInfo.java | 21 +++++
.../types/ContactDetails.java | 21 +++++
.../astoriadefaultservice/types/Contractor.java | 38 +++++++--
.../types/ContractorCollection.java | 20 +++++
.../astoriadefaultservice/types/Customer.java | 51 +++++++++---
.../types/CustomerCollection.java | 20 +++++
.../types/CustomerInfo.java | 35 ++++++--
.../types/CustomerInfoCollection.java | 20 +++++
.../astoriadefaultservice/types/Dimensions.java | 21 +++++
.../types/DiscontinuedProduct.java | 61 ++++++++++----
.../types/DiscontinuedProductCollection.java | 20 +++++
.../astoriadefaultservice/types/Driver.java | 31 ++++++-
.../types/DriverCollection.java | 20 +++++
.../astoriadefaultservice/types/Employee.java | 35 ++++++--
.../types/EmployeeCollection.java | 17 ++++
.../astoriadefaultservice/types/LastLogin.java | 35 ++++++--
.../types/LastLoginCollection.java | 20 +++++
.../astoriadefaultservice/types/License.java | 37 +++++++--
.../types/LicenseCollection.java | 20 +++++
.../astoriadefaultservice/types/Login.java | 31 ++++++-
.../types/LoginCollection.java | 20 +++++
.../types/MappedEntityType.java | 71 ++++++++++------
.../types/MappedEntityTypeCollection.java | 20 +++++
.../astoriadefaultservice/types/Message.java | 42 ++++++++--
.../types/MessageAttachment.java | 31 ++++++-
.../types/MessageAttachmentCollection.java | 20 +++++
.../types/MessageCollection.java | 20 +++++
.../astoriadefaultservice/types/MessageKey.java | 24 ++++++
.../astoriadefaultservice/types/Order.java | 33 +++++++-
.../types/OrderCollection.java | 20 +++++
.../astoriadefaultservice/types/OrderLine.java | 41 +++++++--
.../types/OrderLineCollection.java | 20 +++++
.../types/OrderLineKey.java | 24 ++++++
.../astoriadefaultservice/types/PageView.java | 37 +++++++--
.../types/PageViewCollection.java | 20 +++++
.../astoriadefaultservice/types/Person.java | 30 ++++++-
.../types/PersonCollection.java | 20 +++++
.../types/PersonMetadata.java | 35 ++++++--
.../types/PersonMetadataCollection.java | 20 +++++
.../astoriadefaultservice/types/Phone.java | 21 +++++
.../astoriadefaultservice/types/Product.java | 48 ++++++++---
.../types/ProductCollection.java | 20 +++++
.../types/ProductDetail.java | 31 ++++++-
.../types/ProductDetailCollection.java | 20 +++++
.../types/ProductPageView.java | 41 +++++++--
.../types/ProductPageViewCollection.java | 20 +++++
.../types/ProductPhoto.java | 34 ++++++--
.../types/ProductPhotoCollection.java | 20 +++++
.../types/ProductPhotoKey.java | 24 ++++++
.../types/ProductReview.java | 38 +++++++--
.../types/ProductReviewCollection.java | 20 +++++
.../types/ProductReviewKey.java | 24 ++++++
.../astoriadefaultservice/types/RSAToken.java | 31 ++++++-
.../types/RSATokenCollection.java | 20 +++++
.../types/SpecialEmployee.java | 42 ++++++++--
.../types/SpecialEmployeeCollection.java | 17 ++++
.../opentypesservicev3/DefaultContainer.java | 22 +++++
.../odata/services/opentypesservicev3/Row.java | 20 +++++
.../services/opentypesservicev3/RowIndex.java | 20 +++++
.../types/ContactDetails.java | 21 +++++
.../opentypesservicev3/types/IndexedRow.java | 28 ++++++-
.../types/IndexedRowCollection.java | 20 +++++
.../services/opentypesservicev3/types/Row.java | 28 ++++++-
.../opentypesservicev3/types/RowCollection.java | 20 +++++
.../opentypesservicev3/types/RowIndex.java | 28 ++++++-
.../types/RowIndexCollection.java | 20 +++++
.../primitivekeysservice/EdmBinarySet.java | 20 +++++
.../primitivekeysservice/EdmBooleanSet.java | 20 +++++
.../primitivekeysservice/EdmByteSet.java | 20 +++++
.../EdmDateTimeOffsetSet.java | 20 +++++
.../primitivekeysservice/EdmDateTimeSet.java | 20 +++++
.../primitivekeysservice/EdmDecimalSet.java | 20 +++++
.../primitivekeysservice/EdmDoubleSet.java | 20 +++++
.../primitivekeysservice/EdmGuidSet.java | 20 +++++
.../primitivekeysservice/EdmInt16Set.java | 20 +++++
.../primitivekeysservice/EdmInt32Set.java | 20 +++++
.../primitivekeysservice/EdmInt64Set.java | 20 +++++
.../primitivekeysservice/EdmSingleSet.java | 20 +++++
.../primitivekeysservice/EdmStringSet.java | 20 +++++
.../primitivekeysservice/EdmTimeSet.java | 20 +++++
.../services/primitivekeysservice/Folders.java | 20 +++++
.../primitivekeysservice/TestContext.java | 22 +++++
.../primitivekeysservice/types/EdmBinary.java | 29 ++++++-
.../types/EdmBinaryCollection.java | 20 +++++
.../primitivekeysservice/types/EdmBoolean.java | 29 ++++++-
.../types/EdmBooleanCollection.java | 20 +++++
.../primitivekeysservice/types/EdmByte.java | 29 ++++++-
.../types/EdmByteCollection.java | 20 +++++
.../primitivekeysservice/types/EdmDateTime.java | 29 ++++++-
.../types/EdmDateTimeCollection.java | 20 +++++
.../types/EdmDateTimeOffset.java | 29 ++++++-
.../types/EdmDateTimeOffsetCollection.java | 20 +++++
.../primitivekeysservice/types/EdmDecimal.java | 29 ++++++-
.../types/EdmDecimalCollection.java | 20 +++++
.../primitivekeysservice/types/EdmDouble.java | 29 ++++++-
.../types/EdmDoubleCollection.java | 20 +++++
.../primitivekeysservice/types/EdmGuid.java | 29 ++++++-
.../types/EdmGuidCollection.java | 20 +++++
.../primitivekeysservice/types/EdmInt16.java | 29 ++++++-
.../types/EdmInt16Collection.java | 20 +++++
.../primitivekeysservice/types/EdmInt32.java | 29 ++++++-
.../types/EdmInt32Collection.java | 20 +++++
.../primitivekeysservice/types/EdmInt64.java | 29 ++++++-
.../types/EdmInt64Collection.java | 20 +++++
.../primitivekeysservice/types/EdmSingle.java | 29 ++++++-
.../types/EdmSingleCollection.java | 20 +++++
.../primitivekeysservice/types/EdmString.java | 29 ++++++-
.../types/EdmStringCollection.java | 20 +++++
.../primitivekeysservice/types/EdmTime.java | 29 ++++++-
.../types/EdmTimeCollection.java | 20 +++++
.../primitivekeysservice/types/Folder.java | 31 ++++++-
.../types/FolderCollection.java | 20 +++++
.../AllGeoCollectionTypesSet.java | 20 +++++
.../astoriadefaultservice/AllGeoTypesSet.java | 20 +++++
.../services/astoriadefaultservice/Car.java | 20 +++++
.../astoriadefaultservice/Computer.java | 20 +++++
.../astoriadefaultservice/ComputerDetail.java | 20 +++++
.../astoriadefaultservice/Customer.java | 20 +++++
.../astoriadefaultservice/CustomerInfo.java | 20 +++++
.../astoriadefaultservice/DefaultContainer.java | 21 +++++
.../services/astoriadefaultservice/Driver.java | 20 +++++
.../astoriadefaultservice/LastLogin.java | 20 +++++
.../services/astoriadefaultservice/License.java | 20 +++++
.../services/astoriadefaultservice/Login.java | 20 +++++
.../astoriadefaultservice/MappedEntityType.java | 20 +++++
.../services/astoriadefaultservice/Message.java | 18 ++++
.../MessageAttachment.java | 20 +++++
.../services/astoriadefaultservice/Order.java | 20 +++++
.../astoriadefaultservice/OrderLine.java | 18 ++++
.../astoriadefaultservice/PageView.java | 20 +++++
.../services/astoriadefaultservice/Person.java | 20 +++++
.../astoriadefaultservice/PersonMetadata.java | 20 +++++
.../services/astoriadefaultservice/Product.java | 20 +++++
.../astoriadefaultservice/ProductDetail.java | 20 +++++
.../astoriadefaultservice/ProductPhoto.java | 18 ++++
.../astoriadefaultservice/ProductReview.java | 18 ++++
.../astoriadefaultservice/RSAToken.java | 20 +++++
.../astoriadefaultservice/types/Aliases.java | 21 +++++
.../types/AllSpatialCollectionTypes.java | 29 ++++++-
.../AllSpatialCollectionTypesCollection.java | 20 +++++
.../types/AllSpatialCollectionTypes_Simple.java | 41 +++++++--
...SpatialCollectionTypes_SimpleCollection.java | 20 +++++
.../types/AllSpatialTypes.java | 61 ++++++++++----
.../types/AllSpatialTypesCollection.java | 20 +++++
.../astoriadefaultservice/types/AuditInfo.java | 21 +++++
.../types/BackOrderLine.java | 42 ++++++++--
.../types/BackOrderLine2.java | 42 ++++++++--
.../types/BackOrderLine2Collection.java | 20 +++++
.../types/BackOrderLineCollection.java | 20 +++++
.../astoriadefaultservice/types/Car.java | 45 +++++++---
.../types/CarCollection.java | 20 +++++
.../types/ComplexToCategory.java | 21 +++++
.../types/ComplexWithAllPrimitiveTypes.java | 21 +++++
.../astoriadefaultservice/types/Computer.java | 30 ++++++-
.../types/ComputerCollection.java | 20 +++++
.../types/ComputerDetail.java | 39 +++++++--
.../types/ComputerDetailCollection.java | 20 +++++
.../types/ConcurrencyInfo.java | 21 +++++
.../types/ContactDetails.java | 21 +++++
.../astoriadefaultservice/types/Contractor.java | 39 +++++++--
.../types/ContractorCollection.java | 20 +++++
.../astoriadefaultservice/types/Customer.java | 51 +++++++++---
.../types/CustomerCollection.java | 20 +++++
.../types/CustomerInfo.java | 35 ++++++--
.../types/CustomerInfoCollection.java | 20 +++++
.../astoriadefaultservice/types/Dimensions.java | 21 +++++
.../types/DiscontinuedProduct.java | 61 ++++++++++----
.../types/DiscontinuedProductCollection.java | 20 +++++
.../astoriadefaultservice/types/Driver.java | 31 ++++++-
.../types/DriverCollection.java | 20 +++++
.../astoriadefaultservice/types/Employee.java | 36 ++++++--
.../types/EmployeeCollection.java | 17 ++++
.../astoriadefaultservice/types/LastLogin.java | 35 ++++++--
.../types/LastLoginCollection.java | 20 +++++
.../astoriadefaultservice/types/License.java | 37 +++++++--
.../types/LicenseCollection.java | 20 +++++
.../astoriadefaultservice/types/Login.java | 31 ++++++-
.../types/LoginCollection.java | 20 +++++
.../types/MappedEntityType.java | 71 ++++++++++------
.../types/MappedEntityTypeCollection.java | 20 +++++
.../astoriadefaultservice/types/Message.java | 42 ++++++++--
.../types/MessageAttachment.java | 31 ++++++-
.../types/MessageAttachmentCollection.java | 20 +++++
.../types/MessageCollection.java | 20 +++++
.../astoriadefaultservice/types/MessageKey.java | 24 ++++++
.../astoriadefaultservice/types/Order.java | 33 +++++++-
.../types/OrderCollection.java | 20 +++++
.../astoriadefaultservice/types/OrderLine.java | 42 ++++++++--
.../types/OrderLineCollection.java | 20 +++++
.../types/OrderLineKey.java | 24 ++++++
.../astoriadefaultservice/types/PageView.java | 37 +++++++--
.../types/PageViewCollection.java | 20 +++++
.../astoriadefaultservice/types/Person.java | 31 ++++++-
.../types/PersonCollection.java | 20 +++++
.../types/PersonMetadata.java | 35 ++++++--
.../types/PersonMetadataCollection.java | 20 +++++
.../astoriadefaultservice/types/Phone.java | 21 +++++
.../astoriadefaultservice/types/Product.java | 47 ++++++++---
.../types/ProductCollection.java | 20 +++++
.../types/ProductDetail.java | 31 ++++++-
.../types/ProductDetailCollection.java | 20 +++++
.../types/ProductPageView.java | 41 +++++++--
.../types/ProductPageViewCollection.java | 20 +++++
.../types/ProductPhoto.java | 34 ++++++--
.../types/ProductPhotoCollection.java | 20 +++++
.../types/ProductPhotoKey.java | 24 ++++++
.../types/ProductReview.java | 38 +++++++--
.../types/ProductReviewCollection.java | 20 +++++
.../types/ProductReviewKey.java | 24 ++++++
.../astoriadefaultservice/types/RSAToken.java | 31 ++++++-
.../types/RSATokenCollection.java | 20 +++++
.../types/SpecialEmployee.java | 43 ++++++++--
.../types/SpecialEmployeeCollection.java | 20 +++++
.../fit/proxy/v4/APIBasicDesignTestITCase.java | 14 +++-
.../olingo/fit/proxy/v4/AbstractTestITCase.java | 2 +-
.../olingo/fit/proxy/v4/ContextTestITCase.java | 7 +-
.../fit/proxy/v4/DerivedTypeTestITCase.java | 3 +-
.../fit/proxy/v4/EntityCreateTestITCase.java | 17 ++--
.../fit/proxy/v4/EntityRetrieveTestITCase.java | 1 -
.../fit/proxy/v4/EntityUpdateTestITCase.java | 5 +-
.../fit/proxy/v4/MediaEntityTestITCase.java | 28 ++++---
.../olingo/fit/proxy/v4/OpenTypeTestITCase.java | 8 +-
.../v4/OperationImportInvokeTestITCase.java | 1 +
.../proxy/v4/demo/odatademo/Advertisements.java | 20 +++++
.../fit/proxy/v4/demo/odatademo/Categories.java | 20 +++++
.../proxy/v4/demo/odatademo/DemoService.java | 21 +++++
.../proxy/v4/demo/odatademo/PersonDetails.java | 20 +++++
.../fit/proxy/v4/demo/odatademo/Persons.java | 20 +++++
.../proxy/v4/demo/odatademo/ProductDetails.java | 20 +++++
.../fit/proxy/v4/demo/odatademo/Products.java | 20 +++++
.../fit/proxy/v4/demo/odatademo/Suppliers.java | 20 +++++
.../proxy/v4/demo/odatademo/types/Address.java | 19 +++++
.../v4/demo/odatademo/types/Advertisement.java | 37 +++++++--
.../types/AdvertisementCollection.java | 20 +++++
.../proxy/v4/demo/odatademo/types/Category.java | 30 ++++++-
.../odatademo/types/CategoryCollection.java | 20 +++++
.../proxy/v4/demo/odatademo/types/Customer.java | 33 +++++++-
.../odatademo/types/CustomerCollection.java | 20 +++++
.../proxy/v4/demo/odatademo/types/Employee.java | 37 +++++++--
.../odatademo/types/EmployeeCollection.java | 20 +++++
.../demo/odatademo/types/FeaturedProduct.java | 41 +++++++--
.../types/FeaturedProductCollection.java | 20 +++++
.../proxy/v4/demo/odatademo/types/Person.java | 31 ++++++-
.../demo/odatademo/types/PersonCollection.java | 20 +++++
.../v4/demo/odatademo/types/PersonDetail.java | 43 ++++++++--
.../odatademo/types/PersonDetailCollection.java | 20 +++++
.../proxy/v4/demo/odatademo/types/Product.java | 39 +++++++--
.../demo/odatademo/types/ProductCollection.java | 20 +++++
.../v4/demo/odatademo/types/ProductDetail.java | 31 ++++++-
.../types/ProductDetailCollection.java | 20 +++++
.../proxy/v4/demo/odatademo/types/Supplier.java | 39 +++++++--
.../odatademo/types/SupplierCollection.java | 20 +++++
.../opentypesservicev4/DefaultContainer.java | 22 +++++
.../odata/services/opentypesservicev4/Row.java | 20 +++++
.../services/opentypesservicev4/RowIndex.java | 20 +++++
.../opentypesservicev4/types/AccountInfo.java | 18 ++++
.../opentypesservicev4/types/Color.java | 2 +
.../types/ContactDetails.java | 19 +++++
.../opentypesservicev4/types/IndexedRow.java | 28 ++++++-
.../types/IndexedRowCollection.java | 20 +++++
.../services/opentypesservicev4/types/Row.java | 28 ++++++-
.../opentypesservicev4/types/RowCollection.java | 20 +++++
.../opentypesservicev4/types/RowIndex.java | 28 ++++++-
.../types/RowIndexCollection.java | 20 +++++
.../services/odatawcfservice/Accounts.java | 20 +++++
.../odata/services/odatawcfservice/Boss.java | 20 +++++
.../odata/services/odatawcfservice/Company.java | 20 +++++
.../services/odatawcfservice/Customers.java | 20 +++++
.../odatawcfservice/DefaultStoredPI.java | 20 +++++
.../services/odatawcfservice/Departments.java | 20 +++++
.../services/odatawcfservice/Employees.java | 20 +++++
.../odatawcfservice/InMemoryEntities.java | 21 +++++
.../services/odatawcfservice/LabourUnion.java | 20 +++++
.../services/odatawcfservice/OrderDetails.java | 18 ++++
.../odata/services/odatawcfservice/Orders.java | 20 +++++
.../odata/services/odatawcfservice/People.java | 20 +++++
.../odatawcfservice/ProductDetails.java | 18 ++++
.../odatawcfservice/ProductReviews.java | 18 ++++
.../services/odatawcfservice/Products.java | 20 +++++
.../services/odatawcfservice/PublicCompany.java | 20 +++++
.../services/odatawcfservice/StoredPIs.java | 20 +++++
.../odatawcfservice/SubscriptionTemplates.java | 20 +++++
.../services/odatawcfservice/VipCustomer.java | 20 +++++
.../odatawcfservice/types/AccessLevel.java | 2 +
.../services/odatawcfservice/types/Account.java | 30 ++++++-
.../types/AccountCollection.java | 20 +++++
.../odatawcfservice/types/AccountInfo.java | 18 ++++
.../services/odatawcfservice/types/Address.java | 19 +++++
.../services/odatawcfservice/types/Asset.java | 33 +++++++-
.../odatawcfservice/types/AssetCollection.java | 20 +++++
.../services/odatawcfservice/types/Club.java | 31 ++++++-
.../odatawcfservice/types/ClubCollection.java | 20 +++++
.../services/odatawcfservice/types/Color.java | 2 +
.../services/odatawcfservice/types/Company.java | 34 ++++++--
.../odatawcfservice/types/CompanyAddress.java | 19 +++++
.../odatawcfservice/types/CompanyCategory.java | 2 +
.../types/CompanyCollection.java | 20 +++++
.../odatawcfservice/types/CreditCardPI.java | 42 ++++++++--
.../types/CreditCardPICollection.java | 20 +++++
.../odatawcfservice/types/CreditRecord.java | 35 ++++++--
.../types/CreditRecordCollection.java | 20 +++++
.../odatawcfservice/types/Customer.java | 51 +++++++++---
.../types/CustomerCollection.java | 20 +++++
.../odatawcfservice/types/Department.java | 33 +++++++-
.../types/DepartmentCollection.java | 20 +++++
.../odatawcfservice/types/Employee.java | 49 ++++++++---
.../types/EmployeeCollection.java | 20 +++++
.../odatawcfservice/types/GiftCard.java | 35 ++++++--
.../types/GiftCardCollection.java | 20 +++++
.../odatawcfservice/types/HomeAddress.java | 19 +++++
.../services/odatawcfservice/types/IsBoss.java | 3 +
.../odatawcfservice/types/LabourUnion.java | 31 ++++++-
.../types/LabourUnionCollection.java | 20 +++++
.../services/odatawcfservice/types/Order.java | 35 ++++++--
.../odatawcfservice/types/OrderCollection.java | 20 +++++
.../odatawcfservice/types/OrderDetail.java | 38 +++++++--
.../types/OrderDetailCollection.java | 20 +++++
.../odatawcfservice/types/OrderDetailKey.java | 24 ++++++
.../types/PaymentInstrument.java | 32 ++++++-
.../types/PaymentInstrumentCollection.java | 20 +++++
.../services/odatawcfservice/types/Person.java | 43 +++++++---
.../odatawcfservice/types/PersonCollection.java | 20 +++++
.../services/odatawcfservice/types/Product.java | 43 +++++++---
.../types/ProductCollection.java | 17 ++++
.../odatawcfservice/types/ProductDetail.java | 35 ++++++--
.../types/ProductDetailCollection.java | 20 +++++
.../odatawcfservice/types/ProductDetailKey.java | 24 ++++++
.../odatawcfservice/types/ProductReview.java | 44 +++++++---
.../types/ProductReviewCollection.java | 20 +++++
.../odatawcfservice/types/ProductReviewKey.java | 24 ++++++
.../odatawcfservice/types/PublicCompany.java | 39 +++++++--
.../types/PublicCompanyCollection.java | 20 +++++
.../odatawcfservice/types/Statement.java | 35 ++++++--
.../types/StatementCollection.java | 20 +++++
.../odatawcfservice/types/StoredPI.java | 35 ++++++--
.../types/StoredPICollection.java | 20 +++++
.../odatawcfservice/types/Subscription.java | 37 +++++++--
.../types/SubscriptionCollection.java | 20 +++++
398 files changed, 8880 insertions(+), 863 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java
index a0babe8..6c13664 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java
@@ -171,7 +171,7 @@ public final class Service<C extends CommonEdmEnabledODataClient<?>> {
}
@SuppressWarnings("unchecked")
- public <NE extends EntityType> NE newEntity(final Class<NE> reference) {
+ public <NE extends EntityType> NE newEntityInstance(final Class<NE> reference) {
final EntityInvocationHandler handler = EntityInvocationHandler.getInstance(reference, this);
return (NE) Proxy.newProxyInstance(
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
index 04e5d2a..39fef84 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
@@ -31,7 +31,6 @@ import org.apache.olingo.commons.api.domain.ODataLink;
import org.apache.olingo.commons.api.domain.ODataLinkType;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
-import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.ext.proxy.Service;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
@@ -42,7 +41,6 @@ import org.apache.olingo.ext.proxy.utils.CoreUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.InputStream;
import java.lang.reflect.Proxy;
import java.net.URI;
import java.util.ArrayList;
@@ -52,6 +50,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
abstract class AbstractPersistenceManager implements PersistenceManager {
@@ -252,7 +251,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
}
}
- for (Map.Entry<String, InputStream> streamedChanges : handler.getStreamedPropertyChanges().entrySet()) {
+ for (Map.Entry<String, EdmStreamValue> streamedChanges : handler.getStreamedPropertyChanges().entrySet()) {
final URI targetURI = currentStatus == AttachedEntityStatus.NEW
? URI.create("$" + startingPos) : URIUtils.getURI(
service.getClient().getServiceRoot(),
@@ -360,16 +359,16 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
private void queueUpdateMediaEntity(
final EntityInvocationHandler handler,
final URI uri,
- final InputStream input,
+ final EdmStreamValue input,
final PersistenceChanges changeset) {
LOG.debug("Update media entity '{}'", uri);
final ODataMediaEntityUpdateRequest<?> req =
- service.getClient().getCUDRequestFactory().getMediaEntityUpdateRequest(uri, input);
+ service.getClient().getCUDRequestFactory().getMediaEntityUpdateRequest(uri, input.getStream());
- if (StringUtils.isNotBlank(handler.getEntity().getMediaContentType())) {
- req.setContentType(ODataFormat.fromString(handler.getEntity().getMediaContentType()).toString());
+ if (StringUtils.isNotBlank(input.getContentType())) {
+ req.setContentType(input.getContentType());
}
if (StringUtils.isNotBlank(handler.getETag())) {
@@ -382,12 +381,17 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
private void queueUpdateMediaResource(
final EntityInvocationHandler handler,
final URI uri,
- final InputStream input,
+ final EdmStreamValue input,
final PersistenceChanges changeset) {
LOG.debug("Update media entity '{}'", uri);
- final ODataStreamUpdateRequest req = service.getClient().getCUDRequestFactory().getStreamUpdateRequest(uri, input);
+ final ODataStreamUpdateRequest req =
+ service.getClient().getCUDRequestFactory().getStreamUpdateRequest(uri, input.getStream());
+
+ if (StringUtils.isNotBlank(input.getContentType())) {
+ req.setContentType(input.getContentType());
+ }
if (StringUtils.isNotBlank(handler.getETag())) {
req.setIfMatch(handler.getETag());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamTypeHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamTypeHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamTypeHandler.java
new file mode 100644
index 0000000..b41ff03
--- /dev/null
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EdmStreamTypeHandler.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.ext.proxy.commons;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
+import org.apache.olingo.ext.proxy.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.olingo.client.api.uri.CommonURIBuilder;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
+
+public class EdmStreamTypeHandler extends AbstractInvocationHandler {
+
+ private static final long serialVersionUID = 2629912294765040047L;
+
+ /**
+ * Logger.
+ */
+ private static final Logger LOG = LoggerFactory.getLogger(EdmStreamTypeHandler.class);
+
+ private CommonURIBuilder<?> uri;
+
+ private EdmStreamValue value = null;
+
+ protected EdmStreamTypeHandler(
+ final CommonURIBuilder<?> uri,
+ final Service<?> service) {
+
+ super(service);
+ this.uri = uri;
+ }
+
+ @Override
+ public Object invoke(Object o, Method method, Object[] args) throws Throwable {
+ if (isSelfMethod(method, args)) {
+ return invokeSelfMethod(method, args);
+ } else {
+ throw new NoSuchMethodException(method.getName());
+ }
+ }
+
+ public EdmStreamValue load() {
+ if (value == null && this.uri != null) {
+ final ODataRetrieveResponse<InputStream> res =
+ getClient().getRetrieveRequestFactory().getMediaRequest(this.uri.build()).execute();
+ value = new EdmStreamValue(res.getContentType(), res.getBody());
+ }
+
+ return value;
+ }
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
index fdcb862..9afca40 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
@@ -24,7 +24,6 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe
import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
-import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
@@ -62,6 +61,9 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.olingo.ext.proxy.api.EdmStreamType;
+import org.apache.olingo.ext.proxy.api.EdmStreamTypeImpl;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
import org.apache.olingo.ext.proxy.utils.ClassUtils;
@@ -79,12 +81,14 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
protected int linksTag = 0;
- private final Map<String, InputStream> streamedPropertyChanges = new HashMap<String, InputStream>();
+ private final Map<String, EdmStreamValue> streamedPropertyChanges = new HashMap<String, EdmStreamValue>();
+
+ private final Map<String, EdmStreamType> streamedPropertyCache = new HashMap<String, EdmStreamType>();
private final Map<Class<? extends AbstractTerm>, Object> annotations =
new HashMap<Class<? extends AbstractTerm>, Object>();
- private InputStream stream;
+ private EdmStreamValue stream;
private EntityUUID uuid;
@@ -232,6 +236,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
}
this.streamedPropertyChanges.clear();
+ this.streamedPropertyCache.clear();
this.propertyChanges.clear();
this.linkChanges.clear();
this.linkCache.clear();
@@ -312,14 +317,27 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
@Override
protected Object getPropertyValue(final String name, final Type type) {
try {
+ Object res;
Class<?> ref = ClassUtils.getTypeClass(type);
+ if (ref == EdmStreamType.class) {
+ if (streamedPropertyCache.containsKey(name)) {
+ res = streamedPropertyCache.get(name);
+ } else if (streamedPropertyChanges.containsKey(name)) {
+ res = new EdmStreamTypeImpl(streamedPropertyChanges.get(name));
+ } else {
+ res = Proxy.newProxyInstance(
+ Thread.currentThread().getContextClassLoader(),
+ new Class<?>[] {EdmStreamType.class}, new EdmStreamTypeHandler(
+ getClient().newURIBuilder(baseURI.toASCIIString()).appendPropertySegment(name),
+ service));
+
+ streamedPropertyCache.put(name, EdmStreamType.class.cast(res));
+ }
- if (ref == InputStream.class) {
- return getStreamedProperty(name);
+ return res;
} else {
final CommonODataProperty property = getEntity().getProperty(name);
- Object res;
if (propertyChanges.containsKey(name)) {
res = propertyChanges.get(name);
} else if (ref != null && ClassUtils.getTypeClass(type).isAnnotationPresent(ComplexType.class)) {
@@ -390,7 +408,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
@Override
protected void setPropertyValue(final Property property, final Object value) {
if (EdmPrimitiveTypeKind.Stream.getFullQualifiedName().toString().equalsIgnoreCase(property.type())) {
- setStreamedProperty(property, (InputStream) value);
+ setStreamedProperty(property, (EdmStreamType) value);
} else {
addPropertyChanges(property.name(), value);
@@ -425,66 +443,55 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
|| !this.streamedPropertyChanges.isEmpty();
}
- public void setStream(final InputStream stream) {
+ public void uploadStream(final EdmStreamValue stream) {
if (typeRef.getAnnotation(EntityType.class).hasStream()) {
- IOUtils.closeQuietly(this.stream);
+ if (this.stream != null) {
+ this.stream.close();
+ }
this.stream = stream;
attach(AttachedEntityStatus.CHANGED);
}
}
- public InputStream getStreamChanges() {
+ public EdmStreamValue getStreamChanges() {
return this.stream;
}
- public Map<String, InputStream> getStreamedPropertyChanges() {
+ public Map<String, EdmStreamValue> getStreamedPropertyChanges() {
return streamedPropertyChanges;
}
- public InputStream getStream() {
- final URI contentSource = getEntity().getMediaContentSource();
+ public EdmStreamValue loadStream() {
+ final URI contentSource = getEntity().getMediaContentSource() == null
+ ? getClient().newURIBuilder(baseURI.toASCIIString()).appendValueSegment().build()
+ : getEntity().getMediaContentSource();
if (this.stream == null
&& typeRef.getAnnotation(EntityType.class).hasStream()
&& contentSource != null) {
- final ODataMediaRequest retrieveReq = getClient().getRetrieveRequestFactory()
- .getMediaEntityRequest(contentSource);
+ final ODataMediaRequest retrieveReq =
+ getClient().getRetrieveRequestFactory().getMediaEntityRequest(contentSource);
+
if (StringUtils.isNotBlank(getEntity().getMediaContentType())) {
retrieveReq.setFormat(ODataFormat.fromString(getEntity().getMediaContentType()));
}
- this.stream = retrieveReq.execute().getBody();
- }
- return this.stream;
- }
-
- public Object getStreamedProperty(final String name) {
- InputStream res = streamedPropertyChanges.get(name);
-
- try {
- if (res == null) {
- final URI link = URIUtils.getURI(
- getClient().getServiceRoot(),
- CoreUtils.getMediaEditLink(name, getEntity()).toASCIIString());
-
- final ODataMediaRequest req = getClient().getRetrieveRequestFactory().getMediaRequest(link);
- res = req.execute().getBody();
- }
- } catch (Exception e) {
- res = null;
+ final ODataRetrieveResponse<InputStream> res = retrieveReq.execute();
+ this.stream = new EdmStreamValue(res.getContentType(), res.getBody());
}
- return res;
+ return this.stream;
}
- private void setStreamedProperty(final Property property, final InputStream input) {
+ private void setStreamedProperty(final Property property, final EdmStreamType input) {
final Object obj = streamedPropertyChanges.get(property.name());
if (obj instanceof InputStream) {
IOUtils.closeQuietly((InputStream) obj);
}
- streamedPropertyChanges.put(property.name(), input);
+ streamedPropertyCache.remove(property.name());
+ streamedPropertyChanges.put(property.name(), input.load());
}
@Override
@@ -630,8 +637,10 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
throw new IllegalArgumentException("Invalid " + typeRef.getSimpleName() + "(" + key + ")");
}
- IOUtils.closeQuietly(this.stream);
- this.stream = null;
+ if (this.stream != null) {
+ this.stream.close();
+ this.stream = null;
+ }
} catch (IllegalArgumentException e) {
LOG.warn("Entity '" + uuid + "' not found", e);
throw e;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java
index 30ecea0..75566a3 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java
@@ -71,6 +71,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
+import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.ext.proxy.Service;
@@ -648,13 +649,8 @@ public final class CoreUtils {
}
public static URI getMediaEditLink(final String name, final CommonODataEntity entity) {
- for (ODataLink link : entity.getMediaEditLinks()) {
- if (name.equalsIgnoreCase(link.getName())) {
- return link.getLink();
- }
- }
-
- throw new IllegalArgumentException("Invalid streamed property " + name);
+ final ODataLink mediaEditLink = entity.getMediaEditLink(name);
+ return mediaEditLink == null ? URIUtils.getURI(entity.getEditLink(), name) : mediaEditLink.getLink();
}
public static URI getTargetEntitySetURI(
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
index 9289d39..eef0666 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
@@ -71,13 +71,19 @@ public interface $utility.capitalize($entityType.Name)
#if(!$keys.add($key.KeyPropertyName)) #stop #end
#end
-#set( $complexProps = [] )
#set( $contained = [] )
+
#foreach($propertyName in $entityType.PropertyNames)
#set($property = $entityType.getProperty($propertyName))
#set($fcprops = $utility.getFcProperties($property) )
#if($keys.contains($property.Name))@Key#end
+ #if($property.Type.FullQualifiedName.toString().equals("Edm.Stream"))#*
+ *##set( $returnType = "org.apache.olingo.ext.proxy.api.EdmStreamType" )#*
+ *##else#*
+ *##set( $returnType = $utility.getJavaType($property.Type, $property.Collection) )#*
+ *##end
+
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "$property.Name",
type = "$property.Type.FullQualifiedName.toString()",
nullable = $property.Nullable,
@@ -96,13 +102,9 @@ public interface $utility.capitalize($entityType.Name)
fcNSPrefix = "#if($fcprops.containsKey("fcNSPrefix"))$fcprops.get("fcNSPrefix")#end",
fcNSURI = "#if($fcprops.containsKey("fcNSURI"))$fcprops.get("fcNSURI")#end",
fcKeepInContent = #if($fcprops.containsKey("fcKeepInContent"))$fcprops.get("fcKeepInContent")#{else}false#end)
- $utility.getJavaType($property.Type, $property.Collection) get$utility.capitalize($property.Name)();
-
- void set$utility.capitalize($property.Name)($utility.getJavaType($property.Type, $property.Collection) _$utility.uncapitalize($property.Name));
- #if($utility.isComplex($property.Type.FullQualifiedName))#*
- *##set( $adding = $complexProps.add($property) )
- #end
+ $returnType get$utility.capitalize($property.Name)();
+ void set$utility.capitalize($property.Name)($returnType _$utility.uncapitalize($property.Name));
#end
#foreach($propertyName in $entityType.NavigationPropertyNames)
@@ -126,9 +128,9 @@ public interface $utility.capitalize($entityType.Name)
#end
#if($entityType.hasStream())
- void setStream(java.io.InputStream stream);
+ void uploadStream(org.apache.olingo.ext.proxy.api.EdmStreamValue stream);
- java.io.InputStream getStream();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue loadStream();
#end
#set( $functions = $utility.getFunctionsBoundTo($entityType.Name, false) )
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
index 7f97c84..855a140 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
@@ -656,6 +656,8 @@ public abstract class AbstractUtilities {
+ ",MessageId=" + entity.getProperty("MessageId").asPrimitive();
}
Commons.SEQUENCE.put(entitySetName, messageId);
+ } else if ("PersonDetails".equals(entitySetName)) {
+ res = getDefaultEntryKey(entitySetName, entity, "PersonID");
} else if ("Order".equals(entitySetName)) {
res = getDefaultEntryKey(entitySetName, entity, "OrderId");
} else if ("Product".equals(entitySetName)) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java b/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
index 7f90ecc..32c0a6c 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java
@@ -84,6 +84,7 @@ public abstract class Commons {
SEQUENCE.put("RowIndex", 1000);
SEQUENCE.put("Products", 1000);
SEQUENCE.put("ProductDetails", 1000);
+ SEQUENCE.put("PersonDetails", 1000);
SEQUENCE.put("PaymentInstrument", 10192);
SEQUENCE.put("People", 1000);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
index 6b94b82..0d0ce64 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java
@@ -88,7 +88,7 @@ public abstract class AbstractTestITCase {
final String sampleName,
final DefaultContainer container) {
- final Customer customer = service.newEntity(Customer.class);
+ final Customer customer = service.newEntityInstance(Customer.class);
// add name attribute
customer.setName(sampleName);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java
index 1c5071a..84e2206 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v3;
//CHECKSTYLE:OFF (Maven checkstyle)
@@ -54,8 +55,8 @@ public class ContextTestITCase extends AbstractTestITCase {
@Test
public void attachDetachNewEntity() {
- final Customer customer1 = service.newEntity(Customer.class);
- final Customer customer2 = service.newEntity(Customer.class);
+ final Customer customer1 = service.newEntityInstance(Customer.class);
+ final Customer customer2 = service.newEntityInstance(Customer.class);
final EntityInvocationHandler source1 =
(EntityInvocationHandler) Proxy.getInvocationHandler(customer1);
@@ -124,7 +125,7 @@ public class ContextTestITCase extends AbstractTestITCase {
@Test
public void linkTargetExisting() {
- final Customer customer = service.newEntity(Customer.class);
+ final Customer customer = service.newEntityInstance(Customer.class);
final CustomerInfo customerInfo = container.getCustomerInfo().getByKey(11);
customer.setInfo(customerInfo);
@@ -151,7 +152,7 @@ public class ContextTestITCase extends AbstractTestITCase {
public void linkSourceExisting() {
final Customer customer = container.getCustomer().getByKey(-10);
- final CustomerInfo customerInfo = service.newEntity(CustomerInfo.class);
+ final CustomerInfo customerInfo = service.newEntityInstance(CustomerInfo.class);
customer.setInfo(customerInfo);
assertNotNull(customer.getInfo());
@@ -196,12 +197,12 @@ public class ContextTestITCase extends AbstractTestITCase {
@Test
public void linkEntitySet() {
- final Customer customer = service.newEntity(Customer.class);
+ final Customer customer = service.newEntityInstance(Customer.class);
final OrderCollection toBeLinked = service.newEntityCollection(OrderCollection.class);
- toBeLinked.add(service.newEntity(Order.class));
- toBeLinked.add(service.newEntity(Order.class));
- toBeLinked.add(service.newEntity(Order.class));
+ toBeLinked.add(service.newEntityInstance(Order.class));
+ toBeLinked.add(service.newEntityInstance(Order.class));
+ toBeLinked.add(service.newEntityInstance(Order.class));
customer.setOrders(toBeLinked);
assertNotNull(customer.getOrders());
@@ -236,7 +237,7 @@ public class ContextTestITCase extends AbstractTestITCase {
@Test
public void addProperty() {
- final Customer customer = service.newEntity(Customer.class);
+ final Customer customer = service.newEntityInstance(Customer.class);
customer.setCustomerId(100);
final ContactDetails cd = service.newComplex(ContactDetails.class);
@@ -315,7 +316,7 @@ public class ContextTestITCase extends AbstractTestITCase {
public void checkContextInCaseOfErrors() {
service.getContext().entityContext().detachAll();
- final Login login = service.newEntity(Login.class);
+ final Login login = service.newEntityInstance(Login.class);
final EntityInvocationHandler handler = (EntityInvocationHandler) Proxy.getInvocationHandler(login);
assertFalse(service.getContext().entityContext().isAttached(handler));
@@ -357,7 +358,7 @@ public class ContextTestITCase extends AbstractTestITCase {
@Test
public void flushTest() {
- Customer customer = service.newEntity(Customer.class);
+ Customer customer = service.newEntityInstance(Customer.class);
customer.setCustomerId(300);
customer.setName("samplename");
@@ -368,7 +369,7 @@ public class ContextTestITCase extends AbstractTestITCase {
final OrderCollection toBeLinked = service.newEntityCollection(OrderCollection.class);
for (Integer key : keys) {
- final Order order = service.newEntity(Order.class);
+ final Order order = service.newEntityInstance(Order.class);
order.setOrderId(key);
order.setCustomerId(300);
order.setCustomer(customer);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java
index 7f2852d..c9222c9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java
@@ -80,7 +80,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
public void createEmployee() {
final Integer id = 101;
- final Employee employee = service.newEntity(Employee.class);
+ final Employee employee = service.newEntityInstance(Employee.class);
employee.setPersonId(id);
employee.setName("sample employee from proxy");
employee.setManagersPersonId(-9918);
@@ -144,7 +144,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final String sampleName = "sample customer from proxy with back navigation";
final Integer id = 102;
- Order order = service.newEntity(Order.class);
+ Order order = service.newEntityInstance(Order.class);
order.setCustomerId(id);
order.setOrderId(id); // same id ...
@@ -194,7 +194,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void multiKey() {
- Message message = service.newEntity(Message.class);
+ Message message = service.newEntityInstance(Message.class);
message.setMessageId(100);
message.setFromUsername("fromusername");
message.setToUsername("myusername");
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
index d2b5d04..a4d4922 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v3;
//CHECKSTYLE:OFF (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java
index 58c3f19..7f16a6e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java
@@ -73,7 +73,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void patchLink() {
- Order order = service.newEntity(Order.class);
+ Order order = service.newEntityInstance(Order.class);
order.setOrderId(400);
order.setCustomerId(-9);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java
index 5138e01..d4c2f00 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java
@@ -88,7 +88,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
// 0. create an employee
final Integer id = 101;
- Employee employee = service.newEntity(Employee.class);
+ Employee employee = service.newEntityInstance(Employee.class);
employee.setPersonId(id);
employee.setName("sample employee from proxy");
employee.setManagersPersonId(-9918);
@@ -143,7 +143,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
// 0. create a product
final Integer id = 101;
- Product product = service.newEntity(Product.class);
+ Product product = service.newEntityInstance(Product.class);
product.setProductId(id);
product.setDescription("New product");
@@ -197,7 +197,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
purchaseDate.set(Calendar.MONTH, 0);
purchaseDate.set(Calendar.DAY_OF_MONTH, 1);
- ComputerDetail computerDetail = service.newEntity(ComputerDetail.class);
+ ComputerDetail computerDetail = service.newEntityInstance(ComputerDetail.class);
computerDetail.setComputerDetailId(id);
computerDetail.setSpecificationsBag(Collections.singleton("First spec"));
computerDetail.setPurchaseDate(new Timestamp(purchaseDate.getTimeInMillis()));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
index e46bf42..5958616 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java
@@ -25,6 +25,8 @@ import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.olingo.ext.proxy.api.EdmStreamTypeImpl;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import static org.apache.olingo.fit.proxy.v3.AbstractTestITCase.service;
import static org.junit.Assert.assertEquals;
@@ -39,7 +41,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test
public void read() throws IOException {
- final InputStream is = container.getCar().getByKey(12).load().getStream();
+ final InputStream is = container.getCar().getByKey(12).load().loadStream().getStream();
assertNotNull(is);
IOUtils.closeQuietly(is);
}
@@ -49,15 +51,15 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
final String TO_BE_UPDATED = "buffered stream sample (" + System.currentTimeMillis() + ")";
final InputStream input = new ByteArrayInputStream(TO_BE_UPDATED.getBytes());
- Car car = container.getCar().getByKey(12).load();
- car.setPhoto(input);
+ Car car = container.getCar().getByKey(12);
+ car.setPhoto(new EdmStreamTypeImpl(new EdmStreamValue("application/octet-stream", input)));
container.flush();
- car = container.getCar().getByKey(12).load();
- final InputStream is = car.getPhoto();
- assertEquals(TO_BE_UPDATED, IOUtils.toString(is));
- IOUtils.closeQuietly(is);
+ car = container.getCar().getByKey(12);
+ final EdmStreamValue value = car.getPhoto().load();
+ assertEquals(TO_BE_UPDATED, IOUtils.toString(value.getStream()));
+ IOUtils.closeQuietly(value.getStream());
}
@Test
@@ -68,11 +70,11 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
final String TO_BE_UPDATED = "buffered stream sample (" + System.currentTimeMillis() + ")";
InputStream input = IOUtils.toInputStream(TO_BE_UPDATED);
- car.setStream(input);
+ car.uploadStream(new EdmStreamValue("*/*", input));
container.flush();
- input = container.getCar().getByKey(14).load().getStream();
+ input = container.getCar().getByKey(14).loadStream().getStream();
assertEquals(TO_BE_UPDATED, IOUtils.toString(input));
IOUtils.closeQuietly(input);
@@ -81,13 +83,13 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test
public void create() throws IOException {
- Car car = service.newEntity(Car.class);
+ Car car = service.newEntityInstance(Car.class);
final String TO_BE_UPDATED = "buffered stream sample (" + System.currentTimeMillis() + ")";
InputStream input = IOUtils.toInputStream(TO_BE_UPDATED);
final String DESC = "DESC - " + System.currentTimeMillis();
- car.setStream(input);
+ car.uploadStream(new EdmStreamValue("*/*", input));
car.setDescription(DESC);
container.getCar().add(car);
@@ -100,7 +102,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
car = container.getCar().getByKey(key).load();
assertEquals(DESC, car.getDescription());
- input = car.getStream();
+ input = car.loadStream().getStream();
assertEquals(TO_BE_UPDATED, IOUtils.toString(input));
IOUtils.closeQuietly(input);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
index 93ee038..9db13bb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java
@@ -62,11 +62,11 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
@Test
public void checkOpenTypeEntityTypesExist() {
- assertTrue(otservice.newEntity(Row.class).getClass().getInterfaces()[0].
+ assertTrue(otservice.newEntityInstance(Row.class).getClass().getInterfaces()[0].
getAnnotation(EntityType.class).openType());
- assertTrue(otservice.newEntity(RowIndex.class).getClass().getInterfaces()[0].
+ assertTrue(otservice.newEntityInstance(RowIndex.class).getClass().getInterfaces()[0].
getAnnotation(EntityType.class).openType());
- assertTrue(otservice.newEntity(IndexedRow.class).getClass().getInterfaces()[0].
+ assertTrue(otservice.newEntityInstance(IndexedRow.class).getClass().getInterfaces()[0].
getAnnotation(EntityType.class).openType());
otservice.getContext().detachAll();
}
@@ -85,7 +85,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
public void cud() throws ParseException {
final Integer id = 1426;
- RowIndex rowIndex = otservice.newEntity(RowIndex.class);
+ RowIndex rowIndex = otservice.newEntityInstance(RowIndex.class);
rowIndex.setId(id);
rowIndex.addAdditionalProperty("aString", "string");
rowIndex.addAdditionalProperty("aBoolean", true);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
index f595a57..f8767b9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
index 42fc888..dba606d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
index 28f2d7f..02e7490 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
index f74c0a9..4a43186 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
index 59445f0..11f6f89 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
index e459c4d..96123a0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
index d57b53a..7f013c3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
index 0c8aa1f..840aa8e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
@@ -20,8 +20,29 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
//CHECKSTYLE:OFF (Maven checkstyle)
+import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.ext.proxy.api.annotations.Operation;
+import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
import org.apache.olingo.ext.proxy.api.OperationType;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
index d471150..3c0a39d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
index 1905216..8dc85a5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
index b7f2d54..082e902 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/aa0c5713/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
index 2e79ecd..bc99257 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
@@ -21,6 +21,26 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+import org.apache.olingo.commons.api.edm.geo.MultiPoint;
+import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
+import org.apache.olingo.commons.api.edm.geo.Point;
+import org.apache.olingo.commons.api.edm.geo.Polygon;
+import java.math.BigDecimal;
+import java.net.URI;
+import java.util.UUID;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
//CHECKSTYLE:ON (Maven checkstyle)