You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/03/20 11:26:57 UTC

[03/21] git commit: Merge branch 'olingo200' of https://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4 into olingo200

Merge branch 'olingo200' of https://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4 into olingo200


Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/cb07ded0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/cb07ded0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/cb07ded0

Branch: refs/heads/olingo200
Commit: cb07ded0cb722f9e57492cf0fdf04e58aa5cbcc3
Parents: c602ba8 a835edd
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 14 18:38:10 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 14 18:38:10 2014 +0100

----------------------------------------------------------------------
 .../org/apache/olingo/fit/AbstractServices.java | 151 ++++--
 .../olingo/fit/utils/AbstractUtilities.java     |   4 +
 .../org/apache/olingo/fit/utils/Constants.java  |   2 +-
 .../apache/olingo/fit/utils/JSONUtilities.java  |  11 +
 .../apache/olingo/fit/utils/XMLUtilities.java   |  21 +-
 .../main/resources/v3/Car/14/entity.full.json   |   4 +-
 fit/src/main/resources/v3/Car/14/entity.xml     |   4 +-
 .../main/resources/v3/Car/16/entity.full.json   |   4 +-
 fit/src/main/resources/v3/Car/16/entity.xml     |   4 +-
 fit/src/main/resources/v3/Car/feed.full.json    |  50 +-
 fit/src/main/resources/v3/Car/feed.xml          |  52 +-
 .../v3/Car/filter/((1 add VIN) eq 16).full.json |   2 +-
 .../v3/Car/filter/((1 add VIN) eq 16).xml       |   6 +-
 .../v3/Car/filter/((VIN add 1) eq 16).full.json |   2 +-
 .../v3/Car/filter/((VIN add 1) eq 16).xml       |   6 +-
 .../((VIN lt 16) and (VIN gt 12)).full.json     |   2 +-
 .../filter/((VIN lt 16) and (VIN gt 12)).xml    |  10 +-
 .../v3/Car/filter/(16 eq (1 add VIN)).full.json |   2 +-
 .../v3/Car/filter/(16 eq (1 add VIN)).xml       |   6 +-
 .../v3/Car/filter/(VIN lt 16).full.json         |   2 +-
 .../resources/v3/Car/filter/(VIN lt 16).xml     |  14 +-
 ...ngth(Description) gt (VIN add 10)).full.json |   2 +-
 .../(length(Description) gt (VIN add 10)).xml   |  14 +-
 .../v3/Car/filter/VIN add 5 lt 11.full.json     |   2 +-
 .../resources/v3/Car/filter/VIN add 5 lt 11.xml |   2 +-
 .../v3/Car/filter/VIN div 2 le 8.full.json      |   2 +-
 .../resources/v3/Car/filter/VIN div 2 le 8.xml  |   2 +-
 .../filter/VIN le 18 and VIN gt 12.full.json    |   2 +-
 .../v3/Car/filter/VIN le 18 and VIN gt 12.xml   |   2 +-
 .../v3/Car/filter/VIN mul 2 le 30.full.json     |   2 +-
 .../resources/v3/Car/filter/VIN mul 2 le 30.xml |   2 +-
 ...not (((VIN ge 16) or (VIN le 12))).full.json |   2 +-
 .../not (((VIN ge 16) or (VIN le 12))).xml      |  10 +-
 .../startswith(Description,'cen').full.json     |   2 +-
 .../filter/startswith(Description,'cen').xml    |   6 +-
 .../VIN desc/filter/(VIN lt 16).full.json       |  12 +-
 .../Car/orderby/VIN desc/filter/(VIN lt 16).xml |  14 +-
 .../v3/ComputerDetail/-10/entity.full.json      |   6 +-
 .../resources/v3/ComputerDetail/-10/entity.xml  |   6 +-
 .../(month(PurchaseDate) eq 12).full.json       |   2 +-
 .../filter/(month(PurchaseDate) eq 12).xml      |   8 +-
 .../filter/day(PurchaseDate) eq 15.full.json    |   2 +-
 .../filter/day(PurchaseDate) eq 15.xml          |   2 +-
 .../filter/hour(PurchaseDate) eq 1.full.json    |   2 +-
 .../filter/hour(PurchaseDate) eq 1.xml          |   2 +-
 .../filter/minute(PurchaseDate) eq 33.full.json |   2 +-
 .../filter/minute(PurchaseDate) eq 33.xml       |   2 +-
 .../filter/month(PurchaseDate) eq 12.full.json  |   2 +-
 .../filter/month(PurchaseDate) eq 12.xml        |   2 +-
 .../filter/second(PurchaseDate) eq 35.full.json |   2 +-
 .../filter/second(PurchaseDate) eq 35.xml       |   2 +-
 .../filter/year(PurchaseDate) eq 2020.full.json |   2 +-
 .../filter/year(PurchaseDate) eq 2020.xml       |   2 +-
 .../resources/v3/Customer/-10/entity.full.json  |   4 +-
 .../main/resources/v3/Customer/-10/entity.xml   |   4 +-
 .../v3/Customer/-10/links/Info.full.json        |   4 +-
 .../resources/v3/Customer/-10/links/Info.xml    |   2 +-
 .../v3/Customer/-10/links/Logins('3').full.json |   4 +-
 .../v3/Customer/-10/links/Logins.full.json      |   6 +-
 .../resources/v3/Customer/-10/links/Logins.xml  |   4 +-
 .../v3/Customer/-10/links/Orders(-10).full.json |   4 +-
 .../v3/Customer/-10/links/Orders.full.json      |   8 +-
 .../resources/v3/Customer/-10/links/Orders.xml  |   6 +-
 .../main/resources/v3/Customer/-7/entity.xml    |   4 +-
 .../main/resources/v3/Customer/feed.full.json   |   6 +-
 fit/src/main/resources/v3/Customer/feed.xml     |  10 +-
 ....PhoneNumber,'ODataJClient') eq 1).full.json |   2 +-
 ...ePhone.PhoneNumber,'ODataJClient') eq 1).xml |   4 +-
 ...ne.PhoneNumber,'lccvussrv') ne -1).full.json |   2 +-
 ...omePhone.PhoneNumber,'lccvussrv') ne -1).xml |  10 +-
 .../Customer/filter/CustomerId eq -10.full.json |   4 +-
 .../v3/Customer/filter/CustomerId eq -10.xml    |   6 +-
 .../Customer/filter/CustomerId gt -10.full.json |   2 +-
 .../v3/Customer/filter/CustomerId gt -10.xml    |  10 +-
 .../Customer/filter/CustomerId lt -10.full.json |   2 +-
 .../v3/Customer/filter/CustomerId lt -10.xml    |   4 +-
 .../isof(Name,'Edm.String') eq true.full.json   |   2 +-
 .../filter/isof(Name,'Edm.String') eq true.xml  |  10 +-
 .../not endswith(Name,'Chandan').full.json      |   2 +-
 .../filter/not endswith(Name,'Chandan').xml     |  10 +-
 .../v3/Customer/skiptoken/-1.full.json          |   2 +-
 .../main/resources/v3/Customer/skiptoken/-1.xml |   4 +-
 .../v3/Customer/skiptoken/-10.full.json         |   6 +-
 .../resources/v3/Customer/skiptoken/-10.xml     |  10 +-
 .../v3/Customer/skiptoken/-3.full.json          |   6 +-
 .../main/resources/v3/Customer/skiptoken/-3.xml |  10 +-
 .../v3/Customer/skiptoken/-5.full.json          |   6 +-
 .../main/resources/v3/Customer/skiptoken/-5.xml |  10 +-
 .../v3/Customer/skiptoken/-7.full.json          |   6 +-
 .../main/resources/v3/Customer/skiptoken/-7.xml |  10 +-
 .../v3/Customer/skiptoken/-9.full.json          |   6 +-
 .../main/resources/v3/Customer/skiptoken/-9.xml |  10 +-
 .../v3/CustomerInfo/11/entity.full.json         |   4 +-
 .../resources/v3/CustomerInfo/11/entity.xml     |   4 +-
 .../v3/CustomerInfo/12/entity.full.json         |   4 +-
 .../resources/v3/CustomerInfo/12/entity.xml     |   4 +-
 .../v3/EdmBooleanSet/true/entity.full.json      |   2 +-
 .../resources/v3/EdmBooleanSet/true/entity.xml  |   4 +-
 .../v3/EdmByteSet/255/entity.full.json          |   2 +-
 .../main/resources/v3/EdmByteSet/255/entity.xml |   4 +-
 .../entity.full.json                            |   2 +-
 .../79228162514264337593543950335M/entity.xml   |   4 +-
 .../1.7976931348623157E308D/entity.full.json    |   2 +-
 .../1.7976931348623157E308D/entity.xml          |   4 +-
 .../entity.full.json                            |   2 +-
 .../entity.xml                                  |   4 +-
 .../v3/EdmInt16Set/32767/entity.full.json       |   2 +-
 .../resources/v3/EdmInt16Set/32767/entity.xml   |   4 +-
 .../v3/EdmInt32Set/-2147483648/entity.full.json |   2 +-
 .../v3/EdmInt32Set/-2147483648/entity.xml       |   4 +-
 .../9223372036854775807L/entity.full.json       |   2 +-
 .../EdmInt64Set/9223372036854775807L/entity.xml |   4 +-
 .../EdmSingleSet/3.4028235E38f/entity.full.json |   2 +-
 .../v3/EdmSingleSet/3.4028235E38f/entity.xml    |   4 +-
 .../v3/EdmStringSet/'$'/entity.full.json        |   2 +-
 .../resources/v3/EdmStringSet/'$'/entity.xml    |   4 +-
 .../entity.full.json                            |   2 +-
 .../entity.xml                                  |   4 +-
 .../v3/InStreamErrorGetCustomer.full.json       |   2 +-
 .../resources/v3/InStreamErrorGetCustomer.xml   |   6 +-
 .../resources/v3/Login/'3'/entity.full.json     |   4 +-
 fit/src/main/resources/v3/Login/'3'/entity.xml  |   4 +-
 .../resources/v3/Message/1 -10/entity.full.json |   4 +-
 .../main/resources/v3/Message/1 -10/entity.xml  |   4 +-
 .../resources/v3/Order/-10/entity.full.json     |   4 +-
 fit/src/main/resources/v3/Order/-10/entity.xml  |   4 +-
 .../main/resources/v3/Order/-7/entity.full.json |   4 +-
 fit/src/main/resources/v3/Order/-7/entity.xml   |   4 +-
 .../main/resources/v3/Order/-9/entity.full.json |   4 +-
 fit/src/main/resources/v3/Order/-9/entity.xml   |   4 +-
 .../v3/OrderLine/-10 -10/entity.full.json       |   4 +-
 .../resources/v3/OrderLine/-10 -10/entity.xml   |   4 +-
 .../filter/PersonId sub 2 lt -10.full.json      |   2 +-
 .../v3/Person/filter/PersonId sub 2 lt -10.xml  |  12 +-
 ...iaDefaultService.SpecialEmployee').full.json |   2 +-
 ....AstoriaDefaultService.SpecialEmployee').xml |  20 +-
 .../resources/v3/Product/-10/entity.full.json   |   6 +-
 .../main/resources/v3/Product/-10/entity.xml    |   6 +-
 .../resources/v3/Product/-6/entity.full.json    |   6 +-
 fit/src/main/resources/v3/Product/-6/entity.xml |   6 +-
 .../resources/v3/Product/-7/entity.full.json    |   6 +-
 fit/src/main/resources/v3/Product/-7/entity.xml |   6 +-
 .../v3/Product/-7/links/Photos.full.json        |   6 +-
 .../resources/v3/Product/-9/entity.full.json    |   6 +-
 fit/src/main/resources/v3/Product/-9/entity.xml |   6 +-
 .../main/resources/v3/Product/feed.full.json    |  42 +-
 fit/src/main/resources/v3/Product/feed.xml      |  44 +-
 .../ceiling(Dimensions.Width) eq 7338.full.json |   2 +-
 .../ceiling(Dimensions.Width) eq 7338.xml       |   8 +-
 ...', newname') eq 'kdcuklu, newname'.full.json |   2 +-
 ...tion, ', newname') eq 'kdcuklu, newname'.xml |   8 +-
 .../floor(Dimensions.Width) eq 7337.full.json   |   2 +-
 .../filter/floor(Dimensions.Width) eq 7337.xml  |   8 +-
 .../indexof(Description, 'k') eq 0.full.json    |   2 +-
 .../filter/indexof(Description, 'k') eq 0.xml   |  12 +-
 .../filter/length(Description) eq 7.full.json   |   2 +-
 .../Product/filter/length(Description) eq 7.xml |   8 +-
 .../round(Dimensions.Width) eq 7338.full.json   |   2 +-
 .../filter/round(Dimensions.Width) eq 7338.xml  |   8 +-
 ...artswith(Description, 'k') eq true.full.json |   2 +-
 .../startswith(Description, 'k') eq true.xml    |  12 +-
 ...of('kdcuklu', Description) eq true.full.json |   2 +-
 ...stringof('kdcuklu', Description) eq true.xml |   8 +-
 .../toupper(Description) eq 'KDCUKLU'.full.json |   2 +-
 .../toupper(Description) eq 'KDCUKLU'.xml       |   8 +-
 .../v3/ProductPhoto/-2 -2/entity.full.json      |   4 +-
 .../resources/v3/ProductPhoto/-2 -2/entity.xml  |   4 +-
 .../v3/ProductPhoto/-3 -3/entity.full.json      |   4 +-
 .../resources/v3/ProductPhoto/-3 -3/entity.xml  |   4 +-
 fit/src/main/resources/v3/services.full.json    |   2 +-
 fit/src/main/resources/v3/services.xml          |   2 +-
 .../olingo/client/api/format/ODataFormat.java   |   6 +-
 .../client/api/format/ODataPubFormat.java       |   6 +-
 .../olingo/client/api/utils/URIUtils.java       |  13 +-
 .../olingo/client/core/data/AtomEntryImpl.java  |   3 +-
 .../client/core/data/JSONFeedDeserializer.java  |   4 +
 .../client/core/op/impl/ResourceFactory.java    |   3 +-
 .../core/it/AbstractMetadataTestITCase.java     |   1 +
 .../client/core/it/AbstractTestITCase.java      |  92 ++--
 .../client/core/it/v3/AbstractV3TestITCase.java |  53 ++
 .../core/it/v3/ActionOverloadingTestITCase.java | 133 +++++
 .../client/core/it/v3/AsyncTestITCase.java      | 135 +++++
 .../it/v3/AuthEntityRetrieveTestITCase.java     |  54 ++
 .../client/core/it/v3/BatchTestITCase.java      | 406 +++++++++++++++
 .../client/core/it/v3/CountTestITCase.java      |  62 +++
 .../core/it/v3/EntityCreateTestITCase.java      | 480 +++++++++++++++++
 .../core/it/v3/EntityRetrieveTestITCase.java    | 240 +++++++++
 .../client/core/it/v3/EntitySetTestITCase.java  | 151 ++++++
 .../core/it/v3/EntityUpdateTestITCase.java      | 238 +++++++++
 .../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       | 221 ++++++++
 .../it/v3/NavigationLinkCreateTestITCase.java   | 520 +++++++++++++++++++
 .../client/core/it/v3/OpenTypeTestITCase.java   | 273 ++++++++++
 .../core/it/v3/PrimitiveKeysTestITCase.java     |  80 +++
 .../core/it/v3/PropertyRetrieveTestITCase.java  | 277 ++++++++++
 .../client/core/it/v3/PropertyTestITCase.java   | 372 +++++++++++++
 .../core/it/v3/PropertyValueTestITCase.java     | 166 ++++++
 .../core/it/v3/QueryOptionsTestITCase.java      | 197 +++++++
 .../v3/ServiceDocumentRetrieveTestITCase.java   |  73 +++
 .../core/it/v3/ServiceDocumentTestITCase.java   |  56 ++
 .../v3/XHTTPMethodEntityUpdateTestITCase.java   |  38 ++
 .../v3/XHTTPMethodPropertyUpdateTestITCase.java |  38 ++
 .../client/core/it/v4/AbstractV4TestITCase.java |  53 ++
 .../client/core/it/v4/MetadataTestITCase.java   |  41 ++
 pom.xml                                         |  18 +
 210 files changed, 6047 insertions(+), 588 deletions(-)
----------------------------------------------------------------------