[OLINGO-206] Merge branch 'master' into olingo-206-val
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b2508035 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b2508035 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b2508035 Branch: refs/heads/master Commit: b2508035907271bc4e5b7250670602bbeea2c597 Parents: fbafc3a 4a19c8d Author: Stephan Klevenz <[email protected]> Authored: Tue Apr 1 10:56:28 2014 +0200 Committer: Stephan Klevenz <[email protected]> Committed: Tue Apr 1 10:56:28 2014 +0200 ---------------------------------------------------------------------- ODataJClient/engine/pom.xml | 2 +- .../odatajclient/engine/AllGeoTypesSet_-8.xml | 156 +- .../odatajclient/testservice/utils/Commons.java | 4 +- fit/pom.xml | 140 +- .../org/apache/olingo/fit/AbstractServices.java | 1255 +++++++++++++++ .../fit/UnsupportedMediaTypeException.java | 41 + .../java/org/apache/olingo/fit/V3Services.java | 38 + .../java/org/apache/olingo/fit/V4Services.java | 38 + .../org/apache/olingo/fit/methods/MERGE.java | 31 + .../org/apache/olingo/fit/methods/PATCH.java | 31 + .../apache/olingo/fit/rproxy/LinkRewrite.java | 54 + .../olingo/fit/rproxy/LinkRewriteRenderer.java | 56 + .../olingo/fit/utils/AbstractJSONUtilities.java | 503 ++++++ .../olingo/fit/utils/AbstractUtilities.java | 791 ++++++++++ .../olingo/fit/utils/AbstractXMLUtilities.java | 1302 ++++++++++++++++ .../org/apache/olingo/fit/utils/Accept.java | 96 ++ .../org/apache/olingo/fit/utils/Commons.java | 273 ++++ .../org/apache/olingo/fit/utils/Constants.java | 107 ++ .../org/apache/olingo/fit/utils/FSManager.java | 169 ++ .../org/apache/olingo/fit/utils/LinkInfo.java | 54 + .../olingo/fit/utils/MetadataLinkInfo.java | 175 +++ .../olingo/fit/utils/NavigationLinks.java | 120 ++ .../apache/olingo/fit/utils/ODataVersion.java | 35 + .../fit/utils/XHTTPMethodInterceptor.java | 43 + .../olingo/fit/utils/XMLEventReaderWrapper.java | 136 ++ .../org/apache/olingo/fit/utils/XmlElement.java | 99 ++ .../olingo/fit/utils/v3/JSONUtilities.java | 28 + .../olingo/fit/utils/v3/XMLUtilities.java | 191 +++ .../olingo/fit/utils/v4/JSONUtilities.java | 28 + .../olingo/fit/utils/v4/XMLUtilities.java | 142 ++ .../main/resources/META-INF/vfs-providers.xml | 27 + fit/src/main/resources/context.xml | 25 + fit/src/main/resources/esigate.properties | 25 + .../org/esigate/rewrite-proxy.properties | 23 + fit/src/main/resources/tomcat-users.xml | 27 + fit/src/main/resources/v3/Car/12/$value.bin | 0 .../main/resources/v3/Car/12/entity.full.json | 13 + fit/src/main/resources/v3/Car/12/entity.xml | 39 + fit/src/main/resources/v3/Car/14/$value.bin | 0 .../main/resources/v3/Car/14/entity.full.json | 13 + fit/src/main/resources/v3/Car/14/entity.xml | 39 + fit/src/main/resources/v3/Car/15/$value.bin | 0 .../main/resources/v3/Car/15/entity.full.json | 13 + fit/src/main/resources/v3/Car/15/entity.xml | 39 + .../main/resources/v3/Car/16/entity.full.json | 14 + fit/src/main/resources/v3/Car/16/entity.xml | 45 + fit/src/main/resources/v3/Car/feed.full.json | 297 ++++ fit/src/main/resources/v3/Car/feed.xml | 459 ++++++ .../v3/Car/filter/((1 add VIN) eq 16).full.json | 1 + .../v3/Car/filter/((1 add VIN) eq 16).xml | 45 + .../v3/Car/filter/((VIN add 1) eq 16).full.json | 1 + .../v3/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 + .../v3/Car/filter/(16 eq (1 add VIN)).full.json | 1 + .../v3/Car/filter/(16 eq (1 add VIN)).xml | 45 + .../v3/Car/filter/(VIN lt 16).full.json | 1 + .../resources/v3/Car/filter/(VIN lt 16).xml | 117 ++ ...ngth(Description) gt (VIN add 10)).full.json | 1 + .../(length(Description) gt (VIN add 10)).xml | 117 ++ .../v3/Car/filter/VIN add 5 lt 11.full.json | 1 + .../resources/v3/Car/filter/VIN add 5 lt 11.xml | 41 + .../v3/Car/filter/VIN div 2 le 8.full.json | 1 + .../resources/v3/Car/filter/VIN div 2 le 8.xml | 41 + .../filter/VIN le 18 and VIN gt 12.full.json | 1 + .../v3/Car/filter/VIN le 18 and VIN gt 12.xml | 41 + .../v3/Car/filter/VIN mul 2 le 30.full.json | 1 + .../resources/v3/Car/filter/VIN mul 2 le 30.xml | 41 + ...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 ++ .../v3/ComputerDetail/-10/entity.full.json | 23 + .../resources/v3/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 | 41 + .../filter/hour(PurchaseDate) eq 1.full.json | 1 + .../filter/hour(PurchaseDate) eq 1.xml | 41 + .../filter/minute(PurchaseDate) eq 33.full.json | 1 + .../filter/minute(PurchaseDate) eq 33.xml | 41 + .../filter/month(PurchaseDate) eq 12.full.json | 1 + .../filter/month(PurchaseDate) eq 12.xml | 41 + .../filter/second(PurchaseDate) eq 35.full.json | 1 + .../filter/second(PurchaseDate) eq 35.xml | 41 + .../filter/year(PurchaseDate) eq 2020.full.json | 1 + .../filter/year(PurchaseDate) eq 2020.xml | 41 + .../resources/v3/Customer/-10/entity.full.json | 673 ++++++++ .../main/resources/v3/Customer/-10/entity.xml | 516 +++++++ .../v3/Customer/-10/links/Info.full.json | 4 + .../resources/v3/Customer/-10/links/Info.xml | 22 + .../v3/Customer/-10/links/Logins('3').full.json | 4 + .../v3/Customer/-10/links/Logins.full.json | 12 + .../resources/v3/Customer/-10/links/Logins.xml | 25 + .../v3/Customer/-10/links/Orders(-10).full.json | 4 + .../v3/Customer/-10/links/Orders.full.json | 13 + .../resources/v3/Customer/-10/links/Orders.xml | 26 + .../resources/v3/Customer/-7/entity.full.json | 487 ++++++ .../main/resources/v3/Customer/-7/entity.xml | 381 +++++ .../resources/v3/Customer/-9/entity.full.json | 750 +++++++++ .../main/resources/v3/Customer/-9/entity.xml | 565 +++++++ .../main/resources/v3/Customer/feed.full.json | 893 +++++++++++ fit/src/main/resources/v3/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 ++++++++ .../v3/Customer/filter/CustomerId eq -10.xml | 522 +++++++ .../Customer/filter/CustomerId gt -10.full.json | 1 + .../v3/Customer/filter/CustomerId gt -10.xml | 740 +++++++++ .../Customer/filter/CustomerId lt -10.full.json | 1 + .../v3/Customer/filter/CustomerId lt -10.xml | 30 + .../isof(Name,'Edm.String') eq true.full.json | 1 + .../filter/isof(Name,'Edm.String') eq true.xml | 1085 +++++++++++++ .../not endswith(Name,'Chandan').full.json | 1 + .../filter/not endswith(Name,'Chandan').xml | 1065 +++++++++++++ .../v3/Customer/skiptoken/-1.full.json | 6 + .../main/resources/v3/Customer/skiptoken/-1.xml | 30 + .../v3/Customer/skiptoken/-10.full.json | 978 ++++++++++++ .../resources/v3/Customer/skiptoken/-10.xml | 953 ++++++++++++ .../v3/Customer/skiptoken/-3.full.json | 776 ++++++++++ .../main/resources/v3/Customer/skiptoken/-3.xml | 613 ++++++++ .../v3/Customer/skiptoken/-5.full.json | 1444 ++++++++++++++++++ .../main/resources/v3/Customer/skiptoken/-5.xml | 1104 +++++++++++++ .../v3/Customer/skiptoken/-7.full.json | 1296 ++++++++++++++++ .../main/resources/v3/Customer/skiptoken/-7.xml | 990 ++++++++++++ .../v3/Customer/skiptoken/-9.full.json | 715 +++++++++ .../main/resources/v3/Customer/skiptoken/-9.xml | 559 +++++++ .../v3/CustomerInfo/11/entity.full.json | 11 + .../resources/v3/CustomerInfo/11/entity.xml | 37 + .../v3/CustomerInfo/12/entity.full.json | 11 + .../resources/v3/CustomerInfo/12/entity.xml | 37 + .../v3/EdmBooleanSet/true/entity.full.json | 1 + .../resources/v3/EdmBooleanSet/true/entity.xml | 36 + .../v3/EdmByteSet/255/entity.full.json | 1 + .../main/resources/v3/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 + .../v3/EdmInt16Set/32767/entity.full.json | 1 + .../resources/v3/EdmInt16Set/32767/entity.xml | 36 + .../v3/EdmInt32Set/-2147483648/entity.full.json | 1 + .../v3/EdmInt32Set/-2147483648/entity.xml | 36 + .../9223372036854775807L/entity.full.json | 1 + .../EdmInt64Set/9223372036854775807L/entity.xml | 36 + .../EdmSingleSet/3.4028235E38f/entity.full.json | 1 + .../v3/EdmSingleSet/3.4028235E38f/entity.xml | 36 + .../v3/EdmStringSet/'$'/entity.full.json | 1 + .../resources/v3/EdmStringSet/'$'/entity.xml | 36 + .../entity.full.json | 1 + .../entity.xml | 36 + .../v3/InStreamErrorGetCustomer.full.json | 1 + .../resources/v3/InStreamErrorGetCustomer.xml | 525 +++++++ .../resources/v3/Login/'3'/entity.full.json | 13 + fit/src/main/resources/v3/Login/'3'/entity.xml | 42 + .../resources/v3/Message/1 -10/entity.full.json | 17 + .../main/resources/v3/Message/1 -10/entity.xml | 46 + .../resources/v3/Order/-10/entity.full.json | 11 + fit/src/main/resources/v3/Order/-10/entity.xml | 40 + .../main/resources/v3/Order/-7/entity.full.json | 17 + fit/src/main/resources/v3/Order/-7/entity.xml | 43 + .../main/resources/v3/Order/-8/entity.full.json | 17 + fit/src/main/resources/v3/Order/-8/entity.xml | 43 + .../main/resources/v3/Order/-9/entity.full.json | 17 + fit/src/main/resources/v3/Order/-9/entity.xml | 43 + .../v3/OrderLine/-10 -10/entity.full.json | 14 + .../resources/v3/OrderLine/-10 -10/entity.xml | 42 + .../resources/v3/OrderLine/-10 -10/etag.txt | 1 + .../filter/PersonId sub 2 lt -10.full.json | 1 + .../v3/Person/filter/PersonId sub 2 lt -10.xml | 79 + ...iaDefaultService.SpecialEmployee').full.json | 1 + ....AstoriaDefaultService.SpecialEmployee').xml | 131 ++ .../resources/v3/Product/-10/entity.full.json | 51 + .../main/resources/v3/Product/-10/entity.xml | 61 + fit/src/main/resources/v3/Product/-10/etag.txt | 1 + .../resources/v3/Product/-6/entity.full.json | 51 + fit/src/main/resources/v3/Product/-6/entity.xml | 61 + fit/src/main/resources/v3/Product/-6/etag.txt | 1 + .../resources/v3/Product/-7/entity.full.json | 51 + fit/src/main/resources/v3/Product/-7/entity.xml | 61 + fit/src/main/resources/v3/Product/-7/etag.txt | 1 + .../v3/Product/-7/links/Photos.full.json | 12 + .../resources/v3/Product/-9/entity.full.json | 60 + fit/src/main/resources/v3/Product/-9/entity.xml | 68 + fit/src/main/resources/v3/Product/-9/etag.txt | 1 + .../main/resources/v3/Product/feed.full.json | 452 ++++++ fit/src/main/resources/v3/Product/feed.xml | 410 +++++ .../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 + .../v3/ProductPhoto/-2 -2/entity.full.json | 10 + .../resources/v3/ProductPhoto/-2 -2/entity.xml | 39 + .../v3/ProductPhoto/-3 -3/entity.full.json | 10 + .../resources/v3/ProductPhoto/-3 -3/entity.xml | 38 + fit/src/main/resources/v3/badRequest.json | 17 + fit/src/main/resources/v3/badRequest.xml | 30 + fit/src/main/resources/v3/largeMetadata.xml | 42 + fit/src/main/resources/v3/metadata.xml | 719 +++++++++ fit/src/main/resources/v3/notFound.json | 11 + fit/src/main/resources/v3/notFound.xml | 25 + fit/src/main/resources/v3/services.full.json | 102 ++ fit/src/main/resources/v3/services.xml | 98 ++ .../main/resources/v3/unsupportedMediaType.json | 17 + .../main/resources/v3/unsupportedMediaType.xml | 34 + fit/src/main/resources/v4/People/feed.full.json | 333 ++++ fit/src/main/resources/v4/People/feed.xml | 219 +++ fit/src/main/resources/v4/metadata.xml | 438 ++++++ .../main/webapp/WEB-INF/applicationContext.xml | 50 + fit/src/main/webapp/WEB-INF/web.xml | 75 + lib/client-api/pom.xml | 4 +- .../olingo/client/api/CommonConfiguration.java | 184 +++ .../olingo/client/api/CommonODataClient.java | 76 + .../apache/olingo/client/api/Configuration.java | 184 --- .../org/apache/olingo/client/api/Constants.java | 217 --- .../olingo/client/api/ODataBatchConstants.java | 56 + .../apache/olingo/client/api/ODataClient.java | 55 - .../olingo/client/api/ODataConstants.java | 219 --- .../apache/olingo/client/api/ODataError.java | 67 - .../apache/olingo/client/api/ODataV3Client.java | 39 - .../apache/olingo/client/api/ODataV4Client.java | 39 - .../client/api/UnsupportedInV3Exception.java | 31 - .../olingo/client/api/V3Configuration.java | 44 - .../olingo/client/api/V4Configuration.java | 24 - .../ODataClientErrorException.java | 110 ++ .../ODataServerErrorException.java | 38 + .../api/communication/header/HeaderName.java | 147 ++ .../communication/header/ODataHeaderValues.java | 45 + .../api/communication/header/ODataHeaders.java | 59 + .../request/ODataBasicRequest.java | 55 + .../request/ODataBatchableRequest.java | 46 + .../api/communication/request/ODataRequest.java | 191 +++ .../request/ODataStreamManager.java | 57 + .../request/ODataStreamedRequest.java | 38 + .../communication/request/ODataStreamer.java | 39 + .../api/communication/request/UpdateType.java | 55 + .../request/batch/BatchStreamManager.java | 42 + .../batch/CommonBatchRequestFactory.java | 35 + .../request/batch/ODataBatchLineIterator.java | 57 + .../request/batch/ODataBatchRequest.java | 57 + .../request/batch/ODataBatchRequestItem.java | 46 + .../request/batch/ODataBatchResponseItem.java | 56 + .../request/batch/ODataChangeset.java | 39 + .../request/batch/ODataRetrieve.java | 37 + .../request/batch/v3/BatchRequestFactory.java | 24 + .../request/batch/v4/BatchRequestFactory.java | 24 + .../request/cud/CommonCUDRequestFactory.java | 145 ++ .../request/cud/ODataDeleteRequest.java | 29 + .../request/cud/ODataEntityCreateRequest.java | 29 + .../request/cud/ODataEntityUpdateRequest.java | 29 + .../request/cud/ODataLinkCreateRequest.java | 29 + .../request/cud/ODataLinkUpdateRequest.java | 29 + .../request/cud/ODataPropertyUpdateRequest.java | 29 + .../request/cud/ODataValueUpdateRequest.java | 29 + .../request/cud/v3/CUDRequestFactory.java | 24 + .../request/cud/v4/CUDRequestFactory.java | 24 + .../invoke/CommonInvokeRequestFactory.java | 61 + .../request/invoke/ODataInvokeRequest.java | 40 + .../request/invoke/ODataNoContent.java | 31 + .../request/invoke/v3/InvokeRequestFactory.java | 24 + .../request/invoke/v4/InvokeRequestFactory.java | 24 + .../retrieve/CommonRetrieveRequestFactory.java | 105 ++ .../request/retrieve/ODataEntityRequest.java | 28 + .../retrieve/ODataEntitySetIteratorRequest.java | 28 + .../request/retrieve/ODataEntitySetRequest.java | 28 + .../request/retrieve/ODataMediaRequest.java | 28 + .../request/retrieve/ODataMetadataRequest.java | 28 + .../request/retrieve/ODataPropertyRequest.java | 28 + .../request/retrieve/ODataRawRequest.java | 42 + .../request/retrieve/ODataRetrieveRequest.java | 29 + .../retrieve/ODataServiceDocumentRequest.java | 28 + .../request/retrieve/ODataValueRequest.java | 28 + .../retrieve/v3/ODataLinkCollectionRequest.java | 29 + .../retrieve/v3/RetrieveRequestFactory.java | 34 + .../retrieve/v4/RetrieveRequestFactory.java | 24 + .../streamed/CommonStreamedRequestFactory.java | 62 + .../MediaEntityCreateStreamManager.java | 28 + .../MediaEntityUpdateStreamManager.java | 28 + .../streamed/ODataMediaEntityCreateRequest.java | 28 + .../streamed/ODataMediaEntityUpdateRequest.java | 28 + .../streamed/ODataStreamUpdateRequest.java | 30 + .../streamed/ODataStreamedEntityRequest.java | 50 + .../streamed/StreamUpdateStreamManager.java | 28 + .../streamed/v3/StreamedRequestFactory.java | 24 + .../streamed/v4/StreamedRequestFactory.java | 24 + .../response/ODataBatchResponse.java | 37 + .../response/ODataDeleteResponse.java | 27 + .../response/ODataEntityCreateResponse.java | 36 + .../response/ODataEntityUpdateResponse.java | 36 + .../response/ODataInvokeResponse.java | 36 + .../response/ODataLinkOperationResponse.java | 28 + .../ODataMediaEntityCreateResponse.java | 36 + .../ODataMediaEntityUpdateResponse.java | 36 + .../response/ODataPropertyUpdateResponse.java | 36 + .../response/ODataRawResponse.java | 33 + .../communication/response/ODataResponse.java | 117 ++ .../response/ODataRetrieveResponse.java | 34 + .../response/ODataStreamUpdateResponse.java | 36 + .../response/ODataValueUpdateResponse.java | 36 + .../api/deserializer/AnnotationProperty.java | 24 - .../api/deserializer/ClientException.java | 36 - .../client/api/deserializer/ComplexValue.java | 35 - .../olingo/client/api/deserializer/Entity.java | 59 - .../client/api/deserializer/EntitySet.java | 34 - .../api/deserializer/NavigationProperty.java | 27 - .../client/api/deserializer/Property.java | 24 - .../olingo/client/api/deserializer/Reader.java | 30 - .../api/deserializer/StructuralProperty.java | 30 - .../olingo/client/api/deserializer/Value.java | 28 - .../olingo/client/api/domain/EdmSimpleType.java | 289 ---- .../client/api/domain/ODataCollectionValue.java | 98 -- .../client/api/domain/ODataComplexValue.java | 97 -- .../olingo/client/api/domain/ODataDuration.java | 79 - .../api/domain/ODataEntitySetIterator.java | 311 ++++ .../client/api/domain/ODataGeospatialValue.java | 488 ------ .../client/api/domain/ODataInvokeResult.java | 30 - .../client/api/domain/ODataPrimitiveValue.java | 378 ----- .../olingo/client/api/domain/ODataProperty.java | 192 --- .../client/api/domain/ODataServiceDocument.java | 183 --- .../client/api/domain/ODataTimestamp.java | 138 -- .../olingo/client/api/domain/ODataValue.java | 111 -- .../domain/geospatial/ComposedGeospatial.java | 75 - .../api/domain/geospatial/Geospatial.java | 157 -- .../domain/geospatial/GeospatialCollection.java | 48 - .../api/domain/geospatial/LineString.java | 39 - .../api/domain/geospatial/MultiLineString.java | 39 - .../api/domain/geospatial/MultiPoint.java | 39 - .../api/domain/geospatial/MultiPolygon.java | 39 - .../client/api/domain/geospatial/Point.java | 77 - .../client/api/domain/geospatial/Polygon.java | 73 - .../api/domain/v3/ODataLinkCollection.java | 100 ++ .../olingo/client/api/format/ODataFormat.java | 97 -- .../client/api/format/ODataMediaFormat.java | 71 - .../client/api/format/ODataPubFormat.java | 97 -- .../client/api/format/ODataValueFormat.java | 76 - .../client/api/op/ClientODataDeserializer.java | 39 + .../olingo/client/api/op/CommonODataBinder.java | 132 ++ .../olingo/client/api/op/CommonODataReader.java | 104 ++ .../olingo/client/api/op/ODataBinder.java | 122 -- .../olingo/client/api/op/ODataDeserializer.java | 94 -- .../olingo/client/api/op/ODataReader.java | 104 -- .../olingo/client/api/op/ODataSerializer.java | 118 -- .../client/api/op/ODataV3Deserializer.java | 23 - .../client/api/op/ODataV4Deserializer.java | 30 - .../olingo/client/api/op/ODataWriter.java | 94 ++ .../olingo/client/api/op/v3/ODataBinder.java | 35 + .../client/api/op/v3/ODataDeserializer.java | 37 + .../olingo/client/api/op/v3/ODataReader.java | 37 + .../olingo/client/api/op/v4/ODataBinder.java | 25 + .../client/api/op/v4/ODataDeserializer.java | 31 + .../olingo/client/api/op/v4/ODataReader.java | 25 + .../client/api/uri/CommonFilterArgFactory.java | 83 + .../client/api/uri/CommonFilterFactory.java | 61 + .../olingo/client/api/uri/CommonURIBuilder.java | 224 +++ .../apache/olingo/client/api/uri/FilterArg.java | 30 + .../olingo/client/api/uri/URIBuilder.java | 225 --- .../apache/olingo/client/api/uri/URIFilter.java | 32 + .../olingo/client/api/uri/V3URIBuilder.java | 47 - .../olingo/client/api/uri/V4URIBuilder.java | 87 -- .../olingo/client/api/uri/filter/FilterArg.java | 30 - .../client/api/uri/filter/FilterArgFactory.java | 83 - .../client/api/uri/filter/FilterFactory.java | 61 - .../olingo/client/api/uri/filter/URIFilter.java | 32 - .../api/uri/filter/V3FilterArgFactory.java | 25 - .../client/api/uri/filter/V3FilterFactory.java | 26 - .../api/uri/filter/V4FilterArgFactory.java | 55 - .../client/api/uri/filter/V4FilterFactory.java | 32 - .../client/api/uri/v3/FilterArgFactory.java | 28 + .../olingo/client/api/uri/v3/FilterFactory.java | 28 + .../olingo/client/api/uri/v3/URIBuilder.java | 49 + .../client/api/uri/v4/FilterArgFactory.java | 59 + .../olingo/client/api/uri/v4/FilterFactory.java | 35 + .../olingo/client/api/uri/v4/URIBuilder.java | 89 ++ .../olingo/client/api/utils/XMLUtils.java | 178 --- .../olingo/client/api/v3/Configuration.java | 46 + .../olingo/client/api/v3/ODataClient.java | 67 + .../client/api/v3/UnsupportedInV3Exception.java | 31 + .../olingo/client/api/v4/Configuration.java | 26 + .../olingo/client/api/v4/ODataClient.java | 67 + lib/client-core/pom.xml | 97 +- .../client/core/AbstractConfiguration.java | 15 +- .../olingo/client/core/AbstractODataClient.java | 36 +- .../olingo/client/core/ODataClientFactory.java | 11 +- .../olingo/client/core/ODataV3ClientImpl.java | 146 -- .../olingo/client/core/ODataV4ClientImpl.java | 146 -- .../olingo/client/core/V3ConfigurationImpl.java | 57 - .../olingo/client/core/V4ConfigurationImpl.java | 31 - .../communication/header/ODataHeadersImpl.java | 111 ++ .../request/AbstractODataBasicRequest.java | 126 ++ .../request/AbstractODataStreamManager.java | 182 +++ .../request/AbstractODataStreamer.java | 101 ++ .../communication/request/ODataRequestImpl.java | 489 ++++++ .../core/communication/request/Wrapper.java | 41 + .../batch/AbstractBatchRequestFactory.java | 36 + .../batch/AbstractODataBatchRequestItem.java | 124 ++ .../batch/AbstractODataBatchResponseItem.java | 146 ++ .../request/batch/ODataBatchController.java | 89 ++ .../batch/ODataBatchLineIteratorImpl.java | 93 ++ .../request/batch/ODataBatchRequestImpl.java | 255 ++++ .../request/batch/ODataBatchUtilities.java | 329 ++++ .../request/batch/ODataChangesetImpl.java | 128 ++ .../batch/ODataChangesetResponseItem.java | 129 ++ .../request/batch/ODataRetrieveImpl.java | 81 + .../batch/ODataRetrieveResponseItem.java | 85 ++ .../batch/v3/BatchRequestFactoryImpl.java | 33 + .../batch/v4/BatchRequestFactoryImpl.java | 33 + .../request/cud/AbstractCUDRequestFactory.java | 197 +++ .../request/cud/ODataDeleteRequestImpl.java | 93 ++ .../cud/ODataEntityCreateRequestImpl.java | 125 ++ .../cud/ODataEntityUpdateRequestImpl.java | 131 ++ .../request/cud/ODataLinkCreateRequestImpl.java | 108 ++ .../request/cud/ODataLinkUpdateRequestImpl.java | 111 ++ .../cud/ODataPropertyUpdateRequestImpl.java | 129 ++ .../cud/ODataValueUpdateRequestImpl.java | 139 ++ .../request/cud/v3/CUDRequestFactoryImpl.java | 33 + .../request/cud/v4/CUDRequestFactoryImpl.java | 33 + .../invoke/AbstractInvokeRequestFactory.java | 46 + .../request/invoke/ODataInvokeRequestImpl.java | 235 +++ .../invoke/v3/InvokeRequestFactoryImpl.java | 112 ++ .../invoke/v4/InvokeRequestFactoryImpl.java | 48 + .../retrieve/AbstractODataRetrieveRequest.java | 98 ++ .../AbstractRetrieveRequestFactory.java | 92 ++ .../retrieve/ODataEntityRequestImpl.java | 95 ++ .../ODataEntitySetIteratorRequestImpl.java | 86 ++ .../retrieve/ODataEntitySetRequestImpl.java | 97 ++ .../request/retrieve/ODataMediaRequestImpl.java | 109 ++ .../retrieve/ODataMetadataRequestImpl.java | 108 ++ .../retrieve/ODataPropertyRequestImpl.java | 97 ++ .../request/retrieve/ODataRawRequestImpl.java | 101 ++ .../ODataServiceDocumentRequestImpl.java | 93 ++ .../request/retrieve/ODataValueRequestImpl.java | 107 ++ .../v3/ODataLinkCollectionRequestImpl.java | 99 ++ .../retrieve/v3/RetrieveRequestFactoryImpl.java | 41 + .../retrieve/v4/RetrieveRequestFactoryImpl.java | 33 + .../AbstractODataStreamedEntityRequest.java | 70 + .../streamed/AbstractODataStreamedRequest.java | 153 ++ .../AbstractStreamedRequestFactory.java | 76 + .../ODataMediaEntityCreateRequestImpl.java | 134 ++ .../ODataMediaEntityUpdateRequestImpl.java | 137 ++ .../streamed/ODataStreamUpdateRequestImpl.java | 133 ++ .../streamed/v3/StreamedRequestFactoryImpl.java | 33 + .../streamed/v4/StreamedRequestFactoryImpl.java | 33 + .../response/AbstractODataResponse.java | 276 ++++ .../batch/ODataBatchResponseManager.java | 151 ++ .../data/JSONServiceDocumentDeserializer.java | 15 +- .../core/data/ODataJacksonDeserializer.java | 45 - .../core/data/ODataJacksonSerializer.java | 45 - .../data/XMLServiceDocumentDeserializer.java | 3 +- .../core/data/v3/JSONServiceDocumentImpl.java | 4 +- .../core/data/v4/JSONServiceDocumentImpl.java | 4 +- .../deserializer/AnnotationPropertyImpl.java | 53 - .../core/deserializer/ComplexValueImpl.java | 82 - .../client/core/deserializer/EntityImpl.java | 126 -- .../core/deserializer/EntitySetBuilder.java | 72 - .../client/core/deserializer/EntitySetImpl.java | 120 -- .../client/core/deserializer/JsonReader.java | 89 -- .../deserializer/NavigationPropertyImpl.java | 89 -- .../core/deserializer/PrimitiveValue.java | 51 - .../core/deserializer/PropertyCollection.java | 96 -- .../deserializer/PropertyCollectionBuilder.java | 221 --- .../deserializer/StructuralPropertyImpl.java | 83 - .../core/domain/ODataGeospatialValueImpl.java | 130 ++ .../core/domain/ODataPrimitiveValueImpl.java | 177 +++ .../client/core/edm/EdmActionImportImpl.java | 3 +- .../olingo/client/core/edm/EdmClientImpl.java | 25 +- .../client/core/edm/EdmComplexTypeImpl.java | 1 + .../client/core/edm/EdmEntityContainerImpl.java | 3 +- .../client/core/edm/EdmEntityTypeImpl.java | 1 + .../olingo/client/core/edm/EdmEnumTypeImpl.java | 14 +- .../client/core/edm/EdmFunctionImportImpl.java | 1 + .../core/edm/EdmNavigationPropertyImpl.java | 1 + .../client/core/edm/EdmOperationImpl.java | 8 +- .../client/core/edm/EdmParameterImpl.java | 1 + .../olingo/client/core/edm/EdmPropertyImpl.java | 1 + .../client/core/edm/EdmReturnTypeImpl.java | 1 + .../olingo/client/core/edm/EdmSchemaImpl.java | 15 +- .../client/core/edm/EdmTypeDefinitionImpl.java | 12 +- .../olingo/client/core/edm/EdmTypeInfo.java | 174 --- .../core/edm/v3/EdmActionImportProxy.java | 2 +- .../core/edm/v3/EdmFunctionImportProxy.java | 2 +- .../core/edm/v3/EdmServiceMetadataImpl.java | 6 +- .../client/core/edm/v3/FunctionImportUtils.java | 36 + .../core/edm/v3/V3FunctionImportUtils.java | 36 - .../core/edm/xml/AbstractComplexType.java | 1 - .../core/edm/xml/AbstractEdmDeserializer.java | 71 + .../core/edm/xml/AbstractEntityContainer.java | 1 - .../client/core/edm/xml/AbstractEntitySet.java | 1 - .../client/core/edm/xml/AbstractEntityType.java | 1 - .../client/core/edm/xml/AbstractEnumType.java | 1 - .../client/core/edm/xml/AbstractSchema.java | 1 - .../core/edm/xml/ComplexTypeDeserializer.java | 82 + .../core/edm/xml/DataServicesDeserializer.java | 3 +- .../client/core/edm/xml/EdmxDeserializer.java | 6 +- .../edm/xml/EntityContainerDeserializer.java | 101 ++ .../core/edm/xml/EntityKeyDeserializer.java | 47 + .../client/core/edm/xml/EntityKeyImpl.java | 1 - .../core/edm/xml/EntitySetDeserializer.java | 69 + .../core/edm/xml/EntityTypeDeserializer.java | 90 ++ .../core/edm/xml/EnumTypeDeserializer.java | 72 + .../core/edm/xml/ParameterDeserializer.java | 3 +- .../core/edm/xml/PropertyDeserializer.java | 3 +- .../client/core/edm/xml/SchemaDeserializer.java | 148 ++ .../edm/xml/v3/AnnotationsDeserializer.java | 2 +- .../edm/xml/v3/AssociationDeserializer.java | 2 +- .../edm/xml/v3/AssociationSetDeserializer.java | 2 +- .../edm/xml/v3/FunctionImportDeserializer.java | 2 +- .../ReferentialConstraintRoleDeserializer.java | 2 +- .../edm/xml/v3/TypeAnnotationDeserializer.java | 2 +- .../core/edm/xml/v4/ActionDeserializer.java | 2 +- .../core/edm/xml/v4/AnnotationDeserializer.java | 4 +- .../edm/xml/v4/AnnotationsDeserializer.java | 2 +- .../core/edm/xml/v4/FunctionDeserializer.java | 2 +- .../xml/v4/NavigationPropertyDeserializer.java | 2 +- .../core/edm/xml/v4/ReferenceDeserializer.java | 2 +- .../core/edm/xml/v4/ReturnTypeDeserializer.java | 2 +- .../core/edm/xml/v4/SingletonDeserializer.java | 2 +- .../core/edm/xml/v4/TermDeserializer.java | 2 +- .../edm/xml/v4/TypeDefinitionDeserializer.java | 2 +- .../xml/v4/annotation/ApplyDeserializer.java | 2 +- .../edm/xml/v4/annotation/CastDeserializer.java | 2 +- .../v4/annotation/CollectionDeserializer.java | 2 +- .../DynExprConstructDeserializer.java | 2 +- .../edm/xml/v4/annotation/IsOfDeserializer.java | 2 +- .../annotation/LabeledElementDeserializer.java | 2 +- .../edm/xml/v4/annotation/NullDeserializer.java | 2 +- .../annotation/PropertyValueDeserializer.java | 2 +- .../xml/v4/annotation/RecordDeserializer.java | 2 +- .../xml/v4/annotation/UrlRefDeserializer.java | 2 +- .../client/core/op/AbstractODataBinder.java | 405 +++++ .../client/core/op/AbstractODataReader.java | 117 ++ .../olingo/client/core/op/ODataWriterImpl.java | 102 ++ .../core/op/impl/AbstractEdmDeserializer.java | 71 - .../core/op/impl/AbstractJacksonTool.java | 85 -- .../core/op/impl/AbstractODataBinder.java | 582 ------- .../core/op/impl/AbstractODataDeserializer.java | 178 --- .../core/op/impl/AbstractODataReader.java | 138 -- .../core/op/impl/AbstractODataSerializer.java | 161 -- .../core/op/impl/ComplexTypeDeserializer.java | 83 - .../op/impl/EntityContainerDeserializer.java | 102 -- .../core/op/impl/EntityKeyDeserializer.java | 50 - .../core/op/impl/EntitySetDeserializer.java | 70 - .../core/op/impl/EntityTypeDeserializer.java | 92 -- .../core/op/impl/EnumTypeDeserializer.java | 73 - .../op/impl/InjectableSerializerProvider.java | 43 - .../client/core/op/impl/ODataV3BinderImpl.java | 37 - .../core/op/impl/ODataV3DeserializerImpl.java | 70 - .../client/core/op/impl/ODataV3ReaderImpl.java | 48 - .../core/op/impl/ODataV3SerializerImpl.java | 32 - .../client/core/op/impl/ODataV4BinderImpl.java | 62 - .../core/op/impl/ODataV4DeserializerImpl.java | 71 - .../client/core/op/impl/ODataV4ReaderImpl.java | 48 - .../core/op/impl/ODataV4SerializerImpl.java | 32 - .../client/core/op/impl/SchemaDeserializer.java | 149 -- .../client/core/op/impl/v3/ODataBinderImpl.java | 42 + .../core/op/impl/v3/ODataDeserializerImpl.java | 67 + .../client/core/op/impl/v3/ODataReaderImpl.java | 66 + .../core/op/impl/v3/ODataSerializerImpl.java | 32 + .../client/core/op/impl/v4/ODataBinderImpl.java | 59 + .../core/op/impl/v4/ODataDeserializerImpl.java | 58 + .../client/core/op/impl/v4/ODataReaderImpl.java | 49 + .../core/op/impl/v4/ODataSerializerImpl.java | 32 + .../core/uri/AbstractComparingFilter.java | 45 + .../core/uri/AbstractFilterArgFactory.java | 178 +++ .../client/core/uri/AbstractFilterFactory.java | 108 ++ .../client/core/uri/AbstractURIBuilder.java | 8 +- .../olingo/client/core/uri/AndFilter.java | 42 + .../apache/olingo/client/core/uri/EqFilter.java | 33 + .../olingo/client/core/uri/FilterConst.java | 40 + .../olingo/client/core/uri/FilterFunction.java | 48 + .../olingo/client/core/uri/FilterLambda.java | 46 + .../olingo/client/core/uri/FilterLiteral.java | 40 + .../apache/olingo/client/core/uri/FilterOp.java | 45 + .../olingo/client/core/uri/FilterProperty.java | 40 + .../apache/olingo/client/core/uri/GeFilter.java | 33 + .../apache/olingo/client/core/uri/GtFilter.java | 33 + .../olingo/client/core/uri/HasFilter.java | 34 + .../apache/olingo/client/core/uri/LeFilter.java | 33 + .../apache/olingo/client/core/uri/LtFilter.java | 33 + .../olingo/client/core/uri/MatchFilter.java | 36 + .../apache/olingo/client/core/uri/NeFilter.java | 33 + .../olingo/client/core/uri/NotFilter.java | 35 + .../apache/olingo/client/core/uri/OrFilter.java | 42 + .../apache/olingo/client/core/uri/URIUtils.java | 64 +- .../client/core/uri/V3URIBuilderImpl.java | 94 -- .../client/core/uri/V4URIBuilderImpl.java | 101 -- .../uri/filter/AbstractComparingFilter.java | 45 - .../uri/filter/AbstractFilterArgFactory.java | 178 --- .../core/uri/filter/AbstractFilterFactory.java | 108 -- .../client/core/uri/filter/AndFilter.java | 42 - .../olingo/client/core/uri/filter/EqFilter.java | 33 - .../client/core/uri/filter/FilterConst.java | 41 - .../client/core/uri/filter/FilterFunction.java | 48 - .../client/core/uri/filter/FilterLambda.java | 46 - .../client/core/uri/filter/FilterLiteral.java | 41 - .../olingo/client/core/uri/filter/FilterOp.java | 45 - .../client/core/uri/filter/FilterProperty.java | 40 - .../olingo/client/core/uri/filter/GeFilter.java | 33 - .../olingo/client/core/uri/filter/GtFilter.java | 33 - .../client/core/uri/filter/HasFilter.java | 34 - .../olingo/client/core/uri/filter/LeFilter.java | 33 - .../olingo/client/core/uri/filter/LtFilter.java | 33 - .../client/core/uri/filter/MatchFilter.java | 36 - .../olingo/client/core/uri/filter/NeFilter.java | 33 - .../client/core/uri/filter/NotFilter.java | 35 - .../olingo/client/core/uri/filter/OrFilter.java | 42 - .../core/uri/filter/V3FilterArgFactoryImpl.java | 31 - .../core/uri/filter/V3FilterFactoryImpl.java | 33 - .../core/uri/filter/V4FilterArgFactoryImpl.java | 107 -- .../core/uri/filter/V4FilterFactoryImpl.java | 46 - .../core/uri/v3/FilterArgFactoryImpl.java | 33 + .../client/core/uri/v3/FilterFactoryImpl.java | 34 + .../client/core/uri/v3/URIBuilderImpl.java | 96 ++ .../core/uri/v4/FilterArgFactoryImpl.java | 110 ++ .../client/core/uri/v4/FilterFactoryImpl.java | 49 + .../client/core/uri/v4/URIBuilderImpl.java | 102 ++ .../client/core/v3/ConfigurationImpl.java | 58 + .../olingo/client/core/v3/ODataClientImpl.java | 150 ++ .../client/core/v4/ConfigurationImpl.java | 32 + .../olingo/client/core/v4/ODataClientImpl.java | 149 ++ .../client/core/xml/AbstractDOMParser.java | 46 - .../client/core/xml/AndroidDOMParserImpl.java | 53 - .../client/core/xml/DefaultDOMParserImpl.java | 78 - .../olingo/client/core/xml/XMLParser.java | 37 - .../client/core/AbstractPrimitiveTest.java | 429 ++++++ .../client/core/AbstractPropertyTest.java | 175 +++ .../apache/olingo/client/core/AbstractTest.java | 25 +- .../olingo/client/core/AtomLinksQualifier.java | 40 + .../olingo/client/core/ODataClientTest.java | 4 +- .../deserializer/JsonReaderPerformance.java | 76 - .../core/deserializer/JsonReaderTest.java | 372 ----- .../core/it/AbstractMetadataTestITCase.java | 31 + .../client/core/it/AbstractTestITCase.java | 550 +++++++ .../client/core/it/v3/AbstractTestITCase.java | 52 + .../core/it/v3/ActionOverloadingTestITCase.java | 133 ++ .../client/core/it/v3/AsyncTestITCase.java | 134 ++ .../it/v3/AuthEntityRetrieveTestITCase.java | 54 + .../client/core/it/v3/BatchTestITCase.java | 406 +++++ .../client/core/it/v3/CountTestITCase.java | 60 + .../core/it/v3/EntityCreateTestITCase.java | 485 ++++++ .../core/it/v3/EntityRetrieveTestITCase.java | 239 +++ .../client/core/it/v3/EntitySetTestITCase.java | 149 ++ .../core/it/v3/EntityUpdateTestITCase.java | 241 +++ .../client/core/it/v3/ErrorTestITCase.java | 172 +++ .../core/it/v3/FilterFactoryTestITCase.java | 167 ++ .../client/core/it/v3/FilterTestITCase.java | 94 ++ .../client/core/it/v3/InvokeTestITCase.java | 275 ++++ .../core/it/v3/KeyAsSegmentTestITCase.java | 110 ++ .../client/core/it/v3/LinkTestITCase.java | 177 +++ .../core/it/v3/MediaEntityTestITCase.java | 187 +++ .../client/core/it/v3/MetadataTestITCase.java | 41 + .../it/v3/NavigationLinkCreateTestITCase.java | 521 +++++++ .../client/core/it/v3/OpenTypeTestITCase.java | 266 ++++ .../core/it/v3/PrimitiveKeysTestITCase.java | 69 + .../core/it/v3/PropertyRetrieveTestITCase.java | 277 ++++ .../client/core/it/v3/PropertyTestITCase.java | 355 +++++ .../core/it/v3/PropertyValueTestITCase.java | 166 ++ .../core/it/v3/QueryOptionsTestITCase.java | 199 +++ .../v3/ServiceDocumentRetrieveTestITCase.java | 73 + .../core/it/v3/ServiceDocumentTestITCase.java | 56 + .../v3/XHTTPMethodEntityUpdateTestITCase.java | 38 + .../v3/XHTTPMethodPropertyUpdateTestITCase.java | 38 + .../client/core/it/v4/AbstractTestITCase.java | 52 + .../client/core/it/v4/EntitySetTestITCase.java | 155 ++ .../client/core/it/v4/MetadataTestITCase.java | 41 + .../apache/olingo/client/core/v3/AtomTest.java | 132 ++ .../olingo/client/core/v3/EntitySetTest.java | 63 + .../olingo/client/core/v3/EntityTest.java | 189 +++ .../apache/olingo/client/core/v3/ErrorTest.java | 74 + .../client/core/v3/FilterFactoryTest.java | 14 +- .../apache/olingo/client/core/v3/JSONTest.java | 106 ++ .../olingo/client/core/v3/MetadataTest.java | 17 +- .../client/core/v3/PrimitiveValueTest.java | 569 +++++++ .../client/core/v3/ServiceDocumentTest.java | 8 +- .../olingo/client/core/v3/URIBuilderTest.java | 18 +- .../client/core/v4/FilterFactoryTest.java | 17 +- .../olingo/client/core/v4/MetadataTest.java | 13 +- .../client/core/v4/PrimitiveValueTest.java | 73 + .../client/core/v4/ServiceDocumentTest.java | 8 +- .../olingo/client/core/v4/URIBuilderTest.java | 22 +- .../src/test/resources/complexProperty.json | 8 - .../src/test/resources/fullEntity.json | 22 - .../src/test/resources/fullEntitySet.json | 29 - .../resources/fullEntitySetWithTwoEntities.json | 49 - ...fullEntityWithCollectionOfComplexValues.json | 28 - .../src/test/resources/minimalEntity.json | 21 - .../apache/olingo/client/core/atom_cleanup.xsl | 48 + .../core/v3/AllGeoTypesSet_-10_GeogLine.json | 1 + .../core/v3/AllGeoTypesSet_-10_GeogLine.xml | 22 + .../core/v3/AllGeoTypesSet_-10_GeogPoint.json | 1 + .../core/v3/AllGeoTypesSet_-10_GeogPoint.xml | 22 + .../client/core/v3/AllGeoTypesSet_-10_Geom.json | 1 + .../client/core/v3/AllGeoTypesSet_-10_Geom.xml | 33 + .../v3/AllGeoTypesSet_-3_GeomMultiPolygon.json | 1 + .../v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml | 61 + .../client/core/v3/AllGeoTypesSet_-5.json | 1 + .../olingo/client/core/v3/AllGeoTypesSet_-5.xml | 181 +++ .../v3/AllGeoTypesSet_-5_GeogCollection.json | 1 + .../v3/AllGeoTypesSet_-5_GeogCollection.xml | 39 + .../core/v3/AllGeoTypesSet_-5_GeogPolygon.json | 1 + .../core/v3/AllGeoTypesSet_-5_GeogPolygon.xml | 38 + .../v3/AllGeoTypesSet_-6_GeomMultiLine.json | 1 + .../core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml | 42 + .../v3/AllGeoTypesSet_-7_GeomMultiPoint.json | 1 + .../v3/AllGeoTypesSet_-7_GeomMultiPoint.xml | 34 + .../client/core/v3/AllGeoTypesSet_-8.json | 1 + .../olingo/client/core/v3/AllGeoTypesSet_-8.xml | 177 +++ .../v3/AllGeoTypesSet_-8_GeomCollection.json | 1 + .../v3/AllGeoTypesSet_-8_GeomCollection.xml | 38 + .../apache/olingo/client/core/v3/Car_16.json | 1 + .../org/apache/olingo/client/core/v3/Car_16.xml | 48 + .../client/core/v3/ComputerDetail_-10.json | 1 + .../client/core/v3/ComputerDetail_-10.xml | 22 + .../apache/olingo/client/core/v3/Customer.json | 3 + .../apache/olingo/client/core/v3/Customer.xml | 22 + .../olingo/client/core/v3/Customer_-10.json | 1 + .../olingo/client/core/v3/Customer_-10.xml | 528 +++++++ .../core/v3/Customer_-10_BackupContactInfo.json | 1 + .../core/v3/Customer_-10_BackupContactInfo.xml | 22 + .../client/core/v3/Customer_-10_CustomerId.json | 1 + .../client/core/v3/Customer_-10_CustomerId.xml | 22 + .../core/v3/Customer_-10_CustomerId_value.txt | 1 + .../v3/Customer_-10_PrimaryContactInfo.json | 1 + .../core/v3/Customer_-10_PrimaryContactInfo.xml | 22 + ...a4af-4bbd-bf0a-2b2c22635565'_Attachment.json | 1 + ...-a4af-4bbd-bf0a-2b2c22635565'_Attachment.xml | 22 + ...af-4bbd-bf0a-2b2c22635565'_AttachmentId.json | 1 + ...4af-4bbd-bf0a-2b2c22635565'_AttachmentId.xml | 22 + .../client/core/v3/PersonDetails_0_Person.json | 1 + .../client/core/v3/PersonDetails_0_Person.xml | 75 + ..._-10_ComplexConcurrency_QueriedDateTime.json | 1 + ...t_-10_ComplexConcurrency_QueriedDateTime.xml | 22 + .../core/v3/Product_-10_Dimensions_Width.json | 1 + .../core/v3/Product_-10_Dimensions_Width.xml | 22 + .../client/core/v3/Product_-9_Description.json | 1 + .../client/core/v3/Product_-9_Description.xml | 22 + .../client/core/v3/Products_0_Categories.json | 1 + .../client/core/v3/Products_0_Categories.xml | 79 + .../olingo/client/core/v3/Products_1.json | 1 + .../apache/olingo/client/core/v3/Products_1.xml | 51 + .../core/v3/Products_1_DiscontinuedDate.json | 1 + .../core/v3/Products_1_DiscontinuedDate.xml | 24 + .../org/apache/olingo/client/core/v3/error.json | 9 + .../org/apache/olingo/client/core/v3/error.xml | 25 + .../apache/olingo/client/core/v3/metadata.xml | 701 +-------- .../olingo/client/core/v3/stacktrace.json | 14 + .../apache/olingo/client/core/v3/stacktrace.xml | 35 + .../olingo/client/core/v4/complexProperty.json | 8 + .../olingo/client/core/v4/fullEntity.json | 22 + .../olingo/client/core/v4/fullEntitySet.json | 29 + .../core/v4/fullEntitySetWithTwoEntities.json | 49 + ...fullEntityWithCollectionOfComplexValues.json | 28 + .../olingo/client/core/v4/minimalEntity.json | 21 + .../client/core/v4/primitiveNullValue.json | 3 + .../client/core/v4/setOfComplexProperties.json | 13 + .../core/v4/setOfPrimitiveProperties.json | 8 + .../src/test/resources/primitiveNullValue.json | 3 - lib/client-core/src/test/resources/sample.png | Bin 0 -> 25566 bytes .../test/resources/setOfComplexProperties.json | 13 - .../resources/setOfPrimitiveProperties.json | 8 - lib/commons-api/pom.xml | 16 +- .../apache/olingo/commons/api/Constants.java | 243 +++ .../commons/api/data/CollectionValue.java | 27 + .../olingo/commons/api/data/ComplexValue.java | 27 + .../apache/olingo/commons/api/data/Entry.java | 167 ++ .../apache/olingo/commons/api/data/Feed.java | 75 + .../olingo/commons/api/data/GeoUtils.java | 90 ++ .../commons/api/data/GeospatialValue.java | 28 + .../apache/olingo/commons/api/data/Link.java | 121 ++ .../olingo/commons/api/data/NullValue.java | 26 + .../olingo/commons/api/data/PrimitiveValue.java | 25 + .../olingo/commons/api/data/Property.java | 34 + .../apache/olingo/commons/api/data/Value.java | 44 + .../commons/api/data/v3/LinkCollection.java | 52 + .../commons/api/domain/AbstractODataValue.java | 127 ++ .../api/domain/ODataCollectionValue.java | 98 ++ .../commons/api/domain/ODataComplexValue.java | 97 ++ .../olingo/commons/api/domain/ODataEntity.java | 316 ++++ .../commons/api/domain/ODataEntitySet.java | 120 ++ .../olingo/commons/api/domain/ODataError.java | 67 + .../api/domain/ODataGeospatialValue.java | 57 + .../commons/api/domain/ODataInlineEntity.java | 74 + .../api/domain/ODataInlineEntitySet.java | 74 + .../commons/api/domain/ODataInvokeResult.java | 30 + .../olingo/commons/api/domain/ODataItem.java | 111 ++ .../olingo/commons/api/domain/ODataLink.java | 190 +++ .../commons/api/domain/ODataLinkType.java | 93 ++ .../commons/api/domain/ODataObjectFactory.java | 218 +++ .../commons/api/domain/ODataOperation.java | 88 ++ .../commons/api/domain/ODataPrimitiveValue.java | 67 + .../commons/api/domain/ODataProperty.java | 186 +++ .../commons/api/domain/ODataPropertyType.java | 40 + .../api/domain/ODataServiceDocument.java | 183 +++ .../olingo/commons/api/domain/ODataValue.java | 84 + .../org/apache/olingo/commons/api/edm/Edm.java | 161 +- .../olingo/commons/api/edm/EdmActionImport.java | 2 +- .../commons/api/edm/EdmGeospatialType.java | 34 + .../commons/api/edm/EdmPrimitiveTypeKind.java | 139 ++ .../api/edm/constants/ODataServiceVersion.java | 8 +- .../commons/api/edm/geo/ComposedGeospatial.java | 78 + .../olingo/commons/api/edm/geo/Geospatial.java | 169 ++ .../api/edm/geo/GeospatialCollection.java | 48 + .../olingo/commons/api/edm/geo/LineString.java | 38 + .../commons/api/edm/geo/MultiLineString.java | 39 + .../olingo/commons/api/edm/geo/MultiPoint.java | 39 + .../commons/api/edm/geo/MultiPolygon.java | 38 + .../olingo/commons/api/edm/geo/Point.java | 77 + .../olingo/commons/api/edm/geo/Polygon.java | 73 + .../olingo/commons/api/format/ContentType.java | 47 + .../olingo/commons/api/format/Format.java | 26 + .../olingo/commons/api/format/ODataFormat.java | 102 ++ .../commons/api/format/ODataMediaFormat.java | 76 + .../commons/api/format/ODataPubFormat.java | 121 ++ .../commons/api/format/ODataValueFormat.java | 81 + .../commons/api/op/CommonODataDeserializer.java | 71 + .../olingo/commons/api/op/ODataSerializer.java | 100 ++ lib/commons-core/pom.xml | 112 +- .../commons/core/data/AbstractAtomDealer.java | 87 ++ .../commons/core/data/AbstractAtomObject.java | 78 + .../olingo/commons/core/data/AbstractEntry.java | 159 ++ .../core/data/AbstractJsonDeserializer.java | 175 +++ .../core/data/AbstractJsonSerializer.java | 94 ++ .../core/data/AbstractPayloadObject.java | 48 + .../commons/core/data/AbstractPropertyImpl.java | 80 + .../olingo/commons/core/data/AbstractValue.java | 98 ++ .../commons/core/data/AtomDeserializer.java | 368 +++++ .../olingo/commons/core/data/AtomEntryImpl.java | 25 + .../olingo/commons/core/data/AtomFeedImpl.java | 66 + .../core/data/AtomGeoValueDeserializer.java | 261 ++++ .../core/data/AtomGeoValueSerializer.java | 221 +++ .../core/data/AtomPropertyDeserializer.java | 218 +++ .../commons/core/data/AtomPropertyImpl.java | 25 + .../core/data/AtomPropertySerializer.java | 88 ++ .../commons/core/data/AtomSerializer.java | 264 ++++ .../commons/core/data/CollectionValueImpl.java | 40 + .../commons/core/data/ComplexValueImpl.java | 40 + .../commons/core/data/GeospatialValueImpl.java | 42 + .../core/data/JSONEntryDeserializer.java | 241 +++ .../olingo/commons/core/data/JSONEntryImpl.java | 92 ++ .../commons/core/data/JSONEntrySerializer.java | 120 ++ .../commons/core/data/JSONErrorBundle.java | 50 + .../olingo/commons/core/data/JSONErrorImpl.java | 237 +++ .../commons/core/data/JSONFeedDeserializer.java | 68 + .../olingo/commons/core/data/JSONFeedImpl.java | 113 ++ .../commons/core/data/JSONFeedSerializer.java | 57 + .../core/data/JSONGeoValueDeserializer.java | 273 ++++ .../core/data/JSONGeoValueSerializer.java | 183 +++ .../core/data/JSONPropertyDeserializer.java | 71 + .../commons/core/data/JSONPropertyImpl.java | 53 + .../core/data/JSONPropertySerializer.java | 59 + .../olingo/commons/core/data/LinkImpl.java | 112 ++ .../olingo/commons/core/data/NullValueImpl.java | 35 + .../core/data/ODataJacksonDeserializer.java | 44 + .../core/data/ODataJacksonSerializer.java | 45 + .../commons/core/data/PrimitiveValueImpl.java | 41 + .../olingo/commons/core/data/XMLErrorImpl.java | 213 +++ .../core/data/v3/JSONLinkCollectionImpl.java | 118 ++ .../core/data/v3/XMLLinkCollectionImpl.java | 70 + .../core/edm/AbstractEdmComplexType.java | 39 +- .../core/edm/AbstractEdmEntityContainer.java | 176 +-- .../commons/core/edm/AbstractEdmOperation.java | 131 +- .../core/edm/AbstractEdmOperationImport.java | 65 +- .../commons/core/edm/AbstractEdmParameter.java | 5 +- .../commons/core/edm/AbstractEdmProperty.java | 5 +- .../commons/core/edm/AbstractEdmReturnType.java | 5 +- .../core/edm/AbstractEdmStructuredType.java | 159 +- .../olingo/commons/core/edm/EdmNamedImpl.java | 21 +- .../olingo/commons/core/edm/EdmTypeImpl.java | 31 +- .../olingo/commons/core/edm/EdmTypeInfo.java | 184 +++ .../AbstractEdmGeospatialType.java | 76 + .../commons/core/edm/primitivetype/EdmDate.java | 5 +- .../core/edm/primitivetype/EdmDateTime.java | 137 ++ .../edm/primitivetype/EdmDateTimeOffset.java | 68 +- .../core/edm/primitivetype/EdmGeography.java | 36 + .../primitivetype/EdmGeographyCollection.java | 37 + .../primitivetype/EdmGeographyLineString.java | 37 + .../EdmGeographyMultiLineString.java | 37 + .../primitivetype/EdmGeographyMultiPoint.java | 37 + .../primitivetype/EdmGeographyMultiPolygon.java | 37 + .../edm/primitivetype/EdmGeographyPoint.java | 37 + .../edm/primitivetype/EdmGeographyPolygon.java | 37 + .../core/edm/primitivetype/EdmGeometry.java | 36 + .../primitivetype/EdmGeometryCollection.java | 37 + .../primitivetype/EdmGeometryLineString.java | 37 + .../EdmGeometryMultiLineString.java | 37 + .../primitivetype/EdmGeometryMultiPoint.java | 37 + .../primitivetype/EdmGeometryMultiPolygon.java | 37 + .../edm/primitivetype/EdmGeometryPoint.java | 37 + .../edm/primitivetype/EdmGeometryPolygon.java | 37 + .../commons/core/edm/primitivetype/EdmNull.java | 75 - .../primitivetype/EdmPrimitiveTypeFactory.java | 138 ++ .../edm/primitivetype/EdmPrimitiveTypeKind.java | 95 -- .../core/edm/primitivetype/EdmStream.java | 88 ++ .../commons/core/edm/primitivetype/EdmTime.java | 77 + .../core/edm/primitivetype/EdmTimeOfDay.java | 45 +- .../commons/core/op/AbstractJacksonTool.java | 83 + .../core/op/AbstractODataDeserializer.java | 106 ++ .../core/op/AbstractODataSerializer.java | 141 ++ .../core/op/InjectableSerializerProvider.java | 43 + .../commons/core/op/ODataObjectFactoryImpl.java | 162 ++ .../olingo/commons/core/op/ResourceFactory.java | 125 ++ .../primitivetype/CommonPrimitiveTypeTest.java | 191 ++- .../core/edm/primitivetype/EdmBinaryTest.java | 30 +- .../core/edm/primitivetype/EdmBooleanTest.java | 4 +- .../core/edm/primitivetype/EdmByteTest.java | 5 +- .../core/edm/primitivetype/EdmDateTest.java | 4 +- .../primitivetype/EdmDateTimeOffsetTest.java | 4 +- .../core/edm/primitivetype/EdmDecimalTest.java | 19 +- .../core/edm/primitivetype/EdmDoubleTest.java | 17 +- .../core/edm/primitivetype/EdmDurationTest.java | 4 +- .../core/edm/primitivetype/EdmGuidTest.java | 4 +- .../core/edm/primitivetype/EdmInt16Test.java | 9 +- .../core/edm/primitivetype/EdmInt32Test.java | 11 +- .../core/edm/primitivetype/EdmInt64Test.java | 13 +- .../core/edm/primitivetype/EdmNullTest.java | 24 +- .../core/edm/primitivetype/EdmSByteTest.java | 5 +- .../core/edm/primitivetype/EdmSingleTest.java | 15 +- .../core/edm/primitivetype/EdmStringTest.java | 4 +- .../edm/primitivetype/EdmTimeOfDayTest.java | 4 +- .../core/edm/primitivetype/UInt7Test.java | 6 +- lib/server-core/pom.xml | 38 +- .../core/edm/provider/EdmEnumTypeImpl.java | 9 +- .../edm/provider/EdmTypeDefinitionImpl.java | 9 +- .../core/uri/UriResourceLambdaAllImpl.java | 16 +- .../core/uri/UriResourceLambdaAnyImpl.java | 15 +- .../olingo/server/core/uri/parser/Parser.java | 1 - .../server/core/uri/parser/UriContext.java | 4 - .../core/uri/parser/UriParseTreeVisitor.java | 302 ++-- .../core/uri/queryoption/ExpandItemImpl.java | 1 - .../edm/provider/EdmComplexTypeImplTest.java | 13 +- .../edm/provider/EdmEntityTypeImplTest.java | 14 +- .../server/core/edm/provider/EdmEnumTest.java | 9 +- .../edm/provider/EdmFunctionImportImplTest.java | 31 +- .../core/edm/provider/EdmParameterImplTest.java | 6 +- .../core/edm/provider/EdmPropertyImplTest.java | 4 +- .../edm/provider/EdmReturnTypeImplTest.java | 9 +- .../edm/provider/EdmTypeDefinitionImplTest.java | 23 +- .../server/core/testutil/EdmTechProvider.java | 2 +- .../server/core/uri/UriResourceImplTest.java | 43 +- .../core/uri/testutil/ExpandValidator.java | 1 - .../core/uri/testutil/ResourceValidator.java | 1 - pom.xml | 157 +- 962 files changed, 72675 insertions(+), 13952 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b2508035/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java ----------------------------------------------------------------------
