You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/04/04 07:51:12 UTC
[18/21] git commit: [OLINGO-206] merge master
[OLINGO-206] merge 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/929fb655
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/929fb655
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/929fb655
Branch: refs/heads/master
Commit: 929fb655604652b27466ef38533e961e5dcb4611
Parents: 2f7a865 793c56e
Author: Stephan Klevenz <st...@sap.com>
Authored: Wed Apr 2 09:43:09 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Wed Apr 2 09:43:09 2014 +0200
----------------------------------------------------------------------
.../org/apache/olingo/fit/AbstractServices.java | 91 +-
.../java/org/apache/olingo/fit/V4NorthWind.java | 47 +
.../org/apache/olingo/fit/V4NorthWindExt.java | 48 +
.../java/org/apache/olingo/fit/V4Services.java | 3 +-
.../olingo/fit/utils/AbstractJSONUtilities.java | 100 +-
.../olingo/fit/utils/AbstractUtilities.java | 76 +-
.../olingo/fit/utils/AbstractXMLUtilities.java | 180 ++-
.../org/apache/olingo/fit/utils/Commons.java | 54 +-
.../apache/olingo/fit/utils/ConstantKey.java | 67 +
.../org/apache/olingo/fit/utils/Constants.java | 161 +-
.../olingo/fit/utils/MetadataLinkInfo.java | 22 +
.../apache/olingo/fit/utils/ODataVersion.java | 2 +-
.../utils/ResolvingReferencesInterceptor.java | 57 +
.../fit/utils/XHTTPMethodInterceptor.java | 5 +-
.../olingo/fit/utils/XMLEventReaderWrapper.java | 21 +-
.../org/apache/olingo/fit/utils/XmlElement.java | 20 +-
.../olingo/fit/utils/v3/XMLUtilities.java | 7 +-
.../olingo/fit/utils/v4/XMLUtilities.java | 7 +-
.../main/resources/v4/Company/entity.full.json | 38 +
fit/src/main/resources/v4/Company/entity.xml | 49 +
.../resources/v4/Customers/1/entity.full.json | 67 +
.../main/resources/v4/Customers/1/entity.xml | 67 +
.../v4/Customers/1/links/Company.full.json | 4 +
.../resources/v4/Customers/1/links/Company.xml | 22 +
.../v4/Customers/1/links/Orders.full.json | 10 +
.../resources/v4/Customers/1/links/Orders.xml | 25 +
.../main/resources/v4/Orders/8/entity.full.json | 23 +
fit/src/main/resources/v4/Orders/8/entity.xml | 50 +
fit/src/main/resources/v4/Orders/8/etag.txt | 1 +
.../main/resources/v4/Orders/8/links/.full.json | 4 +
.../Orders/8/links/CustomerForOrder.full.json | 4 +
.../v4/Orders/8/links/CustomerForOrder.xml | 22 +
fit/src/main/resources/v4/Orders/feed.full.json | 48 +
fit/src/main/resources/v4/Orders/feed.xml | 72 +
.../main/resources/v4/People/5/entity.full.json | 51 +
fit/src/main/resources/v4/People/5/entity.xml | 55 +
.../v4/ProductDetails/6 1/entity.full.json | 19 +
.../resources/v4/ProductDetails/6 1/entity.xml | 41 +
fit/src/main/resources/v4/badRequest.json | 17 +
fit/src/main/resources/v4/badRequest.xml | 30 +
.../main/resources/v4/northwind-metadata.xml | 91 ++
.../main/resources/v4/northwindExt-metadata.xml | 408 +++++
fit/src/main/resources/v4/notFound.json | 11 +
fit/src/main/resources/v4/notFound.xml | 25 +
...JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json | 4 +
.../T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml | 22 +
fit/src/main/resources/v4/services.full.json | 126 ++
fit/src/main/resources/v4/services.xml | 102 ++
.../main/resources/v4/unsupportedMediaType.json | 17 +
.../main/resources/v4/unsupportedMediaType.xml | 34 +
.../main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../olingo/client/api/CommonODataClient.java | 10 +-
.../ODataClientErrorException.java | 31 +-
.../api/communication/header/HeaderName.java | 111 +-
.../communication/header/ODataHeaderValues.java | 45 -
.../communication/header/ODataPreferences.java | 424 +++++
.../api/communication/request/ODataRequest.java | 24 +-
.../api/communication/request/UpdateType.java | 55 -
.../request/cud/CommonCUDRequestFactory.java | 20 +-
.../request/cud/ODataEntityCreateRequest.java | 8 +-
.../communication/request/cud/UpdateType.java | 31 +
.../request/cud/v3/UpdateType.java | 56 +
.../request/cud/v4/UpdateType.java | 52 +
.../retrieve/CommonRetrieveRequestFactory.java | 83 +-
.../request/retrieve/EdmMetadataRequest.java | 28 +
.../request/retrieve/ODataEntityRequest.java | 4 +-
.../retrieve/ODataEntitySetIteratorRequest.java | 5 +-
.../request/retrieve/ODataEntitySetRequest.java | 9 +-
.../request/retrieve/ODataMetadataRequest.java | 28 -
.../request/retrieve/ODataPropertyRequest.java | 4 +-
.../request/retrieve/XMLMetadataRequest.java | 29 +
.../retrieve/v3/RetrieveRequestFactory.java | 22 +-
.../retrieve/v4/RetrieveRequestFactory.java | 21 +
.../response/ODataEntityCreateResponse.java | 9 +-
.../response/ODataEntityUpdateResponse.java | 4 +-
.../ODataMediaEntityCreateResponse.java | 4 +-
.../ODataMediaEntityUpdateResponse.java | 4 +-
.../response/ODataPropertyUpdateResponse.java | 4 +-
.../communication/response/ODataResponse.java | 25 +
.../olingo/client/api/data/ServiceDocument.java | 15 -
.../api/domain/ODataEntitySetIterator.java | 26 +-
.../client/api/op/ClientODataDeserializer.java | 3 +-
.../olingo/client/api/op/CommonODataBinder.java | 33 +-
.../olingo/client/api/op/CommonODataReader.java | 28 +-
.../olingo/client/api/op/ODataWriter.java | 14 +-
.../olingo/client/api/op/v3/ODataBinder.java | 22 +
.../client/api/op/v3/ODataDeserializer.java | 3 +-
.../olingo/client/api/op/v3/ODataReader.java | 13 +
.../olingo/client/api/op/v4/ODataBinder.java | 21 +
.../olingo/client/api/op/v4/ODataReader.java | 14 +
.../olingo/client/api/uri/CommonURIBuilder.java | 13 +-
.../olingo/client/api/uri/SegmentType.java | 1 +
.../olingo/client/api/uri/v3/URIBuilder.java | 3 +-
.../olingo/client/api/uri/v4/URIBuilder.java | 39 +-
.../olingo/client/api/v3/ODataClient.java | 10 +-
.../olingo/client/api/v4/ODataClient.java | 10 +-
.../olingo/client/core/AbstractODataClient.java | 21 -
.../communication/request/ODataRequestImpl.java | 55 +-
.../request/cud/AbstractCUDRequestFactory.java | 22 +-
.../cud/ODataEntityCreateRequestImpl.java | 31 +-
.../cud/ODataEntityUpdateRequestImpl.java | 18 +-
.../cud/ODataPropertyUpdateRequestImpl.java | 18 +-
.../cud/ODataValueUpdateRequestImpl.java | 4 +-
.../request/invoke/ODataInvokeRequestImpl.java | 28 +-
.../invoke/v3/InvokeRequestFactoryImpl.java | 18 +-
.../retrieve/AbstractMetadataRequestImpl.java | 52 +
.../retrieve/AbstractODataRetrieveRequest.java | 4 +
.../AbstractRetrieveRequestFactory.java | 39 +-
.../retrieve/EdmMetadataRequestImpl.java | 73 +
.../retrieve/ODataEntityRequestImpl.java | 23 +-
.../ODataEntitySetIteratorRequestImpl.java | 16 +-
.../retrieve/ODataEntitySetRequestImpl.java | 29 +-
.../retrieve/ODataMetadataRequestImpl.java | 108 --
.../retrieve/ODataPropertyRequestImpl.java | 22 +-
.../request/retrieve/ODataRawRequestImpl.java | 10 +-
.../ODataServiceDocumentRequestImpl.java | 6 +-
.../request/retrieve/ODataValueRequestImpl.java | 4 +-
.../retrieve/v3/RetrieveRequestFactoryImpl.java | 40 +-
.../retrieve/v3/XMLMetadataRequestImpl.java | 79 +
.../retrieve/v4/RetrieveRequestFactoryImpl.java | 42 +-
.../retrieve/v4/XMLMetadataRequestImpl.java | 122 ++
.../ODataMediaEntityCreateRequestImpl.java | 11 +-
.../ODataMediaEntityUpdateRequestImpl.java | 11 +-
.../response/AbstractODataResponse.java | 40 +
.../core/data/AbstractServiceDocument.java | 33 +-
.../data/JSONServiceDocumentDeserializer.java | 37 +-
.../data/XMLServiceDocumentDeserializer.java | 33 +-
.../core/data/v3/JSONServiceDocumentImpl.java | 32 -
.../core/data/v3/XMLServiceDocumentImpl.java | 18 -
.../core/data/v4/AbstractServiceDocument.java | 40 -
.../core/data/v4/JSONServiceDocumentImpl.java | 15 -
.../core/data/v4/XMLServiceDocumentImpl.java | 1 -
.../core/domain/ODataGeospatialValueImpl.java | 130 --
.../core/domain/ODataPrimitiveValueImpl.java | 177 --
.../edm/AbstractEdmServiceMetadataImpl.java | 24 +-
.../client/core/edm/EdmBindingTargetImpl.java | 39 +-
.../olingo/client/core/edm/EdmClientImpl.java | 46 +-
.../client/core/edm/EdmEntityContainerImpl.java | 57 +-
.../olingo/client/core/edm/EdmEnumTypeImpl.java | 4 +-
.../core/edm/EdmNavigationPropertyImpl.java | 35 +-
.../olingo/client/core/edm/EdmSchemaImpl.java | 9 +-
.../client/core/edm/EdmTypeDefinitionImpl.java | 2 +-
.../client/core/edm/v3/EdmEntitySetProxy.java | 18 +-
.../core/edm/v3/EdmServiceMetadataImpl.java | 9 +-
.../core/edm/v4/EdmServiceMetadataImpl.java | 24 +-
.../client/core/edm/xml/v4/XMLMetadataImpl.java | 1 +
.../client/core/op/AbstractODataBinder.java | 171 +-
.../client/core/op/AbstractODataReader.java | 78 +-
.../olingo/client/core/op/ODataWriterImpl.java | 20 +-
.../client/core/op/impl/v3/ODataBinderImpl.java | 68 +
.../core/op/impl/v3/ODataDeserializerImpl.java | 17 +-
.../client/core/op/impl/v3/ODataReaderImpl.java | 47 +-
.../client/core/op/impl/v4/ODataBinderImpl.java | 132 +-
.../core/op/impl/v4/ODataDeserializerImpl.java | 7 +-
.../client/core/op/impl/v4/ODataReaderImpl.java | 28 +-
.../core/uri/AbstractFilterArgFactory.java | 9 +-
.../client/core/uri/AbstractFilterFactory.java | 7 +
.../client/core/uri/AbstractURIBuilder.java | 78 +-
.../olingo/client/core/uri/FilterLiteral.java | 10 +-
.../olingo/client/core/uri/ParameterAlias.java | 48 +
.../apache/olingo/client/core/uri/URIUtils.java | 257 ++-
.../core/uri/v3/FilterArgFactoryImpl.java | 5 +
.../client/core/uri/v3/FilterFactoryImpl.java | 7 +-
.../client/core/uri/v3/URIBuilderImpl.java | 12 +-
.../core/uri/v4/FilterArgFactoryImpl.java | 5 +
.../client/core/uri/v4/FilterFactoryImpl.java | 7 +-
.../client/core/uri/v4/URIBuilderImpl.java | 41 +-
.../olingo/client/core/v3/ODataClientImpl.java | 13 +-
.../olingo/client/core/v4/ODataClientImpl.java | 17 +-
.../client/core/AbstractPrimitiveTest.java | 429 -----
.../client/core/AbstractPropertyTest.java | 175 --
.../apache/olingo/client/core/AbstractTest.java | 10 -
.../core/it/AbstractMetadataTestITCase.java | 7 +-
.../client/core/it/AbstractTestITCase.java | 550 -------
.../client/core/it/v3/AbstractTestITCase.java | 530 +++++-
.../client/core/it/v3/AsyncTestITCase.java | 22 +-
.../core/it/v3/EntityCreateTestITCase.java | 135 +-
.../core/it/v3/EntityRetrieveTestITCase.java | 43 +-
.../client/core/it/v3/EntitySetTestITCase.java | 19 +-
.../core/it/v3/EntityUpdateTestITCase.java | 29 +-
.../client/core/it/v3/ErrorTestITCase.java | 14 +-
.../core/it/v3/FilterFactoryTestITCase.java | 4 +-
.../client/core/it/v3/FilterTestITCase.java | 4 +-
.../core/it/v3/KeyAsSegmentTestITCase.java | 10 +-
.../client/core/it/v3/LinkTestITCase.java | 2 +-
.../core/it/v3/MediaEntityTestITCase.java | 8 +-
.../it/v3/NavigationLinkCreateTestITCase.java | 521 ------
.../client/core/it/v3/OpenTypeTestITCase.java | 168 +-
.../core/it/v3/PrimitiveKeysTestITCase.java | 8 +-
.../core/it/v3/PropertyRetrieveTestITCase.java | 41 +-
.../client/core/it/v3/PropertyTestITCase.java | 45 +-
.../core/it/v3/PropertyValueTestITCase.java | 24 +-
.../core/it/v3/QueryOptionsTestITCase.java | 40 +-
.../v3/ServiceDocumentRetrieveTestITCase.java | 73 -
.../client/core/it/v4/AbstractTestITCase.java | 3 +-
.../core/it/v4/EntityCreateTestITCase.java | 82 +
.../core/it/v4/EntityRetrieveTestITCase.java | 288 ++++
.../client/core/it/v4/EntitySetTestITCase.java | 30 +-
.../client/core/it/v4/MetadataTestITCase.java | 22 +-
.../core/it/v4/PropertyValueTestITCase.java | 145 ++
.../core/it/v4/ServiceDocumentTestITCase.java | 64 +
.../olingo/client/core/uri/URIEscapeTest.java | 79 +
.../client/core/uri/v3/FilterFactoryTest.java | 167 ++
.../client/core/uri/v3/URIBuilderTest.java | 162 ++
.../client/core/uri/v4/FilterFactoryTest.java | 86 +
.../client/core/uri/v4/URIBuilderTest.java | 152 ++
.../apache/olingo/client/core/v3/AtomTest.java | 10 +-
.../olingo/client/core/v3/EntitySetTest.java | 7 +-
.../olingo/client/core/v3/EntityTest.java | 31 +-
.../apache/olingo/client/core/v3/ErrorTest.java | 6 +-
.../client/core/v3/FilterFactoryTest.java | 167 --
.../apache/olingo/client/core/v3/JSONTest.java | 53 +-
.../olingo/client/core/v3/MetadataTest.java | 4 +-
.../client/core/v3/PrimitiveValueTest.java | 123 +-
.../olingo/client/core/v3/PropertyTest.java | 166 ++
.../olingo/client/core/v3/URIBuilderTest.java | 131 --
.../apache/olingo/client/core/v4/AtomTest.java | 74 +
.../olingo/client/core/v4/EntitySetTest.java | 91 ++
.../olingo/client/core/v4/EntityTest.java | 250 +++
.../apache/olingo/client/core/v4/ErrorTest.java | 61 +
.../client/core/v4/FilterFactoryTest.java | 86 -
.../apache/olingo/client/core/v4/JSONTest.java | 173 ++
.../olingo/client/core/v4/MetadataTest.java | 5 +-
.../client/core/v4/PrimitiveValueTest.java | 4 +-
.../olingo/client/core/v4/PropertyTest.java | 138 ++
.../client/core/v4/ServiceDocumentTest.java | 14 +-
.../olingo/client/core/v4/URIBuilderTest.java | 136 --
.../apache/olingo/client/core/atom_cleanup.xsl | 48 -
.../core/v3/Customer_-10_BackupContactInfo.json | 219 ++-
.../core/v3/Customer_-10_BackupContactInfo.xml | 397 ++++-
.../client/core/v3/Customer_-10_CustomerId.xml | 4 +-
.../v3/Customer_-10_PrimaryContactInfo.json | 45 +-
.../core/v3/Customer_-10_PrimaryContactInfo.xml | 82 +-
.../olingo/client/core/v3/atom_cleanup.xsl | 48 +
.../org/apache/olingo/client/core/v3/error.xml | 2 +-
...ccounts_101_expand_MyPaymentInstruments.json | 94 ++
...Accounts_101_expand_MyPaymentInstruments.xml | 129 ++
...ts_f89dee73-af9f-4cd4-b330-db93c25ff3c7.json | 16 +
...nts_f89dee73-af9f-4cd4-b330-db93c25ff3c7.xml | 46 +
.../apache/olingo/client/core/v4/Customers.json | 57 +
.../apache/olingo/client/core/v4/Customers.xml | 106 ++
.../client/core/v4/Employees_3_HomeAddress.json | 6 +
.../client/core/v4/Employees_3_HomeAddress.xml | 31 +
.../olingo/client/core/v4/PersonDetails_1.json | 22 +
.../olingo/client/core/v4/PersonDetails_1.xml | 55 +
.../olingo/client/core/v4/Products_5.json | 29 +
.../apache/olingo/client/core/v4/Products_5.xml | 49 +
.../client/core/v4/Products_5_CoverColors.json | 5 +
.../client/core/v4/Products_5_CoverColors.xml | 30 +
.../client/core/v4/Products_5_SkinColor.json | 5 +
.../client/core/v4/Products_5_SkinColor.xml | 27 +
.../olingo/client/core/v4/VipCustomer.json | 50 +
.../olingo/client/core/v4/VipCustomer.xml | 73 +
.../olingo/client/core/v4/atom_cleanup.xsl | 48 +
.../core/v4/collectionOfEntityReferences.json | 11 +
.../core/v4/collectionOfEntityReferences.xml | 25 +
.../olingo/client/core/v4/complexProperty.json | 8 -
.../core/v4/entity.collection.complex.json | 14 +
.../core/v4/entity.collection.primitive.json | 7 +
.../olingo/client/core/v4/entity.complex.json | 12 +
.../olingo/client/core/v4/entity.full.json | 22 +
.../olingo/client/core/v4/entity.minimal.json | 15 +
.../olingo/client/core/v4/entity.primitive.json | 22 +
.../olingo/client/core/v4/entityReference.json | 4 +
.../olingo/client/core/v4/entityReference.xml | 22 +
.../org/apache/olingo/client/core/v4/error.json | 14 +
.../org/apache/olingo/client/core/v4/error.xml | 31 +
.../olingo/client/core/v4/fromdoc1-metadata.xml | 2 +-
.../olingo/client/core/v4/fullEntity.json | 22 -
.../olingo/client/core/v4/fullEntitySet.json | 29 -
.../core/v4/fullEntitySetWithTwoEntities.json | 49 -
...fullEntityWithCollectionOfComplexValues.json | 28 -
.../client/core/v4/primitiveNullValue.json | 3 -
.../olingo/client/core/v4/serviceDocument.json | 1 +
.../client/core/v4/setOfComplexProperties.json | 13 -
.../core/v4/setOfPrimitiveProperties.json | 8 -
.../apache/olingo/commons/api/Constants.java | 53 +-
.../olingo/commons/api/data/Container.java | 76 +
.../apache/olingo/commons/api/data/Entry.java | 23 +-
.../olingo/commons/api/data/EnumValue.java | 25 +
.../apache/olingo/commons/api/data/Feed.java | 1 -
.../olingo/commons/api/data/GeoUtils.java | 9 +-
.../apache/olingo/commons/api/data/Value.java | 8 +-
.../api/domain/AbstractODataPayload.java | 52 +
.../commons/api/domain/AbstractODataValue.java | 44 +-
.../commons/api/domain/CommonODataEntity.java | 215 +++
.../api/domain/CommonODataEntitySet.java | 57 +
.../api/domain/CommonODataObjectFactory.java | 210 +++
.../commons/api/domain/CommonODataProperty.java | 77 +
.../api/domain/ODataCollectionValue.java | 66 +-
.../commons/api/domain/ODataComplexValue.java | 61 +-
.../olingo/commons/api/domain/ODataEntity.java | 316 ----
.../commons/api/domain/ODataEntitySet.java | 120 --
.../olingo/commons/api/domain/ODataError.java | 28 +-
.../api/domain/ODataGeospatialValue.java | 57 -
.../commons/api/domain/ODataInlineEntity.java | 8 +-
.../api/domain/ODataInlineEntitySet.java | 8 +-
.../olingo/commons/api/domain/ODataItem.java | 26 +-
.../olingo/commons/api/domain/ODataLink.java | 10 +-
.../commons/api/domain/ODataObjectFactory.java | 218 ---
.../commons/api/domain/ODataProperty.java | 186 ---
.../commons/api/domain/ODataPropertyType.java | 8 +-
.../api/domain/ODataServiceDocument.java | 20 -
.../olingo/commons/api/domain/ODataValue.java | 27 +-
.../commons/api/domain/v3/ODataEntity.java | 32 +
.../commons/api/domain/v3/ODataEntitySet.java | 29 +
.../api/domain/v3/ODataObjectFactory.java | 58 +
.../commons/api/domain/v3/ODataProperty.java | 41 +
.../commons/api/domain/v4/ODataEntity.java | 52 +
.../commons/api/domain/v4/ODataEntitySet.java | 29 +
.../commons/api/domain/v4/ODataEnumValue.java | 24 +
.../api/domain/v4/ODataObjectFactory.java | 62 +
.../commons/api/domain/v4/ODataProperty.java | 54 +
.../commons/api/domain/v4/ODataValue.java | 36 +
.../commons/api/edm/EdmBindingTarget.java | 7 +
.../commons/api/edm/EdmEntityContainer.java | 5 +
.../olingo/commons/api/edm/EdmEnumType.java | 5 +
.../commons/api/edm/EdmGeospatialType.java | 34 -
.../commons/api/edm/EdmNavigationProperty.java | 27 +-
.../api/edm/EdmNavigationPropertyBinding.java | 28 +
.../api/edm/EdmReferentialConstraint.java | 28 +
.../api/edm/constants/ODataServiceVersion.java | 71 +
.../commons/api/edm/geo/ComposedGeospatial.java | 22 +-
.../olingo/commons/api/edm/geo/Geospatial.java | 36 +-
.../api/edm/geo/GeospatialCollection.java | 15 +-
.../olingo/commons/api/edm/geo/LineString.java | 4 +-
.../commons/api/edm/geo/MultiLineString.java | 8 +-
.../olingo/commons/api/edm/geo/MultiPoint.java | 4 +-
.../commons/api/edm/geo/MultiPolygon.java | 8 +-
.../olingo/commons/api/edm/geo/Point.java | 8 +-
.../olingo/commons/api/edm/geo/Polygon.java | 18 +-
.../olingo/commons/api/format/ContentType.java | 28 +-
.../olingo/commons/api/format/ODataFormat.java | 36 +-
.../commons/api/format/ODataPubFormat.java | 31 +-
.../commons/api/op/CommonODataDeserializer.java | 8 +-
.../commons/core/data/AbstractAtomDealer.java | 36 +-
.../commons/core/data/AbstractAtomObject.java | 78 -
.../olingo/commons/core/data/AbstractEntry.java | 14 +-
.../core/data/AbstractJsonDeserializer.java | 28 +-
.../core/data/AbstractJsonSerializer.java | 16 +-
.../commons/core/data/AbstractODataError.java | 58 +
.../commons/core/data/AbstractODataObject.java | 81 +
.../commons/core/data/AbstractProperty.java | 80 +
.../commons/core/data/AbstractPropertyImpl.java | 80 -
.../olingo/commons/core/data/AbstractValue.java | 17 +-
.../commons/core/data/AtomDeserializer.java | 329 ++--
.../olingo/commons/core/data/AtomFeedImpl.java | 2 +-
.../core/data/AtomGeoValueDeserializer.java | 46 +-
.../core/data/AtomGeoValueSerializer.java | 4 +-
.../core/data/AtomPropertyDeserializer.java | 54 +-
.../commons/core/data/AtomPropertyImpl.java | 2 +-
.../core/data/AtomPropertySerializer.java | 42 +-
.../commons/core/data/AtomSerializer.java | 38 +-
.../olingo/commons/core/data/EnumValueImpl.java | 41 +
.../core/data/JSONEntryDeserializer.java | 118 +-
.../olingo/commons/core/data/JSONEntryImpl.java | 59 -
.../commons/core/data/JSONEntrySerializer.java | 8 +-
.../commons/core/data/JSONErrorBundle.java | 50 -
.../olingo/commons/core/data/JSONErrorImpl.java | 237 ---
.../commons/core/data/JSONFeedDeserializer.java | 39 +-
.../olingo/commons/core/data/JSONFeedImpl.java | 26 +-
.../commons/core/data/JSONFeedSerializer.java | 9 +-
.../core/data/JSONGeoValueDeserializer.java | 73 +-
.../core/data/JSONGeoValueSerializer.java | 8 +-
.../core/data/JSONODataErrorDeserializer.java | 60 +
.../commons/core/data/JSONODataErrorImpl.java | 26 +
.../core/data/JSONPropertyDeserializer.java | 38 +-
.../commons/core/data/JSONPropertyImpl.java | 22 +-
.../core/data/JSONPropertySerializer.java | 12 +-
.../core/data/ODataJacksonDeserializer.java | 42 +
.../commons/core/data/PrimitiveValueImpl.java | 2 +-
.../olingo/commons/core/data/XMLErrorImpl.java | 213 ---
.../commons/core/data/XMLODataErrorImpl.java | 23 +
.../domain/AbstractODataCollectionValue.java | 92 ++
.../core/domain/AbstractODataComplexValue.java | 93 ++
.../core/domain/AbstractODataEntity.java | 268 ++++
.../core/domain/AbstractODataEntitySet.java | 73 +
.../core/domain/AbstractODataObjectFactory.java | 115 ++
.../domain/AbstractODataPrimitiveValue.java | 179 +++
.../core/domain/AbstractODataProperty.java | 147 ++
.../domain/v3/ODataCollectionValueImpl.java | 32 +
.../core/domain/v3/ODataComplexValueImpl.java | 32 +
.../commons/core/domain/v3/ODataEntityImpl.java | 46 +
.../core/domain/v3/ODataEntitySetImpl.java | 51 +
.../core/domain/v3/ODataObjectFactoryImpl.java | 96 ++
.../core/domain/v3/ODataPrimitiveValueImpl.java | 44 +
.../core/domain/v3/ODataPropertyImpl.java | 45 +
.../domain/v4/ODataCollectionValueImpl.java | 42 +
.../core/domain/v4/ODataComplexValueImpl.java | 44 +
.../commons/core/domain/v4/ODataEntityImpl.java | 62 +
.../core/domain/v4/ODataEntitySetImpl.java | 51 +
.../core/domain/v4/ODataEnumValueImpl.java | 50 +
.../core/domain/v4/ODataObjectFactoryImpl.java | 107 ++
.../core/domain/v4/ODataPrimitiveValueImpl.java | 56 +
.../core/domain/v4/ODataPropertyImpl.java | 57 +
.../core/edm/AbstractEdmEntityContainer.java | 196 +--
.../commons/core/edm/AbstractEdmEnumType.java | 5 +
.../commons/core/edm/AbstractEdmParameter.java | 2 +-
.../edm/EdmNavigationPropertyBindingImpl.java | 43 +
.../core/edm/EdmReferentialConstraintImpl.java | 42 +
.../olingo/commons/core/edm/EdmTypeInfo.java | 1 -
.../AbstractEdmGeospatialType.java | 76 -
.../primitivetype/AbstractGeospatialType.java | 539 +++++++
.../core/edm/primitivetype/EdmGeography.java | 19 +-
.../primitivetype/EdmGeographyCollection.java | 33 +-
.../primitivetype/EdmGeographyLineString.java | 32 +-
.../EdmGeographyMultiLineString.java | 33 +-
.../primitivetype/EdmGeographyMultiPoint.java | 34 +-
.../primitivetype/EdmGeographyMultiPolygon.java | 32 +-
.../edm/primitivetype/EdmGeographyPoint.java | 29 +-
.../edm/primitivetype/EdmGeographyPolygon.java | 32 +-
.../core/edm/primitivetype/EdmGeometry.java | 19 +-
.../primitivetype/EdmGeometryCollection.java | 33 +-
.../primitivetype/EdmGeometryLineString.java | 32 +-
.../EdmGeometryMultiLineString.java | 33 +-
.../primitivetype/EdmGeometryMultiPoint.java | 33 +-
.../primitivetype/EdmGeometryMultiPolygon.java | 33 +-
.../edm/primitivetype/EdmGeometryPoint.java | 28 +-
.../edm/primitivetype/EdmGeometryPolygon.java | 32 +-
.../primitivetype/EdmPrimitiveTypeFactory.java | 31 +-
.../commons/core/edm/primitivetype/EdmTime.java | 5 +
.../core/op/AbstractODataDeserializer.java | 57 +-
.../commons/core/op/ODataObjectFactoryImpl.java | 162 --
.../primitivetype/CommonPrimitiveTypeTest.java | 170 +-
.../core/edm/primitivetype/EdmBinaryTest.java | 2 +-
.../core/edm/primitivetype/EdmBooleanTest.java | 2 +-
.../core/edm/primitivetype/EdmByteTest.java | 2 +-
.../core/edm/primitivetype/EdmDateTest.java | 2 +-
.../primitivetype/EdmDateTimeOffsetTest.java | 2 +-
.../core/edm/primitivetype/EdmDecimalTest.java | 16 +-
.../core/edm/primitivetype/EdmDoubleTest.java | 14 +-
.../core/edm/primitivetype/EdmDurationTest.java | 2 +-
.../core/edm/primitivetype/EdmGeoTest.java | 174 ++
.../core/edm/primitivetype/EdmGuidTest.java | 2 +-
.../core/edm/primitivetype/EdmInt16Test.java | 6 +-
.../core/edm/primitivetype/EdmInt32Test.java | 8 +-
.../core/edm/primitivetype/EdmInt64Test.java | 10 +-
.../core/edm/primitivetype/EdmNullTest.java | 20 +-
.../core/edm/primitivetype/EdmSByteTest.java | 2 +-
.../core/edm/primitivetype/EdmSingleTest.java | 12 +-
.../core/edm/primitivetype/EdmStringTest.java | 2 +-
.../edm/primitivetype/EdmTimeOfDayTest.java | 2 +-
.../core/edm/primitivetype/UInt7Test.java | 2 +-
.../apache/olingo/server/api/ODataFormat.java | 23 -
.../olingo/server/api/ODataSerializer.java | 31 -
.../apache/olingo/server/api/ODataServer.java | 2 +
.../server/api/serializer/ODataFormat.java | 23 +
.../server/api/serializer/ODataSerializer.java | 33 +
.../olingo/server/core/CircleStreamBuffer.java | 327 ----
.../olingo/server/core/ODataJsonSerializer.java | 147 --
.../olingo/server/core/ODataSerializerImpl.java | 38 -
.../olingo/server/core/ODataServerImpl.java | 10 +-
.../server/core/edm/provider/EdmActionImpl.java | 16 +-
.../core/edm/provider/EdmActionImportImpl.java | 16 +-
.../core/edm/provider/EdmBindingTargetImpl.java | 44 +-
.../core/edm/provider/EdmComplexTypeImpl.java | 20 +-
.../edm/provider/EdmEntityContainerImpl.java | 13 +-
.../core/edm/provider/EdmEntitySetImpl.java | 16 +-
.../core/edm/provider/EdmEntityTypeImpl.java | 22 +-
.../core/edm/provider/EdmEnumTypeImpl.java | 20 +-
.../core/edm/provider/EdmFunctionImpl.java | 16 +-
.../edm/provider/EdmKeyPropertyRefImpl.java | 16 +-
.../edm/provider/EdmNavigationPropertyImpl.java | 34 +-
.../edm/provider/EdmOperationImportImpl.java | 2 +-
.../core/edm/provider/EdmParameterImpl.java | 16 +-
.../core/edm/provider/EdmPropertyImpl.java | 16 +-
.../core/edm/provider/EdmReturnTypeImpl.java | 16 +-
.../server/core/edm/provider/EdmSchemaImpl.java | 2 +-
.../edm/provider/EdmServiceMetadataImpl.java | 18 +-
.../core/edm/provider/EdmSingletonImpl.java | 16 +-
.../provider/EdmStructuredTypeHelperImpl.java | 16 +-
.../edm/provider/EdmTypeDefinitionImpl.java | 2 +-
.../core/serializer/ODataJsonSerializer.java | 87 +
.../core/serializer/ODataXmlSerializerImpl.java | 72 +
.../json/ServiceDocumentJsonSerializer.java | 103 ++
.../serializer/utils/CircleStreamBuffer.java | 327 ++++
.../xml/MetadataDocumentXmlSerializer.java | 543 +++++++
.../olingo/server/core/uri/UriInfoImpl.java | 4 +-
.../server/core/uri/UriParameterImpl.java | 16 +-
.../server/core/uri/UriResourceActionImpl.java | 16 +-
.../uri/UriResourceComplexPropertyImpl.java | 16 +-
.../server/core/uri/UriResourceCountImpl.java | 16 +-
.../core/uri/UriResourceEntitySetImpl.java | 16 +-
.../core/uri/UriResourceFunctionImpl.java | 16 +-
.../olingo/server/core/uri/UriResourceImpl.java | 16 +-
.../server/core/uri/UriResourceItImpl.java | 16 +-
.../core/uri/UriResourceLambdaAllImpl.java | 16 +-
.../core/uri/UriResourceLambdaAnyImpl.java | 16 +-
.../core/uri/UriResourceLambdaVarImpl.java | 16 +-
.../uri/UriResourceNavigationPropertyImpl.java | 16 +-
.../uri/UriResourcePrimitivePropertyImpl.java | 16 +-
.../server/core/uri/UriResourceRefImpl.java | 16 +-
.../server/core/uri/UriResourceRootImpl.java | 16 +-
.../core/uri/UriResourceSingletonImpl.java | 16 +-
.../uri/UriResourceStartingTypeFilterImpl.java | 16 +-
.../server/core/uri/UriResourceTypedImpl.java | 16 +-
.../server/core/uri/UriResourceValueImpl.java | 16 +-
.../olingo/server/core/uri/parser/RawUri.java | 16 +-
.../server/core/uri/parser/UriContext.java | 33 +-
.../core/uri/parser/UriParseTreeVisitor.java | 37 +-
.../core/uri/parser/UriParserException.java | 16 +-
.../uri/parser/UriParserSemanticException.java | 16 +-
.../uri/parser/UriParserSyntaxException.java | 16 +-
.../uri/queryoption/AliasQueryOptionImpl.java | 16 +-
.../core/uri/queryoption/CountOptionImpl.java | 16 +-
.../uri/queryoption/CustomQueryOptionImpl.java | 16 +-
.../core/uri/queryoption/ExpandItemImpl.java | 28 +-
.../core/uri/queryoption/ExpandOptionImpl.java | 16 +-
.../core/uri/queryoption/FilterOptionImpl.java | 16 +-
.../core/uri/queryoption/FormatOptionImpl.java | 16 +-
.../core/uri/queryoption/IdOptionImpl.java | 16 +-
.../core/uri/queryoption/LevelsOptionImpl.java | 16 +-
.../core/uri/queryoption/OrderByItemImpl.java | 16 +-
.../core/uri/queryoption/OrderByOptionImpl.java | 16 +-
.../core/uri/queryoption/QueryOptionImpl.java | 16 +-
.../core/uri/queryoption/SearchOptionImpl.java | 16 +-
.../core/uri/queryoption/SelectItemImpl.java | 28 +-
.../core/uri/queryoption/SelectOptionImpl.java | 16 +-
.../core/uri/queryoption/SkipOptionImpl.java | 16 +-
.../uri/queryoption/SkipTokenOptionImpl.java | 16 +-
.../uri/queryoption/SystemQueryOptionImpl.java | 18 +-
.../core/uri/queryoption/TopOptionImpl.java | 17 +-
.../uri/queryoption/expression/AliasImpl.java | 16 +-
.../uri/queryoption/expression/BinaryImpl.java | 16 +-
.../queryoption/expression/EnumerationImpl.java | 16 +-
.../queryoption/expression/ExpressionImpl.java | 16 +-
.../queryoption/expression/LambdaRefImpl.java | 16 +-
.../uri/queryoption/expression/LiteralImpl.java | 16 +-
.../uri/queryoption/expression/MemberImpl.java | 28 +-
.../uri/queryoption/expression/MethodImpl.java | 16 +-
.../queryoption/expression/TypeLiteralImpl.java | 16 +-
.../uri/queryoption/expression/UnaryImpl.java | 16 +-
.../olingo/server/core/ServiceDocumentTest.java | 133 --
.../core/edm/provider/EdmActionImplTest.java | 18 +-
.../edm/provider/EdmActionImportImplTest.java | 2 -
.../edm/provider/EdmComplexTypeImplTest.java | 16 +-
.../provider/EdmEntityContainerImplTest.java | 100 +-
.../core/edm/provider/EdmEntitySetImplTest.java | 19 +-
.../edm/provider/EdmEntityTypeImplTest.java | 16 +-
.../server/core/edm/provider/EdmEnumTest.java | 18 +-
.../core/edm/provider/EdmFunctionImplTest.java | 18 +-
.../edm/provider/EdmFunctionImportImplTest.java | 18 +-
.../edm/provider/EdmKeyPropertyRefImplTest.java | 17 +-
.../core/edm/provider/EdmMemberImplTest.java | 20 +-
.../core/edm/provider/EdmNamedImplTest.java | 16 +-
.../provider/EdmNavigationPropertyImplTest.java | 18 +-
.../core/edm/provider/EdmParameterImplTest.java | 16 +-
.../core/edm/provider/EdmPropertyImplTest.java | 16 +-
.../EdmProviderImplOverloadingTest.java | 17 +-
.../core/edm/provider/EdmProviderImplTest.java | 17 +-
.../edm/provider/EdmReturnTypeImplTest.java | 20 +-
.../core/edm/provider/EdmSchemaImplTest.java | 33 +-
.../provider/EdmServiceMetadataImplTest.java | 17 +-
.../core/edm/provider/EdmSingletonImplTest.java | 19 +-
.../edm/provider/EdmTypeDefinitionImplTest.java | 18 +-
.../core/edm/provider/EdmTypeImplTest.java | 16 +-
.../serializer/json/ServiceDocumentTest.java | 133 ++
.../serializer/xml/MetadataDocumentTest.java | 57 +
.../core/testutil/EdmTechTestProvider.java | 24 +-
.../server/core/testutil/StringUtils.java | 4 +-
.../testutil/techprovider/ActionProvider.java | 191 +++
.../techprovider/ComplexTypeProvider.java | 175 ++
.../techprovider/ContainerProvider.java | 361 +++++
.../testutil/techprovider/EdmTechProvider.java | 147 ++
.../techprovider/EntityTypeProvider.java | 410 +++++
.../testutil/techprovider/EnumTypeProvider.java | 47 +
.../testutil/techprovider/FunctionProvider.java | 852 ++++++++++
.../testutil/techprovider/PropertyProvider.java | 590 +++++++
.../testutil/techprovider/SchemaProvider.java | 250 +++
.../techprovider/TypeDefinitionProvider.java | 30 +
.../olingo/server/core/uri/RawUriTest.java | 26 +-
.../olingo/server/core/uri/UriInfoImplTest.java | 23 +-
.../server/core/uri/UriResourceImplTest.java | 60 +-
.../core/uri/antlr/TestFullResourcePath.java | 1515 +++++++++---------
.../olingo/server/core/uri/antlr/TestLexer.java | 25 +-
.../core/uri/antlr/TestUriParserImpl.java | 310 ++--
.../core/uri/queryoption/QueryOptionTest.java | 34 +-
.../queryoption/expression/ExpressionTest.java | 57 +-
.../core/uri/testutil/ExpandValidator.java | 29 +-
.../core/uri/testutil/FilterTreeToText.java | 16 +-
.../core/uri/testutil/FilterValidator.java | 22 +-
.../core/uri/testutil/ParseTreeToText.java | 16 +-
.../core/uri/testutil/ParserValidator.java | 16 +-
.../core/uri/testutil/ParserWithLogging.java | 16 +-
.../core/uri/testutil/ResourceValidator.java | 50 +-
.../core/uri/testutil/TestErrorLogger.java | 16 +-
.../core/uri/testutil/TokenValidator.java | 16 +-
.../core/uri/testutil/UriLexerWithTrace.java | 16 +-
.../server/core/uri/testutil/UriValidator.java | 27 +-
.../server/core/uri/testutil/Validator.java | 16 +-
pom.xml | 18 +
591 files changed, 22528 insertions(+), 10350 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/929fb655/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java
----------------------------------------------------------------------
diff --cc lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java
index a5ec95b,eedefce..5992d90
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java
@@@ -278,13 -289,8 +278,13 @@@ public class UriInfoImpl implements Uri
return this;
}
- public void removeResourcePart(int index) {
- this.pathParts.remove(index);
+ public void removeResourcePart(final int index) {
+ pathParts.remove(index);
+ }
+ @Override
+ public Collection<SystemQueryOption> getSystemQueryOptions() {
+ return Collections.unmodifiableCollection(systemQueryOptions.values());
}
+
}