[OLINGO-575] Delete V3 sources from master
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/c8865db8 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/c8865db8 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/c8865db8 Branch: refs/heads/master Commit: c8865db8e8f5fc13257ca04f5fe0d6597070763a Parents: 03ad044 Author: Christian Amend <[email protected]> Authored: Wed Feb 18 15:01:25 2015 +0100 Committer: Christian Amend <[email protected]> Committed: Wed Feb 18 15:01:25 2015 +0100 ---------------------------------------------------------------------- .../olingo/ext/proxy/AbstractService.java | 11 +- .../commons/AbstractPersistenceManager.java | 244 +-- .../proxy/commons/EntityInvocationHandler.java | 157 +- .../commons/EntitySetInvocationHandler.java | 10 +- .../olingo/ext/proxy/utils/CoreUtils.java | 232 ++- .../src/it/v3Sample/pom.xml | 107 -- .../it/v3Sample/src/test/resources/metadata.xml | 719 --------- .../src/it/v3Sample/verify.groovy | 20 - .../ext/pojogen/NavPropertyBindingDetails.java | 52 +- .../olingo/ext/pojogen/V3POJOGenMojo.java | 54 - .../apache/olingo/ext/pojogen/V3Utility.java | 29 - .../src/main/resources/service.vm | 25 - .../src/main/resources/v30/complexType.vm | 52 - .../v30/complexTypeComposableInvoker.vm | 51 - .../src/main/resources/v30/container.vm | 19 - fit/src/it/actionOverloadingV3/pom.xml | 107 -- fit/src/it/actionOverloadingV3/verify.groovy | 20 - fit/src/it/openTypeV3/pom.xml | 107 -- fit/src/it/openTypeV3/verify.groovy | 20 - fit/src/it/primitiveKeysServiceV3/pom.xml | 107 -- fit/src/it/primitiveKeysServiceV3/verify.groovy | 20 - fit/src/it/staticServiceV3/pom.xml | 107 -- fit/src/it/staticServiceV3/verify.groovy | 20 - .../org/apache/olingo/fit/AbstractServices.java | 4 +- .../apache/olingo/fit/V3ActionOverloading.java | 209 --- .../org/apache/olingo/fit/V3KeyAsSegment.java | 181 --- .../java/org/apache/olingo/fit/V3OpenType.java | 149 -- .../org/apache/olingo/fit/V3PrimitiveKeys.java | 52 - .../java/org/apache/olingo/fit/V3Services.java | 482 ------ .../olingo/fit/server/TomcatTestServer.java | 5 - .../resources/V30/AllGeoTypesSet/-10/entity.xml | 161 -- .../main/resources/V30/AllGeoTypesSet/feed.xml | 1371 ----------------- fit/src/main/resources/V30/Car/12/$value.bin | 0 .../main/resources/V30/Car/12/entity.full.json | 13 - fit/src/main/resources/V30/Car/12/entity.xml | 39 - fit/src/main/resources/V30/Car/14/$value.bin | 0 .../main/resources/V30/Car/14/entity.full.json | 13 - fit/src/main/resources/V30/Car/14/entity.xml | 39 - fit/src/main/resources/V30/Car/15/$value.bin | 0 .../main/resources/V30/Car/15/entity.full.json | 13 - fit/src/main/resources/V30/Car/15/entity.xml | 39 - .../main/resources/V30/Car/16/entity.full.json | 14 - fit/src/main/resources/V30/Car/16/entity.xml | 45 - fit/src/main/resources/V30/Car/feed.full.json | 297 ---- fit/src/main/resources/V30/Car/feed.xml | 459 ------ .../Car/filter/((1 add VIN) eq 16).full.json | 1 - .../V30/Car/filter/((1 add VIN) eq 16).xml | 45 - .../Car/filter/((VIN add 1) eq 16).full.json | 1 - .../V30/Car/filter/((VIN add 1) eq 16).xml | 45 - .../((VIN lt 16) and (VIN gt 12)).full.json | 1 - .../filter/((VIN lt 16) and (VIN gt 12)).xml | 81 - .../Car/filter/(16 eq (1 add VIN)).full.json | 1 - .../V30/Car/filter/(16 eq (1 add VIN)).xml | 45 - .../V30/Car/filter/(VIN eq 16).full.json | 15 - .../resources/V30/Car/filter/(VIN eq 16).xml | 45 - .../V30/Car/filter/(VIN lt 16).full.json | 1 - .../resources/V30/Car/filter/(VIN lt 16).xml | 117 -- ...ngth(Description) gt (VIN add 10)).full.json | 1 - .../(length(Description) gt (VIN add 10)).xml | 117 -- .../V30/Car/filter/VIN add 5 lt 11.full.json | 1 - .../V30/Car/filter/VIN add 5 lt 11.xml | 32 - .../V30/Car/filter/VIN div 2 le 8.full.json | 1 - .../resources/V30/Car/filter/VIN div 2 le 8.xml | 22 - .../filter/VIN le 18 and VIN gt 12.full.json | 1 - .../V30/Car/filter/VIN le 18 and VIN gt 12.xml | 22 - .../V30/Car/filter/VIN mul 2 le 30.full.json | 1 - .../V30/Car/filter/VIN mul 2 le 30.xml | 22 - ...not (((VIN ge 16) or (VIN le 12))).full.json | 1 - .../not (((VIN ge 16) or (VIN le 12))).xml | 81 - .../startswith(Description,'cen').full.json | 1 - .../filter/startswith(Description,'cen').xml | 45 - .../VIN desc/filter/(VIN lt 16).full.json | 9 - .../Car/orderby/VIN desc/filter/(VIN lt 16).xml | 117 -- fit/src/main/resources/V30/Computer/feed.xml | 207 --- .../V30/ComputerDetail/-10/entity.full.json | 23 - .../resources/V30/ComputerDetail/-10/entity.xml | 44 - .../(month(PurchaseDate) eq 12).full.json | 1 - .../filter/(month(PurchaseDate) eq 12).xml | 64 - .../filter/day(PurchaseDate) eq 15.full.json | 1 - .../filter/day(PurchaseDate) eq 15.xml | 22 - .../filter/hour(PurchaseDate) eq 1.full.json | 1 - .../filter/hour(PurchaseDate) eq 1.xml | 22 - .../filter/minute(PurchaseDate) eq 33.full.json | 1 - .../filter/minute(PurchaseDate) eq 33.xml | 22 - .../filter/month(PurchaseDate) eq 12.full.json | 1 - .../filter/month(PurchaseDate) eq 12.xml | 22 - .../filter/second(PurchaseDate) eq 35.full.json | 1 - .../filter/second(PurchaseDate) eq 35.xml | 22 - .../filter/year(PurchaseDate) eq 2020.full.json | 1 - .../filter/year(PurchaseDate) eq 2020.xml | 22 - .../resources/V30/Customer/-10/entity.full.json | 673 -------- .../main/resources/V30/Customer/-10/entity.xml | 516 ------- .../V30/Customer/-10/links/Info.full.json | 4 - .../resources/V30/Customer/-10/links/Info.xml | 22 - .../Customer/-10/links/Logins('3').full.json | 4 - .../V30/Customer/-10/links/Logins.full.json | 12 - .../resources/V30/Customer/-10/links/Logins.xml | 25 - .../Customer/-10/links/Orders(-10).full.json | 4 - .../V30/Customer/-10/links/Orders.full.json | 13 - .../resources/V30/Customer/-10/links/Orders.xml | 26 - .../resources/V30/Customer/-7/entity.full.json | 487 ------ .../main/resources/V30/Customer/-7/entity.xml | 381 ----- .../resources/V30/Customer/-9/entity.full.json | 750 --------- .../main/resources/V30/Customer/-9/entity.xml | 565 ------- .../resources/V30/Customer/-9/links/Orders.xml | 24 - .../main/resources/V30/Customer/feed.full.json | 893 ----------- fit/src/main/resources/V30/Customer/feed.xml | 704 --------- ....PhoneNumber,'ODataJClient') eq 1).full.json | 1 - ...ePhone.PhoneNumber,'ODataJClient') eq 1).xml | 30 - ...ne.PhoneNumber,'lccvussrv') ne -1).full.json | 1 - ...omePhone.PhoneNumber,'lccvussrv') ne -1).xml | 600 -------- .../Customer/filter/CustomerId eq -10.full.json | 678 -------- .../V30/Customer/filter/CustomerId eq -10.xml | 522 ------- .../Customer/filter/CustomerId gt -10.full.json | 1 - .../V30/Customer/filter/CustomerId gt -10.xml | 740 --------- .../Customer/filter/CustomerId lt -10.full.json | 1 - .../V30/Customer/filter/CustomerId lt -10.xml | 30 - .../isof(Name,'Edm.String') eq true.full.json | 1 - .../filter/isof(Name,'Edm.String') eq true.xml | 1065 ------------- .../not endswith(Name,'Chandan').full.json | 1 - .../filter/not endswith(Name,'Chandan').xml | 1065 ------------- .../V30/Customer/skiptoken/-1.full.json | 6 - .../resources/V30/Customer/skiptoken/-1.xml | 30 - .../V30/Customer/skiptoken/-10.full.json | 978 ------------ .../resources/V30/Customer/skiptoken/-10.xml | 953 ------------ .../V30/Customer/skiptoken/-3.full.json | 776 ---------- .../resources/V30/Customer/skiptoken/-3.xml | 613 -------- .../V30/Customer/skiptoken/-5.full.json | 1444 ------------------ .../resources/V30/Customer/skiptoken/-5.xml | 1104 ------------- .../V30/Customer/skiptoken/-7.full.json | 1296 ---------------- .../resources/V30/Customer/skiptoken/-7.xml | 990 ------------ .../V30/Customer/skiptoken/-9.full.json | 715 --------- .../resources/V30/Customer/skiptoken/-9.xml | 559 ------- .../V30/CustomerInfo/11/entity.full.json | 11 - .../resources/V30/CustomerInfo/11/entity.xml | 37 - .../V30/CustomerInfo/12/entity.full.json | 11 - .../resources/V30/CustomerInfo/12/entity.xml | 37 - .../V30/CustomerInfo/16/entity.full.json | 11 - .../resources/V30/CustomerInfo/16/entity.xml | 37 - .../V30/CustomerInfo/17/entity.full.json | 11 - .../resources/V30/CustomerInfo/17/entity.xml | 37 - .../resources/V30/CustomerInfo/feed.full.json | 94 -- .../main/resources/V30/CustomerInfo/feed.xml | 187 --- .../main/resources/V30/Driver/'2'/entity.xml | 38 - .../V30/EdmBooleanSet/true/entity.full.json | 1 - .../resources/V30/EdmBooleanSet/true/entity.xml | 36 - .../V30/EdmByteSet/255/entity.full.json | 1 - .../resources/V30/EdmByteSet/255/entity.xml | 36 - .../entity.full.json | 1 - .../79228162514264337593543950335M/entity.xml | 36 - .../1.7976931348623157E308D/entity.full.json | 1 - .../1.7976931348623157E308D/entity.xml | 36 - .../entity.full.json | 1 - .../entity.xml | 36 - .../V30/EdmInt16Set/32767/entity.full.json | 1 - .../resources/V30/EdmInt16Set/32767/entity.xml | 36 - .../EdmInt32Set/-2147483648/entity.full.json | 1 - .../V30/EdmInt32Set/-2147483648/entity.xml | 36 - .../9223372036854775807L/entity.full.json | 1 - .../EdmInt64Set/9223372036854775807L/entity.xml | 36 - .../EdmSingleSet/3.4028235E38f/entity.full.json | 1 - .../V30/EdmSingleSet/3.4028235E38f/entity.xml | 36 - .../V30/EdmStringSet/'$'/entity.full.json | 1 - .../resources/V30/EdmStringSet/'$'/entity.xml | 36 - .../entity.full.json | 1 - .../entity.xml | 36 - ...ionReturnsCollectionOfComplexTypes.full.json | 1 - ...rojectionReturnsCollectionOfComplexTypes.xml | 618 -------- .../resources/V30/GetArgumentPlusOne.full.json | 4 - .../main/resources/V30/GetArgumentPlusOne.xml | 23 - .../resources/V30/GetPrimitiveString.full.json | 1 - .../main/resources/V30/GetPrimitiveString.xml | 23 - .../resources/V30/GetSpecificCustomer.full.json | 137 -- .../main/resources/V30/GetSpecificCustomer.xml | 200 --- .../V30/InStreamErrorGetCustomer.full.json | 1 - .../resources/V30/InStreamErrorGetCustomer.xml | 578 ------- .../resources/V30/Login/'3'/entity.full.json | 13 - fit/src/main/resources/V30/Login/'3'/entity.xml | 42 - .../V30/Message/1 -10/entity.full.json | 17 - .../main/resources/V30/Message/1 -10/entity.xml | 46 - fit/src/main/resources/V30/Message/feed.xml | 277 ---- .../resources/V30/Order/-10/entity.full.json | 11 - fit/src/main/resources/V30/Order/-10/entity.xml | 40 - .../resources/V30/Order/-7/entity.full.json | 17 - fit/src/main/resources/V30/Order/-7/entity.xml | 43 - .../resources/V30/Order/-8/entity.full.json | 17 - fit/src/main/resources/V30/Order/-8/entity.xml | 43 - .../resources/V30/Order/-9/entity.full.json | 17 - fit/src/main/resources/V30/Order/-9/entity.xml | 43 - .../V30/OrderLine/-10 -10/entity.full.json | 14 - .../resources/V30/OrderLine/-10 -10/entity.xml | 42 - .../resources/V30/OrderLine/-10 -10/etag.txt | 1 - .../feed.full.json | 30 - .../feed.xml | 69 - .../feed.full.json | 1 - .../feed.xml | 200 --- .../feed.full.json | 80 - .../feed.xml | 131 -- fit/src/main/resources/V30/Person/feed.xml | 307 ---- .../filter/PersonId sub 2 lt -10.full.json | 1 - .../V30/Person/filter/PersonId sub 2 lt -10.xml | 79 - ...iaDefaultService.SpecialEmployee').full.json | 1 - ....AstoriaDefaultService.SpecialEmployee').xml | 131 -- .../resources/V30/Product/-10/entity.full.json | 51 - .../main/resources/V30/Product/-10/entity.xml | 61 - fit/src/main/resources/V30/Product/-10/etag.txt | 1 - .../resources/V30/Product/-6/entity.full.json | 51 - .../main/resources/V30/Product/-6/entity.xml | 61 - fit/src/main/resources/V30/Product/-6/etag.txt | 1 - .../resources/V30/Product/-7/entity.full.json | 51 - .../main/resources/V30/Product/-7/entity.xml | 61 - fit/src/main/resources/V30/Product/-7/etag.txt | 1 - .../V30/Product/-7/links/Photos.full.json | 12 - .../resources/V30/Product/-9/entity.full.json | 60 - .../main/resources/V30/Product/-9/entity.xml | 68 - fit/src/main/resources/V30/Product/-9/etag.txt | 1 - .../main/resources/V30/Product/feed.full.json | 452 ------ fit/src/main/resources/V30/Product/feed.xml | 415 ----- .../ceiling(Dimensions.Width) eq 7338.full.json | 1 - .../ceiling(Dimensions.Width) eq 7338.xml | 68 - ...', newname') eq 'kdcuklu, newname'.full.json | 1 - ...tion, ', newname') eq 'kdcuklu, newname'.xml | 74 - .../floor(Dimensions.Width) eq 7337.full.json | 1 - .../filter/floor(Dimensions.Width) eq 7337.xml | 68 - .../indexof(Description, 'k') eq 0.full.json | 1 - .../filter/indexof(Description, 'k') eq 0.xml | 117 -- .../filter/length(Description) eq 7.full.json | 1 - .../Product/filter/length(Description) eq 7.xml | 74 - .../round(Dimensions.Width) eq 7338.full.json | 1 - .../filter/round(Dimensions.Width) eq 7338.xml | 68 - ...artswith(Description, 'k') eq true.full.json | 1 - .../startswith(Description, 'k') eq true.xml | 117 -- ...of('kdcuklu', Description) eq true.full.json | 1 - ...stringof('kdcuklu', Description) eq true.xml | 74 - .../toupper(Description) eq 'KDCUKLU'.full.json | 1 - .../toupper(Description) eq 'KDCUKLU'.xml | 74 - .../V30/ProductPhoto/-2 -2/entity.full.json | 10 - .../resources/V30/ProductPhoto/-2 -2/entity.xml | 39 - .../V30/ProductPhoto/-3 -3/entity.full.json | 10 - .../resources/V30/ProductPhoto/-3 -3/entity.xml | 38 - .../entity.full.json | 10 - .../entity.xml | 42 - .../entity.full.json | 9 - .../entity.xml | 40 - .../resources/V30/actionOverloadingMetadata.xml | 708 --------- .../actionOverloadingRetrieveProduct.full.json | 1 - .../V30/actionOverloadingRetrieveProduct.xml | 24 - fit/src/main/resources/V30/badRequest.json | 17 - fit/src/main/resources/V30/badRequest.xml | 30 - fit/src/main/resources/V30/largeMetadata.xml | 42 - fit/src/main/resources/V30/metadata.xml | 719 --------- fit/src/main/resources/V30/notFound.json | 11 - fit/src/main/resources/V30/notFound.xml | 25 - fit/src/main/resources/V30/openTypeMetadata.xml | 67 - .../resources/V30/primitiveKeysMetadata.xml | 147 -- fit/src/main/resources/V30/services.full.json | 102 -- fit/src/main/resources/V30/services.xml | 98 -- .../resources/V30/unsupportedMediaType.json | 17 - .../main/resources/V30/unsupportedMediaType.xml | 34 - .../olingo/fit/proxy/v3/AbstractTestITCase.java | 167 -- .../proxy/v3/ActionOverloadingTestITCase.java | 113 -- .../olingo/fit/proxy/v3/AsyncTestITCase.java | 89 -- .../olingo/fit/proxy/v3/ContextTestITCase.java | 513 ------- .../fit/proxy/v3/EntityCreateTestITCase.java | 229 --- .../fit/proxy/v3/EntityRetrieveTestITCase.java | 226 --- .../fit/proxy/v3/EntitySetTestITCase.java | 99 -- .../fit/proxy/v3/EntityUpdateTestITCase.java | 120 -- .../olingo/fit/proxy/v3/FilterTestITCase.java | 130 -- .../olingo/fit/proxy/v3/InvokeTestITCase.java | 244 --- .../fit/proxy/v3/MediaEntityTestITCase.java | 115 -- .../olingo/fit/proxy/v3/OpenTypeTestITCase.java | 140 -- .../fit/proxy/v3/PrimitiveKeysTestITCase.java | 88 -- .../olingo/fit/proxy/v3/PropertyTestITCase.java | 57 - .../fit/proxy/v3/actionoverloading/Service.java | 177 --- .../AllGeoCollectionTypesSet.java | 38 - .../astoriadefaultservice/AllGeoTypesSet.java | 38 - .../services/astoriadefaultservice/Car.java | 38 - .../astoriadefaultservice/Computer.java | 38 - .../astoriadefaultservice/ComputerDetail.java | 38 - .../astoriadefaultservice/Customer.java | 38 - .../astoriadefaultservice/CustomerInfo.java | 38 - .../astoriadefaultservice/DefaultContainer.java | 122 -- .../services/astoriadefaultservice/Driver.java | 38 - .../astoriadefaultservice/LastLogin.java | 38 - .../services/astoriadefaultservice/License.java | 38 - .../services/astoriadefaultservice/Login.java | 38 - .../astoriadefaultservice/MappedEntityType.java | 38 - .../services/astoriadefaultservice/Message.java | 40 - .../MessageAttachment.java | 38 - .../services/astoriadefaultservice/Order.java | 38 - .../astoriadefaultservice/OrderLine.java | 40 - .../astoriadefaultservice/PageView.java | 38 - .../services/astoriadefaultservice/Person.java | 38 - .../astoriadefaultservice/PersonMetadata.java | 38 - .../services/astoriadefaultservice/Product.java | 38 - .../astoriadefaultservice/ProductDetail.java | 38 - .../astoriadefaultservice/ProductPhoto.java | 40 - .../astoriadefaultservice/ProductReview.java | 40 - .../astoriadefaultservice/RSAToken.java | 38 - .../astoriadefaultservice/package-info.java | 20 - .../astoriadefaultservice/types/Aliases.java | 48 - .../types/AliasesCollection.java | 39 - .../AliasesCollectionComposableInvoker.java | 32 - .../types/AliasesComposableInvoker.java | 45 - .../types/AllSpatialCollectionTypes.java | 82 - .../AllSpatialCollectionTypesCollection.java | 39 - ...lectionTypesCollectionComposableInvoker.java | 32 - ...SpatialCollectionTypesComposableInvoker.java | 64 - .../types/AllSpatialCollectionTypes_Simple.java | 261 ---- ...SpatialCollectionTypes_SimpleCollection.java | 39 - ...Types_SimpleCollectionComposableInvoker.java | 32 - ...CollectionTypes_SimpleComposableInvoker.java | 202 --- .../types/AllSpatialTypes.java | 514 ------- .../types/AllSpatialTypesCollection.java | 39 - ...SpatialTypesCollectionComposableInvoker.java | 32 - .../types/AllSpatialTypesComposableInvoker.java | 432 ------ .../astoriadefaultservice/types/AuditInfo.java | 70 - .../types/AuditInfoCollection.java | 39 - .../AuditInfoCollectionComposableInvoker.java | 32 - .../types/AuditInfoComposableInvoker.java | 67 - .../types/BackOrderLine.java | 236 --- .../types/BackOrderLine2.java | 236 --- .../types/BackOrderLine2Collection.java | 39 - ...ckOrderLine2CollectionComposableInvoker.java | 32 - .../types/BackOrderLine2ComposableInvoker.java | 176 --- .../types/BackOrderLineCollection.java | 39 - ...ackOrderLineCollectionComposableInvoker.java | 32 - .../types/BackOrderLineComposableInvoker.java | 176 --- .../astoriadefaultservice/types/Car.java | 166 -- .../types/CarCollection.java | 39 - .../types/CarCollectionComposableInvoker.java | 32 - .../types/CarComposableInvoker.java | 136 -- .../types/ComplexToCategory.java | 70 - .../types/ComplexToCategoryCollection.java | 39 - ...exToCategoryCollectionComposableInvoker.java | 32 - .../ComplexToCategoryComposableInvoker.java | 67 - .../astoriadefaultservice/types/Computer.java | 123 -- .../types/ComputerCollection.java | 39 - .../ComputerCollectionComposableInvoker.java | 32 - .../types/ComputerComposableInvoker.java | 97 -- .../types/ComputerDetail.java | 258 ---- .../types/ComputerDetailCollection.java | 39 - ...mputerDetailCollectionComposableInvoker.java | 32 - .../types/ComputerDetailComposableInvoker.java | 212 --- .../types/ConcurrencyInfo.java | 59 - .../types/ConcurrencyInfoCollection.java | 39 - ...currencyInfoCollectionComposableInvoker.java | 32 - .../types/ConcurrencyInfoComposableInvoker.java | 56 - .../types/ContactDetails.java | 103 -- .../types/ContactDetailsCollection.java | 39 - ...ntactDetailsCollectionComposableInvoker.java | 32 - .../types/ContactDetailsComposableInvoker.java | 100 -- .../astoriadefaultservice/types/Contractor.java | 255 ---- .../types/ContractorCollection.java | 39 - .../ContractorCollectionComposableInvoker.java | 32 - .../types/ContractorComposableInvoker.java | 189 --- .../astoriadefaultservice/types/Customer.java | 314 ---- .../types/CustomerCollection.java | 39 - .../CustomerCollectionComposableInvoker.java | 32 - .../types/CustomerComposableInvoker.java | 252 --- .../types/CustomerInfo.java | 112 -- .../types/CustomerInfoCollection.java | 39 - ...CustomerInfoCollectionComposableInvoker.java | 32 - .../types/CustomerInfoComposableInvoker.java | 90 -- .../astoriadefaultservice/types/Dimensions.java | 70 - .../types/DimensionsCollection.java | 39 - .../DimensionsCollectionComposableInvoker.java | 32 - .../types/DimensionsComposableInvoker.java | 67 - .../types/DiscontinuedProduct.java | 425 ------ .../types/DiscontinuedProductCollection.java | 39 - ...inuedProductCollectionComposableInvoker.java | 32 - .../DiscontinuedProductComposableInvoker.java | 334 ---- .../astoriadefaultservice/types/Driver.java | 123 -- .../types/DriverCollection.java | 39 - .../DriverCollectionComposableInvoker.java | 32 - .../types/DriverComposableInvoker.java | 97 -- .../astoriadefaultservice/types/Employee.java | 251 --- .../types/EmployeeCollection.java | 48 - .../EmployeeCollectionComposableInvoker.java | 32 - .../types/EmployeeComposableInvoker.java | 176 --- .../astoriadefaultservice/types/LastLogin.java | 177 --- .../types/LastLoginCollection.java | 39 - .../LastLoginCollectionComposableInvoker.java | 32 - .../types/LastLoginComposableInvoker.java | 143 -- .../astoriadefaultservice/types/License.java | 204 --- .../types/LicenseCollection.java | 39 - .../LicenseCollectionComposableInvoker.java | 32 - .../types/LicenseComposableInvoker.java | 166 -- .../astoriadefaultservice/types/Login.java | 179 --- .../types/LoginCollection.java | 39 - .../types/LoginCollectionComposableInvoker.java | 32 - .../types/LoginComposableInvoker.java | 137 -- .../types/MappedEntityType.java | 595 -------- .../types/MappedEntityTypeCollection.java | 39 - ...edEntityTypeCollectionComposableInvoker.java | 32 - .../MappedEntityTypeComposableInvoker.java | 501 ------ .../astoriadefaultservice/types/Message.java | 287 ---- .../types/MessageAttachment.java | 109 -- .../types/MessageAttachmentCollection.java | 39 - ...geAttachmentCollectionComposableInvoker.java | 32 - .../MessageAttachmentComposableInvoker.java | 87 -- .../types/MessageCollection.java | 39 - .../MessageCollectionComposableInvoker.java | 32 - .../types/MessageComposableInvoker.java | 232 --- .../astoriadefaultservice/types/MessageKey.java | 52 - .../astoriadefaultservice/types/Order.java | 164 -- .../types/OrderCollection.java | 39 - .../types/OrderCollectionComposableInvoker.java | 32 - .../types/OrderComposableInvoker.java | 130 -- .../astoriadefaultservice/types/OrderLine.java | 227 --- .../types/OrderLineCollection.java | 39 - .../OrderLineCollectionComposableInvoker.java | 32 - .../types/OrderLineComposableInvoker.java | 176 --- .../types/OrderLineKey.java | 52 - .../astoriadefaultservice/types/PageView.java | 204 --- .../types/PageViewCollection.java | 39 - .../PageViewCollectionComposableInvoker.java | 32 - .../types/PageViewComposableInvoker.java | 166 -- .../astoriadefaultservice/types/Person.java | 130 -- .../types/PersonCollection.java | 39 - .../PersonCollectionComposableInvoker.java | 32 - .../types/PersonComposableInvoker.java | 97 -- .../types/PersonMetadata.java | 177 --- .../types/PersonMetadataCollection.java | 39 - ...rsonMetadataCollectionComposableInvoker.java | 32 - .../types/PersonMetadataComposableInvoker.java | 143 -- .../astoriadefaultservice/types/Phone.java | 59 - .../types/PhoneCollection.java | 39 - .../types/PhoneCollectionComposableInvoker.java | 32 - .../types/PhoneComposableInvoker.java | 56 - .../astoriadefaultservice/types/Product.java | 308 ---- .../types/ProductCollection.java | 39 - .../ProductCollectionComposableInvoker.java | 32 - .../types/ProductComposableInvoker.java | 242 --- .../types/ProductDetail.java | 123 -- .../types/ProductDetailCollection.java | 39 - ...roductDetailCollectionComposableInvoker.java | 32 - .../types/ProductDetailComposableInvoker.java | 97 -- .../types/ProductPageView.java | 275 ---- .../types/ProductPageViewCollection.java | 39 - ...ductPageViewCollectionComposableInvoker.java | 32 - .../types/ProductPageViewComposableInvoker.java | 212 --- .../types/ProductPhoto.java | 137 -- .../types/ProductPhotoCollection.java | 39 - ...ProductPhotoCollectionComposableInvoker.java | 32 - .../types/ProductPhotoComposableInvoker.java | 110 -- .../types/ProductPhotoKey.java | 52 - .../types/ProductReview.java | 178 --- .../types/ProductReviewCollection.java | 39 - ...roductReviewCollectionComposableInvoker.java | 32 - .../types/ProductReviewComposableInvoker.java | 143 -- .../types/ProductReviewKey.java | 63 - .../astoriadefaultservice/types/RSAToken.java | 123 -- .../types/RSATokenCollection.java | 39 - .../RSATokenCollectionComposableInvoker.java | 32 - .../types/RSATokenComposableInvoker.java | 97 -- .../types/SpecialEmployee.java | 344 ----- .../types/SpecialEmployeeCollection.java | 48 - ...cialEmployeeCollectionComposableInvoker.java | 32 - .../types/SpecialEmployeeComposableInvoker.java | 255 ---- .../types/package-info.java | 20 - .../olingo/fit/proxy/v3/opentype/Service.java | 142 -- .../opentypesservicev3/DefaultContainer.java | 64 - .../odata/services/opentypesservicev3/Row.java | 38 - .../services/opentypesservicev3/RowIndex.java | 38 - .../opentypesservicev3/package-info.java | 20 - .../types/ContactDetails.java | 169 -- .../types/ContactDetailsCollection.java | 39 - ...ntactDetailsCollectionComposableInvoker.java | 32 - .../types/ContactDetailsComposableInvoker.java | 166 -- .../opentypesservicev3/types/IndexedRow.java | 100 -- .../types/IndexedRowCollection.java | 39 - .../IndexedRowCollectionComposableInvoker.java | 32 - .../types/IndexedRowComposableInvoker.java | 65 - .../services/opentypesservicev3/types/Row.java | 83 - .../opentypesservicev3/types/RowCollection.java | 39 - .../types/RowCollectionComposableInvoker.java | 32 - .../types/RowComposableInvoker.java | 65 - .../opentypesservicev3/types/RowIndex.java | 97 -- .../types/RowIndexCollection.java | 39 - .../RowIndexCollectionComposableInvoker.java | 32 - .../types/RowIndexComposableInvoker.java | 75 - .../opentypesservicev3/types/package-info.java | 20 - .../fit/proxy/v3/primitivekeys/Service.java | 153 -- .../primitivekeysservice/EdmBinarySet.java | 38 - .../primitivekeysservice/EdmBooleanSet.java | 38 - .../primitivekeysservice/EdmByteSet.java | 38 - .../EdmDateTimeOffsetSet.java | 38 - .../primitivekeysservice/EdmDateTimeSet.java | 38 - .../primitivekeysservice/EdmDecimalSet.java | 38 - .../primitivekeysservice/EdmDoubleSet.java | 38 - .../primitivekeysservice/EdmGuidSet.java | 38 - .../primitivekeysservice/EdmInt16Set.java | 38 - .../primitivekeysservice/EdmInt32Set.java | 38 - .../primitivekeysservice/EdmInt64Set.java | 38 - .../primitivekeysservice/EdmSingleSet.java | 38 - .../primitivekeysservice/EdmStringSet.java | 38 - .../primitivekeysservice/EdmTimeSet.java | 38 - .../services/primitivekeysservice/Folders.java | 38 - .../primitivekeysservice/TestContext.java | 90 -- .../primitivekeysservice/package-info.java | 20 - .../primitivekeysservice/types/EdmBinary.java | 82 - .../types/EdmBinaryCollection.java | 39 - .../EdmBinaryCollectionComposableInvoker.java | 32 - .../types/EdmBinaryComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmBoolean.java | 82 - .../types/EdmBooleanCollection.java | 39 - .../EdmBooleanCollectionComposableInvoker.java | 32 - .../types/EdmBooleanComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmByte.java | 82 - .../types/EdmByteCollection.java | 39 - .../EdmByteCollectionComposableInvoker.java | 32 - .../types/EdmByteComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmDateTime.java | 82 - .../types/EdmDateTimeCollection.java | 39 - .../EdmDateTimeCollectionComposableInvoker.java | 32 - .../types/EdmDateTimeComposableInvoker.java | 64 - .../types/EdmDateTimeOffset.java | 82 - .../types/EdmDateTimeOffsetCollection.java | 39 - ...teTimeOffsetCollectionComposableInvoker.java | 32 - .../EdmDateTimeOffsetComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmDecimal.java | 82 - .../types/EdmDecimalCollection.java | 39 - .../EdmDecimalCollectionComposableInvoker.java | 32 - .../types/EdmDecimalComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmDouble.java | 82 - .../types/EdmDoubleCollection.java | 39 - .../EdmDoubleCollectionComposableInvoker.java | 32 - .../types/EdmDoubleComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmGuid.java | 82 - .../types/EdmGuidCollection.java | 39 - .../EdmGuidCollectionComposableInvoker.java | 32 - .../types/EdmGuidComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmInt16.java | 82 - .../types/EdmInt16Collection.java | 39 - .../EdmInt16CollectionComposableInvoker.java | 32 - .../types/EdmInt16ComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmInt32.java | 82 - .../types/EdmInt32Collection.java | 39 - .../EdmInt32CollectionComposableInvoker.java | 32 - .../types/EdmInt32ComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmInt64.java | 82 - .../types/EdmInt64Collection.java | 39 - .../EdmInt64CollectionComposableInvoker.java | 32 - .../types/EdmInt64ComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmSingle.java | 82 - .../types/EdmSingleCollection.java | 39 - .../EdmSingleCollectionComposableInvoker.java | 32 - .../types/EdmSingleComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmString.java | 82 - .../types/EdmStringCollection.java | 39 - .../EdmStringCollectionComposableInvoker.java | 32 - .../types/EdmStringComposableInvoker.java | 64 - .../primitivekeysservice/types/EdmTime.java | 82 - .../types/EdmTimeCollection.java | 39 - .../EdmTimeCollectionComposableInvoker.java | 32 - .../types/EdmTimeComposableInvoker.java | 64 - .../primitivekeysservice/types/Folder.java | 123 -- .../types/FolderCollection.java | 39 - .../FolderCollectionComposableInvoker.java | 32 - .../types/FolderComposableInvoker.java | 97 -- .../types/package-info.java | 20 - .../fit/proxy/v3/staticservice/Service.java | 178 --- .../AllGeoCollectionTypesSet.java | 38 - .../astoriadefaultservice/AllGeoTypesSet.java | 38 - .../services/astoriadefaultservice/Car.java | 38 - .../astoriadefaultservice/Computer.java | 38 - .../astoriadefaultservice/ComputerDetail.java | 38 - .../astoriadefaultservice/Customer.java | 38 - .../astoriadefaultservice/CustomerInfo.java | 38 - .../astoriadefaultservice/DefaultContainer.java | 165 -- .../services/astoriadefaultservice/Driver.java | 38 - .../astoriadefaultservice/LastLogin.java | 38 - .../services/astoriadefaultservice/License.java | 38 - .../services/astoriadefaultservice/Login.java | 38 - .../astoriadefaultservice/MappedEntityType.java | 38 - .../services/astoriadefaultservice/Message.java | 40 - .../MessageAttachment.java | 38 - .../services/astoriadefaultservice/Order.java | 38 - .../astoriadefaultservice/OrderLine.java | 40 - .../astoriadefaultservice/PageView.java | 38 - .../services/astoriadefaultservice/Person.java | 38 - .../astoriadefaultservice/PersonMetadata.java | 38 - .../services/astoriadefaultservice/Product.java | 38 - .../astoriadefaultservice/ProductDetail.java | 38 - .../astoriadefaultservice/ProductPhoto.java | 40 - .../astoriadefaultservice/ProductReview.java | 40 - .../astoriadefaultservice/RSAToken.java | 38 - .../astoriadefaultservice/package-info.java | 20 - .../astoriadefaultservice/types/Aliases.java | 48 - .../types/AliasesCollection.java | 39 - .../AliasesCollectionComposableInvoker.java | 32 - .../types/AliasesComposableInvoker.java | 45 - .../types/AllSpatialCollectionTypes.java | 82 - .../AllSpatialCollectionTypesCollection.java | 39 - ...lectionTypesCollectionComposableInvoker.java | 32 - ...SpatialCollectionTypesComposableInvoker.java | 64 - .../types/AllSpatialCollectionTypes_Simple.java | 261 ---- ...SpatialCollectionTypes_SimpleCollection.java | 39 - ...Types_SimpleCollectionComposableInvoker.java | 32 - ...CollectionTypes_SimpleComposableInvoker.java | 202 --- .../types/AllSpatialTypes.java | 514 ------- .../types/AllSpatialTypesCollection.java | 39 - ...SpatialTypesCollectionComposableInvoker.java | 32 - .../types/AllSpatialTypesComposableInvoker.java | 432 ------ .../astoriadefaultservice/types/AuditInfo.java | 70 - .../types/AuditInfoCollection.java | 39 - .../AuditInfoCollectionComposableInvoker.java | 32 - .../types/AuditInfoComposableInvoker.java | 67 - .../types/BackOrderLine.java | 236 --- .../types/BackOrderLine2.java | 236 --- .../types/BackOrderLine2Collection.java | 39 - ...ckOrderLine2CollectionComposableInvoker.java | 32 - .../types/BackOrderLine2ComposableInvoker.java | 176 --- .../types/BackOrderLineCollection.java | 39 - ...ackOrderLineCollectionComposableInvoker.java | 32 - .../types/BackOrderLineComposableInvoker.java | 176 --- .../astoriadefaultservice/types/Car.java | 166 -- .../types/CarCollection.java | 39 - .../types/CarCollectionComposableInvoker.java | 32 - .../types/CarComposableInvoker.java | 136 -- .../types/ComplexToCategory.java | 70 - .../types/ComplexToCategoryCollection.java | 39 - ...exToCategoryCollectionComposableInvoker.java | 32 - .../ComplexToCategoryComposableInvoker.java | 67 - .../types/ComplexWithAllPrimitiveTypes.java | 191 --- .../ComplexWithAllPrimitiveTypesCollection.java | 39 - ...imitiveTypesCollectionComposableInvoker.java | 32 - ...xWithAllPrimitiveTypesComposableInvoker.java | 188 --- .../astoriadefaultservice/types/Computer.java | 131 -- .../types/ComputerCollection.java | 39 - .../ComputerCollectionComposableInvoker.java | 32 - .../types/ComputerComposableInvoker.java | 97 -- .../types/ComputerDetail.java | 268 ---- .../types/ComputerDetailCollection.java | 39 - ...mputerDetailCollectionComposableInvoker.java | 32 - .../types/ComputerDetailComposableInvoker.java | 212 --- .../types/ConcurrencyInfo.java | 59 - .../types/ConcurrencyInfoCollection.java | 39 - ...currencyInfoCollectionComposableInvoker.java | 32 - .../types/ConcurrencyInfoComposableInvoker.java | 56 - .../types/ContactDetails.java | 103 -- .../types/ContactDetailsCollection.java | 39 - ...ntactDetailsCollectionComposableInvoker.java | 32 - .../types/ContactDetailsComposableInvoker.java | 100 -- .../astoriadefaultservice/types/Contractor.java | 248 --- .../types/ContractorCollection.java | 39 - .../ContractorCollectionComposableInvoker.java | 32 - .../types/ContractorComposableInvoker.java | 189 --- .../astoriadefaultservice/types/Customer.java | 314 ---- .../types/CustomerCollection.java | 39 - .../CustomerCollectionComposableInvoker.java | 32 - .../types/CustomerComposableInvoker.java | 252 --- .../types/CustomerInfo.java | 112 -- .../types/CustomerInfoCollection.java | 39 - ...CustomerInfoCollectionComposableInvoker.java | 32 - .../types/CustomerInfoComposableInvoker.java | 90 -- .../astoriadefaultservice/types/Dimensions.java | 70 - .../types/DimensionsCollection.java | 39 - .../DimensionsCollectionComposableInvoker.java | 32 - .../types/DimensionsComposableInvoker.java | 67 - .../types/DiscontinuedProduct.java | 425 ------ .../types/DiscontinuedProductCollection.java | 39 - ...inuedProductCollectionComposableInvoker.java | 32 - .../DiscontinuedProductComposableInvoker.java | 334 ---- .../astoriadefaultservice/types/Driver.java | 123 -- .../types/DriverCollection.java | 39 - .../DriverCollectionComposableInvoker.java | 32 - .../types/DriverComposableInvoker.java | 97 -- .../astoriadefaultservice/types/Employee.java | 242 --- .../types/EmployeeCollection.java | 48 - .../EmployeeCollectionComposableInvoker.java | 32 - .../types/EmployeeComposableInvoker.java | 176 --- .../astoriadefaultservice/types/LastLogin.java | 177 --- .../types/LastLoginCollection.java | 39 - .../LastLoginCollectionComposableInvoker.java | 32 - .../types/LastLoginComposableInvoker.java | 143 -- .../astoriadefaultservice/types/License.java | 204 --- .../types/LicenseCollection.java | 39 - .../LicenseCollectionComposableInvoker.java | 32 - .../types/LicenseComposableInvoker.java | 166 -- .../astoriadefaultservice/types/Login.java | 179 --- .../types/LoginCollection.java | 39 - .../types/LoginCollectionComposableInvoker.java | 32 - .../types/LoginComposableInvoker.java | 137 -- .../types/MappedEntityType.java | 595 -------- .../types/MappedEntityTypeCollection.java | 39 - ...edEntityTypeCollectionComposableInvoker.java | 32 - .../MappedEntityTypeComposableInvoker.java | 501 ------ .../astoriadefaultservice/types/Message.java | 287 ---- .../types/MessageAttachment.java | 109 -- .../types/MessageAttachmentCollection.java | 39 - ...geAttachmentCollectionComposableInvoker.java | 32 - .../MessageAttachmentComposableInvoker.java | 87 -- .../types/MessageCollection.java | 39 - .../MessageCollectionComposableInvoker.java | 32 - .../types/MessageComposableInvoker.java | 232 --- .../astoriadefaultservice/types/MessageKey.java | 52 - .../astoriadefaultservice/types/Order.java | 164 -- .../types/OrderCollection.java | 39 - .../types/OrderCollectionComposableInvoker.java | 32 - .../types/OrderComposableInvoker.java | 130 -- .../astoriadefaultservice/types/OrderLine.java | 219 --- .../types/OrderLineCollection.java | 39 - .../OrderLineCollectionComposableInvoker.java | 32 - .../types/OrderLineComposableInvoker.java | 176 --- .../types/OrderLineKey.java | 52 - .../astoriadefaultservice/types/PageView.java | 204 --- .../types/PageViewCollection.java | 39 - .../PageViewCollectionComposableInvoker.java | 32 - .../types/PageViewComposableInvoker.java | 166 -- .../astoriadefaultservice/types/Person.java | 123 -- .../types/PersonCollection.java | 39 - .../PersonCollectionComposableInvoker.java | 32 - .../types/PersonComposableInvoker.java | 97 -- .../types/PersonMetadata.java | 177 --- .../types/PersonMetadataCollection.java | 39 - ...rsonMetadataCollectionComposableInvoker.java | 32 - .../types/PersonMetadataComposableInvoker.java | 143 -- .../astoriadefaultservice/types/Phone.java | 59 - .../types/PhoneCollection.java | 39 - .../types/PhoneCollectionComposableInvoker.java | 32 - .../types/PhoneComposableInvoker.java | 56 - .../astoriadefaultservice/types/Product.java | 309 ---- .../types/ProductCollection.java | 39 - .../ProductCollectionComposableInvoker.java | 32 - .../types/ProductComposableInvoker.java | 242 --- .../types/ProductDetail.java | 123 -- .../types/ProductDetailCollection.java | 39 - ...roductDetailCollectionComposableInvoker.java | 32 - .../types/ProductDetailComposableInvoker.java | 97 -- .../types/ProductPageView.java | 275 ---- .../types/ProductPageViewCollection.java | 39 - ...ductPageViewCollectionComposableInvoker.java | 32 - .../types/ProductPageViewComposableInvoker.java | 212 --- .../types/ProductPhoto.java | 137 -- .../types/ProductPhotoCollection.java | 39 - ...ProductPhotoCollectionComposableInvoker.java | 32 - .../types/ProductPhotoComposableInvoker.java | 110 -- .../types/ProductPhotoKey.java | 52 - .../types/ProductReview.java | 178 --- .../types/ProductReviewCollection.java | 39 - ...roductReviewCollectionComposableInvoker.java | 32 - .../types/ProductReviewComposableInvoker.java | 143 -- .../types/ProductReviewKey.java | 63 - .../astoriadefaultservice/types/RSAToken.java | 123 -- .../types/RSATokenCollection.java | 39 - .../RSATokenCollectionComposableInvoker.java | 32 - .../types/RSATokenComposableInvoker.java | 97 -- .../types/SpecialEmployee.java | 330 ---- .../types/SpecialEmployeeCollection.java | 39 - ...cialEmployeeCollectionComposableInvoker.java | 32 - .../types/SpecialEmployeeComposableInvoker.java | 255 ---- .../types/package-info.java | 20 - .../fit/proxy/v4/APIBasicDesignTestITCase.java | 223 ++- .../olingo/fit/proxy/v4/demo/Service.java | 27 +- .../olingo/fit/proxy/v4/opentype/Service.java | 92 +- .../fit/proxy/v4/staticservice/Service.java | 198 ++- .../olingo/fit/v3/AbstractTestITCase.java | 520 ------- .../fit/v3/ActionOverloadingTestITCase.java | 119 -- .../apache/olingo/fit/v3/AsyncTestITCase.java | 131 -- .../fit/v3/AuthEntityRetrieveTestITCase.java | 42 - .../apache/olingo/fit/v3/BatchTestITCase.java | 495 ------ .../apache/olingo/fit/v3/CountTestITCase.java | 62 - .../olingo/fit/v3/EntityCreateTestITCase.java | 484 ------ .../olingo/fit/v3/EntityRetrieveTestITCase.java | 262 ---- .../olingo/fit/v3/EntitySetTestITCase.java | 175 --- .../olingo/fit/v3/EntityUpdateTestITCase.java | 242 --- .../apache/olingo/fit/v3/ErrorTestITCase.java | 165 -- .../olingo/fit/v3/FilterFactoryTestITCase.java | 167 -- .../apache/olingo/fit/v3/FilterTestITCase.java | 94 -- .../apache/olingo/fit/v3/InvokeTestITCase.java | 250 --- .../olingo/fit/v3/KeyAsSegmentTestITCase.java | 110 -- .../apache/olingo/fit/v3/LinkTestITCase.java | 178 --- .../olingo/fit/v3/MediaEntityTestITCase.java | 186 --- .../olingo/fit/v3/MetadataTestITCase.java | 34 - .../olingo/fit/v3/OpenTypeTestITCase.java | 183 --- .../olingo/fit/v3/PrimitiveKeysTestITCase.java | 70 - .../fit/v3/PropertyRetrieveTestITCase.java | 296 ---- .../olingo/fit/v3/PropertyTestITCase.java | 359 ----- .../olingo/fit/v3/PropertyValueTestITCase.java | 157 -- .../olingo/fit/v3/QueryOptionsTestITCase.java | 175 --- .../fit/v3/ServiceDocumentTestITCase.java | 57 - .../v3/XHTTPMethodEntityUpdateTestITCase.java | 38 - .../v3/XHTTPMethodPropertyUpdateTestITCase.java | 38 - .../request/batch/v3/BatchRequestFactory.java | 30 - .../request/batch/v3/ODataBatchRequest.java | 31 - .../request/cud/v3/CUDRequestFactory.java | 52 - .../request/cud/v3/ODataLinkCreateRequest.java | 30 - .../request/cud/v3/ODataLinkUpdateRequest.java | 30 - .../request/cud/v3/UpdateType.java | 57 - .../retrieve/v3/ODataLinkCollectionRequest.java | 28 - .../retrieve/v3/RetrieveRequestFactory.java | 55 - .../api/domain/v3/ODataLinkCollection.java | 100 -- .../client/api/edm/xml/v3/Annotations.java | 30 - .../client/api/edm/xml/v3/Association.java | 31 - .../client/api/edm/xml/v3/AssociationEnd.java | 32 - .../client/api/edm/xml/v3/AssociationSet.java | 30 - .../api/edm/xml/v3/AssociationSetEnd.java | 26 - .../client/api/edm/xml/v3/FunctionImport.java | 43 - .../api/edm/xml/v3/NavigationProperty.java | 29 - .../olingo/client/api/edm/xml/v3/Parameter.java | 26 - .../client/api/edm/xml/v3/ParameterMode.java | 27 - .../olingo/client/api/edm/xml/v3/Property.java | 48 - .../client/api/edm/xml/v3/PropertyValue.java | 43 - .../api/edm/xml/v3/ReferentialConstraint.java | 26 - .../edm/xml/v3/ReferentialConstraintRole.java | 31 - .../client/api/edm/xml/v3/TypeAnnotation.java | 31 - .../olingo/client/api/edm/xml/v3/Using.java | 27 - .../client/api/edm/xml/v3/ValueAnnotation.java | 45 - .../olingo/client/api/edm/xml/v3/ValueTerm.java | 26 - .../api/serialization/v3/ODataBinder.java | 51 - .../api/serialization/v3/ODataDeserializer.java | 38 - .../api/serialization/v3/ODataReader.java | 50 - .../client/api/uri/v3/FilterArgFactory.java | 28 - .../olingo/client/api/uri/v3/FilterFactory.java | 28 - .../olingo/client/api/uri/v3/URIBuilder.java | 48 - .../client/api/v3/EdmEnabledODataClient.java | 34 - .../olingo/client/api/v3/ODataClient.java | 62 - .../client/api/v3/UnsupportedInV3Exception.java | 31 - .../olingo/client/core/ODataClientFactory.java | 30 +- .../batch/v3/BatchRequestFactoryImpl.java | 38 - .../request/batch/v3/ODataBatchRequestImpl.java | 116 -- .../request/cud/v3/CUDRequestFactoryImpl.java | 57 - .../cud/v3/ODataLinkCreateRequestImpl.java | 100 -- .../cud/v3/ODataLinkUpdateRequestImpl.java | 102 -- .../v3/EdmEnabledInvokeRequestFactoryImpl.java | 52 - .../invoke/v3/InvokeRequestFactoryImpl.java | 51 - .../invoke/v3/ODataInvokeRequestImpl.java | 41 - .../v3/ODataLinkCollectionRequestImpl.java | 91 -- .../retrieve/v3/RetrieveRequestFactoryImpl.java | 76 - .../retrieve/v3/XMLMetadataRequestImpl.java | 67 - .../olingo/client/core/edm/EdmClientImpl.java | 113 +- .../client/core/edm/EdmEntityContainerImpl.java | 58 +- .../olingo/client/core/edm/EdmSchemaImpl.java | 66 +- .../core/edm/EdmStructuredTypeHelperImpl.java | 5 - .../core/edm/v3/EdmActionImportProxy.java | 61 - .../client/core/edm/v3/EdmActionProxy.java | 39 - .../client/core/edm/v3/EdmEntitySetProxy.java | 134 -- .../core/edm/v3/EdmFunctionImportProxy.java | 69 - .../client/core/edm/v3/EdmFunctionProxy.java | 44 - .../core/edm/v3/EdmNavigationPropertyProxy.java | 186 --- .../client/core/edm/v3/EdmOperationProxy.java | 93 -- .../client/core/edm/v3/FunctionImportUtils.java | 36 - .../core/edm/xml/ComplexTypeDeserializer.java | 50 +- .../core/edm/xml/DataServicesDeserializer.java | 34 +- .../client/core/edm/xml/EdmxDeserializer.java | 37 +- .../edm/xml/EntityContainerDeserializer.java | 60 +- .../core/edm/xml/EntitySetDeserializer.java | 5 +- .../core/edm/xml/EntityTypeDeserializer.java | 44 +- .../core/edm/xml/EnumTypeDeserializer.java | 11 +- .../core/edm/xml/ParameterDeserializer.java | 9 +- .../core/edm/xml/PropertyDeserializer.java | 76 +- .../client/core/edm/xml/SchemaDeserializer.java | 118 +- .../edm/xml/v3/AnnotationsDeserializer.java | 57 - .../client/core/edm/xml/v3/AnnotationsImpl.java | 50 - .../edm/xml/v3/AssociationDeserializer.java | 55 - .../core/edm/xml/v3/AssociationEndImpl.java | 78 - .../client/core/edm/xml/v3/AssociationImpl.java | 64 - .../edm/xml/v3/AssociationSetDeserializer.java | 54 - .../core/edm/xml/v3/AssociationSetEndImpl.java | 53 - .../core/edm/xml/v3/AssociationSetImpl.java | 63 - .../client/core/edm/xml/v3/ComplexTypeImpl.java | 54 - .../core/edm/xml/v3/DataServicesImpl.java | 38 - .../olingo/client/core/edm/xml/v3/EdmxImpl.java | 32 - .../core/edm/xml/v3/EntityContainerImpl.java | 69 - .../client/core/edm/xml/v3/EntitySetImpl.java | 27 - .../client/core/edm/xml/v3/EntityTypeImpl.java | 54 - .../client/core/edm/xml/v3/EnumTypeImpl.java | 38 - .../edm/xml/v3/FunctionImportDeserializer.java | 69 - .../core/edm/xml/v3/FunctionImportImpl.java | 140 -- .../client/core/edm/xml/v3/MemberImpl.java | 27 - .../core/edm/xml/v3/NavigationPropertyImpl.java | 66 - .../client/core/edm/xml/v3/ParameterImpl.java | 40 - .../client/core/edm/xml/v3/PropertyImpl.java | 141 -- .../core/edm/xml/v3/PropertyValueImpl.java | 129 -- .../edm/xml/v3/ReferentialConstraintImpl.java | 57 - .../ReferentialConstraintRoleDeserializer.java | 53 - .../xml/v3/ReferentialConstraintRoleImpl.java | 51 - .../client/core/edm/xml/v3/ReturnTypeProxy.java | 63 - .../client/core/edm/xml/v3/SchemaImpl.java | 137 -- .../edm/xml/v3/TypeAnnotationDeserializer.java | 54 - .../core/edm/xml/v3/TypeAnnotationImpl.java | 64 - .../client/core/edm/xml/v3/UsingImpl.java | 53 - .../core/edm/xml/v3/ValueAnnotationImpl.java | 141 -- .../client/core/edm/xml/v3/ValueTermImpl.java | 53 - .../client/core/edm/xml/v3/XMLMetadataImpl.java | 31 - .../core/serialization/v3/ODataBinderImpl.java | 130 -- .../serialization/v3/ODataDeserializerImpl.java | 76 - .../core/serialization/v3/ODataReaderImpl.java | 82 - .../core/uri/v3/FilterArgFactoryImpl.java | 38 - .../client/core/uri/v3/FilterFactoryImpl.java | 37 - .../client/core/uri/v3/URIBuilderImpl.java | 69 - .../core/v3/EdmEnabledODataClientImpl.java | 81 - .../olingo/client/core/v3/ODataClientImpl.java | 140 -- .../apache/olingo/client/core/AbstractTest.java | 3 - .../olingo/client/core/ODataClientTest.java | 22 +- .../client/core/uri/v3/FilterFactoryTest.java | 166 -- .../client/core/uri/v3/URIBuilderTest.java | 151 -- .../apache/olingo/client/core/v3/AtomTest.java | 130 -- .../olingo/client/core/v3/EntitySetTest.java | 67 - .../olingo/client/core/v3/EntityTest.java | 194 --- .../apache/olingo/client/core/v3/ErrorTest.java | 75 - .../apache/olingo/client/core/v3/JSONTest.java | 119 -- .../olingo/client/core/v3/MetadataTest.java | 339 ---- .../client/core/v3/PrimitiveValueTest.java | 574 ------- .../olingo/client/core/v3/PropertyTest.java | 169 -- .../client/core/v3/ServiceDocumentTest.java | 58 - .../commons/api/data/v3/LinkCollection.java | 50 - .../commons/api/domain/v3/ODataEntity.java | 33 - .../commons/api/domain/v3/ODataEntitySet.java | 30 - .../api/domain/v3/ODataObjectFactory.java | 69 - .../commons/api/domain/v3/ODataProperty.java | 41 - .../core/data/v3/LinkCollectionImpl.java | 79 - .../domain/v3/ODataCollectionValueImpl.java | 34 - .../core/domain/v3/ODataComplexValueImpl.java | 35 - .../commons/core/domain/v3/ODataEntityImpl.java | 46 - .../core/domain/v3/ODataEntitySetImpl.java | 44 - .../core/domain/v3/ODataObjectFactoryImpl.java | 129 -- .../core/domain/v3/ODataPrimitiveValueImpl.java | 47 - .../core/domain/v3/ODataPropertyImpl.java | 43 - .../core/serialization/AtomDeserializer.java | 67 +- .../JsonLinkCollectionDeserializer.java | 79 - 923 files changed, 813 insertions(+), 94023 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java index 958494f..db80e72 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java @@ -24,12 +24,14 @@ import java.lang.reflect.Proxy; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.zip.GZIPInputStream; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonEdmEnabledODataClient; import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.core.edm.EdmClientImpl; +import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.ODataFormat; @@ -83,9 +85,12 @@ public abstract class AbstractService<C extends CommonEdmEnabledODataClient<?>> } final Edm edm = metadata == null ? null : new EdmClientImpl(version, metadata.getSchemaByNsOrAlias()); - this.client = version.compareTo(ODataServiceVersion.V40) < 0 - ? ODataClientFactory.getEdmEnabledV3(serviceRoot, edm) - : ODataClientFactory.getEdmEnabledV4(serviceRoot, edm, metadataETag); + //TODO: check runtime exception or not + if(version.compareTo(ODataServiceVersion.V40) < 0){ + throw new ODataRuntimeException("Only OData V4 or higher supported."); + } + + this.client = ODataClientFactory.getEdmEnabledV4(serviceRoot, edm, metadataETag); this.client.getConfiguration().setDefaultPubFormat(ODataFormat.JSON_FULL_METADATA); this.transactional = transactional; this.context = new Context(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c8865db8/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 a45df6f..f72945a 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 @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ @@ -30,6 +30,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.Future; + import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.communication.header.ODataPreferences; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; @@ -37,16 +38,18 @@ import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateR import org.apache.olingo.client.api.communication.request.cud.v4.ODataReferenceAddingRequest; import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest; +import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.client.core.uri.URIUtils; +import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.domain.CommonODataEntity; 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.ext.proxy.AbstractService; +import org.apache.olingo.ext.proxy.api.EdmStreamValue; import org.apache.olingo.ext.proxy.api.PersistenceManager; import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.EdmStreamValue; import org.apache.olingo.ext.proxy.context.AttachedEntity; import org.apache.olingo.ext.proxy.context.AttachedEntityStatus; import org.apache.olingo.ext.proxy.context.EntityLinkDesc; @@ -93,8 +96,8 @@ abstract class AbstractPersistenceManager implements PersistenceManager { for (AttachedEntity attachedEntity : service.getContext().entityContext()) { final AttachedEntityStatus status = attachedEntity.getStatus(); if (((status != AttachedEntityStatus.ATTACHED - && status != AttachedEntityStatus.LINKED) || attachedEntity.getEntity().isChanged()) - && !items.contains(attachedEntity.getEntity())) { + && status != AttachedEntityStatus.LINKED) || attachedEntity.getEntity().isChanged()) + && !items.contains(attachedEntity.getEntity())) { pos++; pos = processEntityContext(attachedEntity.getEntity(), pos, items, delayedUpdates, changes); } @@ -122,27 +125,27 @@ abstract class AbstractPersistenceManager implements PersistenceManager { ODataLink result; switch (type) { - case ENTITY_NAVIGATION: - result = service.getClient().getObjectFactory().newEntityNavigationLink(name, uri); - break; + case ENTITY_NAVIGATION: + result = service.getClient().getObjectFactory().newEntityNavigationLink(name, uri); + break; - case ENTITY_SET_NAVIGATION: - result = service.getClient().getObjectFactory().newEntitySetNavigationLink(name, uri); - break; + case ENTITY_SET_NAVIGATION: + result = service.getClient().getObjectFactory().newEntitySetNavigationLink(name, uri); + break; - default: - throw new IllegalArgumentException("Invalid link type " + type.name()); + default: + throw new IllegalArgumentException("Invalid link type " + type.name()); } return result; } protected int processEntityContext( - final EntityInvocationHandler handler, - int pos, - final TransactionItems items, - final List<EntityLinkDesc> delayedUpdates, - final PersistenceChanges changeset) { + final EntityInvocationHandler handler, + int pos, + final TransactionItems items, + final List<EntityLinkDesc> delayedUpdates, + final PersistenceChanges changeset) { items.put(handler, null); @@ -162,20 +165,20 @@ abstract class AbstractPersistenceManager implements PersistenceManager { for (Map.Entry<String, AnnotatableInvocationHandler> entry : handler.getPropAnnotatableHandlers().entrySet()) { CoreUtils.addAnnotations(service.getClient(), - entry.getValue().getAnnotations(), ((ODataEntity) entity).getProperty(entry.getKey())); + entry.getValue().getAnnotations(), ((ODataEntity) entity).getProperty(entry.getKey())); } } } for (Map.Entry<NavigationProperty, Object> property : handler.getLinkChanges().entrySet()) { final ODataLinkType type = Collection.class.isAssignableFrom(property.getValue().getClass()) - ? ODataLinkType.ENTITY_SET_NAVIGATION - : ODataLinkType.ENTITY_NAVIGATION; + ? ODataLinkType.ENTITY_SET_NAVIGATION + : ODataLinkType.ENTITY_NAVIGATION; final Set<EntityInvocationHandler> toBeLinked = new HashSet<EntityInvocationHandler>(); for (Object proxy : type == ODataLinkType.ENTITY_SET_NAVIGATION - ? (Collection<?>) property.getValue() : Collections.singleton(property.getValue())) { + ? (Collection<?>) property.getValue() : Collections.singleton(property.getValue())) { final EntityInvocationHandler target = (EntityInvocationHandler) Proxy.getInvocationHandler(proxy); @@ -193,8 +196,8 @@ abstract class AbstractPersistenceManager implements PersistenceManager { if ((status == AttachedEntityStatus.ATTACHED || status == AttachedEntityStatus.LINKED) && !target.isChanged()) { LOG.debug("Add link to '{}'", target); entity.addLink(buildNavigationLink( - property.getKey().name(), - URIUtils.getURI(service.getClient().getServiceRoot(), editLink.toASCIIString()), type)); + property.getKey().name(), + URIUtils.getURI(service.getClient().getServiceRoot(), editLink.toASCIIString()), type)); } else { if (!items.contains(target)) { pos = processEntityContext(target, pos, items, delayedUpdates, changeset); @@ -209,8 +212,8 @@ abstract class AbstractPersistenceManager implements PersistenceManager { } else if (status == AttachedEntityStatus.CHANGED) { LOG.debug("Changed: '{}' from '{}' to (${}) '{}'", type.name(), handler, targetPos, target); entity.addLink(buildNavigationLink( - property.getKey().name(), - URIUtils.getURI(service.getClient().getServiceRoot(), editLink.toASCIIString()), type)); + property.getKey().name(), + URIUtils.getURI(service.getClient().getServiceRoot(), editLink.toASCIIString()), type)); } else { // create the link for the current object LOG.debug("'{}' from '{}' to (${}) '{}'", type.name(), handler, targetPos, target); @@ -239,8 +242,8 @@ abstract class AbstractPersistenceManager implements PersistenceManager { for (Map.Entry<String, AnnotatableInvocationHandler> entry : handler.getNavPropAnnotatableHandlers().entrySet()) { CoreUtils.addAnnotations(service.getClient(), - entry.getValue().getAnnotations(), - (org.apache.olingo.commons.api.domain.v4.ODataLink) entity.getNavigationLink(entry.getKey())); + entry.getValue().getAnnotations(), + (org.apache.olingo.commons.api.domain.v4.ODataLink) entity.getNavigationLink(entry.getKey())); } } @@ -260,9 +263,9 @@ abstract class AbstractPersistenceManager implements PersistenceManager { // update media properties if (!handler.getPropertyChanges().isEmpty()) { final URI targetURI = currentStatus == AttachedEntityStatus.NEW - ? URI.create("$" + startingPos) - : URIUtils.getURI( - service.getClient().getServiceRoot(), handler.getEntity().getEditLink().toASCIIString()); + ? URI.create("$" + startingPos) + : URIUtils.getURI( + service.getClient().getServiceRoot(), handler.getEntity().getEditLink().toASCIIString()); queueUpdate(handler, targetURI, entity, changeset); pos++; items.put(handler, pos); @@ -272,10 +275,10 @@ abstract class AbstractPersistenceManager implements PersistenceManager { // update media content if (handler.getStreamChanges() != null) { final URI targetURI = currentStatus == AttachedEntityStatus.NEW - ? URI.create("$" + startingPos + "/$value") - : URIUtils.getURI( - service.getClient().getServiceRoot(), - handler.getEntity().getEditLink().toASCIIString() + "/$value"); + ? URI.create("$" + startingPos + "/$value") + : URIUtils.getURI( + service.getClient().getServiceRoot(), + handler.getEntity().getEditLink().toASCIIString() + "/$value"); queueUpdateMediaEntity(handler, targetURI, handler.getStreamChanges(), changeset); @@ -288,9 +291,9 @@ abstract class AbstractPersistenceManager implements PersistenceManager { for (Map.Entry<String, EdmStreamValue> streamedChanges : handler.getStreamedPropertyChanges().entrySet()) { final URI targetURI = currentStatus == AttachedEntityStatus.NEW - ? URI.create("$" + startingPos) : URIUtils.getURI( - service.getClient().getServiceRoot(), - CoreUtils.getMediaEditLink(streamedChanges.getKey(), entity).toASCIIString()); + ? URI.create("$" + startingPos) : URIUtils.getURI( + service.getClient().getServiceRoot(), + CoreUtils.getMediaEditLink(streamedChanges.getKey(), entity).toASCIIString()); queueUpdateMediaResource(handler, targetURI, streamedChanges.getValue(), changeset); @@ -305,10 +308,10 @@ abstract class AbstractPersistenceManager implements PersistenceManager { } protected void processDelayedUpdates( - final List<EntityLinkDesc> delayedUpdates, - int pos, - final TransactionItems items, - final PersistenceChanges changeset) { + final List<EntityLinkDesc> delayedUpdates, + int pos, + final TransactionItems items, + final PersistenceChanges changeset) { for (EntityLinkDesc delayedUpdate : delayedUpdates) { if (StringUtils.isBlank(delayedUpdate.getReference())) { @@ -317,15 +320,15 @@ abstract class AbstractPersistenceManager implements PersistenceManager { items.put(delayedUpdate.getSource(), pos); final CommonODataEntity changes = - service.getClient().getObjectFactory().newEntity(delayedUpdate.getSource().getEntity().getTypeName()); + service.getClient().getObjectFactory().newEntity(delayedUpdate.getSource().getEntity().getTypeName()); AttachedEntityStatus status = service.getContext().entityContext().getStatus(delayedUpdate.getSource()); final URI sourceURI; if (status == AttachedEntityStatus.CHANGED) { sourceURI = URIUtils.getURI( - service.getClient().getServiceRoot(), - delayedUpdate.getSource().getEntity().getEditLink().toASCIIString()); + service.getClient().getServiceRoot(), + delayedUpdate.getSource().getEntity().getEditLink().toASCIIString()); } else { int sourcePos = items.get(delayedUpdate.getSource()); sourceURI = URI.create("$" + sourcePos); @@ -337,16 +340,16 @@ abstract class AbstractPersistenceManager implements PersistenceManager { final URI targetURI; if (status == AttachedEntityStatus.CHANGED) { targetURI = URIUtils.getURI( - service.getClient().getServiceRoot(), target.getEntity().getEditLink().toASCIIString()); + service.getClient().getServiceRoot(), target.getEntity().getEditLink().toASCIIString()); } else { int targetPos = items.get(target); targetURI = URI.create("$" + targetPos); } changes.addLink(delayedUpdate.getType() == ODataLinkType.ENTITY_NAVIGATION - ? service.getClient().getObjectFactory(). + ? service.getClient().getObjectFactory(). newEntityNavigationLink(delayedUpdate.getSourceName(), targetURI) - : service.getClient().getObjectFactory(). + : service.getClient().getObjectFactory(). newEntitySetNavigationLink(delayedUpdate.getSourceName(), targetURI)); LOG.debug("'{}' from {} to {}", delayedUpdate.getType().name(), sourceURI, targetURI); @@ -355,12 +358,12 @@ abstract class AbstractPersistenceManager implements PersistenceManager { queueUpdate(delayedUpdate.getSource(), sourceURI, changes, changeset); } else { URI sourceURI = URIUtils.getURI( - service.getClient().getServiceRoot(), - delayedUpdate.getSource().getEntity().getEditLink().toASCIIString() + service.getClient().getServiceRoot(), + delayedUpdate.getSource().getEntity().getEditLink().toASCIIString() + "/" + delayedUpdate.getSourceName() + "/$ref"); if (queueUpdateLinkViaRef( - delayedUpdate.getSource(), sourceURI, URI.create(delayedUpdate.getReference()), changeset)) { + delayedUpdate.getSource(), sourceURI, URI.create(delayedUpdate.getReference()), changeset)) { pos++; items.put(delayedUpdate.getSource(), pos); } @@ -369,50 +372,50 @@ abstract class AbstractPersistenceManager implements PersistenceManager { } private AttachedEntityStatus queue( - final EntityInvocationHandler handler, - final CommonODataEntity entity, - final PersistenceChanges changeset) { + final EntityInvocationHandler handler, + final CommonODataEntity entity, + final PersistenceChanges changeset) { switch (service.getContext().entityContext().getStatus(handler)) { - case NEW: - queueCreate(handler, entity, changeset); - return AttachedEntityStatus.NEW; - - case DELETED: - queueDelete(handler, entity, changeset); - return AttachedEntityStatus.DELETED; - - default: - if (handler.isChanged(false)) { - queueUpdate(handler, entity, changeset); - return AttachedEntityStatus.CHANGED; - } else { - return null; - } + case NEW: + queueCreate(handler, entity, changeset); + return AttachedEntityStatus.NEW; + + case DELETED: + queueDelete(handler, entity, changeset); + return AttachedEntityStatus.DELETED; + + default: + if (handler.isChanged(false)) { + queueUpdate(handler, entity, changeset); + return AttachedEntityStatus.CHANGED; + } else { + return null; + } } } private void queueCreate( - final EntityInvocationHandler handler, - final CommonODataEntity entity, - final PersistenceChanges changeset) { + final EntityInvocationHandler handler, + final CommonODataEntity entity, + final PersistenceChanges changeset) { LOG.debug("Create '{}'", handler); changeset.addChange(service.getClient().getCUDRequestFactory(). - getEntityCreateRequest(handler.getEntitySetURI(), entity), handler); + getEntityCreateRequest(handler.getEntitySetURI(), entity), handler); } private void queueUpdateMediaEntity( - final EntityInvocationHandler handler, - final URI uri, - final EdmStreamValue input, - final PersistenceChanges changeset) { + final EntityInvocationHandler handler, + final URI uri, + final EdmStreamValue input, + final PersistenceChanges changeset) { LOG.debug("Update media entity '{}'", uri); final ODataMediaEntityUpdateRequest<?> req = - service.getClient().getCUDRequestFactory().getMediaEntityUpdateRequest(uri, input.getStream()); + service.getClient().getCUDRequestFactory().getMediaEntityUpdateRequest(uri, input.getStream()); if (StringUtils.isNotBlank(input.getContentType())) { req.setContentType(input.getContentType()); @@ -426,15 +429,15 @@ abstract class AbstractPersistenceManager implements PersistenceManager { } private void queueUpdateMediaResource( - final EntityInvocationHandler handler, - final URI uri, - final EdmStreamValue input, - final PersistenceChanges changeset) { + final EntityInvocationHandler handler, + final URI uri, + final EdmStreamValue input, + final PersistenceChanges changeset) { LOG.debug("Update media entity '{}'", uri); final ODataStreamUpdateRequest req = - service.getClient().getCUDRequestFactory().getStreamUpdateRequest(uri, input.getStream()); + service.getClient().getCUDRequestFactory().getStreamUpdateRequest(uri, input.getStream()); if (StringUtils.isNotBlank(input.getContentType())) { req.setContentType(input.getContentType()); @@ -448,20 +451,21 @@ abstract class AbstractPersistenceManager implements PersistenceManager { } private void queueUpdate( - final EntityInvocationHandler handler, - final CommonODataEntity changes, - final PersistenceChanges changeset) { + final EntityInvocationHandler handler, + final CommonODataEntity changes, + final PersistenceChanges changeset) { LOG.debug("Update '{}'", handler.getEntityURI()); + // TODO: Check + if (service.getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0) { + throw new ODataRuntimeException("Only OData V4 or higher supported."); + } + final ODataEntityUpdateRequest<CommonODataEntity> req = - service.getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0 - ? ((org.apache.olingo.client.api.v3.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). - getEntityUpdateRequest(handler.getEntityURI(), - org.apache.olingo.client.api.communication.request.cud.v3.UpdateType.PATCH, changes) - : ((org.apache.olingo.client.api.v4.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). + ((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). getEntityUpdateRequest(handler.getEntityURI(), - org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); + org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); req.setPrefer(new ODataPreferences(service.getClient().getServiceVersion()).returnContent()); @@ -473,17 +477,17 @@ abstract class AbstractPersistenceManager implements PersistenceManager { } private boolean queueUpdateLinkViaRef( - final EntityInvocationHandler handler, - final URI source, - final URI targetRef, - final PersistenceChanges changeset) { + final EntityInvocationHandler handler, + final URI source, + final URI targetRef, + final PersistenceChanges changeset) { LOG.debug("Update '{}'", targetRef); URI sericeRoot = handler.getClient().newURIBuilder(handler.getClient().getServiceRoot()).build(); - + if (service.getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) >= 1) { final ODataReferenceAddingRequest req = - ((org.apache.olingo.client.api.v4.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). + ((org.apache.olingo.client.api.v4.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). getReferenceAddingRequest(sericeRoot, source, targetRef); req.setPrefer(new ODataPreferences(service.getClient().getServiceVersion()).returnContent()); @@ -499,21 +503,21 @@ abstract class AbstractPersistenceManager implements PersistenceManager { } private void queueUpdate( - final EntityInvocationHandler handler, - final URI uri, - final CommonODataEntity changes, - final PersistenceChanges changeset) { + final EntityInvocationHandler handler, + final URI uri, + final CommonODataEntity changes, + final PersistenceChanges changeset) { LOG.debug("Update '{}'", uri); + // TODO: Check + if (service.getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0) { + throw new ODataRuntimeException("Only OData V4 or higher supported."); + } final ODataEntityUpdateRequest<CommonODataEntity> req = - service.getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0 - ? ((org.apache.olingo.client.api.v3.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). - getEntityUpdateRequest(uri, - org.apache.olingo.client.api.communication.request.cud.v3.UpdateType.PATCH, changes) - : ((org.apache.olingo.client.api.v4.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). + ((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). getEntityUpdateRequest(uri, - org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); + org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); req.setPrefer(new ODataPreferences(service.getClient().getServiceVersion()).returnContent()); @@ -525,17 +529,17 @@ abstract class AbstractPersistenceManager implements PersistenceManager { } private void queueDelete( - final EntityInvocationHandler handler, - final CommonODataEntity entity, - final PersistenceChanges changeset) { + final EntityInvocationHandler handler, + final CommonODataEntity entity, + final PersistenceChanges changeset) { final URI deleteURI = entity.getEditLink() == null ? handler.getEntityURI() : entity.getEditLink(); changeset.addChange(buildDeleteRequest(deleteURI, handler.getETag()), handler); } private void queueDelete( - final URI deleteURI, - final String etag, - final PersistenceChanges changeset) { + final URI deleteURI, + final String etag, + final PersistenceChanges changeset) { changeset.addChange(buildDeleteRequest(deleteURI, etag), null); } @@ -553,7 +557,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager { } private AttachedEntityStatus resolveNavigationLink( - final NavigationProperty property, final EntityInvocationHandler handler) { + final NavigationProperty property, final EntityInvocationHandler handler) { if (handler.getUUID().getEntitySetURI() == null) { final Object key = CoreUtils.getKey(service.getClient(), handler, handler.getTypeRef(), handler.getEntity()); handler.updateUUID(CoreUtils.getTargetEntitySetURI(service.getClient(), property), handler.getTypeRef(), null);
